Merge stable keywords from -r2; Drop old.

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

4 files changed, 17 insertions, 52 deletions

diff --git a/dev-perl/SpeedyCGI/ChangeLog b/dev-perl/SpeedyCGI/ChangeLog
index 51ee6387e1d7..241ca0943d1e 100644
--- a/dev-perl/SpeedyCGI/ChangeLog
+++ b/dev-perl/SpeedyCGI/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/SpeedyCGI
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/SpeedyCGI/ChangeLog,v 1.18 2013/09/08 14:51:37 idella4 Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/SpeedyCGI/ChangeLog,v 1.19 2014/06/29 08:13:56 zlogene Exp $
+
+  29 Jun 2014; Mikle Kolyada <zlogene@gentoo.org> -SpeedyCGI-2.22-r2.ebuild,
+  SpeedyCGI-2.22-r3.ebuild:
+  Merge stable keywords from -r2; Drop old.
 
 *SpeedyCGI-2.22-r3 (08 Sep 2013)
 
diff --git a/dev-perl/SpeedyCGI/Manifest b/dev-perl/SpeedyCGI/Manifest
index b2d65577d41c..bccead6b478e 100644
--- a/dev-perl/SpeedyCGI/Manifest
+++ b/dev-perl/SpeedyCGI/Manifest
@@ -17,14 +17,15 @@ AUX SpeedyCGI-2.22-test-timeout.patch 350 SHA256 be54aec63ce50274a50e5d02ce42d72
 AUX SpeedyCGI-2.22-uninit-crash.patch 500 SHA256 2ef99326835406b4464cd7b4f2a0952f68e932041eb2c5fca42585ac761616dc SHA512 a92be5a0949799a75a8bbfafeaea17276c63b460a1434a7b4ada7f460f302f5d8ee16b0de87fe607f27abc2714b8612bbdf66550deb45e9e740804b936c75d52 WHIRLPOOL 81cce43f067df7f067b30a2df3ffdfc2cbb0c8d9b6237ee72c4061bac0fb34ece6593b38c95b79dd2530beb95782a263e8aa360e0c8744169a1c0dcb3907398a
 DIST CGI-SpeedyCGI-2.22.tar.gz 151946 SHA256 9021a5c6d8ed205422f091209addf7d1be27222adbcbd17bc52fbc527bcc6f98 SHA512 e29112c2dcc2d7494bd06a92ec80ba8b424b66fba78148e2e8dfc7aa3c51379f9cbc5aabc146199ce9190815de6f0da5da1d0d68e1ff499a663384523235fb38 WHIRLPOOL d7ea153a5b1c7b0e341fbed7e19178e3eb3fb2e588c26aaeb2b58f6616e8996edfb0ec16874d90dc81080c428e9a6a0e0ffb39fa55872ee461b799470c10c2d7
 DIST speedy-error.patch 3087 SHA256 9da44c9c7c5068c214e52076e011d5485f077e26080ddabd1ab1eda854605c6d SHA512 d58b31732a285f518040440a8dfa26f590a68ccef0ad7f9083b8752643477a3bd2ef5ec6833e6d1f331d72096ffa25a1840d9e2aab4732cf818b5fcbcb96de52 WHIRLPOOL d87a5cc6ea301037e0a460a32222505660325c2a46e04fa1c4a413cae11c5ae2c78831d0de072c6cbdaf6bb95e282bf70cb1f781f71dd01291de0e7d9b5a5283
-EBUILD SpeedyCGI-2.22-r2.ebuild 1230 SHA256 d34ddb552150e459f04894242cf08cecf2216a34a511fe4742dc5511ef60cf57 SHA512 b8736b8ec6b2ae4ceda538a2dc65eaf4c521d9518ac264855954c9039bb8f5c1a5efe4b37749fe29f0e9b0e0961717b51e3002850471ae101b206c8c458cfdc0 WHIRLPOOL bb5701c4cd5be9ca0832227fa6715fdb3d138a3dd4aaf9b09aa1e4a0022f844299c6012946a235e5f9ae52331ffe025093a92ab58137cc18a8087422ca8af342
-EBUILD SpeedyCGI-2.22-r3.ebuild 1269 SHA256 866fb0d84ec62b78fb92212e610c25fcdcb637228f97fdb56e8bcdc68442d125 SHA512 260683f528d97301b5600d2af4d363c30b5209ac72364a1fa79b421860b9e8063eff3d0bc7228d6a2b2fef001fa9d86226a423380d980d4e63f4c4f54ca95997 WHIRLPOOL 37cbdbc0d17615e8f0b05d498d5f5524356a57512d90c83ff3b15dbcdb9e6fe74d4a699a83b5a4bb8c8d6f33d02dd5a3ed76dc582d89193ccf59688294973d27
-MISC ChangeLog 3036 SHA256 64cfd0db41adca0ef94751923baf27bb012c6d01b057e1c3f81279a960d912a8 SHA512 67696147cd858ccf015d58a2b84f776f3ecbf7f04363e5eb4c13c1fc8502f630bd64252dea220e3728a46f381d27ca3c0d4c642b0c7138d43bef85d12af00cbf WHIRLPOOL c1dcb216d984deebceda2adbabe40faee24abec566f0fd86262a0763e00362fadcbca05db52a983759da687308c4affb7eb915e2d213841c41a1c83c7703f053
+EBUILD SpeedyCGI-2.22-r3.ebuild 1266 SHA256 20c695ea8864463af1c6ead375f1c7cb8424def1f3472c02018d8c02d2400618 SHA512 b66b6831243cfb19ae6f75ca46a04a144c365aa8d2ee70ac9ec82179ed9d1eca8b3e922ac1011e6f0e2eacd7b33ca8c19683dfba1c8fc9e32d683c73c7347a30 WHIRLPOOL 779c1d99b2382646aa013fff740594ea73910e5c00f8332e4a4e1115531c6740046d8c40f83984e59c4dd3c0e27971992b54803b4cd6c09f3bb435a5848b6dcf
+MISC ChangeLog 3186 SHA256 a38dabd962dad1adfa01caf0065e4dd147f839934ace834fba69a1d5cf1d7766 SHA512 9c0ac9d113aa4e4553be47e4776adc0dfa1d54ad661cd13404d3b7457b2dbd1897ab5a1760f6049092ab323820b1e7ce217419e7a68d80e78ce2225465d083b8 WHIRLPOOL a2cb10ef95928422a190a74360616f78eccd2a69df37c28faeb992e45cd3924a7914cc5f14d9cdc5280681d45106f0e1b0b2c97c18dc1232284b754dffa2026f
 MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlIsjwUACgkQso7CE7gHKw296QCgyM1YODhRLfSvU+8AHCIseEgO
-qNwAoL/LGXYfuVHmPBMBGx8Iigf+NQvB
-=UqvM
+iJwEAQEIAAYFAlOvzAsACgkQG9wOWsQutdbq0QQAoGGaDjofADJ9BBe7aMY9EK4Q
+n2PqREwf8d7JDkJ+owkljRg62SsCVgkncaAwW8oppdzvC62qJ9sKyXgwa+w1F6sY
+lDuF2qjf3DQQERGphiuIcGKT44wnT3D6PAI4MRrBternPgdh1ckErF9vAcszKHCu
+1Qd1zczO5Z3X+8w/ojA=
+=NEHl
 -----END PGP SIGNATURE-----
diff --git a/dev-perl/SpeedyCGI/SpeedyCGI-2.22-r2.ebuild b/dev-perl/SpeedyCGI/SpeedyCGI-2.22-r2.ebuild
deleted file mode 100644
index 0cdb21e14dcb..000000000000
--- a/dev-perl/SpeedyCGI/SpeedyCGI-2.22-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/SpeedyCGI/SpeedyCGI-2.22-r2.ebuild,v 1.7 2010/12/29 11:32:25 pva Exp $
-
-EAPI="2"
-inherit perl-module
-
-DESCRIPTION="Speed up perl scripts by running them persistently"
-HOMEPAGE="http://daemoninc.com/SpeedyCGI/"
-SRC_URI="http://daemoninc.com/SpeedyCGI/CGI-${P}.tar.gz
-	http://oss.oetiker.ch/smokeping/pub/speedy-error.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/CGI-${P}
-
-PATCHES=( "${DISTDIR}/speedy-error.patch"
-"${FILESDIR}/${P}-makefile-manpage.patch"
-"${FILESDIR}/${P}-empty-param.patch"
-"${FILESDIR}/${P}-strerror.patch"
-"${FILESDIR}/${P}-apache-docs.patch"
-"${FILESDIR}/${P}-apache2.2.patch"
-"${FILESDIR}/${P}-strip-backend-libs.patch"
-"${FILESDIR}/${P}-test-timeout.patch"
-"${FILESDIR}/${P}-speedy_unsafe_putenv.patch"
-"${FILESDIR}/${P}-perl5.10.patch"
-"${FILESDIR}/${P}-perl_sys_init.patch"
-"${FILESDIR}/${P}-uninit-crash.patch"
-"${FILESDIR}/${P}-big-socket-buffers.patch"
-"${FILESDIR}/${P}-ldflags.patch"
-"${FILESDIR}/${P}-parallel-build.patch"
-)
-
-MAKEOPTS="${MAKEOPTS} -j1" #348065
diff --git a/dev-perl/SpeedyCGI/SpeedyCGI-2.22-r3.ebuild b/dev-perl/SpeedyCGI/SpeedyCGI-2.22-r3.ebuild
index b3a18789c6db..f73699b82f49 100644
--- a/dev-perl/SpeedyCGI/SpeedyCGI-2.22-r3.ebuild
+++ b/dev-perl/SpeedyCGI/SpeedyCGI-2.22-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/SpeedyCGI/SpeedyCGI-2.22-r3.ebuild,v 1.1 2013/09/08 14:51:36 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/SpeedyCGI/SpeedyCGI-2.22-r3.ebuild,v 1.2 2014/06/29 08:13:56 zlogene Exp $
 
 EAPI=5
 inherit perl-module
@@ -12,7 +12,7 @@ SRC_URI="http://daemoninc.com/SpeedyCGI/CGI-${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~hppa sparc x86"
 IUSE=""
 
 DEPEND=""