Replaced useless dpkg-1.15.1-nls patch with one that allows to select specific LINGUAS and fixed unicode flag support (previously was building with wide headers and linking with normal ncurces lib when USE=-unicode). Thanks to guillem@d.o for pointing some of this problems.

Package-Manager: portage-2.1.7.5/cvs/Linux i686

5 files changed, 147 insertions, 2 deletions

diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index 52e66dfa6119..9d17f98e1551 100644
--- a/app-arch/dpkg/ChangeLog
+++ b/app-arch/dpkg/ChangeLog
@@ -1,6 +1,16 @@
 # 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.108 2009/11/18 15:52:14 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.109 2009/11/25 14:14:22 yvasilev Exp $
+
+*dpkg-1.15.5.2-r1 (25 Nov 2009)
+
+  25 Nov 2009; Yuri Vasilevski <yvasilev@gentoo.org>
+  +dpkg-1.15.5.2-r1.ebuild, +files/dpkg-1.15.5-nls.patch,
+  +files/dpkg-1.15.5-unicode.patch:
+  Replaced useless dpkg-1.15.1-nls patch with one that allows to select
+  specific LINGUAS and fixed unicode flag support (previously was building
+  with wide headers and linking with normal ncurces lib when USE=-unicode).
+  Thanks to guillem@d.o for pointing some of this problems.
 
   18 Nov 2009; Yuri Vasilevski <yvasilev@gentoo.org> -dpkg-1.15.5.1.ebuild:
   Removed broken (due to lack of perl 5.10) version.
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 3bc7efa5e313..d3891e752b53 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,4 +1,6 @@
 AUX dpkg-1.15.1-nls.patch 625 RMD160 f5db7dff31d1708be5d38c0849e4a39e278536ae SHA1 751bb464b95ca32726532939c249cdb82fda35b5 SHA256 2e1bb1939c29870d71ae4f93ed572db7dffec31d3887cfe1e3047f8ec0b0f5fc
+AUX dpkg-1.15.5-nls.patch 576 RMD160 23c515eb0d4411abe67f545f01d38c62d8b455cc SHA1 56292d9b015a21fb26e647c9ce355cce85feeff0 SHA256 0d6d9281098bb68a649ae295ccae888ba849e5083d8a6d7c8b2d21d0a8c69bfd
+AUX dpkg-1.15.5-unicode.patch 2715 RMD160 831b2637348a4da62f0ae99429cc32f50ff82def SHA1 5d4149c10a86b124e1cdb20c96a3895feb471cdf SHA256 b463f0de1947cb107b656e73dade0a61717998ae7f1de9ab3f6a0b6b06d5e134
 DIST dpkg_1.15.2.tar.gz 7049986 RMD160 21556b88f9b5ba809525b27f94df99d96bdfd37e SHA1 e73a709f80454fc56e2d31dc28230f783661bb93 SHA256 ec92968f6a7fdfeddb4cee5bd177f03b1dd99ec2fe7ea0b6a2e8d4cbbfee1a74
 DIST dpkg_1.15.3.1.tar.gz 7071636 RMD160 b03617937c25995b67e311c388ab1d5295443751 SHA1 72d0ac7a8090ae6b089fb52ae1d143d549b51293 SHA256 01205ac6a0047b495c1c03c6951a10161b2811e27389f99991d78688c9790e05
 DIST dpkg_1.15.3.tar.gz 7070609 RMD160 491cc6c5ca0774f20f4dcf3e2115f8020027ce52 SHA1 9b6ddecf88cfcc0a106aa533746cc97595833008 SHA256 3dbc0cfdeee4535680d73a7967ee9580f5a55de36b99d13ce8bed643dadc1e2c
@@ -10,6 +12,7 @@ EBUILD dpkg-1.15.3.1.ebuild 1497 RMD160 eb202862df76d4ef2003d5afecd35272b8ae2a0b
 EBUILD dpkg-1.15.3.ebuild 1495 RMD160 516941dcfd20d314996d8256ba68a2846954f4ba SHA1 cfb9b9c6a70d57466ed5f1f9e2c6f478187c8665 SHA256 9f18ed58dc678548179d66bc0041780966b19d3642bb469d618040d2a34f4f77
 EBUILD dpkg-1.15.4.1.ebuild 1497 RMD160 616c9c6dc1cb52e4c79979980640d88bd95d4b8a SHA1 faf4819d3218d7bb6657738eca2a9e6d0e35a558 SHA256 3722e3e4f82d926e6be48baf5f7c4f488d391e8747cf186ba07e54a38bbe1c1b
 EBUILD dpkg-1.15.4.ebuild 1495 RMD160 bdb90bbb7bd8bae43b6395b63bec19d497b152eb SHA1 cadef511ed8e2d45e853a6d436c9e5dfbd75d76d SHA256 c35e57febea275e19f182473cc1de331d52c0b2e189edd0b1d9871744a0ed917
+EBUILD dpkg-1.15.5.2-r1.ebuild 1664 RMD160 c55e7086954a44215016d3da19fe77d6d5da1cf6 SHA1 39ab638c7d9acc818f56d5f78fdbf3a0259f0ba9 SHA256 ef107957e83b42cc60f450045d35e9e159d0398ea38ab5bc7952fb122ee17ec2
 EBUILD dpkg-1.15.5.2.ebuild 1508 RMD160 b3a47d6df504ba49a70e4d8058b418ef3032a8a3 SHA1 1ef5f558fa1baad22495bf38709b816047e3bcee SHA256 a75b4c1364eac3e2a7077c495799659de5dccc1534b8600f26b8c22eda2e51e5
-MISC ChangeLog 14179 RMD160 f540df6b5a1f8f649bd9bf72c465d5de2c6875af SHA1 95c0bcfba34ca7767768428b4eb5ea17bee2c08f SHA256 4eb3ea774019eef2222d6514b5678b22f8d6e4ff1efec2ff62ef0f8d7c21c71b
+MISC ChangeLog 14643 RMD160 d56de2dec47bb2461572e6a64431789a36d540cf SHA1 2bbda52c7f739e3f121c6831f8265a6f588939f9 SHA256 c405dcc1542d23f7708cb5b13dbe1bad4326afeee310775831cb34bbec0b2966
 MISC metadata.xml 162 RMD160 ebe445a93e16f05a392ebdf3882b56b92931e37e SHA1 8bc26eb7c98535f3e31d2288f25fba83838857e5 SHA256 316a32c1e8ee9f6548707abec9a803d0a19feea1be10a19273cc04e0cd357644
diff --git a/app-arch/dpkg/dpkg-1.15.5.2-r1.ebuild b/app-arch/dpkg/dpkg-1.15.5.2-r1.ebuild
new file mode 100644
index 000000000000..71a22112ff0f
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.15.5.2-r1.ebuild
@@ -0,0 +1,61 @@
+# 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.5.2-r1.ebuild,v 1.1 2009/11/25 14:14:22 yvasilev 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.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~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
+	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-nls.patch b/app-arch/dpkg/files/dpkg-1.15.5-nls.patch
new file mode 100644
index 000000000000..88e7b79e3d55
--- /dev/null
+++ b/app-arch/dpkg/files/dpkg-1.15.5-nls.patch
@@ -0,0 +1,12 @@
+diff -Naurp dpkg-1.15.5.2.orig/man/Makefile.am dpkg-1.15.5.2/man/Makefile.am
+--- dpkg-1.15.5.2.orig/man/Makefile.am	2009-11-18 07:28:44.000000000 +0000
++++ dpkg-1.15.5.2/man/Makefile.am	2009-11-21 07:14:37.000000000 +0000
+@@ -36,7 +36,7 @@ update-po:
+ 	$(PO4A) $(PO4A_BUILD_OPTS) --force po/po4a.cfg
+ 
+ # Extract the list of languages from the po4a config file.
+-LINGUAS = `sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg`
++LINGUAS := `sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg`
+ 
+ install-data-local: install-data-local-@USE_PO4A@
+ 
diff --git a/app-arch/dpkg/files/dpkg-1.15.5-unicode.patch b/app-arch/dpkg/files/dpkg-1.15.5-unicode.patch
new file mode 100644
index 000000000000..1d257c036f1f
--- /dev/null
+++ b/app-arch/dpkg/files/dpkg-1.15.5-unicode.patch
@@ -0,0 +1,59 @@
+diff -Naurp dpkg-1.15.5.2.orig/m4/dpkg-libs.m4 dpkg-1.15.5.2/m4/dpkg-libs.m4
+--- dpkg-1.15.5.2.orig/m4/dpkg-libs.m4	2009-11-21 09:40:57.000000000 +0000
++++ dpkg-1.15.5.2/m4/dpkg-libs.m4	2009-11-21 09:37:55.000000000 +0000
+@@ -100,14 +100,23 @@ fi
+ # DPKG_LIB_CURSES
+ # ---------------
+ # Check for curses library.
+-AC_DEFUN([DPKG_LIB_CURSES],
+-[AC_ARG_VAR([CURSES_LIBS], [linker flags for curses library])dnl
+-AC_CHECK_HEADERS([ncursesw/ncurses.h ncurses/ncurses.h ncurses.h curses.h \
+-                  ncursesw/term.h ncurses/term.h term.h])
+-AC_CHECK_LIB([ncursesw], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncursesw"],
+-	[AC_CHECK_LIB([ncurses], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncurses"],
++AC_DEFUN([DPKG_LIB_CURSES], [
++AC_REQUIRE([AM_UNICODE])
++AC_ARG_VAR([CURSES_LIBS], [linker flags for curses library])dnl
++if test "x$USE_UNICODE" = "xyes"; then
++	AC_CHECK_HEADERS([ncursesw/ncurses.h ncurses/ncurses.h ncurses.h curses.h \
++	                  ncursesw/term.h ncurses/term.h term.h])
++	AC_CHECK_LIB([ncursesw], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncursesw"],
++		[AC_CHECK_LIB([ncurses], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncurses"],
++			[AC_CHECK_LIB([curses], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lcurses"],
++				[AC_MSG_WARN([no curses library found])])])])
++else
++	AC_CHECK_HEADERS([ncurses/ncurses.h ncurses.h curses.h \
++	                  ncurses/term.h term.h])
++	AC_CHECK_LIB([ncurses], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lncurses"],
+ 		[AC_CHECK_LIB([curses], [initscr], [CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }-lcurses"],
+-			[AC_MSG_WARN([no curses library found])])])])
++			[AC_MSG_WARN([no curses library found])])])
++fi
+ ])# DPKG_LIB_CURSES
+ 
+ # DPKG_LIB_SSD
+diff -Naurp dpkg-1.15.5.2.orig/m4/unicode.m4 dpkg-1.15.5.2/m4/unicode.m4
+--- dpkg-1.15.5.2.orig/m4/unicode.m4	1970-01-01 00:00:00.000000000 +0000
++++ dpkg-1.15.5.2/m4/unicode.m4	2009-11-21 09:46:53.000000000 +0000
+@@ -0,0 +1,21 @@
++# unicode.m4
++dnl Copyright (C) 2009 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++dnl
++dnl Author:
++dnl   Yuri Vasilevski <yvasilev@gentoo.org>, 2009
++
++AC_PREREQ(2.50)
++
++AC_DEFUN([AM_UNICODE],
++[
++  AC_MSG_CHECKING([whether UNICODE is requested])
++  dnl Default: UNICODE is enabled
++  AC_ARG_ENABLE(unicode,
++    [  --disable-unicode       do not use Unicode (wide characters) support],
++    USE_UNICODE=$enableval, USE_UNICODE=yes)
++  AC_MSG_RESULT($USE_UNICODE)
++  AC_SUBST(USE_UNICODE)
++])