Shorten pkg setup.

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

diff --git a/dev-libs/libdbusmenu-qt/ChangeLog b/dev-libs/libdbusmenu-qt/ChangeLog
index 9d2a56eb07319b1406fb9a3d91bbeb4758ff28d2..36a5a6cd72a79e598b8569cec113c16f38c394cb 100644 (file)
--- a/dev-libs/libdbusmenu-qt/ChangeLog
+++ b/dev-libs/libdbusmenu-qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libdbusmenu-qt
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/ChangeLog,v 1.38 2014/10/15 13:48:57 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/ChangeLog,v 1.39 2015/01/30 20:40:55 johu Exp $
+
+  30 Jan 2015; Johannes Huber <johu@gentoo.org>
+  libdbusmenu-qt-0.9.3_pre20140619.ebuild:
+  Shorten pkg setup.
 
   15 Oct 2014; Michael Palimaka <kensington@gentoo.org>
   +files/libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch:

diff --git a/dev-libs/libdbusmenu-qt/Manifest b/dev-libs/libdbusmenu-qt/Manifest
index f2893dd67b43e46ddc3ae3c2fe3e1f04306062c8..8c917c9504f2102f44b325e555358bc7618732e9 100644 (file)
--- a/dev-libs/libdbusmenu-qt/Manifest
+++ b/dev-libs/libdbusmenu-qt/Manifest
@@ -6,24 +6,23 @@ AUX libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch 383 SHA256 ecd136a04d75
 DIST libdbusmenu-qt-0.9.2.tar.xz 242888 SHA256 ecd1108f637c4c58946aff2aba70010f8060bd87c1acc85a917c2b3f43cf406d SHA512 93471a03cfc127babc58cf07b1caa30ae901ad2d213790d5085117f331a6cea0d2ab6b5ba21abdf582c40f172ff8e8168a185fa1a27d7d367a01a3b6ed731155 WHIRLPOOL b38e23c9def7802040c8ce94bcce6a644cf5e088a90fda091a2ba75b5a332b36d97f00d998f8c1b1942101eceecdb8c78612fcb3ee5f0604de98f65aa33cb3f7
 DIST libdbusmenu-qt_0.9.3+14.10.20140619.orig.tar.gz 46641 SHA256 e531b29388317f48e22c652c7111e9c7750aa7d429a72742c49a1c8af1e61968 SHA512 791c1904a1c960a94bba2c624469d8a9c1c76e14fc40917feb5aeb8c55acc6c68a0b03509037440f35ad8416710cbe705c1b117b23a9a684b6ff0d919d1d5e18 WHIRLPOOL b76294a4c9cdf943594f685aeae13e12db8d6f0b85f4a86031023c15072cdae619ff70c95e8db40eaeb9acb8d234e48e45ca79899c835b068387df040f688160
 EBUILD libdbusmenu-qt-0.9.2.ebuild 1584 SHA256 d5d2e3da65c5fb7b5e6d7a50a2b97999046e37082abca4f1456093f70a701294 SHA512 49af1dd63fd3bd975df7a2642f4758e89c2d30ca7fe6bfef6e1be5080f3afabe27d5512c17a769d7abe5d54894f39fd5b91b4a36200311a69d697320629048b3 WHIRLPOOL c213dde5f85466f8c3f964f9439e4146b6e09e527ef846b1da35c081842e41fd9c5ab9ef22cf3af92e80d2517365e4a4b9c07e5e1965ffc9baa1ce8897a5f850
-EBUILD libdbusmenu-qt-0.9.3_pre20140619.ebuild 2404 SHA256 d021c4b904228d4467076a409d53756c12a1d2ba4a9b70c5607ebeaca95c863c SHA512 9b482918718230e5d0e423ba76a629f4cc110094da84a539938b11aadbd3afe783b843d392404d96b3c98f35ec94214e3f6ce4d76d7e71ed154c42ad8244ff89 WHIRLPOOL a60ebd4fb2ebcc2e56e9693141053be922d79870bea4d780048b083f099e543c60c301a311f21e10df19087347dac5f331c0d9dbc2c5ee224bfc28ce2d7b2fbc
-MISC ChangeLog 5854 SHA256 274a6f879a63b7064af1ff8745f7245347ecb97fab7e8067252034458897c8f7 SHA512 f29e4ea4088abb53d272d566f9ca988cc61f698e43208e5c114ea43d1afb8f18d9e930d5377d3fb7d13d40eec9711264a57ecdc409de3272d1d84fcb6d024d2e WHIRLPOOL e15dc72b4c6ee42f55f51d973a6c55e0ff621a2332cfb4e606c90d0f138eea6aa91300d26e41985400120cafa0a9c48876306b14c1ee13bedddb2617aa119ffd
+EBUILD libdbusmenu-qt-0.9.3_pre20140619.ebuild 2341 SHA256 19640c1957284cb36100b73e2c7325132b2fc53a38ec13a6316c8ffc9441bb1a SHA512 6dc1c277b3cae007df65567819f502fe5807f8f31b8c746d59aed684afb1f4204ad40cdbfa69ac169d79a085b95477ba5ebe061a0fe7153ffd8a019a74f8af65 WHIRLPOOL 6c0e10dec4057a84a11f56276093165b6383bcd29a37d476de869b6b87e2ad3313f765a5fab8423b7745407b320b31e070368f73a016bb8a17e2187f75dc4395
+MISC ChangeLog 5961 SHA256 b2957dfad2e84bb9482f9bbedc72d0199c471f3e5be8ad9da515ae9ed2da193b SHA512 589ea1194ff783efd9bd35dac8f20f919ceac50a3f1135a72c6503306c796a194037dc2d9943f99f65d51514fb6dd21512edaa949bbfab2cfc1d384213550b08 WHIRLPOOL fae5923307a03cd317de758f7c010b3c16fd54f5b950dc32e4a68fb95b283d92b334012da0e7113aba4d9b3adb3849f1264639fea2b735eff26857d2770f4bdd
 MISC metadata.xml 255 SHA256 dc41bad6a32aa70aaf9724aa119a3bfbe4b0c81e29add0cd88c3f71223344984 SHA512 b8add7d8b375b51c03bce2893170e1dea441882876963cf799f349a0bf894312f397d0f7373914e10073b4aa2f0efcd0ad824dde519f1d28aeff46b0c1cc1675 WHIRLPOOL 790f2d96fc4ca8e044eba597c3954a9ebd1a3fd0a372f4b443a1d61c9155d0c7c9ab3d27393568e1112ac376ef87652772b5313945d5b4691f17cfe4603d3efb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJUPntNRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7En3D/sEuzcq/Ua39ADR/pczMFpM0TQT4MYPkytf0/8gFuxqbbiWvJOPd2cVuVgc
-v5rwMSUzBquepQcNpMJwu1Gt3ndlgxyFCsjiCt3k8eII+wNllaRZumSP5YvCFGM7
-dbExpfjbOsXU3YhHPMMteOVtL8xWBgRu0a04iSiRimHtpPvjO8a0nQ01jbQorbEx
-vDxWb2t0XjYLRuEbmpx4oCi5LornHGvbLRStmGbWosif5w5Zfyn/1PqFVZxeOcxM
-DyoYkhiGQMn0vqD8NJfOP+4YQHXBXhcH/GZI5k4r82HSalVcX4RyAs3Nf2h06NVG
-agPrxPeNo3WiWRs5gXUy8Oux3dq1HAz3uxw1rb/m+cMRHgSyjCSWIb9+L91CjCWI
-CjklrhMYq8LrtfHotBbR/i5QPgcHcyK6JoPplC/VreDxqE0ylc7fiASXcO7VmOC1
-fuDRrHqaCy3fJu0G2gN0AlecURKpxUzHT113XU0gBaM4UzHSlar3MKP0b7OaxY4p
-0rNkBBC0o5AuAH2JsC12LuBC1sohr95lQqWs4LB28AUlSqipOStTVf/7wfRa5WM/
-7hyz9YNOhWY192wdZGPCvjHOkbJRQLSu/LC4BEJZqgmIhQG6hwc2xAMFPdNmULmi
-wJ31oK7/H0LOx/lU6A349BlYSyWL5fNGCWlxI6JU0fPS93JMaQ==
-=X3ZD
+iQIcBAEBCAAGBQJUy+xYAAoJEGVpnaTzz9K9us0P/1a5Kp/D3pOgaKiZu7PBYDYc
+jhE5lQqJ1Y+kXkYPA4yAO1NfGZqLzVAgeYA0H8MdrFjy0UL3zMT5HtXtBShkm6dG
+w3C6Mcf+Cak72JH0w8i+S0+Sl9U1Hdcj5qJqEWHIK1fvaFwoGc3b9hFl2cKRwuFo
+gq3jvDZr4TMSZf32HG9U9y+Px2zYo2JLBllZyPJjmJvi38ZswCIq3Xt7ASNiP5Xy
+8svgXf0Beua35OVqXhC6NV+xeuSQ08zRfbpooMwklUxTTTWPpyopT6+XqIqD2vPL
+TDnl61h9WediM7AiF3EM++4tn2r2cvt+CnK1U9/9v9+oxn45XoA7iEUU4We7xNC7
+NfYSSvXNXkyU8eq8FfExkOXBry6VwOfBMkn/ZBxtKWlQwILkLgFWmnLM7A4RfwUh
+2ew8beJ2XR0FziYE/SZRHarKWF2cawb5TKNZJmkxFz5xkaoU0HCbdQU9J0gGK4ih
+bWQLNhkMko6XR5ZopQcC1tV0sRM3PRpi5oZwepVmlVPhQG0UKBxEf4i3gGevxqlm
+qWIeGIE93nS1agENuPyM5roleMpLvbX62bMw1HhwvXG/iJibQZdVN5jZBmzN5qfY
+fZMdQ0Lnnzf5571K3qBTzx+qorZOPC/Ic/CUGZ1fKScaKP6PD5/TO7Y9UOvnQQLs
+kx/11GbIGxc99Sr4REjd
+=nxf8
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619.ebuild
index 194dd70f265f54802fd60161f26f300d87a8c274..b03b47c5ebce86d6e800bb24a492f8c9d94d9ec6 100644 (file)
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619.ebuild,v 1.1 2014/10/15 13:47:18 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619.ebuild,v 1.2 2015/01/30 20:40:55 johu Exp $
 
 EAPI=5
 
@@ -58,9 +58,7 @@ DOCS=( NEWS README )
 RESTRICT="test"
 
 pkg_setup() {
-       MULTIBUILD_VARIANTS=()
-       use qt4 && MULTIBUILD_VARIANTS+=( qt4 )
-       use qt5 && MULTIBUILD_VARIANTS+=( qt5 )
+       MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
 }
 
 src_prepare() {