Fix configure warning for 1.14.25. Patch to conditionally install English start-stop-daemon.8 man page (bug #268298).

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

6 files changed, 45 insertions, 12 deletions

diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index 3583aa6a7f69..37c6ea29c38b 100644
--- a/app-arch/dpkg/ChangeLog
+++ b/app-arch/dpkg/ChangeLog
@@ -1,6 +1,12 @@
 # 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.84 2009/05/03 17:14:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.85 2009/05/04 15:28:34 jer Exp $
+
+  04 May 2009; Jeroen Roovers <jer@gentoo.org> dpkg-1.14.25.ebuild,
+  +files/dpkg-1.14.25-start-stop-daemon.8.patch, dpkg-1.14.26.ebuild,
+  dpkg-1.15.0.ebuild:
+  Fix configure warning for 1.14.25. Patch to conditionally install English
+  start-stop-daemon.8 man page (bug #268298).
 
 *dpkg-1.15.0 (03 May 2009)
 
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index edd19dbe2321..e62b84a94608 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,5 +1,6 @@
 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 392 RMD160 5295ee81250b6c1eefc7836e69c7d656851eca43 SHA1 f682dd45e0c45ed8b9cb7c210d3506b20e66db53 SHA256 1567faa6bf595968962ab51898cfc6d8d882e72458214d9598f2d586ee0e21a3
 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
@@ -9,8 +10,8 @@ DIST dpkg_1.15.0.tar.gz 6707886 RMD160 377ac42cd5ed392f0f193a2de49cdc6911a53a0b
 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 1472 RMD160 f8d47bc00de380f5b35409f0ac76814f227d3d2d SHA1 4b729e6c2be9278cfd88f26e0f10ce715a742d0f SHA256 e3df7aa879ff58b7276aee9f8ffb3aedcd7a82902096baed98d145de5a6e6250
-EBUILD dpkg-1.14.26.ebuild 1465 RMD160 c79f1d00e82f9c0a9dc2dda3da784e89150568fe SHA1 1267de874f6ebba258ef58a9201a3ee5aded2004 SHA256 8408363ae992d59e6746abd9df924a7562f1f23e522400b43585abebd88f576b
-EBUILD dpkg-1.15.0.ebuild 1464 RMD160 9ca5b50dfc6f0b84aae71d597c25580d1069641a SHA1 5df10e440042476978d68a6a06ac8c5377bd747c SHA256 8ec09df5461e54f975696611d7ba5c4964e78adc7733907c59d35fbd51c9ad2c
-MISC ChangeLog 10303 RMD160 84017739a10b01ee51b79601544c9fabcc204a3e SHA1 34387bba6da3af9e7dc6ebfe049835dbf1dbb31c SHA256 add583c9e0ae7d15651befba4405dfd6552a549a385dcd9b352779fb2a50487c
+EBUILD dpkg-1.14.25.ebuild 1591 RMD160 6b3226e33a87c0d71b59face2b58de8704a9624d SHA1 35bfdceecf0343fe8340b805772c8499c8e60309 SHA256 a457796b8f6251bd8069ea0a974eeede447033045021d6ceea8b28e0d425267e
+EBUILD dpkg-1.14.26.ebuild 1600 RMD160 03eb3dcd319f8ae07449c3cb50b5b6126ab38062 SHA1 fd4bc82eecedee3ad66cadbfee1eb5e7f4e07819 SHA256 bf0e7aaf5fdc0abe41f1a8ab47ed02bd9ee8a25a7fda5e68499c9428caa1168e
+EBUILD dpkg-1.15.0.ebuild 1599 RMD160 b05e376f9d01e80993f0440e0c4d51aa157a2e40 SHA1 a9f57f3c44253e8f7440e9a99ab44232149862bb SHA256 4f79fee749f68878c3c99f8126949fc8c52291eb4dff9a859e1e5fe902a00f3c
+MISC ChangeLog 10586 RMD160 00e3174236daae9918087e38d1fd3cb4f67fba7a SHA1 86811336f8fffc4cc8968f2d5d2f31f79ab575c3 SHA256 b630ec33341697453e8874e5cc3f73a17607cc9215dd81f1170afe11908f8a78
 MISC metadata.xml 162 RMD160 ebe445a93e16f05a392ebdf3882b56b92931e37e SHA1 8bc26eb7c98535f3e31d2288f25fba83838857e5 SHA256 316a32c1e8ee9f6548707abec9a803d0a19feea1be10a19273cc04e0cd357644
diff --git a/app-arch/dpkg/dpkg-1.14.25.ebuild b/app-arch/dpkg/dpkg-1.14.25.ebuild
index 03d00c039792..dda428dfc2a5 100644
--- a/app-arch/dpkg/dpkg-1.14.25.ebuild
+++ b/app-arch/dpkg/dpkg-1.14.25.ebuild
@@ -1,8 +1,8 @@
 # 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.14.25.ebuild,v 1.2 2009/05/01 18:47:15 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.14.25.ebuild,v 1.3 2009/05/04 15:28:34 jer Exp $
 
-inherit eutils multilib
+inherit eutils multilib autotools
 
 DESCRIPTION="Package maintenance system for Debian"
 HOMEPAGE="http://packages.qa.debian.org/dpkg"
@@ -30,11 +30,13 @@ src_unpack() {
 		sed -i "s:ncursesw/::" dselect/{Makefile.in,dselect.h,main.cc} #217046
 		export ac_cv_lib_ncursesw_initscr=no
 	fi
+	epatch "${FILESDIR}"/${P}-start-stop-daemon.8.patch
+	eautoreconf
 }
 
 src_compile() {
 	econf \
-		$(use_with bzip2 bz2lib) \
+		$(use_with bzip2 bz2) \
 		$(use_enable nls) \
 		$(use_with selinux) \
 		$(use_with zlib) \
@@ -47,6 +49,7 @@ src_install() {
 	emake DESTDIR="${D}" install || die
 	rm "${D}"/usr/sbin/install-info
 	rm "${D}"/usr/share/man/man?/install-info.?
+	#rm "${D}"/usr/share/man/man?/start-stop-daemon*
 	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.14.26.ebuild b/app-arch/dpkg/dpkg-1.14.26.ebuild
index d3c44bdaf4ee..c7d40e586f39 100644
--- a/app-arch/dpkg/dpkg-1.14.26.ebuild
+++ b/app-arch/dpkg/dpkg-1.14.26.ebuild
@@ -1,8 +1,8 @@
 # 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.14.26.ebuild,v 1.1 2009/05/03 17:07:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.14.26.ebuild,v 1.2 2009/05/04 15:28:34 jer Exp $
 
-inherit eutils multilib
+inherit eutils multilib autotools
 
 DESCRIPTION="Package maintenance system for Debian"
 HOMEPAGE="http://packages.qa.debian.org/dpkg"
@@ -30,6 +30,8 @@ src_unpack() {
 		sed -i "s:ncursesw/::" dselect/{Makefile.in,dselect.h,main.cc} #217046
 		export ac_cv_lib_ncursesw_initscr=no
 	fi
+	epatch "${FILESDIR}"/${PN}-1.14.25-start-stop-daemon.8.patch
+	eautoreconf
 }
 
 src_compile() {
@@ -47,6 +49,7 @@ src_install() {
 	emake DESTDIR="${D}" install || die
 	rm "${D}"/usr/sbin/install-info
 	rm "${D}"/usr/share/man/man?/install-info.?
+	#rm "${D}"/usr/share/man/man?/start-stop-daemon*
 	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.0.ebuild b/app-arch/dpkg/dpkg-1.15.0.ebuild
index 9a3c678d4cbf..cb1a54d5480d 100644
--- a/app-arch/dpkg/dpkg-1.15.0.ebuild
+++ b/app-arch/dpkg/dpkg-1.15.0.ebuild
@@ -1,8 +1,8 @@
 # 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.0.ebuild,v 1.1 2009/05/03 17:14:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.0.ebuild,v 1.2 2009/05/04 15:28:34 jer Exp $
 
-inherit eutils multilib
+inherit eutils multilib autotools
 
 DESCRIPTION="Package maintenance system for Debian"
 HOMEPAGE="http://packages.qa.debian.org/dpkg"
@@ -30,6 +30,8 @@ src_unpack() {
 		sed -i "s:ncursesw/::" dselect/{Makefile.in,dselect.h,main.cc} #217046
 		export ac_cv_lib_ncursesw_initscr=no
 	fi
+	epatch "${FILESDIR}"/${PN}-1.14.25-start-stop-daemon.8.patch
+	eautoreconf
 }
 
 src_compile() {
@@ -47,6 +49,7 @@ src_install() {
 	emake DESTDIR="${D}" install || die
 	rm "${D}"/usr/sbin/install-info
 	rm "${D}"/usr/share/man/man?/install-info.?
+	#rm "${D}"/usr/share/man/man?/start-stop-daemon*
 	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.14.25-start-stop-daemon.8.patch b/app-arch/dpkg/files/dpkg-1.14.25-start-stop-daemon.8.patch
new file mode 100644
index 000000000000..d6b727c859d9
--- /dev/null
+++ b/app-arch/dpkg/files/dpkg-1.14.25-start-stop-daemon.8.patch
@@ -0,0 +1,17 @@
+--- dpkg-1.14.25/man/Makefile.am.orig	2009-02-01 07:18:59.000000000 +0100
++++ dpkg-1.14.25/man/Makefile.am	2009-05-04 17:02:32.000000000 +0200
+@@ -100,9 +100,13 @@
+ 	dselect.1 \
+ 	dselect.cfg.5 \
+ 	install-info.8 \
+-	start-stop-daemon.8 \
+ 	update-alternatives.8
+ 
++if WITH_START_STOP_DAEMON
++dist_man_MANS = \
++	start-stop-daemon.8
++endif
++
+ EXTRA_DIST = \
+ 	po/po4a.cfg \
+ 	po/dpkg-man.pot