Merge stable keywords from -r0; Drop old.

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

4 files changed, 23 insertions, 35 deletions

diff --git a/dev-perl/Net-SNMP/ChangeLog b/dev-perl/Net-SNMP/ChangeLog
index c0eced2053fa..237947bf75c1 100644
--- a/dev-perl/Net-SNMP/ChangeLog
+++ b/dev-perl/Net-SNMP/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/Net-SNMP
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-SNMP/ChangeLog,v 1.59 2013/09/14 02:19:50 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-SNMP/ChangeLog,v 1.60 2014/06/27 10:32:56 zlogene Exp $
+
+  27 Jun 2014; Mikle Kolyada <zlogene@gentoo.org> -Net-SNMP-6.0.1.ebuild,
+  Net-SNMP-6.0.1-r1.ebuild:
+  Merge stable keywords from -r0; Drop old.
 
   14 Sep 2013; Patrick Lauer <patrick@gentoo.org> Net-SNMP-6.0.1-r1.ebuild:
   Whitespace
diff --git a/dev-perl/Net-SNMP/Manifest b/dev-perl/Net-SNMP/Manifest
index 292d77c7b9b1..b6617bd92bdb 100644
--- a/dev-perl/Net-SNMP/Manifest
+++ b/dev-perl/Net-SNMP/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST Net-SNMP-v6.0.1.tar.gz 94664 SHA256 14c37bc1cbb3f3cdc7d6c13e0f27a859f14cdcfd5ea54a0467a88bc259b0b741 SHA512 5e38d4a934661201d42fd4a2d08aeca8c4522e0e430303eec7af38d16ea0aee131a4ec563bf87874376fe4995a674a24451f2a12b71a9c51ed3632e6f65314df WHIRLPOOL 627e9c8fc9278cb13f19d85cf8b460980add6d79268c160b680c92cd5f18e453e1d4f3f1604999dede16847254531dbc952e198179014c2063b01331803b3808
-EBUILD Net-SNMP-6.0.1-r1.ebuild 863 SHA256 04826303ec361a838540491b1de08a518a57aaee26bbd7b18a996da940a46299 SHA512 dd4eecc29b346ee315d3abc551e7ebd4774c7a35007a4c56cfb8763109bc2609ddebc4076b1ad70f3fba5a64e22e5e55bd725826c3aa8578321395e41f5ad411 WHIRLPOOL d3fa8413ab450841b19b2b0bfae178ac1c25c951b8fac6e35a6e6eeb9837131b6cc7d7eec928fa49351f9f56ed2545df6960f1fa09edbed698420dc98f60f3b9
-EBUILD Net-SNMP-6.0.1.ebuild 681 SHA256 74004e816b28add2c352b5a8423de226bb6235bdaf2a28962b4bdd4ba1232a15 SHA512 bfcc2a884cc6c8f75dfbdb6cb617e365f2227ffc6cee27db0a0a92b09e1b1e786646deab86dc566da74f9736c506c32b93cb921a2b6288aee166210c443408ef WHIRLPOOL 022b0527fa460819644ab0f4d8eac2a2c68fa02372f3e4c031b8025ba3a94899b15fe0e6de57b5dcaac36ea820f04b4cd4772648172bf08078eb13cfffa79a05
-MISC ChangeLog 7238 SHA256 86e59f008a35c06ad6100c5664cc0d93c909a22441326d8ee8c9ecd1e75c84df SHA512 662e29334274a4bb1c5a81f7668c8ed48da66c27ac61c3937ef517b2f73131d9f84fd607e29c7ec03b8d784704c9c55d97806df8de10dbcc5c6370adee466af7 WHIRLPOOL e1c72b26f0092468b71a9d509346877c9df5580c41ca4680d01acd65db5457f234c92c71be78dc300edc402a7121a393fb6303a44f9712a8198ff7d1ea58dc2a
+EBUILD Net-SNMP-6.0.1-r1.ebuild 855 SHA256 49a955d8912aa474ef62352cf1bdf26c43063c53ceb778c3b6cfebccb046bfd4 SHA512 0f4c0134731fe95d214ea54848030f6e0f9a5cdc2b7fececabf984ed92eb9407fbd3c8bc2d722814a8d089112ef94eede7e5042604a777c3c2c301c253f1a248 WHIRLPOOL 38713c203fdf58ed8336cea45cab3983e1680be4ae9cb3646518f3bcd648e0d66e90c8d028246b52e13759831eea4ed4089bcdea16560a71c40fa0e75aa8471a
+MISC ChangeLog 7385 SHA256 fec967d8708b400cf71884e7e6cdb0749148198caef32631630b6f408bd70eac SHA512 777ebd746945b6ceda02cf67853d5b88054c992ac225955819845a1c072dbe550b8bef0c0e6ca584381b33b02982a7f4c543290abd4044a4ee91727f5c481576 WHIRLPOOL 49cbc59b836788ad615d584f086553da1d982688952e4aeb489bcb589ccf2e53a3f3af16f53a13c6e4f5b7f6173be699d2fdd28af76274cc048435a367b807b4
 MISC metadata.xml 1298 SHA256 cba712dbcb421dc37345484d753b1cca89c966af29fd9668765c94b18b172a60 SHA512 0f8fb25c2f1f153bdfb3cc590f5d0485e20d8abd3c43e8ec9425649946629df3b2e347c2656f901ce77ae413ecf2d72122d5f5d502c7d629a782745088b960f6 WHIRLPOOL 105a67818a3a28dcc9d63f20db1112c7a6e976a3d654391ae62bdd8990f6abc49d1f67bc5647b3dbbe6434bd714d5353f303e4762f44d83035ead7a050b28a16
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iJwEAQEIAAYFAlOtSZoACgkQG9wOWsQutdYGvwQAj3bLoloOGPGQzuPRweQj9xWq
+odu+nJXzbt6YkUQAdWucjo4f0jfJlhpBUc8MHfswCncr4njLlhSWVy/+ab2c281w
++ro1/GM3bSgy/5yJZ84wjusfOyPO9ubP6sdYvR8qKbBlvzejtcJS/8Z0If3Ldo57
+5geQCZMavU+MbbEY1lc=
+=QHEr
+-----END PGP SIGNATURE-----
diff --git a/dev-perl/Net-SNMP/Net-SNMP-6.0.1-r1.ebuild b/dev-perl/Net-SNMP/Net-SNMP-6.0.1-r1.ebuild
index b5eb7f112f3d..8b00c6b5e321 100644
--- a/dev-perl/Net-SNMP/Net-SNMP-6.0.1-r1.ebuild
+++ b/dev-perl/Net-SNMP/Net-SNMP-6.0.1-r1.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/Net-SNMP/Net-SNMP-6.0.1-r1.ebuild,v 1.2 2013/09/14 02:19:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-SNMP/Net-SNMP-6.0.1-r1.ebuild,v 1.3 2014/06/27 10:32:56 zlogene Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="A SNMP Perl Module"
 
 SLOT="0"
-KEYWORDS=~"alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~sparc-solaris ~x86-solaris"
 # Package warrants IUSE examples
 IUSE=""
 
diff --git a/dev-perl/Net-SNMP/Net-SNMP-6.0.1.ebuild b/dev-perl/Net-SNMP/Net-SNMP-6.0.1.ebuild
deleted file mode 100644
index 815c3c885d0e..000000000000
--- a/dev-perl/Net-SNMP/Net-SNMP-6.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-SNMP/Net-SNMP-6.0.1.ebuild,v 1.9 2012/09/01 11:44:24 grobian Exp $
-
-EAPI=3
-
-MY_P=${PN}-v${PV}
-S=${WORKDIR}/${MY_P}
-MODULE_AUTHOR=DTOWN
-inherit perl-module
-
-DESCRIPTION="A SNMP Perl Module"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/Crypt-DES-2.03
-	>=virtual/perl-Digest-MD5-2.11
-	>=dev-perl/Digest-SHA1-1.02
-	>=dev-perl/Digest-HMAC-1.0
-	>=virtual/perl-libnet-1.0703"
-DEPEND="${RDEPEND}
-	virtual/perl-Module-Build"
-
-SRC_TEST=do