Add Qt 5 support wrt bug #534304.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

diff --git a/dev-qt/qtlockedfile/ChangeLog b/dev-qt/qtlockedfile/ChangeLog
index f62879ca309ab1831f250e1d2251232860a5ce42..20d291eec32d65eeff1e8ec464d4c24582ec445f 100644 (file)
--- a/dev-qt/qtlockedfile/ChangeLog
+++ b/dev-qt/qtlockedfile/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtlockedfile
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/ChangeLog,v 1.10 2014/07/14 11:52:44 pesa Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/ChangeLog,v 1.11 2015/01/02 16:51:33 kensington Exp $
+
+*qtlockedfile-2.4.1_p20130904-r1 (02 Jan 2015)
+
+  02 Jan 2015; Michael Palimaka <kensington@gentoo.org>
+  +files/qtlockedfile5.prf, +qtlockedfile-2.4.1_p20130904-r1.ebuild:
+  Add Qt 5 support wrt bug #534304.
 
   14 Jul 2014; Davide Pesavento <pesa@gentoo.org>
   qtlockedfile-2.4.1_p20130904.ebuild:

diff --git a/dev-qt/qtlockedfile/Manifest b/dev-qt/qtlockedfile/Manifest
index 312b47841f7ff8709b08c5f02a3e94e00374b3fb..c576de95d79fa8d837ee116f1d7df56b39d8eecc 100644 (file)
--- a/dev-qt/qtlockedfile/Manifest
+++ b/dev-qt/qtlockedfile/Manifest
@@ -2,26 +2,27 @@
 Hash: SHA256
 
 AUX qtlockedfile.prf 127 SHA256 6e7023bee801fe58a477b37223ed484763f6e429713b67376c414884fbcd9351 SHA512 c0c2d30c6c598ab5b8f52985df6cbf60199391dd1a43114a26c42c2fd13faeecd65f289433594ceda7dd7ed28925b00f1205ae0cb5d324859dcef2c152a3d075 WHIRLPOOL 971c8d4eec4af74cb0fc79f3c56f9a4a587d9d2509245a0e2eeeb767ac42af7491fa7fdf58cbd16bdb6f75e3fe0c8aea9e8f900afca7243ad5d0fc1726539376
+AUX qtlockedfile5.prf 138 SHA256 d3e5a0d8f6ecd2cace6b87a00594d820f26ccb1c6d3909b8e285494ba47561cd SHA512 b8ea398207afe648d3d652551184e8acf9452529db841898750ebe10b21352782d9da77864897073f4a71800b101ad08274159c81d66d228ce7a4f2adcd5fe48 WHIRLPOOL 55a7f94cebf8d023bc13e2318b91e48e82913955ebcbf3198e83c59b45007f979d438a015f73a4113d7c8cd5f8c2d3438e96c4324eda729b8996fb3c8e601543
 DIST qt-solutions-20130904.tar.xz 751536 SHA256 fc27b49883269a21ced2d3cb543eb78e79223afe5933bbc7d3194146f72f8884 SHA512 9e50d0a7d9fee08a72a3c6dee1d3fe45d04ae0930a967d81eff457f6c0ff53ac8449ef1d8241a5ce75ca2dcf9f4a2fe27b899647748d11060c3ab5767c3d0e75 WHIRLPOOL b933a301de905cffab8393a7adf055ed2f5198f1572657f5993e016746340d9862017982308ac11310add272ae1cd5c3435054dce2dd9d7ee5a9c92baf1878c2
+EBUILD qtlockedfile-2.4.1_p20130904-r1.ebuild 2090 SHA256 9c3e6307fa8c8d58c497faa9876453d35a8ec95419a0a11abcb3b71642a5a65c SHA512 a38cb8627bf6c17d0ab053e40ad08b8bd43db934c584b15ca922fe91e84732a2ff658873b0ad4ed7bebedf9ec8c84d8dad57104a2bbb65311eeadeed3adb6bb5 WHIRLPOOL 2b987b33b78f01491abdb2de8fbaab54104e61d55fe48865936c77fcdb9bd8b797a5eea3a1216059b8a7bba2272c9f0f51b8305d1c0f04595250dbec60e8634a
 EBUILD qtlockedfile-2.4.1_p20130904.ebuild 1125 SHA256 81a655133a9f2e2fd91cb8dcfdc34400e162dfd7525bd961c469cb374b0fd8c4 SHA512 b550606ac47daf3af1ba49eaf59ce65033f308e41524f41f70db4bc3c65725df6d29b306482786192841ca642625daaf5c44f255619e84b589ce2a4091af193e WHIRLPOOL 12039366a6387c2fbfad676107fa4b22f6e3eb6bd0283250bb7ba42b7e0d6b1811c6d11e1eb30df5c717b40956b18683b2fd89b42f1c9b4be32859525e3fd141
-MISC ChangeLog 1575 SHA256 1675f5361a48bb053be0f220a80a2b18d82514a8833e2be1c067325fb3568790 SHA512 8c7224cf71991a7e138cf253a15d5da61364e1254c8f025dbcf3eddecc23538d24cabe2261a3f9bb9facbca8bcb608bc7ffac8c30e2e4fc0efb71cd41350ef6c WHIRLPOOL 667dae427a615d9f5094ed48af98f4334928f7e7ee14fe66196e0f4cc83c8fd6194b3e8836eb1527dcaf176d8dc1983d1723fb7b2579c168c0f4689bee074f1b
+MISC ChangeLog 1791 SHA256 7e0b26596952163e390b5a1297ba9e5b570844480e94cd95b045db471ed76c74 SHA512 54fc50b1b8fa1b8f69a42ce56396be5301ab687ef7655ea3fbefc6d987fd5ebc8841c1b716f6849af7be4a112665e8cee6372c3139336cb8c7effa11737476bf WHIRLPOOL 23702eb0e2d1d270922948fc0737861a48afb3e158fb380df21bd73f378389be04b7874e67f3eb4ee75e4bf68f9e8267454871ebc79e22d9c570c74d019de2a3
 MISC metadata.xml 156 SHA256 2bc85ad7339ae0191c26e435f2da777058779a7ebf73d14658a6ea7bfcec01b2 SHA512 d9991797d488000e1b306b9d97982fb862fbb44d72d4f7560e3ab12ba2022a7abdd3a71bd971a18f562edefc6948e5d5db0972425f7ebe7208696678f1c17b45 WHIRLPOOL aa1bf1df6e2bb4c13c1eae59bfa12dcfe4b81794562c52538f037c75d706f415fed1acc302501cd5f3017b13c910cadbbb9b823a0625cd3b64b29b860259492e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTw8SVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9WvMP/jMpfB1t9qV8rapShL/tNVau
-+b/02FQItn6GVD9vOhvqWFtJ+HNO1o0rwlKrEjT0c9DvKl2t2zQXd+wy+A7HWNZe
-RpDO3uh3dnGlu9/4xTSMAEfvvcud6I6EUJxxiyH43NVJV0mT1iKiNHTluZvrHRME
-hgVtWirFP68kSTZ7XQeauwrkY1B2+iFWhCw+VJrekivL2X9CKHN2XY87KEEnmbgt
-2Gu2toKB1ZAO62i7SFxrQnLpdQiKr7mcXfoLHanPdICqnTWBA2hSY9WLmokeP7Fv
-YGmxAWNgkBpxNaKni6MM3hJ1ZWBCaMCv/v2reXNJJNlo9HWuiyeLrRJczBCyN1ht
-aoVe5kXJm/CUzgD497e56CHm39deHFjtf+neVJzB55T7F3f6qhDEVujJ3YokLGhy
-IHZJbQCyVROAdH0IOVYyazmskG5odYiC1H/6UZhHAUuV0jQv0tPXmYUMaM3YBux5
-/WdT8GAqbwFcJjikSHcRTHu43hHe8epz16oWJmj/JAL5vI2a1vQquGsMbJJvynXy
-ngn6hbdNNr2RNUvBoQyLAXFroo7vVspLkAJVnr5mjkjew5hlArd82Jqjl0sbqWXD
-gddw56RLMTaATW9T7YdDN75B2i2o41YUjY4gx6w9VDVuSSkhCKNGjTziUhgys6iD
-VO6x+IzstNLGvpuvkxW3
-=4izq
+iQJiBAEBCABMBQJUpsyoRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7PmhEAC9R6qx1qcuAXRLb1LaolL+WfjUvR4mcLGa1SZWPgyKfB2ebVOwOAfvsbgy
+pwzWRiaWUOmR+E6vqLJF+2eZAR2Xl8GCeTdwSLDzayALAGWEy8YybyCgmhnYV9ms
+Rx2CWKYxRUC2sg+jJkNXtzg7xM+jSAge8mCcRdasAF4hn/88BqtJT6rK1jbQDLQO
+T9I4qpmos8m5WvZrQyWKgxhAtaKmfqVBdAPPGk6QWCyRIQl7Aqe87K0GRiS/dOv8
+3rW8SZ1pwxXZFNE8yZWseHbgLXUV4xgwjSTI3wiiFDk3riiY3g3B1ArKGRQfw0n9
+Ty9p++1gFkFfChSnqB2IzUYuM05Gnof1TLnR02mW05uPefg2hG0HIvzoPtkIFQcT
+xkCBbq7mqV9xtR+pOvR4APrTi2IIHE2I31hcMDOf1z1M4IfDB2XUuJEkctjWsk9+
+wfGSgua4VYoeMlDSUVd4TXDwhV6PejlMddTGbICcpaiL87RahWbGNKoEmM4uuhPL
+sN0UaedjxsCHLC+BZATx476iEypzJWKLm9tOVRcInBMk2wCiL0JVMXhFsYS+uQNw
+LCnx2UmvvPnGlFH4FJ0xXTog4R4O9GbAAHfRv8Gox22l1YIpBWEmRDZxABnl/xQ0
+tdc+ocFMG/7DQyTFCcMSL3HUZb6pjYoAEPyvEHj40pO5GDkxRw==
+=RZyj
 -----END PGP SIGNATURE-----

diff --git a/dev-qt/qtlockedfile/files/qtlockedfile5.prf b/dev-qt/qtlockedfile/files/qtlockedfile5.prf
new file mode 100644 (file)
index 0000000..b22ba89
--- /dev/null
+++ b/dev-qt/qtlockedfile/files/qtlockedfile5.prf
@@ -0,0 +1,3 @@
+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-r1.ebuild
new file mode 100644 (file)
index 0000000..59b8569
--- /dev/null
+++ b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild
@@ -0,0 +1,92 @@
+# 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.1 2015/01/02 16:51:33 kensington Exp $
+
+EAPI=5
+
+inherit multibuild multilib qmake-utils
+
+MY_P=qt-solutions-${PV#*_p}
+
+DESCRIPTION="QFile extension with advisory locking functions"
+HOMEPAGE="http://doc.qt.digia.com/solutions/4/qtlockedfile/index.html"
+SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc +qt4 qt5"
+
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+DEPEND="
+       qt4? ( dev-qt/qtcore:4 )
+       qt5? ( dev-qt/qtcore:5 )
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}/${PN}
+
+pkg_setup() {
+       MULTIBUILD_VARIANTS=()
+       if use qt4 ; then
+               MULTIBUILD_VARIANTS+=( qt4 )
+       fi
+       if use qt5 ; then
+               MULTIBUILD_VARIANTS+=( qt5 )
+       fi
+}
+
+src_prepare() {
+       echo 'SOLUTIONS_LIBRARY = yes' > config.pri
+       echo 'QT -= gui' >> src/qtlockedfile.pri
+
+       sed -i -e "s/-head/-${PV%.*}/" common.pri || die
+       sed -i -e '/SUBDIRS+=example/d' ${PN}.pro || die
+
+       multibuild_copy_sources
+}
+
+src_configure() {
+       myconfigure() {
+               if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+                       eqmake4 buildlib/buildlib.pro
+               fi
+               if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then
+                       eqmake5 buildlib/buildlib.pro
+               fi
+       }
+
+       multibuild_foreach_variant run_in_build_dir myconfigure
+}
+
+src_compile() {
+       multibuild_foreach_variant run_in_build_dir default
+}
+
+src_install() {
+       dodoc README.TXT
+       use doc && dodoc -r doc/html
+
+       myinstall() {
+               if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+                       insinto /usr/include/qt4/QtSolutions
+                       doins src/QtLockedFile src/${PN}.h
+
+                       insinto /usr/share/qt4/mkspecs/features
+                       doins "${FILESDIR}"/${PN}.prf
+               fi
+
+               if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then
+                       insinto /usr/include/qt5/QtSolutions
+                       doins src/QtLockedFile src/${PN}.h
+
+                       insinto /usr/$(get_libdir)/qt5/mkspecs/features
+                       newins "${FILESDIR}"/${PN}5.prf ${PN}.prf
+               fi
+
+               dolib.so lib/*
+       }
+
+       multibuild_foreach_variant run_in_build_dir myinstall
+}