Version bump. Fix 1.15.8.4 test limitation too.

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

4 files changed, 98 insertions, 5 deletions

diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index 670be5f19ce0..f9669400174a 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.138 2010/08/13 15:24:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.139 2010/09/14 05:09:28 jer Exp $
+
+*dpkg-1.15.8.5 (14 Sep 2010)
+
+  14 Sep 2010; Jeroen Roovers <jer@gentoo.org> dpkg-1.15.8.4.ebuild,
+  +dpkg-1.15.8.5.ebuild:
+  Version bump. Fix 1.15.8.4 test limitation too.
 
 *dpkg-1.15.8.4 (13 Aug 2010)
 
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 9d613d7254eb..2a62ab9bd9cb 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -3,8 +3,10 @@ AUX dpkg-1.15.5.6-bootstrap.patch 1067 RMD160 9fe0761df7192424a5fb28de81761f4782
 DIST dpkg_1.15.6.1.tar.bz2 4841958 RMD160 f69942f73c450fab16df999ea11567dd90830c4a SHA1 098fe2e4b1f2898529519bf0876c849811ca17d9 SHA256 83194eecaba9cc2e609c3f0bc204f5e13b37b6c5c6ffc11a5f7382e542091213
 DIST dpkg_1.15.8.3.tar.bz2 5043688 RMD160 53e7f41a57b077cab48e887dd988324b33fb55af SHA1 b3662c901450d5dc5ab5f682eee757e6e80f9402 SHA256 1ed72e493354647b3669e04124fdb33d3db05501fba005de3a6c9d1200d5de5c
 DIST dpkg_1.15.8.4.tar.bz2 5046836 RMD160 d487e4eb4c4888fcc7fad06ab4220a02ccfd5919 SHA1 aff67eda19c1cbdfb29de6e292d8e556dcccd72a SHA256 9ee9431fe4fd93b80af8005de492a196b7fee1346225ee3522ee1cd758c3ad21
+DIST dpkg_1.15.8.5.tar.bz2 5174315 RMD160 6f488a6c3dcc410476a22d952c3c5b195cb15d29 SHA1 a520d5454da0af80a1dd10b3d58c5d1b17f5a042 SHA256 2ef55e8eb6c1e8c3dfb54c8ccc9a883fec7540b705c5179ca7a198bebe2f18bc
 EBUILD dpkg-1.15.6.1.ebuild 2386 RMD160 b436d9cd306bdafa6748d62f64774ff5eb5689e0 SHA1 b68241a1fa9d2519f695b50aa2e37122fb417d1c SHA256 b11ce24e01ca2251ad1b741f230aaad5a2559e3fabcd6f6ab823b1ba359f5c79
 EBUILD dpkg-1.15.8.3.ebuild 2446 RMD160 c8c85c46e5dfe7aec6b9782bc9143c7e5782918e SHA1 758c0165e8b570ce76de64c693f5e6541aa8902a SHA256 4d7b030b9c93e62cc914434f825bf75574259d7e1e555d38b82f05be9eafe1ec
-EBUILD dpkg-1.15.8.4.ebuild 2478 RMD160 836aa4db3d5c07aaa6b95b67f24256446b6ff491 SHA1 a1b86dc2c19a8684e94ddff8385b834f9c32af7a SHA256 5f0c0931edcbafedf9abbcdcbba131d094e578a78313c54810ea258a2a00e2f5
-MISC ChangeLog 18789 RMD160 addcc3e04c663b3714b25073ce69916f3b28a309 SHA1 a910103879c604bd658085063d9606b16e865984 SHA256 4f22448da1db9a685fb82b75c15ddb2f263d9f8f3e8182da76fb2c5a875889a7
+EBUILD dpkg-1.15.8.4.ebuild 2478 RMD160 f44de7e87add2d3e34a7d42e4b2a57635d4c40a2 SHA1 3e8b7df82fe2188e0b1406da1c4664fe26abd8ae SHA256 64ed3248faaf6193079627e7ef84245d6f057684a25bb2483308f4d1cb57c81b
+EBUILD dpkg-1.15.8.5.ebuild 2478 RMD160 b7157c1907eb90584fcf5c3dd2b509864a81d712 SHA1 afdd89722f67ec924cea8f6a9606ef7ad7579c3d SHA256 14dd16071d89d1e31e874ff3329a340a12f3097da0de15b60298ff02c31ca8ed
+MISC ChangeLog 18964 RMD160 734c41fe62668f30fa72c003d0269a2a859839fb SHA1 70da86a24baa9959bddcf0e8a8bd9a1dae9f23df SHA256 c258e857cc8f33b204d01b10c61a96996b359328a7877f40e8e7956a3cd0a5fb
 MISC metadata.xml 249 RMD160 91de35e671db35d8e1c3fe50177b6ec889466712 SHA1 d6956b17015162642aa95088fc3abbaee87d69d3 SHA256 d6077d4b746902b16a584be1c22f32bd2f88f2f5eff566ba8fb7b0b78a6827b7
diff --git a/app-arch/dpkg/dpkg-1.15.8.4.ebuild b/app-arch/dpkg/dpkg-1.15.8.4.ebuild
index 3fc3f119cf08..798bd116cde7 100644
--- a/app-arch/dpkg/dpkg-1.15.8.4.ebuild
+++ b/app-arch/dpkg/dpkg-1.15.8.4.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/app-arch/dpkg/dpkg-1.15.8.4.ebuild,v 1.1 2010/08/13 15:24:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.8.4.ebuild,v 1.2 2010/09/14 05:09:28 jer Exp $
 
 EAPI=3
 
@@ -42,7 +42,7 @@ src_prepare() {
 
 	# On every version bump, update the version manually after establishing
 	# which tests fail (bug #310847)
-	if [[ "${PV}" = "1.15.8.3" ]]; then
+	if [[ "${PV}" = "1.15.8.4" ]]; then
 		sed -i scripts/Makefile.am -e '/850_Dpkg_Compression.t/d' \
 			|| die "sed failed"
 	fi
diff --git a/app-arch/dpkg/dpkg-1.15.8.5.ebuild b/app-arch/dpkg/dpkg-1.15.8.5.ebuild
new file mode 100644
index 000000000000..c445c5447b03
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.15.8.5.ebuild
@@ -0,0 +1,85 @@
+# 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.8.5.ebuild,v 1.1 2010/09/14 05:09:28 jer Exp $
+
+EAPI=3
+
+inherit eutils multilib autotools toolchain-funcs
+
+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 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+IUSE="bzip2 dselect nls test unicode zlib"
+
+LANGS="sv de es ja fr hu pl ru"
+
+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_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.15.5.6-bootstrap.patch
+
+	# don't mess with linker optimisation, respect user's flags (don't break!)
+	sed -i -e '/DPKG_LINKER_OPTIMISATIONS/d' configure.ac || die
+
+	# Force the use of the running bash for get-version (this file is never
+	# installed, so no need to worry about hardcoding a temporary bash)
+	sed -i -e '1c\#!'"${BASH}" get-version || die
+
+	# On every version bump, update the version manually after establishing
+	# which tests fail (bug #310847)
+	if [[ "${PV}" = "1.15.8.5" ]]; then
+		sed -i scripts/Makefile.am -e '/850_Dpkg_Compression.t/d' \
+			|| die "sed failed"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	local myconf
+	if use nls; then
+		myconf="--enable-nls $(use_with dselect)"
+	else
+		if use dselect; then
+			elog "Building dselect requires USE=nls - disabling USE=dselect..."
+		fi
+		myconf="--disable-nls --without-dselect"
+	fi
+	econf \
+		${myconf} \
+		$(use_with bzip2 bz2) \
+		$(use_enable unicode) \
+		$(use_with zlib) \
+		--disable-compiler-warnings \
+		--without-selinux \
+		--without-start-stop-daemon
+}
+
+src_install() {
+	strip-linguas ${LANGS}
+	if [ -z "${LINGUAS}" ] ; then
+		LINGUAS=none
+	fi
+
+	emake DESTDIR="${D}" LINGUAS="${LINGUAS}" install || die "emake install failed"
+	rm "${ED}"/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}
+}