Merge stable keywords; Drop old.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC42EB5D6

4 files changed, 14 insertions, 65 deletions

diff --git a/dev-perl/PortageXS/ChangeLog b/dev-perl/PortageXS/ChangeLog
index 7122c43b4e43..694850a7784c 100644
--- a/dev-perl/PortageXS/ChangeLog
+++ b/dev-perl/PortageXS/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/PortageXS
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PortageXS/ChangeLog,v 1.64 2014/08/14 13:28:21 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PortageXS/ChangeLog,v 1.65 2014/08/14 15:04:37 zlogene Exp $
+
+  14 Aug 2014; Mikle Kolyada <zlogene@gentoo.org> -PortageXS-0.02.10-r3.ebuild,
+  PortageXS-0.02.10-r4.ebuild:
+  Merge stable keywords; Drop old.
 
 *PortageXS-0.02.10-r4 (14 Aug 2014)
 
diff --git a/dev-perl/PortageXS/Manifest b/dev-perl/PortageXS/Manifest
index d60e59dddcb9..085b6109df19 100644
--- a/dev-perl/PortageXS/Manifest
+++ b/dev-perl/PortageXS/Manifest
@@ -7,17 +7,16 @@ AUX PortageXS-0.02.10-portage_path_fix.patch 4165 SHA256 760e70cd04ff0922d3d1bd4
 AUX PortageXS-0.02.10-prefix.patch 6463 SHA256 11b0aca23516f59362ffe56d12d4718d8843935502ed4df17463bff6d39b0d01 SHA512 1225da7ef7911f8a3ada93f2d23ffd23e78bec735152403b809db75cda99fc576bc34fbbcd8487af16b3fadd946bc4c48497db9a4e9f9bf27705b91793d5ea37 WHIRLPOOL 39b98d5f9587596447370ec7c523fbf3e64f41bff4ae416e8a7b38aa2b03a9f4d05164d3fdfbb2d8425a7f33ee844465448e0bf140828780e30d82647c4750d9
 DIST PortageXS-0.02.10.tar.gz 28890 SHA256 1d41222577243d8fa004ce3dfeb67dce95c10339218ee1097d972cb8f97862c2 SHA512 8f5a6cf8fa415e13401fd7901c81fef42e0cee81b7a9c1f276cce9582c705ac7e2004ec213033fce065f965445342ed0140d8b752d2e857dd40c620ed4af6b1b WHIRLPOOL 3c7d41f5d5647ba4f31ef8d07f5172bf76c1ccb443443df37e526a91f76e1353c6c04941077d45a89d8b08d68b0b263dab5a08b923d6fb0faad1572c8c292333
 DIST PortageXS-0.2.12.tar.gz 41772 SHA256 b140ff37c8e8aea72229281ab30e0f85b31834220544769e01720e896c535604 SHA512 e833c8dab25ed6fcfad999e4b0bb803d69523ff57fbcd86ea0c29c671889a66c81f0081d6242039788a73d090e3245776d12a8286114b77f72d39514dfe425bf WHIRLPOOL 7141fb44821acee28d32358f3ab1cce82675004811ef56af1128d1d002ca6adce58fca8cabdaeafa0dc1d975b3bde1f34f1e1dae2328a0caebf136424142a1e7
-EBUILD PortageXS-0.02.10-r3.ebuild 1598 SHA256 ed0d491fccd871a865aff1b17d4be31651c8d2e3d8cb898b41ae1b7f5d0025f8 SHA512 75be77111386e86faab281a5651bfd35a6d1860cbc7373d28991dd7328526fdc782f02f77b652132f3c2003d5bc52bd6fa397ee15379c6f8aa94b8c90cf9e672 WHIRLPOOL ab78c8e4eb65d88a0a58a56a0446d5dbf028f1ef3835460ad53ae656e23727ef49ca44126788e6ccf4a2e8d09439e70103112b32f1dc1900d291258a43c80932
-EBUILD PortageXS-0.02.10-r4.ebuild 1648 SHA256 ec06de6798f7f5460f38ac4791c4383b1246b34119eff3c3fdf1daeaf752841e SHA512 acb72756d329275a12c8c7624498a7b9d6c71009f62a9b685bf26945c2ce4e70fda3f54a34bbc81d44162c58737360f69c9b0c24f9ce867a2d1a20e8e5336280 WHIRLPOOL eb00aa5d578faeda685cf46b1ba16bfbd11f4f157152628536bcb439c35ed23f7f518dd8df0ab14cc2f28f75f4623212ef81610d726d7087a7ba2c7b7d4b37af
+EBUILD PortageXS-0.02.10-r4.ebuild 1638 SHA256 fb061a30d6705dd617f58fb39134758adb08ec3f5862d3c50cb6f27518a10e53 SHA512 e9fa172d0371d743143ee12a14ca190c6722a394fa3ef0eadeef501fbc68ca4cebcc4d248fc691c6b8d50e90c7c955d4f1c7d7bdd8e15379924c13b27ef0fc06 WHIRLPOOL f0eca38f5d1ea429017211abd334864dadbf8e8755e9e8f22cad3e4235530a6e1beb65ac8148e7842bfcb81760e5093896f79890b86a2e6be820f62e0765606d
 EBUILD PortageXS-0.02.12.ebuild 1677 SHA256 841319a8bf66e1fe57199ea32e18302f5c4e1c844d400ce5e2e824082de9d0ca SHA512 9b6cf8685e2a79dfdbbb99943ae1150b9c41040b67d1f265bf75d721494e5d2454e2ff76de57995fe60826bd156cfde00b432dd3dc0b7dc9324cff646a4c4938 WHIRLPOOL 7d90560e39c7c31c94fda7e3f8ce58ada99420657b06de5ae571f905988f6617be7c428f11dbd52e6074240cb0b55f205c55aa768f14914ffa9d03bec9b0fa2f
-MISC ChangeLog 8450 SHA256 6d7798d7a1deaa62c2a594b63db79c84f40ad5b5ea6d4d41a2eaa3a5c90b64c3 SHA512 2a7682cbc514153cf5d8b23b81d1c2e7c8d2bef0fab8b74840f4f93a2ffd992910db7ad0b3dfaa117c5d092f2578834cd86ec6df869d9580d8cff6b7039445db WHIRLPOOL 99e8dfe8389dbdced185d451ae9838369be71753447975addf138a314a560d35f0d4f46b103eb58d73c1847159b97619ae4048c1a34ee995886b5a65cf264d5b
+MISC ChangeLog 8597 SHA256 8cbcd07ba3027b02937cced8dedb9f4c30a4fc8beb37dca74572e3152f3a3c1b SHA512 ad23585095d9661bca0c359c75e0bd6b92876a192f2318c33fa3f23b0d19cdf9ca098d9abe5d758b45ec88d978206e3db5cccac6890fef0ec2a38c32ab849df8 WHIRLPOOL 0766b5dd1bde2d81c59a9743f4434909ca3bdf10db0736b2e68c258fe14d460760e3f596ea554b676d629bbd2144465cf599e6afbcb1115b9a2e90bec9844139
 MISC metadata.xml 759 SHA256 aacc0313f57f684535f841907ba702c98e3e326e779af53369e1ab5867757d3a SHA512 6cccd2fdc3d027143c31c6c0613d39f47cf94cf657eacf3d7fe0afa9d6ba93bd042b9d900a6be0f7092910f3c523067afc6990aafee210ad73c9dce05336cd56 WHIRLPOOL 07b9f1dbcf3cf88031d7b3968483a721449412d1e116c1904890396a87d29fd65107333e429e9dcec90b702883855e069fc8d90230591fae357024f05cfde91a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlPsuTYACgkQG9wOWsQutdZ/8gP9H/iPbOxvfGza0Q07b52YSa3T
-C+cFeAWkcwWVqCe/JANmIhXeGKovSX7haHwnUqglD9AsFXS1xe9ecboSCWlbka0m
-MDUNZ+zf2vUI5giLVcIqlcbNX2VRl++XJwbHeLL1+/H12gZTJs3iByMQA496VH56
-KaJNDfMuDvYDFkU45hc=
-=QYKK
+iJwEAQEIAAYFAlPsz8MACgkQG9wOWsQutdY7eAQArzH9wBHWarcorfn3+YId5DWy
+3zUVnAWyjh5hnjhu0o9rxLqgEm6DxuQuzrbF6pN89LCoeV85iCaVRVhN2ZnSJzYx
+TLBQRqa5ZzwP+XzWXhbk1pqHQVwI0vJD5M0UlhFNpMbj6JAAXM3GWz2CgeYdj5ef
+jIcXdv34kecLxJu0DI0=
+=Pr+a
 -----END PGP SIGNATURE-----
diff --git a/dev-perl/PortageXS/PortageXS-0.02.10-r3.ebuild b/dev-perl/PortageXS/PortageXS-0.02.10-r3.ebuild
deleted file mode 100644
index 82068eeff67f..000000000000
--- a/dev-perl/PortageXS/PortageXS-0.02.10-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PortageXS/PortageXS-0.02.10-r3.ebuild,v 1.2 2014/06/12 07:30:13 kumba Exp $
-
-inherit perl-module eutils prefix
-DESCRIPTION="Portage abstraction layer for perl"
-HOMEPAGE="http://download.mpsna.de/opensource/PortageXS/"
-SRC_URI="http://download.mpsna.de/opensource/PortageXS/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="minimal"
-SRC_TEST="do"
-
-DEPEND="dev-lang/perl
-	virtual/perl-Term-ANSIColor
-	dev-perl/Shell-EnvImporter
-	!minimal? ( dev-perl/IO-Socket-SSL
-				virtual/perl-Sys-Syslog )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.02.10-portage_path_fix.patch
-	epatch "${FILESDIR}"/${PN}-0.02.10-prefix.patch
-	eprefixify \
-		lib/PortageXS/Core.pm \
-		lib/PortageXS.pm \
-		usr/bin/portagexs_client \
-		usr/sbin/portagexsd
-
-	if use minimal ; then
-		rm -r "${S}"/usr
-		rm -r "${S}"/etc/init.d
-		rm -r "${S}"/etc/pxs/certs
-		rm "${S}"/etc/pxs/portagexsd.conf
-		rm -r "${S}"/lib/PortageXS/examples
-	fi
-}
-
-pkg_preinst() {
-	if use !minimal ; then
-		cp -r "${S}"/usr "${D}${EPREFIX}"
-	fi
-	cp -r "${S}"/etc "${D}${EPREFIX}"
-}
-
-pkg_postinst() {
-	if [ -d "${EPREFIX}"/etc/portagexs ]; then
-		elog "${EPREFIX}/etc/portagexs has been moved to ${EPREFIX}/etc/pxs for convenience.  It is safe"
-		elog "to delete old ${EPREFIX}/etc/portagexs directories."
-	fi
-}
diff --git a/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild b/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild
index f6f141f78502..c2e877c3427f 100644
--- a/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild
+++ b/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild,v 1.1 2014/08/14 13:28:21 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild,v 1.2 2014/08/14 15:04:37 zlogene Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.mpsna.de/opensource/PortageXS/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="minimal"
 SRC_TEST="do"