Version bump. Always disable the test that depends on gzip having the --rsyncable extension.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux i686

4 files changed, 17 insertions, 98 deletions

diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index fbdc392e8e4b..a0af88eb025f 100644
--- a/app-arch/dpkg/ChangeLog
+++ b/app-arch/dpkg/ChangeLog
@@ -1,6 +1,13 @@
 # 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.140 2010/10/25 05:20:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.141 2010/11/25 15:01:31 jer Exp $
+
+*dpkg-1.15.8.6 (25 Nov 2010)
+
+  25 Nov 2010; Jeroen Roovers <jer@gentoo.org> -dpkg-1.15.8.3.ebuild,
+  -dpkg-1.15.8.4.ebuild, +dpkg-1.15.8.6.ebuild:
+  Version bump. Always disable the test that depends on gzip having the
+  --rsyncable extension.
 
   25 Oct 2010; Jeroen Roovers <jer@gentoo.org> dpkg-1.15.6.1.ebuild,
   dpkg-1.15.8.3.ebuild, dpkg-1.15.8.4.ebuild, dpkg-1.15.8.5.ebuild:
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index e3c8f5cfd04a..0d8cfece43f3 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,11 +1,9 @@
 AUX dpkg-1.15.5.6-bootstrap.patch 1067 RMD160 9fe0761df7192424a5fb28de81761f478219e5fb SHA1 ec90b81e0bbf078e95732229afac5fd0943f3b38 SHA256 4144c9a1ae1d157c09418106f0f84a61251e3564f3a90cbe0506db669992646c
 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
+DIST dpkg_1.15.8.6.tar.bz2 5222815 RMD160 47c351b3ed7457d9061a368621d8a8991436b80f SHA1 ebc9a6087f8f8c56c973f26f9bdb17ef1c570f0c SHA256 b319621a4d0f9fa7b356b4def978bad0b18b944405f2be9eace5e2713b5f1f49
 EBUILD dpkg-1.15.6.1.ebuild 2403 RMD160 edd027b1ba976dfc98127f4b844a262adef981fa SHA1 88d8481c464c45c01423c69544c5d1baadd676e7 SHA256 0c937186298a54720db798d5c88a1fc0097634ddd00c0d2d2d46d47fb7049322
-EBUILD dpkg-1.15.8.3.ebuild 2466 RMD160 87f389f3ecbe9895d0b36b37db68ba9aae9dda70 SHA1 3bbfe6b9e7924a8fcf575c068cd3e37b8c021404 SHA256 cdec8b4e1fc9eecc9a357d08a68a374d3f8b7a772b2e37928a6df3a49aac6c71
-EBUILD dpkg-1.15.8.4.ebuild 2498 RMD160 6cfb9c1f65b87ff64ba619dd7ce4f37d86897e24 SHA1 77bb32013bec000c84d74cde4dda437c99948282 SHA256 cd2954bd87e85d234ed79f45e74c014c06b2021c5273b814a78b78a8193d9e79
 EBUILD dpkg-1.15.8.5.ebuild 2498 RMD160 73fe10a19c122c705aa4b67dd54a3232f9ea7ddf SHA1 3cabc5bcbd2b8d65e7afd62db4a90c97b98c5408 SHA256 f08152fd667d5fa61a05190a56266a88c41f3ebd73540f3f2dbc32a8774d1a34
-MISC ChangeLog 19169 RMD160 5e93c924ce27e81006e4adb05a9656c9e9aebdc5 SHA1 99c645b777896fdc52f4b3c8f6e660d0c6d0e6cd SHA256 de836e4223e609c55052f2021e7f64d44df94bef875cf748239fdc9186985db7
+EBUILD dpkg-1.15.8.6.ebuild 2489 RMD160 2d076ccea4b288f0b1a1ce0d50d19ec11458fb45 SHA1 2456040a087b6fa415025683352f38c6cb9c4ac0 SHA256 d3abd41413c4abcca9b0c905f57861c7e00de1e336f086b62f3549b44d09d818
+MISC ChangeLog 19415 RMD160 4865e9d22b7612770eef385ce00898788c9cb781 SHA1 50495e0af17a195736c720a340fbcab6c43e1453 SHA256 961e46d8e5ddb0ab494a9e13fe8f63d0de45957ae1a57bb99396f0ee907cb3ed
 MISC metadata.xml 249 RMD160 91de35e671db35d8e1c3fe50177b6ec889466712 SHA1 d6956b17015162642aa95088fc3abbaee87d69d3 SHA256 d6077d4b746902b16a584be1c22f32bd2f88f2f5eff566ba8fb7b0b78a6827b7
diff --git a/app-arch/dpkg/dpkg-1.15.8.3.ebuild b/app-arch/dpkg/dpkg-1.15.8.3.ebuild
deleted file mode 100644
index adcf50b7aba1..000000000000
--- a/app-arch/dpkg/dpkg-1.15.8.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.3.ebuild,v 1.2 2010/10/25 05:20:14 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}
-	dev-util/pkgconfig
-	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.3" ]]; 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) \
-		--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}
-}
diff --git a/app-arch/dpkg/dpkg-1.15.8.4.ebuild b/app-arch/dpkg/dpkg-1.15.8.6.ebuild
index d799a0cb737f..fa75b7402695 100644
--- a/app-arch/dpkg/dpkg-1.15.8.4.ebuild
+++ b/app-arch/dpkg/dpkg-1.15.8.6.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.3 2010/10/25 05:20:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.8.6.ebuild,v 1.1 2010/11/25 15:01:31 jer Exp $
 
 EAPI=3
 
@@ -41,12 +41,11 @@ src_prepare() {
 	# 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.4" ]]; then
-		sed -i scripts/Makefile.am -e '/850_Dpkg_Compression.t/d' \
-			|| die "sed failed"
-	fi
+	# this test depends on a Debian only gzip extension that adds --rsyncable
+	# which will therefore always fail on Gentoo. (bug #310847).
+	sed -i scripts/Makefile.am \
+		-e '/850_Dpkg_Compression.t/d' \
+		|| die "sed failed"
 
 	eautoreconf
 }