Add bootstrap support thanks to Thomas Klute (bug #289094).

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

4 files changed, 97 insertions, 12 deletions

diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index 194be80432bc..6bfd5fc87523 100644
--- a/app-arch/dpkg/ChangeLog
+++ b/app-arch/dpkg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/dpkg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.115 2010/01/10 20:21:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.116 2010/02/05 08:14:53 jer Exp $
+
+*dpkg-1.15.5.6-r1 (05 Feb 2010)
+
+  05 Feb 2010; Jeroen Roovers <jer@gentoo.org> +dpkg-1.15.5.6-r1.ebuild,
+  +files/dpkg-1.15.5.6-bootstrap.patch:
+  Add bootstrap support thanks to Thomas Klute (bug #289094).
 
   10 Jan 2010; Mike Frysinger <vapier@gentoo.org> dpkg-1.15.5.6.ebuild:
   Add ppc64 love.
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 9ed11d061a60..2914957e1174 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX dpkg-1.15.1-nls.patch 625 RMD160 f5db7dff31d1708be5d38c0849e4a39e278536ae SHA1 751bb464b95ca32726532939c249cdb82fda35b5 SHA256 2e1bb1939c29870d71ae4f93ed572db7dffec31d3887cfe1e3047f8ec0b0f5fc
 AUX dpkg-1.15.5-nls.patch 576 RMD160 23c515eb0d4411abe67f545f01d38c62d8b455cc SHA1 56292d9b015a21fb26e647c9ce355cce85feeff0 SHA256 0d6d9281098bb68a649ae295ccae888ba849e5083d8a6d7c8b2d21d0a8c69bfd
 AUX dpkg-1.15.5-unicode.patch 2715 RMD160 831b2637348a4da62f0ae99429cc32f50ff82def SHA1 5d4149c10a86b124e1cdb20c96a3895feb471cdf SHA256 b463f0de1947cb107b656e73dade0a61717998ae7f1de9ab3f6a0b6b06d5e134
+AUX dpkg-1.15.5.6-bootstrap.patch 1067 RMD160 9fe0761df7192424a5fb28de81761f478219e5fb SHA1 ec90b81e0bbf078e95732229afac5fd0943f3b38 SHA256 4144c9a1ae1d157c09418106f0f84a61251e3564f3a90cbe0506db669992646c
 DIST dpkg_1.15.2.tar.gz 7049986 RMD160 21556b88f9b5ba809525b27f94df99d96bdfd37e SHA1 e73a709f80454fc56e2d31dc28230f783661bb93 SHA256 ec92968f6a7fdfeddb4cee5bd177f03b1dd99ec2fe7ea0b6a2e8d4cbbfee1a74
 DIST dpkg_1.15.3.1.tar.gz 7071636 RMD160 b03617937c25995b67e311c388ab1d5295443751 SHA1 72d0ac7a8090ae6b089fb52ae1d143d549b51293 SHA256 01205ac6a0047b495c1c03c6951a10161b2811e27389f99991d78688c9790e05
 DIST dpkg_1.15.3.tar.gz 7070609 RMD160 491cc6c5ca0774f20f4dcf3e2115f8020027ce52 SHA1 9b6ddecf88cfcc0a106aa533746cc97595833008 SHA256 3dbc0cfdeee4535680d73a7967ee9580f5a55de36b99d13ce8bed643dadc1e2c
@@ -24,13 +22,7 @@ EBUILD dpkg-1.15.5.2.ebuild 1509 RMD160 2734ce5c26193b6ff8bfaed5b604470aabc14983
 EBUILD dpkg-1.15.5.3.ebuild 1657 RMD160 c2b955019124fc9c3fdf0b7958325376729f30d4 SHA1 5ef6a1c466919031265dcd5218809bc827eaab2d SHA256 c56f9f8729345f2a0ae6e762c308095bd392a4585fcf9e3a7fede03d84096635
 EBUILD dpkg-1.15.5.4.ebuild 1657 RMD160 98e072c748c4a903e7444895615d3bf9404a7928 SHA1 4dc9c6a0f47b3f9e9522437ec3b7fa9bf98a227d SHA256 bcf0d0b40d4e511668b2b0d03d11c8379c3d04251a3fe027d70a2d3f7d59b26a
 EBUILD dpkg-1.15.5.5.ebuild 1657 RMD160 2bc0c9486eb0dbab4d5ac4d4db414822c2a83d08 SHA1 9c8e30450f70a6761e461fb0a55664d5493203b1 SHA256 d8941c1b5abc2cdc0dc0a3a0845e99dd86bf86f8d5eb98cfaf220979633f95aa
+EBUILD dpkg-1.15.5.6-r1.ebuild 1720 RMD160 61d7e729342654012d02c46ce13ed3c46e055973 SHA1 d524d06b1f1920a4c366921140e526e856594e5e SHA256 db83d78626e739df8c9d0df8263be6d412f6dbaab6b5bdcf89230dcd78a9c49b
 EBUILD dpkg-1.15.5.6.ebuild 1667 RMD160 370ee9024598ab486bb9b0c924644cd73fcbbf5e SHA1 f25f1d553a39c546d9a20fcf843223b3c68c5b8f SHA256 7571e53e0ced6ebbdda2c108a338ed5c8b421c2c217f4d55b4168a22914ff1b1
-MISC ChangeLog 15489 RMD160 aff63a025fd344859f79c6f0262ac967fde5087d SHA1 570cdf5b6d23cfdea23c4ed50eeec9fee1ece797 SHA256 a055de430721cda6e91dd90a684d2b2b6d23b57b5029de14f9b4bcaf96e11046
+MISC ChangeLog 15695 RMD160 6f8ee47151bb7155461ea3c9694c5df067fee40d SHA1 b786d6acc5892af37f0a50d1119eef5f719fcecb SHA256 4ea8fc763041f91b00adabc35b4f9fee76a9ee806a2f63845d44b01a8512f445
 MISC metadata.xml 162 RMD160 ebe445a93e16f05a392ebdf3882b56b92931e37e SHA1 8bc26eb7c98535f3e31d2288f25fba83838857e5 SHA256 316a32c1e8ee9f6548707abec9a803d0a19feea1be10a19273cc04e0cd357644
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iF4EAREIAAYFAktKNskACgkQTwhj9JtAlp5RaQD/Q5CN/i4oamw2mFKK6T96SSmM
-SqhTm0bmIFxeG+jeGh4A/0jp1Jka+D8HsljfvKzNcFSqxsREuCnxP7dXHrqa+Rws
-=PFNe
------END PGP SIGNATURE-----
diff --git a/app-arch/dpkg/dpkg-1.15.5.6-r1.ebuild b/app-arch/dpkg/dpkg-1.15.5.6-r1.ebuild
new file mode 100644
index 000000000000..e59d48419722
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.15.5.6-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.5.6-r1.ebuild,v 1.1 2010/02/05 08:14:53 jer Exp $
+
+inherit eutils multilib autotools
+
+DESCRIPTION="Package maintenance system for Debian"
+HOMEPAGE="http://packages.qa.debian.org/dpkg"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="bzip2 nls test unicode zlib"
+
+LANGS="de es fr hu ja pl pt_BR ru sv"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND=">=dev-lang/perl-5.6.0
+	dev-perl/TimeDate
+	>=sys-libs/ncurses-5.2-r7
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	bzip2? ( app-arch/bzip2 )"
+DEPEND="${RDEPEND}
+	nls? ( app-text/po4a )
+	test? ( dev-perl/Test-Pod dev-perl/IO-String )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.15.5-nls.patch
+	epatch "${FILESDIR}"/${PN}-1.15.5-unicode.patch
+	epatch "${FILESDIR}"/${PN}-1.15.5.6-bootstrap.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_with bzip2 bz2) \
+		$(use_enable nls) \
+		$(use_enable unicode) \
+		$(use_with zlib) \
+		--without-selinux \
+		--without-start-stop-daemon \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	strip-linguas ${LANGS}
+	if [ -z "${LINGUAS}" ] ; then
+		LINGUAS=none
+	fi
+
+	emake DESTDIR="${D}" LINGUAS="${LINGUAS}" install || die "emake install failed"
+	rm "${D}"/usr/sbin/install-info || die "rm install-info failed"
+	dodoc ChangeLog INSTALL THANKS TODO
+	keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk}
+	keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates}
+}
diff --git a/app-arch/dpkg/files/dpkg-1.15.5.6-bootstrap.patch b/app-arch/dpkg/files/dpkg-1.15.5.6-bootstrap.patch
new file mode 100644
index 000000000000..a29cca17b71d
--- /dev/null
+++ b/app-arch/dpkg/files/dpkg-1.15.5.6-bootstrap.patch
@@ -0,0 +1,25 @@
+diff -Nur dpkg-1.15.5.6.org/m4/dpkg-arch.m4 dpkg-1.15.5.6/m4/dpkg-arch.m4
+--- dpkg-1.15.5.6.org/m4/dpkg-arch.m4	2010-01-08 18:23:06.000000000 +0100
++++ dpkg-1.15.5.6/m4/dpkg-arch.m4	2010-02-05 08:13:09.000000000 +0100
+@@ -5,7 +5,7 @@
+ AC_DEFUN([_DPKG_ARCHITECTURE], [
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ $2=$(cd $srcdir/scripts; \
+-    PERL5LIB=$(pwd) ./dpkg-architecture.pl -t$host -q$1 2>/dev/null)
++    pkgdatadir=.. PERL5LIB=$(pwd) ./dpkg-architecture.pl -t$host -q$1 2>/dev/null)
+ ])# _DPKG_ARCHITECURE
+ 
+ # DPKG_CPU_TYPE
+diff -Nur dpkg-1.15.5.6.org/scripts/Dpkg/Arch.pm dpkg-1.15.5.6/scripts/Dpkg/Arch.pm
+--- dpkg-1.15.5.6.org/scripts/Dpkg/Arch.pm	2010-01-08 09:00:34.000000000 +0100
++++ dpkg-1.15.5.6/scripts/Dpkg/Arch.pm	2010-02-05 08:49:42.000000000 +0100
+@@ -47,8 +47,7 @@
+ 	return $build_arch if defined $build_arch;
+ 
+ 	my $build_arch = `dpkg --print-architecture`;
+-	# FIXME: Handle bootstrapping
+-	syserr("dpkg --print-architecture failed") if $? >> 8;
++	if ($? >> 8) { $build_arch = get_raw_host_arch(); }
+ 
+ 	chomp $build_arch;
+ 	return $build_arch;