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

(Portage version: 2.2_rc62/cvs/Linux i686)

3 files changed, 94 insertions, 1 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/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;