Simplify pkg_setup().

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

diff --git a/dev-qt/qtlockedfile/ChangeLog b/dev-qt/qtlockedfile/ChangeLog
index 8513446b210e3a7109a4117e18e76773c50968b7..4b1e363796ce8b856c3d941ed603b7701e7a6a8b 100644 (file)
--- a/dev-qt/qtlockedfile/ChangeLog
+++ b/dev-qt/qtlockedfile/ChangeLog
@@ -1,6 +1,10 @@
 # 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.12 2015/01/02 17:23:06 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/ChangeLog,v 1.13 2015/02/18 18:19:22 pesa Exp $
+
+  18 Feb 2015; Davide Pesavento <pesa@gentoo.org>
+  qtlockedfile-2.4.1_p20130904-r1.ebuild:
+  Simplify pkg_setup().
 
   02 Jan 2015; Michael Palimaka <kensington@gentoo.org>
   qtlockedfile-2.4.1_p20130904-r1.ebuild:

diff --git a/dev-qt/qtlockedfile/Manifest b/dev-qt/qtlockedfile/Manifest
index f4a72f4d9a8e9b0f1e7238df8f90109848feb7b7..19bd77d9cc4f6efd43327f7fb606a507568bb77e 100644 (file)
--- a/dev-qt/qtlockedfile/Manifest
+++ b/dev-qt/qtlockedfile/Manifest
@@ -4,25 +4,26 @@ 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 2046 SHA256 72a00f961aa11902154fe4d391d1508c7af5f261e768bc2cf34da67cb4b08e82 SHA512 f07084fae85aa91512a71533c1f82c810b85f367ba854ff02e14d4dec2e57fc5f5ee389979a1b18e764ea90d4966edb7a05f363235d7c71eeaf317fb2448f13e WHIRLPOOL 61956bf97fb9e53c3d92e39b0c963fe4c4d4a2510b5e122521fcc3d75b2a49fe5257f72128ece868c6bbdf72e02f36660ebddf8eacf4d1c18b0758f9d6020d2d
+EBUILD qtlockedfile-2.4.1_p20130904-r1.ebuild 1957 SHA256 981a7f43a10604742efede9e4c763f779ec19078c6f629db18e22072cfab6df1 SHA512 607da3cefca579de7fdc233ff3b99cc7da6a572f4a0320f4c2874fbc459a47f58fe3cde09f5936c71dca497df3e4946e569125e0100a58d157fed6258b952b21 WHIRLPOOL 65e6d3e70eba6bb27c45cfb3f1d38b119e98a194e7d8bed13cb9a21088b686dcf54716dcbbd9c85e7c0ca37027efda89dacd4d4da3f2d7cee7685012ef304620
 EBUILD qtlockedfile-2.4.1_p20130904.ebuild 1125 SHA256 81a655133a9f2e2fd91cb8dcfdc34400e162dfd7525bd961c469cb374b0fd8c4 SHA512 b550606ac47daf3af1ba49eaf59ce65033f308e41524f41f70db4bc3c65725df6d29b306482786192841ca642625daaf5c44f255619e84b589ce2a4091af193e WHIRLPOOL 12039366a6387c2fbfad676107fa4b22f6e3eb6bd0283250bb7ba42b7e0d6b1811c6d11e1eb30df5c717b40956b18683b2fd89b42f1c9b4be32859525e3fd141
-MISC ChangeLog 1932 SHA256 70f848567025cb87a8e51d2002be6ddffc9039fbd9a2ada6e63b1bf0dffbc46f SHA512 819352fdad6471d3d32740225984663163647f7afb704f0906398d421740a6c7a6ce3317acd87e2a8b5d297ba673a682db94dc26d04adfcd128cabea5c493462 WHIRLPOOL 5f01a9feee9c6cc4f29556fc4664a596a027fed1353baf86c790b9af2977726e8147f671fd89aa4ab42daf67b63595d00ecaa1fcdb1f99e1be39793b05c1edd4
+MISC ChangeLog 2043 SHA256 9d1a70a23354b29aff524be655139ccf9d447bbfd8393f18547a9c14d694b1da SHA512 1b0ae34b2d7f60db0665b76b636fcfa51fc86f34b249daf4916889c84594c93a74c667dba28ecfc43d66dfd6907097cba7d492df613f3d8e5e6fcbe7b99993c8 WHIRLPOOL 4e6237640113d0b15db50ce1c3f4b609afdc674aabf6f1fe1ab838b316b0aa5128c3e08004cbe4fe6bf22e397937c0e1c6da24fc0c60c9852643a8b7a618728f
 MISC metadata.xml 156 SHA256 2bc85ad7339ae0191c26e435f2da777058779a7ebf73d14658a6ea7bfcec01b2 SHA512 d9991797d488000e1b306b9d97982fb862fbb44d72d4f7560e3ab12ba2022a7abdd3a71bd971a18f562edefc6948e5d5db0972425f7ebe7208696678f1c17b45 WHIRLPOOL aa1bf1df6e2bb4c13c1eae59bfa12dcfe4b81794562c52538f037c75d706f415fed1acc302501cd5f3017b13c910cadbbb9b823a0625cd3b64b29b860259492e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJUptQmRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7BZ+D/4wHosSsuPRU/GaD7mlMLMhn8vzb0HqDh5EqWcM00R4LKWGLvO3K6YV5RZJ
-/EUiet9WUJ2y6dmvRODii+J8nPUJP7A0kgu2VQawVdWFXErFmYh+vOEIfbE8kGED
-yLnBbJiY0Y7GvR1UdGoK99k1keboJblsdfXeDkZiuXTTiwsJOr90qXQHc2UEpIpA
-Y2WFpnRiZOLzq67mo88cCcBR8xE9O7gqgtNDqOxa1wo95BTCNSGRwMr6E+mcyVI+
-A8aUnzQhJYtiyq7X6TZdXoyhv8oO+FtD4e1WH2Z/dUOH02zdDJFhfwECLvfjklhU
-mGLrgeDo7EEgOjuTzlq+8w/5tLE03Q2lEs9bbeRrqj1XMdYPYj35TlBTBIauY1g4
-qYxKx3KNurQUGPwwofYSlRqRwPrntjiYeGiOz2524MaJ4WPmF+i/5vARraCMDdbs
-f1bsoz4z+UiXbUoAA33LuZovYPOdrOFhWop6YTNbGbbH2AIxVyLyQhwullv2iRSK
-JHauiyVMav26E89BmUtPWov26hKOoWN7Wmkhsd1jZIswBQvrVCTO8kjyq24vg8kd
-Eu91pPwxn+fIHkhstIx7MiCIkFa6JZ14R6sNZQ4zjBp2j4eAhSyroEsnNpv+2i8P
-rAue5kF7F4Fcix+Guu3TQ+8Qh+eDJ0PFRvltAbHm3Xa8/Q8tuw==
-=YV4K
+iQJ8BAEBCABmBQJU5NexXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9fQUQAIzLJrSvCQAGNDElDOutHef8
+/3anKKaANIczAnkyUadqpgd0RmwBy9iklFAhyIliQbSU1qYW2NFWcz2tNl95g/cw
+LX2OJHQlwWX7uqF1TqDuNLSpxBXpTP3LoxbsQ3v7ZHW5pygDH9kV305cH+Cyx9jF
+UGgpXcIMMN9PeAVYdXdtmYmUefsLMG7miasRzM1LKJThQWw2SIUITPzCmggurc+k
+z6ihrvMZSJKIy0l32ChxzRpU/Kjf9tXqlcVD8AE7jEifQ2s3AoAhOTQhO1IH//x/
+T1b2vApzT/qUxDrHNRjm+iKEDGyb39Urw+Nigy2Ojf9RzxJYPkeJwnzYSI+880v9
+Zh5yeswZzWQm7s+shjuaSqVSEIt7LRO4afyGkhh+2VDAooFs21ws+1h34pSu/6zo
+iuHlrj9yGtS/2x7v17WxQhf68LquqT0NxSR0A6lPRWSx9wpOd+22FB0ezhVnOP3O
+xqsHVHyjDXqkw4uaAJvfN/XN4RAW+vicRIRcQbkLQjt0OtoSwZsWZazDHcBGV2Uu
+YRuhmVnPxUmxp6iYItbNfYGcCUuiapA22FzNe7eNL6M48GD84Uko+tsHAK9tQa1L
+hgQk8O4lLU2GqwG1psMtvLMLX5s9o4lAJqyVU5+uS960C+L3RLByDkdU0EB+5vRK
+BjppVcdmQpdcX3TG4Vaf
+=WUdd
 -----END PGP SIGNATURE-----

diff --git a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild b/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild
index de0810d7771be712cca647c82b3afad265c28129..bc3f8170930597bf7c3131399c3463f825885199 100644 (file)
--- a/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild
+++ b/dev-qt/qtlockedfile/qtlockedfile-2.4.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/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild,v 1.2 2015/01/02 17:23:06 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r1.ebuild,v 1.3 2015/02/18 18:19:22 pesa Exp $
 
 EAPI=5
 
@@ -28,13 +28,7 @@ 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
+       MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
 }
 
 src_prepare() {
@@ -49,10 +43,10 @@ src_prepare() {
 
 src_configure() {
        myconfigure() {
-               if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+               if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
                        eqmake4
                fi
-               if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then
+               if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then
                        eqmake5
                fi
        }
@@ -69,7 +63,7 @@ src_install() {
        use doc && dodoc -r doc/html
 
        myinstall() {
-               if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+               if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
                        insinto /usr/include/qt4/QtSolutions
                        doins src/QtLockedFile src/${PN}.h
 
@@ -77,7 +71,7 @@ src_install() {
                        doins "${FILESDIR}"/${PN}.prf
                fi
 
-               if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then
+               if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then
                        insinto /usr/include/qt5/QtSolutions
                        doins src/QtLockedFile src/${PN}.h
 

diff --git a/dev-qt/qtsingleapplication/ChangeLog b/dev-qt/qtsingleapplication/ChangeLog
index c711c6b26074dc065f7d97222397f027ecacb23c..a6c5e4e9873e5271b3944f944a0968c817bcf2c9 100644 (file)
--- a/dev-qt/qtsingleapplication/ChangeLog
+++ b/dev-qt/qtsingleapplication/ChangeLog
@@ -1,6 +1,10 @@
 # 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.10 2015/02/11 03:41:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.11 2015/02/18 18:20:09 pesa Exp $
+
+  18 Feb 2015; Davide Pesavento <pesa@gentoo.org>
+  qtsingleapplication-2.6.1_p20130904-r2.ebuild:
+  Simplify pkg_setup().
 
   11 Feb 2015; Patrick Lauer <patrick@gentoo.org>
   qtsingleapplication-2.6.1_p20130904-r2.ebuild:

diff --git a/dev-qt/qtsingleapplication/Manifest b/dev-qt/qtsingleapplication/Manifest
index b77264754e00b807d0f83aba240654c7d1fce713..b72ce77c9d5dd5db4a4c2b0307d778062f75f25a 100644 (file)
--- a/dev-qt/qtsingleapplication/Manifest
+++ b/dev-qt/qtsingleapplication/Manifest
@@ -1,9 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 DIST qt-solutions-20130904.tar.xz 751536 SHA256 fc27b49883269a21ced2d3cb543eb78e79223afe5933bbc7d3194146f72f8884 SHA512 9e50d0a7d9fee08a72a3c6dee1d3fe45d04ae0930a967d81eff457f6c0ff53ac8449ef1d8241a5ce75ca2dcf9f4a2fe27b899647748d11060c3ab5767c3d0e75 WHIRLPOOL b933a301de905cffab8393a7adf055ed2f5198f1572657f5993e016746340d9862017982308ac11310add272ae1cd5c3435054dce2dd9d7ee5a9c92baf1878c2
 EBUILD qtsingleapplication-2.6.1_p20130904-r1.ebuild 1484 SHA256 f79887c254965e204770791f123b00ae77d0c74a327bb3d973297afad44ce37e SHA512 899b4804b7a1d0acbe015621926df7dbbcc10260ccc85cdebc5c130f17af3a636d4bb253077e94e4237f7343f4376b5b7a642d017ca783d3448461dc3ba21559 WHIRLPOOL 6be47e8b2072cbbd27f978986c1d3b52639792b6cebcaee65accb4659f032bb0ba75166baddc2f75ba9e2ba6bb4393bb9f7a456dcf5cc170813bacad51290891
-EBUILD qtsingleapplication-2.6.1_p20130904-r2.ebuild 2636 SHA256 2fedb78a94305ca3bd1fbdd43dd99415843256696ae283d4ac38919effb41402 SHA512 0d381ab3a04f2103f55168b78af4cfac7b3e56d5e7c12c688a56811576d706ca076691913d20a3f9dcee5d8c497fe32a4e067e43d1650a707c0f08bda3fcab35 WHIRLPOOL e8ff83398b86d1b0b87f73776f488776d1c32ae2043b7bc47c7784da3af18d65c5cb8b6473e08754da86f1fef9b9188cb1bd24bbcd152168831969cc5e7faf54
-MISC ChangeLog 2506 SHA256 3645bc198398cc07707659122d2d01d99aa38c9f63ec4c54502b9dd022fe0290 SHA512 37804ffd21734fd9ab468b8578d97f9d8fc65847afd4c34e8c83065d3f7ed520f99e27ab2c73cdc8f54a25c6b4a3c7fc2d2e0c2af5014ee5fb4f3bc12e61f9c7 WHIRLPOOL 95f49f2f38a41ae92c11ce3408a6f4332885832ffb3dd5b7252f1558a73e42d73d6dd124255e36a83e05f1bb21e5838ca35597a876ab0272007b2ca3e73628ff
+EBUILD qtsingleapplication-2.6.1_p20130904-r2.ebuild 2546 SHA256 a23b335d33bc96b484f5c5f6ec214da9e997eee74177f94c03ae523f5cc73c23 SHA512 65dfc2060b0ce0753a51da26c1d621dc034a3188d1cca325121a5aa561b62b9ba42774de2d1dca80af04ff534f53020fc4843c77bdb7a7d9f12c5a573ae08a02 WHIRLPOOL 32fd54c03aee4373f82c136780d4f677218775b23aeeb3a8af072a0b5e060a75f14eba3a916a50b1a9cbdc887fba84a0b1bac10534861899f4b21bd61065b709
+MISC ChangeLog 2627 SHA256 e58a6d6df649fff82d68cec5a01c8aab56c5e52b314e19355a34d2f77fd9baeb SHA512 d41e1b30fc507cf07cccb81925374f6e7564028012696f11b174770c4344ac6a99131dc479ec19ad21c36195dc1e2b0a0faf9b9c96ea59c0b77c05073af28954 WHIRLPOOL 35d61bcc6bc9229dc16a434f7022f0c5d5139d77c6d9eb39069d0764bdc7d3337351e813ccf0d22e6d6bc72ccf25016a0a4643d73e918809d680e4d85a918527
 MISC metadata.xml 156 SHA256 2bc85ad7339ae0191c26e435f2da777058779a7ebf73d14658a6ea7bfcec01b2 SHA512 d9991797d488000e1b306b9d97982fb862fbb44d72d4f7560e3ab12ba2022a7abdd3a71bd971a18f562edefc6948e5d5db0972425f7ebe7208696678f1c17b45 WHIRLPOOL aa1bf1df6e2bb4c13c1eae59bfa12dcfe4b81794562c52538f037c75d706f415fed1acc302501cd5f3017b13c910cadbbb9b823a0625cd3b64b29b860259492e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJU5NfaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9ph4QAILfIkQQWECHnfnn1Qp8Tbbv
+ZFR8TNfH63BW2+Y6DYxr8FRM2BgMuapUhITU/5Vr1pYKCX9hYCApBXnpMl4/nAk0
+Rk6+xHp5PryxsD4Y2MWEVu7J59myD9SJr92untIz2nnc8NEWQda/U+9CFbKggrii
+160MSx7wQ71pnKBM6u5DTzmTAuFqzGYcGx1EgdXiOxVSUzZQIfB8arvl3aXt5ppD
+mgH59iLRcjOUNevJA1/L/gsKeTWW8dmySOsbgU0gkj/nPWgS7dFY3nTAdsDEWLDZ
+h2OjUmxOk6BWUxRzqk2VxAaEzaJv2Qs/c/mAoDZOEhElVil7Ee9581qYpCqfNcEG
+ZIS4IZUmtA2OIbOCnFz+vRSQm3sSEl+Tp5Y6JEwyi55h5AR9Ns8lHY63zYPhsFvj
+lc0C6Xo/FZxO/D5k4v85wenFcIq6BZ+qU3x37Raqv1txBuYp59dLsO0lmALmprTe
+omC9DtnqE3ZxRiKxJ5bYvjFZ9dg1QWKIzZ2knnANWSg1pjLPJX+GuLMEFwuTp7+Z
+6jRfI6PEd2qdeE4tNmbcKbtcRHJkrBBl6DZecAfVzFUhHQhPuqu72uSs/D+18bPq
+mB0AmdL7pqEHpv2E814/BANPOP4rCtO5q1AAiycj1zLgrH1ujn7Ew9zRiMFm2SET
+jE2kNaqAUCSp1qbPKf8L
+=iqsU
+-----END PGP SIGNATURE-----

diff --git a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild
index 8bba5d0bdbaa60ff4c632510d987aa6b662b9b3b..2fc9b008badddd3473b1a754bb7f650e8fb1ce83 100644 (file)
--- a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild
+++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.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/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild,v 1.2 2015/02/11 03:41:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r2.ebuild,v 1.3 2015/02/18 18:20:09 pesa Exp $
 
 EAPI=5
 
@@ -39,13 +39,7 @@ 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
+       MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
 }
 
 src_prepare() {
@@ -66,10 +60,10 @@ src_prepare() {
 
 src_configure() {
        myconfigure() {
-               if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+               if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
                        eqmake4
                fi
-               if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then
+               if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then
                        eqmake5
                fi
        }
@@ -86,22 +80,22 @@ src_install() {
        use doc && dodoc -r doc/html
 
        myinstall() {
-               if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
-                       insinto /usr/include/qt4/QtSolutions/
+               if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
+                       insinto /usr/include/qt4/QtSolutions
                        doins src/qtsinglecoreapplication.h
                        use X && doins src/{QtSingleApplication,${PN}.h}
 
-                       insinto /usr/share/qt4/mkspecs/features/
+                       insinto /usr/share/qt4/mkspecs/features
                        doins "${FILESDIR}"/${PN}.prf
                        dosym ${PN}.prf /usr/share/qt4/mkspecs/features/qtsinglecoreapplication.prf
                fi
 
-               if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then
-                       insinto /usr/include/qt5/QtSolutions/
+               if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then
+                       insinto /usr/include/qt5/QtSolutions
                        doins src/qtsinglecoreapplication.h
                        use X && doins src/{QtSingleApplication,${PN}.h}
 
-                       insinto /usr/$(get_libdir)/qt5/mkspecs/features/
+                       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
                fi