diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-05-10 13:54:55 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-05-10 13:54:55 +0000 |
| commit | 86fbbabeeaf4e79c8a91da2f1efd1089829b2048 (patch) | |
| tree | 4a8b1bf98abbf842e62d8b85820d96834864a925 /dev-qt/qtlockedfile | |
| parent | Version Bump (diff) | |
| download | gentoo-2-86fbbabeeaf4e79c8a91da2f1efd1089829b2048.tar.gz gentoo-2-86fbbabeeaf4e79c8a91da2f1efd1089829b2048.tar.bz2 gentoo-2-86fbbabeeaf4e79c8a91da2f1efd1089829b2048.zip | |
Use improved and unified qtlockedfile.prf from Fedora.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Diffstat (limited to 'dev-qt/qtlockedfile')
| -rw-r--r-- | dev-qt/qtlockedfile/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-qt/qtlockedfile/files/qtlockedfile.prf | 7 | ||||
| -rw-r--r-- | dev-qt/qtlockedfile/files/qtlockedfile5.prf | 3 | ||||
| -rw-r--r-- | dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r2.ebuild (renamed from dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild) | 4 |
4 files changed, 15 insertions, 8 deletions
diff --git a/dev-qt/qtlockedfile/ChangeLog b/dev-qt/qtlockedfile/ChangeLog index 7c9985d77755..1db6d4fe0f8a 100644 --- a/dev-qt/qtlockedfile/ChangeLog +++ b/dev-qt/qtlockedfile/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-qt/qtlockedfile # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/ChangeLog,v 1.15 2015/03/02 09:04:19 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/ChangeLog,v 1.16 2015/05/10 13:54:55 pesa Exp $ + +*qtlockedfile-2.4.1_p20130904-r2 (10 May 2015) + + 10 May 2015; Davide Pesavento <pesa@gentoo.org> + +qtlockedfile-2.4.1_p20130904-r2.ebuild, -files/qtlockedfile5.prf, + -qtlockedfile-2.4.1_p20130904-r1.ebuild, files/qtlockedfile.prf: + Use improved and unified qtlockedfile.prf from Fedora. 02 Mar 2015; Agostino Sarubbo <ago@gentoo.org> qtlockedfile-2.4.1_p20130904-r1.ebuild, qtlockedfile-2.4.1_p20130904.ebuild: diff --git a/dev-qt/qtlockedfile/files/qtlockedfile.prf b/dev-qt/qtlockedfile/files/qtlockedfile.prf index 970db04e7fe8..93d656e69586 100644 --- a/dev-qt/qtlockedfile/files/qtlockedfile.prf +++ b/dev-qt/qtlockedfile/files/qtlockedfile.prf @@ -1,3 +1,6 @@ -INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtSolutions -DEPENDPATH *= $$QMAKE_INCDIR_QT/QtSolutions +INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions +greaterThan(QT_MAJOR_VERSION, 4) { +LIBS *= -lQt$${QT_MAJOR_VERSION}Solutions_LockedFile-2.4 +} else { LIBS *= -lQtSolutions_LockedFile-2.4 +} diff --git a/dev-qt/qtlockedfile/files/qtlockedfile5.prf b/dev-qt/qtlockedfile/files/qtlockedfile5.prf deleted file mode 100644 index b22ba89e9a1b..000000000000 --- a/dev-qt/qtlockedfile/files/qtlockedfile5.prf +++ /dev/null @@ -1,3 +0,0 @@ -INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions -DEPENDPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions -LIBS *= -lQt5Solutions_LockedFile-2.4 diff --git a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r2.ebuild index 35083f3b4b9c..405cf3f2e2f5 100644 --- a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild +++ b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild,v 1.5 2015/03/02 09:04:19 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r2.ebuild,v 1.1 2015/05/10 13:54:55 pesa Exp $ EAPI=5 @@ -76,7 +76,7 @@ src_install() { doins src/QtLockedFile src/${PN}.h insinto /usr/$(get_libdir)/qt5/mkspecs/features - newins "${FILESDIR}"/${PN}5.prf ${PN}.prf + doins "${FILESDIR}"/${PN}.prf fi dolib.so lib/* |