Adjust KEYWORDS handling, bug 539276 by Thomas D.

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

diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 891db64d25df3fa4c333452f7bb456c536820bc4..5bb0f0a06fee2b1b15bf0cfd73c0c465f77ea422 100644 (file)
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-firewall/shorewall
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.274 2015/02/07 18:36:38 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.275 2015/02/07 22:59:47 floppym Exp $
+
+  07 Feb 2015; Mike Gilbert <floppym@gentoo.org> shorewall-4.6.6.1.ebuild:
+  Adjust KEYWORDS handling, bug 539276 by Thomas D.
 
   07 Feb 2015; Mikle Kolyada <zlogene@gentoo.org> shorewall-4.6.6.1.ebuild:
   alpha/ppc/ppc64/sparc stable wrt bug #536796

diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 38381548d55bbb9b6e75e788b9f72352f968739e..f546cedca6dd6612b2da26e6a71d4fb5e3120fa9 100644 (file)
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -49,15 +49,13 @@ DIST shorewall6-lite-4.6.6.1.tar.bz2 47753 SHA256 3fee19fe538c8d0bb631f9336d917d
 EBUILD shorewall-4.5.21.10-r1.ebuild 3372 SHA256 de0ffb2098c9fe21a7a37ed6f0653062518c86c9b7d6f9b01516d8eddfe6c451 SHA512 2405be21c36f0f55d446933e3b0d8aaceffafbaab36c7bb6f45020454032c00081b1ddd523880f9c1b501fd9577e5de2c8a1b9a7adb0b9bdc769513a7755ae6d WHIRLPOOL d13644db7f315b958271dc7f443377a5fbb7a56e0feae1bde98db670931c7fe9aa150d6e14c0b6c9136246febfd24e616864bd80470c46ab915c4a1ebc3540d5
 EBUILD shorewall-4.5.21.9.ebuild 3285 SHA256 9d6e1cc9a7a22de912d5c9146d3fc119c8978c04036a1e98cbbde31fd5f78b45 SHA512 df887615e704c0c181fa2bc10f01e07d9a3f12b68193643c0cb9facd6a8df73b3801e1db3cc9ad561a4e769b5f9656e7ac908f87c5ac4e0a00471b6048518abe WHIRLPOOL 2e100845a3a83d0476f381cba4173e7fbc5e771eb6c5c1d21a3357c4ca0d41ef980cba77cda0b5b5daf903a75679ee560e709aee776127262f7d22dcb5827d3d
 EBUILD shorewall-4.6.5.3.ebuild 16080 SHA256 66566cbdbb3baf3e4a0d927d487b5e5030068bfd8c06a41db02736bba702b306 SHA512 86a11bc51299e4deb65e1ff764e50df75bd98243481af38fea5ade66d1bfb7220a12a45fe8bf01a0635474057014c06b581a219413d7b27424ce642fb3a235b5 WHIRLPOOL 274b506aee970c43bdf3f4de257651e3416b5c48bb48ee8a38e597845bb7dd41fd6eed3ba2afc34e408fb714353dd0cc8469a71329a1c13990eb3a9aa41da1fc
-EBUILD shorewall-4.6.6.1.ebuild 16291 SHA256 8810bf47e030267a62cd3f337c7034457ea276aba7d8057bff74725ecd905d76 SHA512 1d33df7500cf12c9f0013cf2b74ada15e07125f73eba473f8381b77f905367d070e6a08d1b6a15ae039a6fb4d83c38ed50d522a54af230a9951d3d6696ac866a WHIRLPOOL 21f03b93d5df0520ec4f20fe3be95e2539089ebf22f5c633efc2dd8a9d8dfb422550fa52d9d3a934aea3bf88b1575081cde3bada721752ea079a03f3f7dbf776
-MISC ChangeLog 42084 SHA256 c8a1eed35e8c3062e3b9b3f1f6ae750757de87e857d3a69ab269c306f5beeef4 SHA512 6f0ce5bcb5fdde8badb07cf692d9bcbf00d55c0e3d174598f730abf55b35a652dca611680a39a10594383ad06aca8b9b739432ddb364c80e7d13057f8ac9a6d9 WHIRLPOOL 2a7f54b5affd4abd99347c4cdca70864ca2918ce074465133e81e071c121ebefeaceafb666cef5235d39636108bcb6642beb30f0e6ecc6aaa6bdd9f212603388
+EBUILD shorewall-4.6.6.1.ebuild 16248 SHA256 33446bfffada03982ea04af8d7b7fbd37e9bb1589ec93e0b4876ec40e18338a5 SHA512 47f89b87a63fe4ea854b4ace1b7f41f83008272a3032df5f8311273b58bedad393d1360f32ab0711a75d888b51ef0c6ddbde6fcbd2127c9f12a2a51458d53dea WHIRLPOOL f98464c97e2ba6ad4023250573660e04cc271178864240f45798d804ad7cb8f98d2d0d38222496aa7db43be721b35589608a2a18d9c65f8068684835d83d5dab
+MISC ChangeLog 42212 SHA256 2247ac0b085ef2316ddea8421b0b8157d8090b73b35de27a949e5b64de658cc1 SHA512 343cc07cf9a26bd3a13c5b6db9c75c76b8748f9dc14eead84b4a11d81e766f8315a9073930ee627de37b472b52831d59ce9e2ebc460005ed36445d1e09222159 WHIRLPOOL 729383c9bfa0b6093f136721778627602eeae2d517ec5b3e700a4bed8de4719cb1ebf39db70e36d8d4e7da9e050cbc1e08430ee895ad1cc3d1fbf7923aa80acc
 MISC metadata.xml 977 SHA256 9d7f6c5409d58e7e897f591a207ae66d26ad601176aad0708a1a21b268e8946f SHA512 4d6cb7e6aa1c1f0b372dbe2eceff76eb44e8d702b780484d41e712c4a34d3cf88d40ddb0868faeb7c26be2ae3f14db7303b18a5a9882fb2254a2f79ba332c979 WHIRLPOOL ec45a44bf7b1f7de9f28bc273e7208ee9125c9d2642a95fc04e83132b097526756435b7d168f847936c1244cc9c246df56d526794d5f2ad1c60534d852ed77d5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlTWWtMACgkQG9wOWsQutdax+AP8CWelF32Q7L177ksDyQm7uQx1
-6cLrlkhPshGBHWVe2ZHkUe0NJAO0biaTFuAR3esL/+3bFby0qAI/2RRDtgO4hMRA
-6lW8rWcEkK35gmaSEwkLg5pBNDp0Yc+zDYkVy4MDrPl2P04+bYuG+rDP4Rr+XGqz
-APVBIRDU4s09fKztQ+o=
-=gZNd
+iF4EAREIAAYFAlTWmOUACgkQC77qH+pIQ6Qu0AEAuaX96oraDFTLiblIG06Vo0WV
+H9hgcEuU70Qn66/WV+YA/3g/JcVcMf6FPTgHHl4/gaTG/sWWlTypu7CUX04kcFkf
+=XI9T
 -----END PGP SIGNATURE-----

diff --git a/net-firewall/shorewall/shorewall-4.6.6.1.ebuild b/net-firewall/shorewall/shorewall-4.6.6.1.ebuild
index a65104ad5c6251de33b5b467b7b9da5dd459f681..948f66efcc489d8a5e42c03cc3cc28b3c544f7d1 100644 (file)
--- a/net-firewall/shorewall/shorewall-4.6.6.1.ebuild
+++ b/net-firewall/shorewall/shorewall-4.6.6.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/net-firewall/shorewall/shorewall-4.6.6.1.ebuild,v 1.4 2015/02/07 18:36:38 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.6.6.1.ebuild,v 1.5 2015/02/07 22:59:47 floppym Exp $
 
 EAPI="5"
 
@@ -11,7 +11,6 @@ DESCRIPTION+=' a high-level tool for configuring Netfilter'
 HOMEPAGE="http://www.shorewall.net/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="doc +init +ipv4 ipv6 lite4 lite6"
 
 MY_PV=${PV/_rc/-RC}
@@ -57,7 +56,6 @@ MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
 MY_URL_PREFIX=
 MY_URL_SUFFIX=
 if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
-       KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
        MY_URL_PREFIX='development/'
 
        _tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
@@ -69,6 +67,8 @@ if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
        # Cleaning up temporary variables
        unset _tmp_last_index
        unset _tmp_suffix
+else
+       KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 fi
 
 SRC_URI="