Stable for PPC (bug #327631). Add notice about validating Release files against a keyring (bug #328647). Fix LICENSE. Install debian/changelog.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 28 insertions, 13 deletions

diff --git a/dev-util/debootstrap/ChangeLog b/dev-util/debootstrap/ChangeLog
index 95d76a393e7b..c58b2de09e4e 100644
--- a/dev-util/debootstrap/ChangeLog
+++ b/dev-util/debootstrap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/debootstrap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/ChangeLog,v 1.123 2010/07/24 15:18:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/ChangeLog,v 1.124 2010/08/05 16:11:38 jer Exp $
+
+*debootstrap-1.0.23-r1 (05 Aug 2010)
+
+  05 Aug 2010; Jeroen Roovers <jer@gentoo.org> -debootstrap-1.0.22.ebuild,
+  debootstrap-1.0.23.ebuild, +debootstrap-1.0.23-r1.ebuild:
+  Stable for PPC (bug #327631). Add notice about validating Release files
+  against a keyring (bug #328647). Fix LICENSE. Install debian/changelog.
 
   24 Jul 2010; Raúl Porcel <armin76@gentoo.org> debootstrap-1.0.23.ebuild:
   alpha/arm/ia64/sparc stable wrt #327631
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 77a2bc2a8b5c..bc3ba18aaeba 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,7 +1,6 @@
-DIST debootstrap_1.0.22.tar.gz 53312 RMD160 a5aa1da728a680b456389d3a34d6b4e5011dabc9 SHA1 c89b232bad0649b101a0b4ea0d6e1a87081778ef SHA256 17df96895a9291d9882ae169615b5df4f1d8680ccb7af489e4583957b760c61b
 DIST debootstrap_1.0.23.tar.gz 54043 RMD160 485f809ed0c0355deb3886cb78344ade8bc15b1b SHA1 1d21f6ce6f8270a35a9eb15cf69738edb1b68e92 SHA256 c5ccafd8fe66d1bd45a27d5d0d0d7978b81fe26d4bdeeb47264a2c566ff69f99
 DIST devices.tar.gz 47835 RMD160 5ef7477a58c48a25765ce6aae981e36a794e5440 SHA1 90d717258702cb147e1e7a2fe2ae5352794565c2 SHA256 0d93f93c8b21160069d14e74f8f990a2e0e1e5a90dc828b29e6b3f5aa5829e48
-EBUILD debootstrap-1.0.22.ebuild 891 RMD160 0f43f2cf7225d8a6cc4323d163706b1355428ce7 SHA1 8b78937b9d71c42deb21cf6e6d03d1e63b250946 SHA256 9a01581bd45de8ebed88e633978f7b2ac5701a6ac1594cabb6e74859df7b940d
-EBUILD debootstrap-1.0.23.ebuild 983 RMD160 c5be43d48e1a9de2e00012520df7bb3d9d024bd2 SHA1 417a74d68c5a8c351c2069df21fc301786d2beec SHA256 2a94e1e5f7040d56441bd9d9e8dffcd7cb3c77733e4695e78a31d0d67369bb33
-MISC ChangeLog 15335 RMD160 e9d87a45f0319d5dd7cad16cca229e6df491105a SHA1 bed0320ebe79c45a3e0dbce524450bd71ba8772d SHA256 b63a09579d053dc9ff8daec05d64f8405256fdae90bdfccc8a6ed554df57e2d8
+EBUILD debootstrap-1.0.23-r1.ebuild 1131 RMD160 95c0957cf83ebcffb5f704aff36ff2439860c7c4 SHA1 eaf35986502fb7032700d69dcb2a37d5e3d7c9e8 SHA256 c4bee28025a661d8b9769820d6823833e8cf5a977abc53593c86ffed3a76b882
+EBUILD debootstrap-1.0.23.ebuild 978 RMD160 4187f9e4c517635cacf92e36d59f2458de7c6bbf SHA1 15d61632537fb0f0f5e0e9a89ca1e127deafc4be SHA256 6bb2d224c6f4c1add15b3ce4dbfa674bc8e67014399fd350c74c4358c2b79625
+MISC ChangeLog 15653 RMD160 b307cdee45296eebad93c4ba3d6ff905e2559dc7 SHA1 adc327c001a88795212bde23dbb4a65391d995fb SHA256 4db676a2dd489fbffdbee858a15af59a5e56acdedfd7d36290cbbbc23ac48f90
 MISC metadata.xml 254 RMD160 fafc94bb5f11971a95352c47958403b296982aaa SHA1 bdaa9d87c2a2beaeccdd15c0a557a7e26bf6099b SHA256 2790aaa1752a64752fb0a90f28f292669aa359e1c1583ad3834746b55e86dbd2
diff --git a/dev-util/debootstrap/debootstrap-1.0.22.ebuild b/dev-util/debootstrap/debootstrap-1.0.23-r1.ebuild
index a2a1c7a79e33..c4a1506219f0 100644
--- a/dev-util/debootstrap/debootstrap-1.0.22.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.23-r1.ebuild
@@ -1,22 +1,26 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/debootstrap-1.0.22.ebuild,v 1.5 2010/05/09 18:29:41 armin76 Exp ${PN}/${PN}-1.0.10.ebuild,v 1.1 2008/07/15 17:46:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/debootstrap-1.0.23-r1.ebuild,v 1.1 2010/08/05 16:11:38 jer Exp ${PN}/${PN}-1.0.10.ebuild,v 1.1 2008/07/15 17:46:08 jer Exp $
 
 inherit eutils
 
 DESCRIPTION="Debian/Ubuntu bootstrap scripts"
 HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz mirror://gentoo/devices.tar.gz"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
+	mirror://gentoo/devices.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="sys-devel/binutils
 	net-misc/wget
 	>=app-arch/dpkg-1.14.20"
 
+# Version 1.0.23 does not include the version in the directory name
+S="${WORKDIR}/${PN}"
+
 src_unpack() {
 	unpack ${PN}_${PV}.tar.gz
 	cp "${DISTDIR}"/devices.tar.gz "${S}"
@@ -28,6 +32,11 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc TODO
+	dodoc TODO debian/changelog
 	doman debootstrap.8
 }
+
+pkg_postinst() {
+	elog "To check Release files against a keyring"
+	elog " (--keyring=K), please install app-crypt/gnupg."
+}
diff --git a/dev-util/debootstrap/debootstrap-1.0.23.ebuild b/dev-util/debootstrap/debootstrap-1.0.23.ebuild
index 0a964b67534a..9be536f41934 100644
--- a/dev-util/debootstrap/debootstrap-1.0.23.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/debootstrap-1.0.23.ebuild,v 1.5 2010/07/24 15:18:52 armin76 Exp ${PN}/${PN}-1.0.10.ebuild,v 1.1 2008/07/15 17:46:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/debootstrap-1.0.23.ebuild,v 1.6 2010/08/05 16:11:38 jer Exp ${PN}/${PN}-1.0.10.ebuild,v 1.1 2008/07/15 17:46:08 jer Exp $
 
 inherit eutils
 
@@ -9,9 +9,9 @@ HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
 SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
 	mirror://gentoo/devices.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="sys-devel/binutils