Version bump.

(Portage version: 2.2_rc67/cvs/Linux i686)

8 files changed, 14 insertions, 320 deletions

diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index 1d1c5ba14c2e..892917366ee6 100644
--- a/app-arch/dpkg/ChangeLog
+++ b/app-arch/dpkg/ChangeLog
@@ -1,6 +1,14 @@
 # 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.130 2010/04/15 21:06:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.131 2010/04/21 15:18:30 jer Exp $
+
+*dpkg-1.15.7 (21 Apr 2010)
+
+  21 Apr 2010; Jeroen Roovers <jer@gentoo.org> -dpkg-1.15.2.ebuild,
+  -dpkg-1.15.5.5.ebuild, -dpkg-1.15.5.6.ebuild, -dpkg-1.15.5.6-r1.ebuild,
+  -files/dpkg-1.15.5-nls.patch, -files/dpkg-1.15.5-unicode.patch,
+  -dpkg-1.15.6.ebuild, +dpkg-1.15.7.ebuild:
+  Version bump.
 
   15 Apr 2010; Markus Meier <maekke@gentoo.org> dpkg-1.15.6.1.ebuild:
   amd64 stable, bug #309633
diff --git a/app-arch/dpkg/dpkg-1.15.2.ebuild b/app-arch/dpkg/dpkg-1.15.2.ebuild
deleted file mode 100644
index 3bf7bbd24d01..000000000000
--- a/app-arch/dpkg/dpkg-1.15.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.2.ebuild,v 1.12 2009/12/02 18:43:18 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/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc s390 sh sparc x86"
-IUSE="bzip2 nls 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 dev-perl/IO-String )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.15.1-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 zlib) \
-		--without-selinux \
-		--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/dpkg-1.15.5.5.ebuild b/app-arch/dpkg/dpkg-1.15.5.5.ebuild
deleted file mode 100644
index 42d63217e842..000000000000
--- a/app-arch/dpkg/dpkg-1.15.5.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.5.ebuild,v 1.1 2009/12/23 00:16:18 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/${PN}/${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/dpkg-1.15.5.6-r1.ebuild b/app-arch/dpkg/dpkg-1.15.5.6-r1.ebuild
deleted file mode 100644
index 63d8276b5b72..000000000000
--- a/app-arch/dpkg/dpkg-1.15.5.6-r1.ebuild
+++ /dev/null
@@ -1,68 +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.5.6-r1.ebuild,v 1.2 2010/02/19 22:18:01 abcd 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 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_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.15.5-nls.patch
-	epatch "${FILESDIR}"/${PN}-1.15.5-unicode.patch
-	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
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with bzip2 bz2) \
-		$(use_enable nls) \
-		$(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.5.6.ebuild b/app-arch/dpkg/dpkg-1.15.5.6.ebuild
deleted file mode 100644
index af3c4a55de1b..000000000000
--- a/app-arch/dpkg/dpkg-1.15.5.6.ebuild
+++ /dev/null
@@ -1,61 +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.5.6.ebuild,v 1.2 2010/01/10 20:21:14 vapier 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/${PN}/${P/-/_}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~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/dpkg-1.15.6.ebuild b/app-arch/dpkg/dpkg-1.15.7.ebuild
index 2fca3376ec75..457ca767f34b 100644
--- a/app-arch/dpkg/dpkg-1.15.6.ebuild
+++ b/app-arch/dpkg/dpkg-1.15.7.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.6.ebuild,v 1.5 2010/03/24 19:30:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.7.ebuild,v 1.1 2010/04/21 15:18:31 jer Exp $
 
 EAPI=3
 
@@ -41,9 +41,10 @@ src_prepare() {
 	sed -i -e '1c\#!'"${BASH}" get-version || die
 
 	# bug 310847
-	if [[ "${PV}" = "1.15.6" ]]; then
-		sed -i lib/dpkg/test/Makefile.am -e '/t[_-]ar/d'
-		sed -i scripts/Makefile.am -e '/850_Dpkg_Compression.t/d'
+	if [[ "${PV}" = "1.15.7" ]]; then
+		sed -i lib/dpkg/test/Makefile.am -e '/t[_-]ar/d' || die "sed failed"
+		sed -i scripts/Makefile.am -e '/850_Dpkg_Compression.t/d' \
+			|| die "sed failed"
 	fi
 
 	eautoreconf
diff --git a/app-arch/dpkg/files/dpkg-1.15.5-nls.patch b/app-arch/dpkg/files/dpkg-1.15.5-nls.patch
deleted file mode 100644
index 88e7b79e3d55..000000000000
--- a/app-arch/dpkg/files/dpkg-1.15.5-nls.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 1d257c036f1f..000000000000
--- a/app-arch/dpkg/files/dpkg-1.15.5-unicode.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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)
-+])