Bump to p1 versions, the parallelinstall patch is no longer needed.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

5 files changed, 19 insertions, 25 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 016735f2f728..9d88af74236a 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/sudo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.268 2011/04/10 22:48:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.269 2011/04/16 12:00:38 flameeyes Exp $
+
+*sudo-1.8.1_p1 (16 Apr 2011)
+*sudo-1.7.6_p1 (16 Apr 2011)
+
+  16 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> -sudo-1.7.6.ebuild,
+  +sudo-1.7.6_p1.ebuild, -sudo-1.8.1.ebuild, +sudo-1.8.1_p1.ebuild,
+  -files/sudo-1.8.1-parallelinstall.patch:
+  Bump to p1 versions, the parallelinstall patch is no longer needed.
 
   10 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> sudo-1.8.1.ebuild,
   +files/sudo-1.8.1-parallelinstall.patch:
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 33150f247714..454c5630272b 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,22 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX sudo-1.8.1-parallelinstall.patch 396 RMD160 406d8cb6066253e60c61033e5687ec7b840a87d0 SHA1 b5faa036a1bfbef56cfdb8ebc695cbbc77a4725a SHA256 2ca911733b79039666c5836b2676489b01f7e50626429fe09d49e7c053a86445
 AUX sudo-skeychallengeargs.diff 567 RMD160 906ee43a7c2f21d1cf5130eac5c98ef0833154fd SHA1 b0efbedc72a1ed85c74ba10e343a68368e76c3e9 SHA256 dd2f4fdba26be6c3b4af15f3b6e18efa19375e1f9c579cdc2c76ee1adcce5e1d
 DIST sudo-1.7.4p4.tar.gz 963663 RMD160 3b5eb69b4317c72def0e811c58a24df8c9c1c892 SHA1 c873f509f80d5722989a912a42a61ad27b71453f SHA256 38de3c3e08346b2b8dcb3cf7ed0813300d1a1d5696d0f338ea8a4ef232aacf97
 DIST sudo-1.7.4p5.tar.gz 966176 RMD160 24fcaa065f9efc229abcf2b70ec4faca03efa32d SHA1 bb9c9ff6ce6d4c70bdc546316442e7021ca754c2 SHA256 72e8e3545f314d342f178b0fee4b483e26d70ef132b081699be035da0f0acbba
-DIST sudo-1.7.6.tar.gz 1123700 RMD160 3ae3f8a0a83c40ab690afaa7e4857972b1b499e4 SHA1 00ef6f24f5440aeef9d6dd962fcd4ead0df53041 SHA256 6d011a1e7d8b018521ae42c570a62a1339bc9c6a8b86cf69d349b67f48e1a33c
-DIST sudo-1.8.1.tar.gz 1238495 RMD160 02160dfc19c5b6981691c6f892ab2b55a0054959 SHA1 ef9391d0c5ea9ecdb2d021e782c8a238694f4169 SHA256 87cfb9c06e69fc16bb8246554804452130a1202b046e069b0da3e3b3a633f0cb
+DIST sudo-1.7.6p1.tar.gz 1124115 RMD160 9a7fcf993e6081044d3c9063e3c82add3cfa16e8 SHA1 b87c4fa295a3670a07b8dce5d6f4627deb0faf17 SHA256 538d5c6372952eaff86dc499e40eb1a87fd60047fa645790e8faa1b51a7cbe07
+DIST sudo-1.8.1p1.tar.gz 1239231 RMD160 5042fd2935bccb67e04c9a97e3a09eb90625a7b0 SHA1 000c156a82216f08db743928a70c0b1990b4b32e SHA256 c6bd76bda54aab022b758e0f321f008403cdaf73621a7f316c22c44e28133e13
 EBUILD sudo-1.7.4_p4.ebuild 7209 RMD160 66eab6cd5ccf87e87913bcd52bde8791e316fe82 SHA1 4bfedb8f6a7354f50422cb8b4baaf266699b5b7c SHA256 0ffac351399a497f94ffd4f674dc2fea9e9e6aed80936aea27bc8ff998ca73bb
 EBUILD sudo-1.7.4_p5.ebuild 7208 RMD160 3e8714403edb762e6e31c084001a82fb7160fbf7 SHA1 7a5fa03c5c68ef5ad43dab98ddeb53d43b4cea9a SHA256 5dcdf6cf6e8a73dae5cdd92d2b447dfb9c7e959eab14fc76ca31a3e0f82d3d26
-EBUILD sudo-1.7.6.ebuild 5319 RMD160 259f297b1960bfa898d7643c357900a61e2a2424 SHA1 c3893420996b2de842a24b921b23375e04a9d109 SHA256 d6d221407739f19e5e835f6d47e469db70b454a0206492fc73360893bdd117f4
-EBUILD sudo-1.8.1.ebuild 5081 RMD160 fe21190035ffcc200f7db889dd351e27fb3dee33 SHA1 70a3d4b07fc87699cc38afcaae0336f7ab4c82c4 SHA256 5661a8f808f43d679d3db391a77ec5b9a30744800edf35bcf04e144d52b79472
-MISC ChangeLog 39264 RMD160 b82198d2d2befb676722454155f1e0983c87d180 SHA1 1e69781a4c7bd4527c7700a8dd8b9ecbf8d55cb2 SHA256 4d22ac1dd50b1acff326376e6607939d106f69dbe816bbb23e1e1e5475229c88
+EBUILD sudo-1.7.6_p1.ebuild 5322 RMD160 005aeb33ab3bfb64b6c2c57f3bf621e564525648 SHA1 a90d441e9eacf37536f26476bb7ac118579c6f29 SHA256 34a02001b158f9cbe6a3d11826c99449e125d48a720fec9e5832e88366f35a02
+EBUILD sudo-1.8.1_p1.ebuild 5034 RMD160 627226ad1e759185b86439b74d8befc86d30bbd4 SHA1 cdfdfdfd812c0d20c57acd13a41fcbd006322a1a SHA256 ca334e646322773c4550d9a810afe1c78c43d24ef232d96e548e3f800b6401f1
+MISC ChangeLog 39581 RMD160 fcebd1a43d04bb046ee48bdcddc3abc5b33c98fa SHA1 b80b621a82a97441847a5e96c3bc2f11ffac5918 SHA256 35d9ae1b0179719556576fd861e743e72b426caebad9ad0682b6565e2de71179
 MISC metadata.xml 560 RMD160 4e8bb9df73a4095b15b23d4ca31dea29b3f376d2 SHA1 a29e70672a1c039c4a97ee65e3e077ba0a01f26b SHA256 465d0ea14b7db3ecd0bad7c175f9e17003794145f5f59c4941f848960c91048a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2iM9cACgkQAiZjviIA2XhdlwCeLefOblhHlUw5YzesU+t/1lol
-r9gAoL9d+2w5Qe4+xQZtJDmRpUHxuUk4
-=iOxc
+iEYEARECAAYFAk2phNMACgkQAiZjviIA2XhdBgCg5l1BW4FvCHbSm9TU2PJzha9D
+YTcAn0sllPGzTeoojOYYuWoVK07cbAej
+=WskF
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sudo/files/sudo-1.8.1-parallelinstall.patch b/app-admin/sudo/files/sudo-1.8.1-parallelinstall.patch
deleted file mode 100644
index e0d9421df52f..000000000000
--- a/app-admin/sudo/files/sudo-1.8.1-parallelinstall.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sudo-1.8.1.orig/plugins/sudoers/Makefile.in	2011-04-06 15:59:31.000000000 +0100
-+++ sudo-1.8.1/plugins/sudoers/Makefile.in	2011-04-10 18:41:26.009495892 +0100
-@@ -349,7 +349,7 @@
- 
- install-includes:
- 
--install-doc:
-+install-doc: install-dirs
- 	@LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0555 $(srcdir)/sudoers2ldif $(DESTDIR)$(docdir)
- 
- install-plugin: sudoers.la install-dirs
diff --git a/app-admin/sudo/sudo-1.7.6.ebuild b/app-admin/sudo/sudo-1.7.6_p1.ebuild
index 9f006bf2cb1d..94e94e7ab5ab 100644
--- a/app-admin/sudo/sudo-1.7.6.ebuild
+++ b/app-admin/sudo/sudo-1.7.6_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.6.ebuild,v 1.1 2011/04/10 10:27:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.6_p1.ebuild,v 1.1 2011/04/16 12:00:38 flameeyes Exp $
 
 EAPI=4
 
diff --git a/app-admin/sudo/sudo-1.8.1.ebuild b/app-admin/sudo/sudo-1.8.1_p1.ebuild
index 27623408cb7a..c9661c116213 100644
--- a/app-admin/sudo/sudo-1.8.1.ebuild
+++ b/app-admin/sudo/sudo-1.8.1_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.1.ebuild,v 1.2 2011/04/10 22:48:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.1_p1.ebuild,v 1.1 2011/04/16 12:00:38 flameeyes Exp $
 
 EAPI=4
 
@@ -53,8 +53,6 @@ REQUIRED_USE="pam? ( !skey ) skey? ( !pam )"
 MAKEOPTS="${MAKEOPTS} SAMPLES="
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-parallelinstall.patch
-
 	elibtoolize
 }