Use improved .prf files from Fedora.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

7 files changed, 57 insertions, 36 deletions

diff --git a/dev-qt/qtsingleapplication/ChangeLog b/dev-qt/qtsingleapplication/ChangeLog
index 0f9636ee82df..6482ddf79880 100644
--- a/dev-qt/qtsingleapplication/ChangeLog
+++ b/dev-qt/qtsingleapplication/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-qt/qtsingleapplication
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.13 2015/03/02 09:04:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.14 2015/05/10 14:16:36 pesa Exp $
+
+*qtsingleapplication-2.6.1_p20130904-r3 (10 May 2015)
+
+  10 May 2015; Davide Pesavento <pesa@gentoo.org>
+  +files/qtsinglecoreapplication.prf,
+  +qtsingleapplication-2.6.1_p20130904-r3.ebuild,
+  -files/qtsingleapplication5.prf,
+  -qtsingleapplication-2.6.1_p20130904-r2.ebuild, files/qtsingleapplication.prf,
+  qtsingleapplication-2.6.1_p20130904-r1.ebuild:
+  Use improved .prf files from Fedora.
 
   02 Mar 2015; Agostino Sarubbo <ago@gentoo.org>
   qtsingleapplication-2.6.1_p20130904-r1.ebuild,
diff --git a/dev-qt/qtsingleapplication/Manifest b/dev-qt/qtsingleapplication/Manifest
index 0ce2bf04a8cf..21cd37262a26 100644
--- a/dev-qt/qtsingleapplication/Manifest
+++ b/dev-qt/qtsingleapplication/Manifest
@@ -3,27 +3,29 @@ Hash: SHA256
 
 AUX 2.6.1_p20130904-no-gui.patch 2294 SHA256 164df2885860282c09534da83c9ac1ee56ee6b03d33efb39f75f54df552929cf SHA512 68b6ccf490483df0590af59c447fdfe99f421fd9dbc6211a7666f7ad0557025e13640b1c579fd25477fc0c197f49efa63c017e24a47b91291d99c773a7ad8dc9 WHIRLPOOL a62315f94e8fae5620b6e29eeccc1105fb0c5f3d8ab7f23f0a94b889844cf65b24eb599e0e372f29359eb9c17f1f577aa62849a7e9ebe55b44c4536a9663765a
 AUX 2.6.1_p20130904-unbundle-qtlockedfile.patch 2547 SHA256 e5efb144ab9b1d442fb8f3c6616090eff635978b63b3bb72f0929dc3e78e6aa4 SHA512 96a1dd68e8ba841c5466183cfdcb9693e01d2096878f52f0f521bcee14ec38fb005bace877af473b645aa035c3651c136220fd2fc5dfb7a8883b9a75cdc55eba WHIRLPOOL 0d97ae41b2e449259d6e53b5df772e5e2ca129e023c329b8c5a02e25da5b9ebad8d2ba683c7ac85e87b9e11cd666f6a01f3cb410a6007cc92c98fcedcf1c871b
-AUX qtsingleapplication.prf 148 SHA256 8ec2ad9c025496b5c1002a34f3603b78c7e9e5986c4706eb533db0090346fb04 SHA512 674d9b16bd774b7fe5e5e1a1e0ef7a7ab898482affb22bc3d72ddfbed8e3cbb42f43810dcc56d3ac4808809f03ed192187ae4b3f8bdeaa8cda2e9b155ee327c5 WHIRLPOOL 069fe748ecf97e2389d0c0f924d9f4b7b185da1fcab5bf5d91f412bc7a589911e4386c9dd4d7d90aa055b6b515efbded5c747ac792305b24f1762bc88722237b
-AUX qtsingleapplication5.prf 159 SHA256 fc6d55650bbfe00571d6de651d08b06259046cb8f845bf0e188ec89da1ad47be SHA512 ce744840f111c88024302b3965d7cb85da43c8f3584aac06fef3a71a78d0c86f1c64419160df8f21037fb776a0e32ba26d9c1830805b5733eeadd56519b89395 WHIRLPOOL 603f0cd9d6bcd5540e4bbda6fc3a43d699b306c8895670415a1d210a05dc8e15b3a582a166371993273217afce260bcb775a0d13a40d6ef977c6ba3b34de6cad
+AUX qtsingleapplication.prf 255 SHA256 55a443957678e5c8f9547ef122bc9297fb62d157ac8742edda88262a4b6b7bae SHA512 005d9f547279ee7df2a4c0ae17ad371a73c9d21a3257740d5ad63c261c8eed64acff7211d009ef787ff9610075d0fbf31fb404803cd0ed2647dc2036ef89fad5 WHIRLPOOL fa28d8dacbf9da25ec6a5c42d6e378c3c1772f02623359ffa84d6ef83657fc2587c81958623ed5490676f294e139f80cc819f2e87cb9804418c88cc6c3c1365f
+AUX qtsinglecoreapplication.prf 240 SHA256 a4f102476419d091ae42e7549f68862a31273de2a7c902cf323a0d376efd99da SHA512 c2900d6d2e7edc680435d88a67e4dbc3e1913b454413370f2c66d81249e41e0b3f037abb5e0ee2c4d3dafac7e7eb1a3db963b11c4805ed9cfc25553829ce20ac WHIRLPOOL 49fafc23df22aebea4cd75c66dcf9f05dabe694a649fb5beca54a22948eab069377b30fc3784f40455c95225d02ddafd979e13145ec6ed09e0f06c2f11c6d447
 DIST qt-solutions-20130904.tar.xz 751536 SHA256 fc27b49883269a21ced2d3cb543eb78e79223afe5933bbc7d3194146f72f8884 SHA512 9e50d0a7d9fee08a72a3c6dee1d3fe45d04ae0930a967d81eff457f6c0ff53ac8449ef1d8241a5ce75ca2dcf9f4a2fe27b899647748d11060c3ab5767c3d0e75 WHIRLPOOL b933a301de905cffab8393a7adf055ed2f5198f1572657f5993e016746340d9862017982308ac11310add272ae1cd5c3435054dce2dd9d7ee5a9c92baf1878c2
-EBUILD qtsingleapplication-2.6.1_p20130904-r1.ebuild 1495 SHA256 5755f53ab9429142d0f066abb2ca779418c69be724acf1e0fd0a553df74c51c3 SHA512 a3f05d5475be103c66734a88861d3357dce779ddc43607ff27a064104aea57353d9e89b600d8cfedc086856f8f6ba50878e3d6317fdda6a2a6eb0b19f9708d97 WHIRLPOOL 1b7fb151bbf387cfd177d734913800144b7d03e310eb1ff36b51ea8cf2624ca4a3b537829ab3a499ce4a54005f1ccb603ece107af101199d366953eadd717602
-EBUILD qtsingleapplication-2.6.1_p20130904-r2.ebuild 2557 SHA256 393235b1e87c633b7a051200a485bb2fe7a43cd15a73de5270011dc7dfb7b7de SHA512 dfd035bba1a18d1195be051c11d0df9d3f963294b4241a2e677f7be81933ba8f762407404d7f3f9a6d3b06a93a55fcb663b229dff496a2124888a7d20021aca2 WHIRLPOOL b2c672ef1e00405a180f6753c3980beade34daba533a3a8c198a31bd990c33e74eb9593ff2d7cbeff98886eb7f229bb3f9ab8a6470d05c0511f6ab3fe66fe6b3
-MISC ChangeLog 2980 SHA256 69eebc2fd516aa44feb2907123a31d154b52fc570edc9bc307bbf84afca46119 SHA512 1960bc4f9e9193f957b275e79ace85617573b60ea787e557d18bb24fa39e4319192037338d02ec58d11a8c1546f748c41a6af1acd14c9fb709ed7a58b3a50f2e WHIRLPOOL 1e03983c88f59d26a8e73a7b812188a753139dc36160f884306d807078a7ba6d143399864a14f0c438f121e7bdc9f011a5bc9cfe8906310ef8bde1cfae8652f2
+EBUILD qtsingleapplication-2.6.1_p20130904-r1.ebuild 1475 SHA256 cce9c000738e7dc7feda1cd9c41b5a5bdbc4b5bb8cad8e80366c4b7ac732ddd1 SHA512 a114bf3a565477ff7a54b6550c8f15ba965b4fe6a631a62e568b5b2939811c85616cd2906a4009fabf1b642d2eab6d930f43398dd1878dd9c1373b2ad31ac0a4 WHIRLPOOL a8391f716846a2d6f7ac95497d2c57f85dafac4deadabad62486d1bfc05c26908a86d8b74bd89bd87aaecc6544e2d6120a218cdc6a595886aeb71da5af1b1c91
+EBUILD qtsingleapplication-2.6.1_p20130904-r3.ebuild 2500 SHA256 df72885f3aeaa9b7880fa3a59b11cdbd1e865b1f29fddcf5851a0395ec543838 SHA512 5c65672a93e53a38584563b215fba39027d8b4d53d6bcab222a17b3fd0345ac985cb5f454a876746ca15beea031df38f190b1a673e34ee5e35d0126e81c7daf0 WHIRLPOOL 6afc33c80e32f7023b7ac6bc9323643a35d198fd26ccddd43da56804cf1a12d7417e34a55a0aa5a9f4097ba403a9bc992e2d14383196529a48af423a40c6c88e
+MISC ChangeLog 3379 SHA256 ff3c7a319701f638f206f54ac06750a6a1497d49675ef466fc47ff675895d51f SHA512 e5ef71dc4cc4cd10423c5e4681cd32b2bd6c823fd2b98053da5a093fb14b45a032815f326ff71b464c7ac9cc6815cc98e6c9347a0f2c36f663d283a6aa70a275 WHIRLPOOL 1dab3122b8c999e2c595760ed7de7f58b1ea6d76188bee23908354f7be215e475ffb7edd7bbddba92a7657e7ede0b1eea31050075f63c88d304f6d9473f160c2
 MISC metadata.xml 156 SHA256 2bc85ad7339ae0191c26e435f2da777058779a7ebf73d14658a6ea7bfcec01b2 SHA512 d9991797d488000e1b306b9d97982fb862fbb44d72d4f7560e3ab12ba2022a7abdd3a71bd971a18f562edefc6948e5d5db0972425f7ebe7208696678f1c17b45 WHIRLPOOL aa1bf1df6e2bb4c13c1eae59bfa12dcfe4b81794562c52538f037c75d706f415fed1acc302501cd5f3017b13c910cadbbb9b823a0625cd3b64b29b860259492e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU9CeXAAoJELp701BxlEWfsxAP/jSCal5j5u5dK3td+w2nDv7r
-26AezvtQWdnKVqQtvRwM+jlTwGrRQoq2u1Z3OCPu1CxEEi53C7FBk+UwmNpg5zVp
-eH1jpC6mWvomI9qvWL4JtJIzBiaObmnBrmlu/JeYSFmPSltXov7ansfkt84y9wWg
-4cm+/Lv0pOxVdn1ERVuDUY7GvuMg1RDm37RChmuunR2RqugQdffro6fKibXcohcd
-TuazJs6HaILX7n4lZ1yCGWxWFtRrzglqWtGm3i4I/1wG7qC4gcesDkfvzIbFSice
-EdWgYleKEpI10QLFOi0kg9TiQ/Z3DT0+rQ99ICBUddx9sWqjQ7EjC5+X7EbOU8lL
-xe+uxP5lVAaxhpJpfWH188HTZJ7dpLaMKizkhLyGtpJROFPPWA0oX5xfFgkw9e0o
-6Dv6eoYXOYr74zHIsBaEfH/1XRB7a5rzhgfb/hXoQOQh3U6762Qexh+Prg3lPW+k
-JA02nfGdE2chdgSuR/5dxUlxW6aHAQYplorvwUVjdTqdTlUXvbzrwHggeYOJzGN2
-1kyqb6fb6362Sz3dUF+S0FrWs6HUvE78pa/Em5inZW/8i4pEUYIbe52nByQV0voL
-erTYvrj1zpDdXuFCsqq8oFG9gBazS938kVjiWCHYLT+uqOXf0d6YtzCAfE00EjYU
-LbBHN8K/UjggKt8BVfob
-=U0l1
+iQJ8BAEBCABmBQJVT2hFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9g4UQAL9OE0wzwJQjP3SiuTA6TNYm
+goEe3Fu3F3LfrxdRx2JlKnso+3b+Zhz/doz8l7ox+cXxTriCxBq3D25pX1gBnbkh
+5k+8dU2I0p5FPIQH/0V2ReglfKDZnHEL/kzU2+rZZ0BSwiF8rV/D2qQkdwP/wP/L
+oMEU4d7iaRir9AyIl/hI8x5D3a7+shobXoytu09IRMr7WTcpqjpcPQPI3MQAgmC8
+gu5fihnpCGXODrFFvEjLTKU60xzm05FH6Hp+KAGkQDvr2R3BRO6Wxl4SSpAxDxZQ
+X1949nyRSoZws3IqySOaOAhSBYogiGqbLMs+8qf0ia3wAEgs02UMsGmkeEvRyOOP
+5SU3A4DoWG6oPBZkco7GwB3A+lBEU4sUiqlK9DQTgU++PWrAA6Buxo03NbTu6Eun
+qaO1kJ9crIy5tYk0qzCfYv80ZDhoPuR9ce+T7OL6Cvjr7Uq/fY73ucZsnvobwTJj
++/d3gpeRSrl72TTEZ2DVICT7ZcoFCKHwKjZ9ckRvr3NzB3ZKdq6+jZsUjlsXlMoq
+fo8etkHcAl6q/8zcilKVGju1o0fMl9OJgmxUmeIKK61RyMAXJHaUuVISpUzktByo
+96cPXqoU4MtvvTta1IwpLAHqgJ/PAD/x56NsbqVWudJtUNU6YT60PjoJcF4yrreI
+tK5hyRsPkXtYARIu+FnL
+=8GKn
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtsingleapplication/files/qtsingleapplication.prf b/dev-qt/qtsingleapplication/files/qtsingleapplication.prf
index 40335a1c345b..3171424fd04f 100644
--- a/dev-qt/qtsingleapplication/files/qtsingleapplication.prf
+++ b/dev-qt/qtsingleapplication/files/qtsingleapplication.prf
@@ -1,4 +1,9 @@
-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_SingleApplication-2.6
+QT *= widgets
+} else {
 LIBS *= -lQtSolutions_SingleApplication-2.6
+}
 QT *= network
+CONFIG *= qtlockedfile
diff --git a/dev-qt/qtsingleapplication/files/qtsingleapplication5.prf b/dev-qt/qtsingleapplication/files/qtsingleapplication5.prf
deleted file mode 100644
index 1e5061dfab67..000000000000
--- a/dev-qt/qtsingleapplication/files/qtsingleapplication5.prf
+++ /dev/null
@@ -1,4 +0,0 @@
-INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
-DEPENDPATH  *= $$[QT_INSTALL_HEADERS]/QtSolutions
-LIBS *= -lQt5Solutions_SingleApplication-2.6
-QT *= network
diff --git a/dev-qt/qtsingleapplication/files/qtsinglecoreapplication.prf b/dev-qt/qtsingleapplication/files/qtsinglecoreapplication.prf
new file mode 100644
index 000000000000..fa3a171a35e4
--- /dev/null
+++ b/dev-qt/qtsingleapplication/files/qtsinglecoreapplication.prf
@@ -0,0 +1,8 @@
+INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
+greaterThan(QT_MAJOR_VERSION, 4) {
+LIBS *= -lQt$${QT_MAJOR_VERSION}Solutions_SingleCoreApplication-2.6
+QT *= widgets
+} else {
+LIBS *= -lQtSolutions_SingleCoreApplication-2.6
+}
+QT *= network
diff --git a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild
index ede38aba8170..1e62412ed8ff 100644
--- a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild
+++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.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/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild,v 1.5 2015/03/02 09:04:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild,v 1.6 2015/05/10 14:16:36 pesa Exp $
 
 EAPI=5
 
@@ -48,13 +48,13 @@ src_install() {
 	dodoc README.TXT
 
 	dolib.so lib/*
-	insinto /usr/include/qt4/QtSolutions/
+	insinto /usr/include/qt4/QtSolutions
 	doins src/qtsinglecoreapplication.h
 	use X && doins src/{QtSingleApplication,${PN}.h}
 
-	insinto /usr/share/qt4/mkspecs/features/
-	doins "${FILESDIR}"/${PN}.prf
-	dosym ${PN}.prf /usr/share/qt4/mkspecs/features/qtsinglecoreapplication.prf
+	insinto /usr/share/qt4/mkspecs/features
+	doins "${FILESDIR}"/qtsinglecoreapplication.prf
+	use X && doins "${FILESDIR}"/${PN}.prf
 
 	use doc && dohtml -r doc/html
 }
diff --git a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.ebuild
index a46d93436993..e59d988245b1 100644
--- a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild
+++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.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/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild,v 1.5 2015/03/02 09:04:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.ebuild,v 1.1 2015/05/10 14:16:36 pesa Exp $
 
 EAPI=5
 
@@ -86,8 +86,8 @@ src_install() {
 			use X && doins src/{QtSingleApplication,${PN}.h}
 
 			insinto /usr/share/qt4/mkspecs/features
-			doins "${FILESDIR}"/${PN}.prf
-			dosym ${PN}.prf /usr/share/qt4/mkspecs/features/qtsinglecoreapplication.prf
+			doins "${FILESDIR}"/qtsinglecoreapplication.prf
+			use X && doins "${FILESDIR}"/${PN}.prf
 		fi
 
 		if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then
@@ -96,8 +96,8 @@ src_install() {
 			use X && doins src/{QtSingleApplication,${PN}.h}
 
 			insinto /usr/$(get_libdir)/qt5/mkspecs/features
-			newins "${FILESDIR}"/${PN}5.prf ${PN}.prf
-			dosym ${PN}.prf /usr/$(get_libdir)/qt5/mkspecs/features/qtsinglecoreapplication.prf
+			doins "${FILESDIR}"/qtsinglecoreapplication.prf
+			use X && doins "${FILESDIR}"/${PN}.prf
 		fi
 
 		dolib.so lib/*