Remove conditional keywording badness

Package-Manager: portage-2.2.19/cvs/Linux x86_64

4 files changed, 12 insertions, 30 deletions

diff --git a/dev-qt/qtcore/ChangeLog b/dev-qt/qtcore/ChangeLog
index 883636e211cc..2e8f0bfe6403 100644
--- a/dev-qt/qtcore/ChangeLog
+++ b/dev-qt/qtcore/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtcore
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.77 2015/05/16 11:27:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.78 2015/05/17 01:49:50 patrick Exp $
+
+  17 May 2015; Patrick Lauer <patrick@gentoo.org> qtcore-4.8.6-r2.ebuild,
+  qtcore-5.4.1.ebuild:
+  Remove conditional keywording badness
 
   16 May 2015; Pacho Ramos <pacho@gentoo.org> qtcore-4.8.6-r2.ebuild:
   ppc stable wrt bug #530238
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 4ca15146ad40..24d9d9126009 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch 4531 SHA256 fd6e59635ea7bc86fdc36333ecd77609ae5cdc52c3a388c3b0088887d9a21b72 SHA512 b81810d62e8652f91b787285e8208b42d723e89aef248aeca24f02cd84b4a098c82571ece7c8af9c25c0535bde61ee376b6c24992f55fbaef2dd77f54f14ef1a WHIRLPOOL f7e6d005c157314eba3501bb9fdcecdb1f0b317880d659ac42e9b17a79ba98892c6ad9b49651a81d2a8c5c77d9e6ab9b7953422435543b1e38f1eeef0865dbd3
 AUX CVE-2013-4549-02-fully-expand-entities.patch 6117 SHA256 848dbcd78c2ae0a3f6acca07b48067c453f721adfbe4dcdc90ca8267eedbc065 SHA512 1564fc1e299704c7f51015fdf3213e3c85460d2950821f53f94bbf98c80275e845aa8804250081df9db8172ca26fde11070e21ce18b8ee17961689ceb96daac9 WHIRLPOOL ccf1494fd0b243aed5149d6f1ebaadb5bfefff4698a95fae6d006247a9daee493e8e4c567a2bc930efc7b22c27761207afd1c8fe8f104c5a3fed491a669d14e8
 AUX qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch 3410 SHA256 9dbb9be4dfefc00711058b99fe2425bb43c811a1b36a6f046336e13c666d40ea SHA512 6770959ba01756d6a3fa9e03edd5f6c1df0d8625f4add65f7fef55a93b7b52c555a0ce749984938fb7ab905c2e0875cec0cb5d07f45c1b447fbc9e2d0ec678bb WHIRLPOOL d06e33e4d6545b99d930212f6ad767a6c59cb241cb0b28fe3401853700c26c9fd9a5dc0eb5cfaef62ed8f7874eccf906c7c39c469c6725e9db3836c8982422d8
@@ -11,14 +8,7 @@ DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
 EBUILD qtcore-4.8.5-r2.ebuild 5207 SHA256 166ffd4d2357025ce9eef8ca0db78184915219b8f3e2e19b8543ef35a7d20094 SHA512 3434d8243745241b55a10ea92a7c24012c1062584fd441d1805119d673c2a55d38caceb65442e168b4a4f0ca93982bf8b052c79ce0db1fbc75ce28d7e3f2c188 WHIRLPOOL 5ccf583d46b52e221d867eea97284d673fb786510a8f73f2cfa9050884a158958e9563895ed125e49492cb5e3f0593d32b2e088e9b15b8d2aaaeddcd333f2310
-EBUILD qtcore-4.8.6-r2.ebuild 3028 SHA256 724810316d8d85092882742734498bd5fbfc59e05d9ba926b6eadedb750a2d2e SHA512 a31191a3a68834090c34b9870440fba2d9ba922b4b6d64b192045435b2124c2a996440f845b83ef81414c93a81c8331499eb49b822779a442b2f9db08e5f99f3 WHIRLPOOL 78df1dd202979b74cb53d5b42891bb733629463017767b8ab503c9c5ac94955c551b60cbf0e37ec58c15b879ec5c732a1197d30c0903c1779e99cf12790079cf
-EBUILD qtcore-5.4.1.ebuild 848 SHA256 239b7ed13c902d2999fe770aaafac73e7e1a015f9728dc296902cac8b9bc0233 SHA512 3a933fdd7bd8ccf183d9e9a837391d27fafc80cc19bf4f0af97ffcc76cdd19dad63ff48a0cda9365ac413db9f275025ccebf72a3f2d12871d065304082d4c985 WHIRLPOOL 0e306a5a180aec2a29ae64893bf6d657a1759a632c96e79a0d6105799501db4195e3d67d70e5498adc0343baa986cb9058bf6300d05e47945110357ae1ec671b
-MISC ChangeLog 38948 SHA256 e7cb5c0ae16f51f3be383e3aee5adc3b1d25f2a3039d0ee3fdfb561b81c880b5 SHA512 24dc211128f8d7d232f5ccd1f448e75c9e9e29fe6a0595555795fbc94d17fd8ce20ce70d5b3c5e9f7ee5f1de03e204769033a83c580213d25356199358e02c79 WHIRLPOOL 6bba4eead73717bf48b6fd6e1265ee8fc15e874eef3a577b64f1dac153dd4e03dfe13284c4b0e739375dc5e7476c904e15799b96ffee11d0340877b806f3ae19
+EBUILD qtcore-4.8.6-r2.ebuild 2951 SHA256 7daf9ee84ffdfd36a9be4363d0566da47b9cb689e4b8868b022f65cd0daf4d3b SHA512 ac3645d8a933f08fce2cae8d5897a8fcf6b945d45af2da442528a63e8f35d022746e9e4b906542b988b50d890d82070b1eed418f81eca2b576da69196359c22e WHIRLPOOL 2318fb54e1a040d81b9c302a9a8e0fd11200c7966d027140a75b1fd168974afe026bee47ae843c46b5372a0419f99b2bdf5b30d37f7120fa7fd904926982318f
+EBUILD qtcore-5.4.1.ebuild 781 SHA256 a14451f1b4b7929096de3556b70f341c8ece705bf6780b7c25f7291ceb503ab0 SHA512 3d7abbb993df30779f8f1858d3bdfbbdea5c5f4cd283a28e50cdad2ed4874b63ef54063af05025bd14ef43e3209cd7137f06916c2f1865886464b7cfaf7dd8bd WHIRLPOOL 8468e1b8a7a6894df88dfd7932c92b10dcdb1731b0bc817535ab9f39f50221b830c9805748170c2c2559fb4f2695adc89afb8d8b27cfa9e2c5f05ba02faaef99
+MISC ChangeLog 39088 SHA256 cdf186a6b4af28cfac78975b4f17201dcd5be6a0408bf0610cbddf463dc037bd SHA512 3a699bba24a85b902e2d03c9ef41c33561af478538293db2c9961fc7e8052f6a7ada9388e6f6d3bc43e4cce87e43c50b6c5fff373728588cddeb4d62c663cb98 WHIRLPOOL 242fce999526b81eace1ce8c1b9fa1126a0adec5ee3aae178342d480e43ba5ddb01d22605450ffc78e22f8823879f98c9f710cd595ae0aeb45002d75b0ee3e23
 MISC metadata.xml 642 SHA256 7fc084d5cbde663884ed35e9733591c8b33c30bc0baf091960e9bf791a49840e SHA512 394414c48c95a7eab1cdefbd8dab7df4049e18daf1d8f5c1cf9dd13c6d79fbaffa5f30d83358cab8de81ef715bf6826095a7e3b3a40e0ac4556a662a8f292093 WHIRLPOOL bda8ef8538520b6e4bdc25adb88ce73225dffa2139f0c3dce768bc924167986a0fc137173003cb923a5ab3f52a44f67cf668f0c85c0c7858f5a9e1b16f9586ef
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlVXKZAACgkQCaWpQKGI+9RAvwCbBTaeVG1mbwr/dlidsp5FMSco
-1F4An3bQQsAqhXd5hRaPO792RlYH8N8z
-=Qpvl
------END PGP SIGNATURE-----
diff --git a/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild b/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild
index 98a6c0d150fd..305e9d5aeeb0 100644
--- a/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild
@@ -1,19 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild,v 1.6 2015/05/16 11:27:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild,v 1.7 2015/05/17 01:49:50 patrick Exp $
 
 EAPI=5
 
 inherit qt4-build-multilib
 
 DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="hppa ppc ppc64"
-else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="+glib iconv icu qt3support ssl"
 
 DEPEND="
diff --git a/dev-qt/qtcore/qtcore-5.4.1.ebuild b/dev-qt/qtcore/qtcore-5.4.1.ebuild
index 86a23fec13f0..356c9b3e5419 100644
--- a/dev-qt/qtcore/qtcore-5.4.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.4.1.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/qtcore/qtcore-5.4.1.ebuild,v 1.4 2015/05/16 10:12:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-5.4.1.ebuild,v 1.5 2015/05/17 01:49:50 patrick Exp $
 
 EAPI=5
 
@@ -9,13 +9,7 @@ QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
-fi
-
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 IUSE="icu systemd"
 
 DEPEND="