Version bump.

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

3 files changed, 91 insertions, 2 deletions

diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index 62788387c351..ebcc742a843f 100644
--- a/app-arch/dpkg/ChangeLog
+++ b/app-arch/dpkg/ChangeLog
@@ -1,6 +1,11 @@
 # 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.123 2010/03/24 19:30:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.124 2010/03/25 05:04:30 jer Exp $
+
+*dpkg-1.15.6.1 (25 Mar 2010)
+
+  25 Mar 2010; Jeroen Roovers <jer@gentoo.org> +dpkg-1.15.6.1.ebuild:
+  Version bump.
 
   24 Mar 2010; Jeroen Roovers <jer@gentoo.org> dpkg-1.15.6.ebuild,
   metadata.xml:
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 4fe70c23ba88..72050867fd02 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -5,11 +5,13 @@ AUX dpkg-1.15.5.6-bootstrap.patch 1067 RMD160 9fe0761df7192424a5fb28de81761f4782
 DIST dpkg_1.15.2.tar.gz 7049986 RMD160 21556b88f9b5ba809525b27f94df99d96bdfd37e SHA1 e73a709f80454fc56e2d31dc28230f783661bb93 SHA256 ec92968f6a7fdfeddb4cee5bd177f03b1dd99ec2fe7ea0b6a2e8d4cbbfee1a74
 DIST dpkg_1.15.5.5.tar.bz2 4682843 RMD160 121751ffffe2780ff104db9c1174320330669e4c SHA1 ca6dcc374f62dc03fa795be4337d2c416016cfd8 SHA256 9929db9c3615df97630e3c2c381209ba77c88b2f2b47b1fcb2933f07e2202a07
 DIST dpkg_1.15.5.6.tar.bz2 4642507 RMD160 dccb8d81f41688486303c5d9de147898b9cf1c8e SHA1 340af57cc79ffe17068d3a483ad97a57d27016b9 SHA256 f3e526deff4c9e0fad53a283add6a6f553d59c62274c1fd02cbb240090114d9b
+DIST dpkg_1.15.6.1.tar.bz2 4841958 RMD160 f69942f73c450fab16df999ea11567dd90830c4a SHA1 098fe2e4b1f2898529519bf0876c849811ca17d9 SHA256 83194eecaba9cc2e609c3f0bc204f5e13b37b6c5c6ffc11a5f7382e542091213
 DIST dpkg_1.15.6.tar.bz2 4845122 RMD160 dcaee7a92ae13e03b2db28d7565216355d9019a1 SHA1 8eeac057c2f86768c941fb49d8148bff46b3390a SHA256 0c942d4b556aea1517761ae937518d2de19692b494987653eca9c3316e3d2304
 EBUILD dpkg-1.15.2.ebuild 1486 RMD160 07cfabb8729e9d7e024c5605e2818eebce031c3f SHA1 2ee7d55330c0d453abb6300428909871a2919ee3 SHA256 09226ccf63ac579c3b52419f5bcf0ee854f2cd3a24b29487c9eaa5b7b2e5ab5a
 EBUILD dpkg-1.15.5.5.ebuild 1657 RMD160 2bc0c9486eb0dbab4d5ac4d4db414822c2a83d08 SHA1 9c8e30450f70a6761e461fb0a55664d5493203b1 SHA256 d8941c1b5abc2cdc0dc0a3a0845e99dd86bf86f8d5eb98cfaf220979633f95aa
 EBUILD dpkg-1.15.5.6-r1.ebuild 2057 RMD160 d5f19fabe5759eaf378ce9d627dfe2443e3fc622 SHA1 d213c3a43bc37305f26eb58da1f496bca19536f0 SHA256 b6e7d60085cbed2a271a0ca97d5f9a0e30f5fa290d5d5e1ad2364c74a2152890
 EBUILD dpkg-1.15.5.6.ebuild 1667 RMD160 370ee9024598ab486bb9b0c924644cd73fcbbf5e SHA1 f25f1d553a39c546d9a20fcf843223b3c68c5b8f SHA256 7571e53e0ced6ebbdda2c108a338ed5c8b421c2c217f4d55b4168a22914ff1b1
+EBUILD dpkg-1.15.6.1.ebuild 2349 RMD160 b2d99e46ea726c79af5b8a8a8d21554eb631bc1b SHA1 84e58eba9b14fbc8fe17bf063cb01bb0a4de1089 SHA256 5f1a02c97bf688a04343e7de6fd1cb1fbdf258ba8aeb6b5e7193bf955d0f6ee2
 EBUILD dpkg-1.15.6.ebuild 2345 RMD160 18f70af4747549213a6a462024c0f228f95aaa58 SHA1 3d197b90e1fbee789730735569fbbaac00afba58 SHA256 f4dbc5398661b28382f8e7eb3da10b82a931032f4a49a795d2f370f6dfa2a827
-MISC ChangeLog 16769 RMD160 e03e8fd5496e0796243648aaf79bbd466bb1c5f9 SHA1 5b3e2ed7a0348e0cfcbfc3b1985c244febcb3e86 SHA256 e6719328645cf19d0dd655f168bfd049a71c17cf3c86887cbcfeb13ca9a330b6
+MISC ChangeLog 16886 RMD160 053ac47be605cec5d624b932e24cd9da4ca9707d SHA1 08a90ca55c4e1e2ca1fc89ac5e61fa2977c34dbd SHA256 09abff14a51cb03f7c557828b976c5cfaaa96248e5ab70bd3931c0fae82be7c3
 MISC metadata.xml 249 RMD160 91de35e671db35d8e1c3fe50177b6ec889466712 SHA1 d6956b17015162642aa95088fc3abbaee87d69d3 SHA256 d6077d4b746902b16a584be1c22f32bd2f88f2f5eff566ba8fb7b0b78a6827b7
diff --git a/app-arch/dpkg/dpkg-1.15.6.1.ebuild b/app-arch/dpkg/dpkg-1.15.6.1.ebuild
new file mode 100644
index 000000000000..e0b168ae21cd
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.15.6.1.ebuild
@@ -0,0 +1,82 @@
+# 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.6.1.ebuild,v 1.1 2010/03/25 05:04:30 jer Exp $
+
+EAPI=3
+
+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 ~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
+
+	# bug 310847
+	if [[ "${PV}" = "1.15.6.1" ]]; then
+		sed -i lib/dpkg/test/Makefile.am -e '/t[_-]ar/d'
+		sed -i scripts/Makefile.am -e '/850_Dpkg_Compression.t/d'
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	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}
+}