Version bump. Rewritten -nls.patch. Drop -start-stop-daemon.8.patch as that is fixed upstream now.

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

4 files changed, 85 insertions, 2 deletions

diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index 7199e5ed58ed..322be4a5d58c 100644
--- a/app-arch/dpkg/ChangeLog
+++ b/app-arch/dpkg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/dpkg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.87 2009/05/04 16:34:30 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.88 2009/05/21 21:00:22 jer Exp $
+
+*dpkg-1.15.1 (21 May 2009)
+
+  21 May 2009; Jeroen Roovers <jer@gentoo.org> +dpkg-1.15.1.ebuild,
+  +files/dpkg-1.15.1-nls.patch:
+  Version bump. Rewritten -nls.patch. Drop -start-stop-daemon.8.patch as
+  that is fixed upstream now.
 
   04 May 2009; <yvasilev@gentoo.org>
   files/dpkg-1.14.25-start-stop-daemon.8.patch:
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 653c178ff3ca..4ad4d3ddfbbc 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,17 +1,20 @@
 AUX dpkg-1.14.12-nls.patch 399 RMD160 332598df3d4ccb68afbc07701c66b40628069696 SHA1 e7617f460cf028eaa30a64b3335a790bfb6cd0df SHA256 a038d0dbcf082fb509b570e70e512d6da39eb4e959de01dbcb2e93b3c7f67fb3
 AUX dpkg-1.14.16.6-check-PATH.patch 691 RMD160 7b728ad6e9018c134314c3b07c0a61783c809552 SHA1 8b0521f171cbea809d345e014e8e5a3fd2df19ef SHA256 25b33bccd84043ec9e1561debb851a277c006ddf3f5b60298e044a1d7853944c
 AUX dpkg-1.14.25-start-stop-daemon.8.patch 982 RMD160 a3c950f3267d1209e1370cd6312f7cd47589c250 SHA1 6b51b1fc1c1b71b43c15f73d56c6238f9a34798f SHA256 d4e80186144ba125fbdb8bd90ab083ee796f7934acbc0d4bfebaa63f6a2daf9f
+AUX dpkg-1.15.1-nls.patch 625 RMD160 f5db7dff31d1708be5d38c0849e4a39e278536ae SHA1 751bb464b95ca32726532939c249cdb82fda35b5 SHA256 2e1bb1939c29870d71ae4f93ed572db7dffec31d3887cfe1e3047f8ec0b0f5fc
 DIST dpkg_1.14.20.tar.gz 6650725 RMD160 d56d42e30e805603fb2f416b5edad667c99c5bd7 SHA1 3a7a67c4257c33cdb1f1cdea2e71bcbc25fa03de SHA256 7181f0ffa9aeba9f5cb70ab6298168d07b54e179faf3990a345494d820ac58ff
 DIST dpkg_1.14.22.tar.gz 6792294 RMD160 b99284ecfe4be33597f716aab957f62e8dec9fb1 SHA1 0886c9e9e93d1c5fec1b8038f959647fa86d2af1 SHA256 f8e954d6d65ffba0fcef4b52a4c92bec3101e9f21f62e9a039cc55eacf4d5381
 DIST dpkg_1.14.23.tar.gz 6812928 RMD160 6717db37529ce6ec8230032241b525626290a762 SHA1 eb7014513d456b5ca11066fc2b4b46e352b8c9d6 SHA256 7d27f2389e05b8727c6a7126c0b65d67749c170ba143e648912a88f2fe707bca
 DIST dpkg_1.14.25.tar.gz 6823861 RMD160 9b5c3b2a84730155de6e1f04efea31ec525253c3 SHA1 e196c16ad9c4c4785b8620b48996a9fe9188bdeb SHA256 545ce9830f0cf649e3b1b40d25d13989c23302623bf9b50f4c24402f63c82184
 DIST dpkg_1.14.26.tar.gz 6857429 RMD160 2179c1679b1cb71da1921f1f1716a8fe95cd5bcf SHA1 15ec444a6fba795266224130b95c37aeea50fe8e SHA256 b5c9ca67cf4d50ae0c8388ae671143bb3fdd810418bb25cd6be6762699be65ad
 DIST dpkg_1.15.0.tar.gz 6707886 RMD160 377ac42cd5ed392f0f193a2de49cdc6911a53a0b SHA1 5810eb92225882112bae82b09cb02a345f0b2b57 SHA256 3ace352953112783e4018ca43e1cd50a2ec362dcd39e762fe335e9a0bb8c8ceb
+DIST dpkg_1.15.1.tar.gz 7042718 RMD160 1ff8f5907f257fcfcacfeb46aa2e4295cc034392 SHA1 ade2d62e93cc0241d9635209415519092fda8097 SHA256 5d88e04046531583e0ecf3e89c9dd8e726ec73af8c37e9c1e334179f9d1f2744
 EBUILD dpkg-1.14.20.ebuild 1468 RMD160 8eb2dcc5f2c1b4adebe0678f64b2c1dc2a8ea488 SHA1 5505c8258ae43fd5996c82270779dbfbf047a931 SHA256 03acbfadb4d9f0210c39e57cb80a7dcd3e012f588c4d89494468d138c79a3a68
 EBUILD dpkg-1.14.22.ebuild 1468 RMD160 87d8d8ab4c173738a6bd48a4fd5d135bc9d74597 SHA1 65cb9d7e579ac0b2b90ee35a94500cca1329fd6d SHA256 6483060875eda347aa90672db80efecab0c0e0ca61196dd82f2c23a05d5f533d
 EBUILD dpkg-1.14.23.ebuild 1476 RMD160 a1d3fe9e6a7907e213570581552231572f0ad8d3 SHA1 e15b0db65183da8118219ca05bb88ef87abdeda9 SHA256 bded78a49fe45f47d4df95c391ac88d1a4d4978219bfe6052047c9a39cc3e2c1
 EBUILD dpkg-1.14.25.ebuild 1541 RMD160 299eef9f14fc2a1f229bb9f55184b03c993d2077 SHA1 45a1da261c143331cfc0635d8a4f87f37f60003c SHA256 22899172260214711d282d46d4f6fb7ee3b6ccfa71ca915ef9cdaebdc6028069
 EBUILD dpkg-1.14.26.ebuild 1550 RMD160 e20626d2457ac7bd55824f6da3b84db15b13cdd2 SHA1 e5a332a66b9cbd5fcf5a3f104df16e0267e25bbd SHA256 a26a8eef8832d408dcc639e308c42b56f594c3ac6a570515d69d9ff6a0b39e85
 EBUILD dpkg-1.15.0.ebuild 1549 RMD160 9e1a3acde4716705408059cae11196cb06e1d68e SHA1 b7d7ac5aae97896197f0f0315bf7fdcdc062d640 SHA256 bd34f094a7eef25816717a9eb4d1f0e3b596b5e1103e41b6c757245c8e2ffb01
-MISC ChangeLog 10990 RMD160 5fcc648ff3d622d9bd7d520f8e8907db9aaa4d13 SHA1 e7d82863ee062c7b5108889ca20473960b592cb5 SHA256 5acaf9a5e94bbbcef4fd809fd912594b1856803950a71163deaf5d10e67eb723
+EBUILD dpkg-1.15.1.ebuild 1478 RMD160 58b1ff53cf0807c0739c12a13e20f8de6526b7ce SHA1 75d74dfb870e7ce864f81f20d688e20f36754054 SHA256 a88335654ff9949b74da4b6dbcd74b6fe35d9899c09a63876ab2a55073a0e25b
+MISC ChangeLog 11217 RMD160 04e4931bfdb8205499451f039b5a74b2c987f2af SHA1 2f59a65cef5cdc826c76cdedab08ce3ac11ef055 SHA256 8d98b884389bda5e58dacfe67e10a8b081d1726a539cbfdcfbbab10789576b2e
 MISC metadata.xml 162 RMD160 ebe445a93e16f05a392ebdf3882b56b92931e37e SHA1 8bc26eb7c98535f3e31d2288f25fba83838857e5 SHA256 316a32c1e8ee9f6548707abec9a803d0a19feea1be10a19273cc04e0cd357644
diff --git a/app-arch/dpkg/dpkg-1.15.1.ebuild b/app-arch/dpkg/dpkg-1.15.1.ebuild
new file mode 100644
index 000000000000..70859eeee314
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.15.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.1.ebuild,v 1.1 2009/05/21 21:00:22 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/dpkg/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE="bzip2 nls selinux test unicode zlib"
+
+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 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-nls.patch #192819
+	if ! use unicode ; then
+		sed -i "s:ncursesw/::" dselect/{Makefile.in,dselect.h,main.cc} #217046
+		export ac_cv_lib_ncursesw_initscr=no
+	fi
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_with bzip2 bz2) \
+		$(use_enable nls) \
+		$(use_with selinux) \
+		$(use_with zlib) \
+		--without-start-stop-daemon \
+		|| die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	rm "${D}"/usr/sbin/install-info
+	rm "${D}"/usr/share/man/man?/install-info.?
+	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.1-nls.patch b/app-arch/dpkg/files/dpkg-1.15.1-nls.patch
new file mode 100644
index 000000000000..cbf876b53ac3
--- /dev/null
+++ b/app-arch/dpkg/files/dpkg-1.15.1-nls.patch
@@ -0,0 +1,19 @@
+respect the configure nls flag
+
+http://bugs.gentoo.org/192819
+
+
+--- dpkg-1.15.1/man/Makefile.in.orig	2009-05-21 06:49:55.000000000 +0200
++++ dpkg-1.15.1/man/Makefile.in	2009-05-21 22:42:28.000000000 +0200
+@@ -197,7 +197,11 @@
+ top_srcdir = @top_srcdir@
+ 
+ # Extract the list of languages from the po4a config file.
++ifeq ($(USE_NLS),yes)
+ LINGUAS = `sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg`
++else
++LINGUAS =
++endif
+ dist_man_MANS = deb-control.5 deb-version.5 deb-shlibs.5 \
+ 	deb-substvars.5 deb-symbols.5 deb-triggers.5 deb-old.5 \
+ 	deb-override.5 deb.5 dpkg-architecture.1 dpkg-buildpackage.1 \