Add rewritten bootstrap patch (bug #386949).

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

5 files changed, 39 insertions, 9 deletions

diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index 75333b95b86a..1ff7cc7df231 100644
--- a/app-arch/dpkg/ChangeLog
+++ b/app-arch/dpkg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/dpkg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.175 2011/10/18 21:23:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.176 2011/10/18 21:58:13 jer Exp $
+
+  18 Oct 2011; Jeroen Roovers <jer@gentoo.org> dpkg-1.16.1.ebuild,
+  dpkg-1.16.1.1.ebuild, +files/dpkg-1.16.1-bootstrap.patch:
+  Add rewritten bootstrap patch (bug #386949).
 
   18 Oct 2011; Jeroen Roovers <jer@gentoo.org> dpkg-1.16.0.3.ebuild,
   dpkg-1.16.1.ebuild, dpkg-1.16.1.1.ebuild:
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index c1daed8c153a..c848c07cc95c 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 AUX dpkg-1.15.5.6-bootstrap.patch 853 RMD160 b6e73361f662971730b2078afbe9ca2b679680a1 SHA1 4266da38c786a3a7d5111a35bb2fb5f0c8656cf6 SHA256 05ed4c2b265556767820fdf31ea9bf0da09eaafae1e39b75d634be385f05ab13
+AUX dpkg-1.16.1-bootstrap.patch 860 RMD160 7058123ea84200030d61b7a6b8c5e05acb8fe1f8 SHA1 ddad0615370f997a750b6345b7460d1fefeef989 SHA256 5153c529dcc043592783f9f51ea7107e351a4a42afa3745c70f50b8d38ec8fd9
 DIST dpkg_1.16.0.3.tar.bz2 5322701 RMD160 f238419da5e1f9f7d527d5550ed21d51cd7e264d SHA1 6e16d18864d4845eeaf6262497fde44931a1638d SHA256 69669720020e67629d70aa5325e3c20c05cae7a9fc2d8abd442672c7b29e31d3
 DIST dpkg_1.16.1.1.tar.bz2 5432275 RMD160 979fd32b76aabd30a222df596bae55c6e228764a SHA1 578c312accfaabf240f1cb8f6e13cfdabd8d8027 SHA256 7bd9861ddfa7408ca790ca0d8fa8a3b585afcb900fdee5b658d42f9fca09202d
 DIST dpkg_1.16.1.tar.bz2 5432348 RMD160 dd9d203001073278e397112729cb8d6d126a3ad7 SHA1 9e8176c88fe2b31782ddae6d0a8f599c7e540e8d SHA256 f9363628a6fa1c24a1e9c41bd8977f9d5a7010bfca3ac9a6f8bf500e7e8df52b
 EBUILD dpkg-1.16.0.3.ebuild 2637 RMD160 0449aa752fad358b38d0471cb3b7d89ebbf29a0b SHA1 0b56aad454c37fd2bc7793425ea8b9443ef80656 SHA256 e66570b7bdb32c537360deff710b6c3a4189baea1270c90aeb9bf36f966d4e8c
-EBUILD dpkg-1.16.1.1.ebuild 2595 RMD160 5faa80b73159956460c2322d501941134e7d645f SHA1 ea8399ed0ba77a74de2dff84e8c2dd3bd3f20bfe SHA256 acdcb5a4ee617fa50634be577a1c929a81be82c7d65843cb29b9ac65ad4ae560
-EBUILD dpkg-1.16.1.ebuild 2593 RMD160 c3567d7e48f621a686ebf959751d3322c5ec11f8 SHA1 54bd695e138dd18c7be62376ea3169505d09b213 SHA256 202fd2480b7294ffeb3de1ec1c63ed6c1565237a3e2c2262a2cd1ce8c319942d
-MISC ChangeLog 23422 RMD160 4d4a1bcdf8a8ff233c471fc0b069f8c3d7fc9535 SHA1 cd5b62fa65732b3ddcaffcca2a80cd25c3d747fb SHA256 347fc7bb98cae98d97d97f14ff63a70b56cc3e85b9f2466efec0771022652fb4
+EBUILD dpkg-1.16.1.1.ebuild 2646 RMD160 98b87634e0cd9e1891c7889184ce3a11130b50eb SHA1 a7ad439a2145af6698eb6a2688f61d26ba71148f SHA256 7f17cd260f4768d0d76341fcff17d71bc8c0f9c4c3ae286773e1c1bf1cbd5adf
+EBUILD dpkg-1.16.1.ebuild 2644 RMD160 7091e396582e2735d57db4777b4ce64f3135fd40 SHA1 bd643ac79bb81fa79fa450f15560a31410d89288 SHA256 d8de83297fe15ab8a2c0e31334eedb3097287b10c17435550f827b397dba060a
+MISC ChangeLog 23597 RMD160 7ab4ed9db08e73040d962416703cc5fb30190631 SHA1 4db4ab7a730bd2e0b55465f322295549d616caa0 SHA256 d747a2d6bfe0a1d930c27c089601bb49ea4f016a312836b352caf7711cd966dc
 MISC metadata.xml 249 RMD160 91de35e671db35d8e1c3fe50177b6ec889466712 SHA1 d6956b17015162642aa95088fc3abbaee87d69d3 SHA256 d6077d4b746902b16a584be1c22f32bd2f88f2f5eff566ba8fb7b0b78a6827b7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6d7k0ACgkQVWmRsqeSphP1qgCeKYOkoaQLdRc8nU7mJNwxyRA4
-3MsAnAtRxIUhdLJ/5SQimt0GFFlg/A9j
-=RL6t
+iEYEARECAAYFAk6d9n8ACgkQVWmRsqeSphMmgQCfZE3r5V2fdkqId7wXrb3cAe+f
+dQgAn3iGpFtcI2b1cDrAeCjeWVCMBgy0
+=O41l
 -----END PGP SIGNATURE-----
diff --git a/app-arch/dpkg/dpkg-1.16.1.1.ebuild b/app-arch/dpkg/dpkg-1.16.1.1.ebuild
index 5faf224995c2..ec38d074f431 100644
--- a/app-arch/dpkg/dpkg-1.16.1.1.ebuild
+++ b/app-arch/dpkg/dpkg-1.16.1.1.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-arch/dpkg/dpkg-1.16.1.1.ebuild,v 1.2 2011/10/18 21:23:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.16.1.1.ebuild,v 1.3 2011/10/18 21:58:13 jer Exp $
 
 EAPI=3
 
@@ -53,6 +53,7 @@ src_prepare() {
 		-e '/850_Dpkg_Compression.t/d' \
 		|| die "sed failed"
 
+	epatch "${FILESDIR}"/${PN}-1.16.1-bootstrap.patch
 	eautoreconf
 }
 
diff --git a/app-arch/dpkg/dpkg-1.16.1.ebuild b/app-arch/dpkg/dpkg-1.16.1.ebuild
index 764d159ef32e..b3173c79b7ad 100644
--- a/app-arch/dpkg/dpkg-1.16.1.ebuild
+++ b/app-arch/dpkg/dpkg-1.16.1.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-arch/dpkg/dpkg-1.16.1.ebuild,v 1.2 2011/10/18 21:23:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.16.1.ebuild,v 1.3 2011/10/18 21:58:13 jer Exp $
 
 EAPI=3
 
@@ -53,6 +53,7 @@ src_prepare() {
 		-e '/850_Dpkg_Compression.t/d' \
 		|| die "sed failed"
 
+	epatch "${FILESDIR}"/${PN}-1.16.1-bootstrap.patch
 	eautoreconf
 }
 
diff --git a/app-arch/dpkg/files/dpkg-1.16.1-bootstrap.patch b/app-arch/dpkg/files/dpkg-1.16.1-bootstrap.patch
new file mode 100644
index 000000000000..71e224b2d733
--- /dev/null
+++ b/app-arch/dpkg/files/dpkg-1.16.1-bootstrap.patch
@@ -0,0 +1,23 @@
+--- a/m4/dpkg-arch.m4	2011-10-12 07:56:03.000000000 +0200
++++ b/m4/dpkg-arch.m4	2011-10-18 23:36:24.311829478 +0200
+@@ -9,7 +9,7 @@
+ AC_REQUIRE([DPKG_PROG_PERL])dnl
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ $2=$(cd $srcdir/scripts; \
+-    PERL5LIB=$(pwd) $PERL dpkg-architecture.pl -t$host -q$1 2>/dev/null)
++    pkgdatadir=.. PERL5LIB=$(pwd) $PERL dpkg-architecture.pl -t$host -q$1 2>/dev/null)
+ ])# _DPKG_ARCHITECURE
+ 
+ # DPKG_CPU_TYPE
+--- a/scripts/Dpkg/Arch.pm	2011-10-14 06:58:09.000000000 +0200
++++ b/scripts/Dpkg/Arch.pm	2011-10-18 23:38:13.714474150 +0200
+@@ -50,8 +50,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;