Replaced dpkg-1.14.25-start-stop-daemon.8.patch to handle nls and install man pages when --without-start-stop-daemon is not passed to ./configure. Fixes bug #268298.

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

3 files changed, 44 insertions, 13 deletions

diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index 80f92819bca0..7199e5ed58ed 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.86 2009/05/04 16:06:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.87 2009/05/04 16:34:30 yvasilev Exp $
+
+  04 May 2009; <yvasilev@gentoo.org>
+  files/dpkg-1.14.25-start-stop-daemon.8.patch:
+  Replaced dpkg-1.14.25-start-stop-daemon.8.patch to handle nls and install
+  man pages when --without-start-stop-daemon is not passed to ./configure.
+  Fixes bug #268298.
 
   04 May 2009; Jeroen Roovers <jer@gentoo.org> dpkg-1.14.25.ebuild,
   dpkg-1.14.26.ebuild, dpkg-1.15.0.ebuild:
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index db11426ee200..653c178ff3ca 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,6 +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
+AUX dpkg-1.14.25-start-stop-daemon.8.patch 982 RMD160 a3c950f3267d1209e1370cd6312f7cd47589c250 SHA1 6b51b1fc1c1b71b43c15f73d56c6238f9a34798f SHA256 d4e80186144ba125fbdb8bd90ab083ee796f7934acbc0d4bfebaa63f6a2daf9f
 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
@@ -13,5 +13,5 @@ EBUILD dpkg-1.14.23.ebuild 1476 RMD160 a1d3fe9e6a7907e213570581552231572f0ad8d3
 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 10727 RMD160 349ed1454dc2dec96930bff55f899e831a49f7b6 SHA1 bda1d0fb599e31306f3e495a6b9f2fd65499b18b SHA256 81ad17f30bc8dab9dab5d4fc2f233217b992e837a22a4544beb4c3deab325371
+MISC ChangeLog 10990 RMD160 5fcc648ff3d622d9bd7d520f8e8907db9aaa4d13 SHA1 e7d82863ee062c7b5108889ca20473960b592cb5 SHA256 5acaf9a5e94bbbcef4fd809fd912594b1856803950a71163deaf5d10e67eb723
 MISC metadata.xml 162 RMD160 ebe445a93e16f05a392ebdf3882b56b92931e37e SHA1 8bc26eb7c98535f3e31d2288f25fba83838857e5 SHA256 316a32c1e8ee9f6548707abec9a803d0a19feea1be10a19273cc04e0cd357644
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
index d6b727c859d9..3f6f20567988 100644
--- 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
@@ -1,17 +1,42 @@
---- 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 \
+--- dpkg-1.15.0.orig/man/Makefile.am	2009-05-04 15:03:33.000000000 +0000
++++ dpkg-1.15.0/man/Makefile.am	2009-05-04 15:37:47.000000000 +0000
+@@ -37,7 +37,7 @@ install-data-local-yes:
+ 			$(MAKE) install-man \
+ 				mandir="$(mandir)/$$lang" \
+ 				man_MANS="" \
+-				dist_man_MANS="$$files"; \
++				manfiles="$$files"; \
+ 		fi \
+ 	done
+ 
+@@ -51,7 +51,7 @@ uninstall-local-yes:
+ 			$(MAKE) uninstall-man \
+ 				mandir="$(mandir)/$$lang" \
+ 				man_MANS="" \
+-				dist_man_MANS="$$files"; \
++				manfiles="$$files"; \
+ 		fi \
+ 	done
+ 
+@@ -64,7 +64,7 @@ dist-hook: man.stamp
+ 		cp -r $(srcdir)/$$lang $(distdir)/; \
+ 	done
+ 
+-dist_man_MANS = \
++manfiles = \
+ 	822-date.1 \
+ 	deb-control.5 \
+ 	deb-version.5 \
+@@ -102,6 +102,12 @@ dist_man_MANS = \
+ 	start-stop-daemon.8 \
  	update-alternatives.8
  
 +if WITH_START_STOP_DAEMON
-+dist_man_MANS = \
-+	start-stop-daemon.8
++  dist_man_MANS = $(manfiles)
++else
++  dist_man_MANS = $(filter-out %start-stop-daemon.8,$(manfiles))
 +endif
 +
  EXTRA_DIST = \
+ 	po/ChangeLog \
  	po/po4a.cfg \
- 	po/dpkg-man.pot