Fix regression in qtsinglecoreapplication.prf wrt bug 549176.

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

4 files changed, 30 insertions, 22 deletions

diff --git a/dev-qt/qtsingleapplication/ChangeLog b/dev-qt/qtsingleapplication/ChangeLog
index 2cbe55714dcd..ee8dab1a39b0 100644
--- a/dev-qt/qtsingleapplication/ChangeLog
+++ b/dev-qt/qtsingleapplication/ChangeLog
@@ -1,6 +1,14 @@
 # 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.16 2015/05/10 15:50:11 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.17 2015/05/11 15:44:05 pesa Exp $
+
+*qtsingleapplication-2.6.1_p20130904-r4 (11 May 2015)
+
+  11 May 2015; Davide Pesavento <pesa@gentoo.org>
+  +qtsingleapplication-2.6.1_p20130904-r4.ebuild,
+  -qtsingleapplication-2.6.1_p20130904-r3.ebuild,
+  files/qtsinglecoreapplication.prf:
+  Fix regression in qtsinglecoreapplication.prf wrt bug 549176.
 
   10 May 2015; Davide Pesavento <pesa@gentoo.org>
   qtsingleapplication-2.6.1_p20130904-r3.ebuild:
diff --git a/dev-qt/qtsingleapplication/Manifest b/dev-qt/qtsingleapplication/Manifest
index 58c6fb2874de..3d639acbc8a5 100644
--- a/dev-qt/qtsingleapplication/Manifest
+++ b/dev-qt/qtsingleapplication/Manifest
@@ -4,28 +4,28 @@ 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 255 SHA256 55a443957678e5c8f9547ef122bc9297fb62d157ac8742edda88262a4b6b7bae SHA512 005d9f547279ee7df2a4c0ae17ad371a73c9d21a3257740d5ad63c261c8eed64acff7211d009ef787ff9610075d0fbf31fb404803cd0ed2647dc2036ef89fad5 WHIRLPOOL fa28d8dacbf9da25ec6a5c42d6e378c3c1772f02623359ffa84d6ef83657fc2587c81958623ed5490676f294e139f80cc819f2e87cb9804418c88cc6c3c1365f
-AUX qtsinglecoreapplication.prf 240 SHA256 a4f102476419d091ae42e7549f68862a31273de2a7c902cf323a0d376efd99da SHA512 c2900d6d2e7edc680435d88a67e4dbc3e1913b454413370f2c66d81249e41e0b3f037abb5e0ee2c4d3dafac7e7eb1a3db963b11c4805ed9cfc25553829ce20ac WHIRLPOOL 49fafc23df22aebea4cd75c66dcf9f05dabe694a649fb5beca54a22948eab069377b30fc3784f40455c95225d02ddafd979e13145ec6ed09e0f06c2f11c6d447
+AUX qtsinglecoreapplication.prf 241 SHA256 fd5757a188f84457c13367aaab743b86f6730d4674457299ba3c76ac51d5f9e8 SHA512 938d2eb0c2a3a8dc8ab1c15a175a6bad78b20ad699936b7afbbc54fec10cff6f7ed9ca69b68d81d36495fad439b8550c0d515e4b4a6856362c475f1d9fa7d974 WHIRLPOOL fa5838c6a55ea40384f123825436790b66b42ada3a2923f8eca8ed202c177896802b301ba18cc663be66d9e067bea96b5be3c743acd2701dde4a72e173718769
 DIST qt-solutions-20130904.tar.xz 751536 SHA256 fc27b49883269a21ced2d3cb543eb78e79223afe5933bbc7d3194146f72f8884 SHA512 9e50d0a7d9fee08a72a3c6dee1d3fe45d04ae0930a967d81eff457f6c0ff53ac8449ef1d8241a5ce75ca2dcf9f4a2fe27b899647748d11060c3ab5767c3d0e75 WHIRLPOOL b933a301de905cffab8393a7adf055ed2f5198f1572657f5993e016746340d9862017982308ac11310add272ae1cd5c3435054dce2dd9d7ee5a9c92baf1878c2
 EBUILD qtsingleapplication-2.6.1_p20130904-r1.ebuild 1475 SHA256 cce9c000738e7dc7feda1cd9c41b5a5bdbc4b5bb8cad8e80366c4b7ac732ddd1 SHA512 a114bf3a565477ff7a54b6550c8f15ba965b4fe6a631a62e568b5b2939811c85616cd2906a4009fabf1b642d2eab6d930f43398dd1878dd9c1373b2ad31ac0a4 WHIRLPOOL a8391f716846a2d6f7ac95497d2c57f85dafac4deadabad62486d1bfc05c26908a86d8b74bd89bd87aaecc6544e2d6120a218cdc6a595886aeb71da5af1b1c91
-EBUILD qtsingleapplication-2.6.1_p20130904-r3.ebuild 2190 SHA256 a2b4598d007b2fa285044dcdcd3fd9a16140bfaa819d6819b70f90888891da9f SHA512 ddbf15412ac95a450414531685915fc51dbe5e190ffe0e7b0a7d45873c8d2a058691e62d72fec3fae0d3af609464f2aa16cb0cf584d0ff9ccd3efeeb2806c28a WHIRLPOOL 6a458447ac31c5e0742638268742b6e147285c3f128041ad48c1f7794b893423eb55752a4b1b88128efdf3dcbdd0444925948f2d85556bc20190524fa3f4024e
-MISC ChangeLog 3638 SHA256 ca8acb47b1f85968a6b1ef2369974407ff919dfcad0d175e7eb62b18acd2633b SHA512 20fb7dee5f60084348b1187d6be5d480c42cdf46c0ebcac793f15baec92e5798f62dddf515e138385d9326072516aaf9d330ee9448e8264042b2fa88a4965600 WHIRLPOOL 1a669544e9ef872561f0659e0abfdc9db6576ccda11fd53bec3f15fc56af77ade50858b1b8e48d5d3c2345a95729107e5b5e1191b7c3458f2ae9f5ee8b0e9b5c
+EBUILD qtsingleapplication-2.6.1_p20130904-r4.ebuild 2190 SHA256 a88f5b6299890cfdceae0ffbb23116bf7d36f478563fd587ba3e50061e285158 SHA512 e1acd6901fa3765d8d9182f424430cd491616b26b3046d38aa95a6ba03edc140358ca4c6d761822e11fcfd9e0a97e771fe901216803f49387219615547ce6040 WHIRLPOOL efe43d44d3f42950be9de9e4e3297d5b2bfe417a0fd6cdb7bc1b17e287f561097b0303183e2410fff6002dc15964756cc29ffc47d029fa05b14d196acb49020d
+MISC ChangeLog 3945 SHA256 539d28994916cd0a5efa2dcfe4c78ba9a5a8112105bb3846b566200db7aec5c7 SHA512 b1e9d8db6d7208b558baeba743291da3e8b5019591fd6d8d4872e155a52c753274ab80d4b262d0ee0be3162e98ad97af45198db56ded586c88be7432ce10e967 WHIRLPOOL 4e453302c03adaa247f8e969b60456a043e5d7f2d642333478cdf8cb3c3df1c2ce95b37f0b7c690db424739206e47e95fb90f8c3a67db5214de0b7dcd1a61813
 MISC metadata.xml 156 SHA256 2bc85ad7339ae0191c26e435f2da777058779a7ebf73d14658a6ea7bfcec01b2 SHA512 d9991797d488000e1b306b9d97982fb862fbb44d72d4f7560e3ab12ba2022a7abdd3a71bd971a18f562edefc6948e5d5db0972425f7ebe7208696678f1c17b45 WHIRLPOOL aa1bf1df6e2bb4c13c1eae59bfa12dcfe4b81794562c52538f037c75d706f415fed1acc302501cd5f3017b13c910cadbbb9b823a0625cd3b64b29b860259492e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVT340XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVUM5NXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV91PwP/3LqJKf8nHYAivrt6xZbomKC
-Cq02WL3pD8eeXIldZ3UAgb2pnO9kFQff/rHNwxmb3dvMxidr3+1StzdBvFWmmfJK
-TFWqAmLqyuUsFJPRBgGmA+pznOSr3iHr2Hww8BakgxWiQrmyV6o7UYQzYpWBt/90
-Ip22xaroKrNg7VDojCEDd1S1+vNZLB++ajHxwn7yU6HCzIHAcFr2dWj4d6j9F4ua
-QHKBMRa0IpPixqKOlzkX/oRCvoxV0GO8avNrzNMu9Kzv03DNMmgMJTL01rjOKs5Y
-irGWOACf7pfJuwtoK5aTinE0Iw9TpIMGBD3bOkr16gUsYT8A2tsjSCVREEFgvy4X
-Lx9xZEx825ESrNbHPE2cLdY3QlU20GK2Tqo6oQo55j1A49qBEZ/GTMTGiZEfXFA+
-ql34K2kMaR+p2OqA6zn0wOLj1UMzhfN5d3999mnara/YNZ4hGGQe3Vzhj8wpmEl7
-1xahsYThopPTDf7mqcLiZgR+PA9L8V4U+QLHiSpiAV2wUL54hve/gGc3+4jayQTQ
-luuGfiqbycygU+ZVIcFylfmyifbus+h1WCoTabwdO9LvpoMKJjqNJtMNB90nRfBe
-gIeUvagEUku/94ceKdJsdi5rUdVP0ys1hIR9dWSPatOf1b44TyPYuHV4Em/VVKAF
-qZtmtn9agPYvx5MnpWcd
-=SLo5
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV93D4QAJcxeVWpUzsHITPCH1+iZ7Xk
+AGFA0n98bSlo4n7G5/ptG+KvgsWkBVu4xlsu1OXMhgAalQyjdCn6BjumeIOXFhnJ
+qAM8U8Px2VvYWcHheT4eJlQhrDOBjMFZ8kFN3k4UqT85/0NyyBl/8YhM679jFTeR
+uLjD9l3isQpa29vf7FUYqXzDOtu8s6mViBLBnuyFAWQFxISAzwZ4o6RjhHXVQ94C
+2XnCtLwuO3p8GK7ONixZaMk4aDje7IALQDjjUh0pzbzNrm7rcgq2fQdJf0+7zF8f
+FZ4xgO/9EbZqDyMd2SFndIK//QeOFXQQoq+mBgpAbEJqNLMgIY6vsI6uliTydEDg
+AJqsFYaiteysEMkSYiC6wgMXP+Z61uUYHzQvj35pC2FDgW6Ru3OkKbjv4hZIoDD9
+NGuJv1+ZCISp5Iym0H2HWmJEupK6Eyp9juScDy9mRLB/6Yt0l2CVtva0EGIIWxWm
+RIhtt19VjgH5M3bKK7nhoPOwHRC/sjbmNXBG7sQG2xQmF6eMsVbQ2ld/juywjPM1
+7CA0OILQIOBMi/bkDTrsJKtxvDfcAPmXtr+OjwXHFkM7CxqHlW0FNtyZczWamFvI
+zgP1yfkFiczjQ8MZDq8xAysvfaaxLjduMn6bLEoxew81KQ6N703OyNx0S+VOMCLC
+8PQ8R/9Ykj2XTdvcCmVn
+=5wBw
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtsingleapplication/files/qtsinglecoreapplication.prf b/dev-qt/qtsingleapplication/files/qtsinglecoreapplication.prf
index fa3a171a35e4..87d2a9583dbd 100644
--- a/dev-qt/qtsingleapplication/files/qtsinglecoreapplication.prf
+++ b/dev-qt/qtsingleapplication/files/qtsinglecoreapplication.prf
@@ -1,8 +1,8 @@
 INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
 greaterThan(QT_MAJOR_VERSION, 4) {
-LIBS *= -lQt$${QT_MAJOR_VERSION}Solutions_SingleCoreApplication-2.6
-QT *= widgets
+LIBS *= -lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication-2.6
 } else {
-LIBS *= -lQtSolutions_SingleCoreApplication-2.6
+LIBS *= -lQtSolutions_SingleApplication-2.6
 }
 QT *= network
+CONFIG *= qtlockedfile
diff --git a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r4.ebuild
index 10d7b0f9dcbf..0a3b44ff9b15 100644
--- a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.ebuild
+++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r4.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-r3.ebuild,v 1.3 2015/05/10 15:50:11 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r4.ebuild,v 1.1 2015/05/11 15:44:05 pesa Exp $
 
 EAPI=5