Version bump. Rework patch for 3.4.2 and explain why.

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

4 files changed, 70 insertions, 2 deletions

diff --git a/sys-apps/debianutils/ChangeLog b/sys-apps/debianutils/ChangeLog
index 8f044e62c92c..b66b0abeac62 100644
--- a/sys-apps/debianutils/ChangeLog
+++ b/sys-apps/debianutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/debianutils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/ChangeLog,v 1.148 2010/10/02 17:37:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/ChangeLog,v 1.149 2010/11/15 19:40:08 jer Exp $
+
+*debianutils-3.4.2 (15 Nov 2010)
+
+  15 Nov 2010; Jeroen Roovers <jer@gentoo.org> +debianutils-3.4.2.ebuild,
+  +files/debianutils-3.4.2-no-bs-namespace.patch:
+  Version bump. Rework patch for 3.4.2 and explain why.
 
   02 Oct 2010; Raúl Porcel <armin76@gentoo.org> debianutils-3.2.3.ebuild:
   alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #336693
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 82be3a486b17..dd6c72133629 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,11 +1,14 @@
 AUX debianutils-3.2.1-no-bs-namespace.patch 966 RMD160 ed1bc623794eb8d6bb1ab026cdaa9341cfd31a82 SHA1 13cc86651e8f37c5a3057a1ca27a8f773567552f SHA256 39cf25f20b0b33ee825007302fd3b1b3e064dd53147902e04a5afc89c96402ed
+AUX debianutils-3.4.2-no-bs-namespace.patch 545 RMD160 508adfa21ff7c63da890af5cf2e7dcb92193c8cb SHA1 840e09f9cd800a49eb1c54d94b19b97a7e9479f1 SHA256 308f4bb5551565ced4c1085432878515b153a5a333858edecee2f155fc0b791a
 DIST debianutils_3.2.3.tar.bz2 106990 RMD160 acd89b9d7d8f7346fed0a16aafd55f6b65c2b461 SHA1 d82ebddb31c402c94e93f6c4663b15307ad1311b SHA256 3c6dee491bb93e92f0e3da8065eddf937f6b584ad72cd09b1e2bd05b66be07b9
 DIST debianutils_3.3.tar.gz 136588 RMD160 5e62edea8483afbf034004fef432bc729c01c48c SHA1 60bc34ce31ff9df03949ce21e1adf250865bf7b3 SHA256 877f2d98af930ef2c5ab80593dd36784ed59bc19dcf7cfb091fbe93f54989c09
 DIST debianutils_3.4.1.tar.gz 141091 RMD160 6b8c1ed65ec097ff241133a56739b25f03acd76b SHA1 11235096cb76a068779e830be0136b7f11bbe7b2 SHA256 0839acc0c1ab359e7921ae6a7bbb82491107b2fc721d61aa33b2cc96de9ec2c5
+DIST debianutils_3.4.2.tar.gz 154865 RMD160 a2a7744a845ad2a4084e39e9cc116fe29969f92e SHA1 9096c46cfbcbddd6aea353c4e3e7af0657d46cb9 SHA256 4b16c96823bf15b6abc0e4b8509d25828f3a33ba6f2dc6f629af0168c90f459c
 DIST debianutils_3.4.tar.gz 137456 RMD160 7fe04df2ee966bdf3ba3fe2fc76acfb37bdb3195 SHA1 a4d2138c968dcab61c3358d5b06a300753d94be4 SHA256 0eb1443466b79b1357af1f78568f5950397789730f08031f7991d4c225c66b20
 EBUILD debianutils-3.2.3.ebuild 1178 RMD160 f1b1f6b68103e1f917173a7ab3c6ebeb6db568ac SHA1 4dfbdeb6140d4749cbd9adb7a698cb1ae053aaf3 SHA256 4f0dcad7021071b51c2b35153e1b9d0e3a437697e1e81a8d4d6ecbbd52adba54
 EBUILD debianutils-3.3.ebuild 1183 RMD160 15a5e9d1c1f3148cb8ea8844930e1879d28af457 SHA1 9e07aef1a79cd0a9cb2146009556bb1794c84e7f SHA256 d1620eb42e44c4d9a68d61a80679c6922c8adc3cce8124bfcdc6f782f4115500
 EBUILD debianutils-3.4.1.ebuild 1185 RMD160 d5ee0d34a00268b948372ad419a1a4560cfddf30 SHA1 5f1fec63419233e78149da061e07cdec6261e70b SHA256 ca15bf7ec6e7d502dcaa1f213d957b6e4d33151677dc78272da11967c39b9dec
+EBUILD debianutils-3.4.2.ebuild 1178 RMD160 ece4158f21579aa4a045a236ed302244a5c44128 SHA1 e54f123523d0091f1b05d65751a96a83234c2e1c SHA256 3210f1ca3c5235663e6fd5be5d1b5b66dd09f131e5ef5993a85eb5453b4c83b8
 EBUILD debianutils-3.4.ebuild 1183 RMD160 5a1e5d7b91e522546a8f1719dc9cb2fb8c153e1a SHA1 84333b3d04a521977f669ba7e2e69275c2505f2a SHA256 f6062cc2d3a7e8d05931f12edd8b9f2c13a8651fe20accdde2d8ab5224d0d8a2
-MISC ChangeLog 20484 RMD160 d54e97d279bc71d93542d0c3c036604ae6311864 SHA1 286b11f884fd311cc587fa364e13f1ef57dffb99 SHA256 d2a05790af3e9ac7136832204ca8261c78ee5ebf18ebadc1d820fb2af580aaa2
+MISC ChangeLog 20695 RMD160 adb7f8d65029aeaa011a1f89f77bbe216350c3d6 SHA1 a58b7b1bd102f1ef124c440fa8566ad44e493fa1 SHA256 3f2f6fbbf4ac73a082c64fb2f20032426ea60bc1c51a04e06fb2befa68c67d74
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-apps/debianutils/debianutils-3.4.2.ebuild b/sys-apps/debianutils/debianutils-3.4.2.ebuild
new file mode 100644
index 000000000000..73ce0ad723bd
--- /dev/null
+++ b/sys-apps/debianutils/debianutils-3.4.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-3.4.2.ebuild,v 1.1 2010/11/15 19:40:08 jer Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A selection of tools from Debian"
+HOMEPAGE="http://packages.qa.debian.org/d/debianutils.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="BSD GPL-2 SMAIL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="kernel_linux static"
+
+PDEPEND="|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-no-bs-namespace.patch
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	econf || die
+	emake || die
+}
+
+src_install() {
+	into /
+	dobin tempfile run-parts || die
+	if use kernel_linux ; then
+		dosbin installkernel || die "installkernel failed"
+	fi
+
+	into /usr
+	dosbin savelog || die "savelog failed"
+
+	doman tempfile.1 run-parts.8 savelog.8
+	use kernel_linux && doman installkernel.8
+	cd debian
+	dodoc changelog control
+}
diff --git a/sys-apps/debianutils/files/debianutils-3.4.2-no-bs-namespace.patch b/sys-apps/debianutils/files/debianutils-3.4.2-no-bs-namespace.patch
new file mode 100644
index 000000000000..4bc2ce2aa779
--- /dev/null
+++ b/sys-apps/debianutils/files/debianutils-3.4.2-no-bs-namespace.patch
@@ -0,0 +1,15 @@
+Allow dots in the names, bug #95173.  Patch by Kerin Millar.
+Re-sourced for 3.4.2 since the man page has now been corrected but not the
+regex itself (dot files are still OK upstream?) - jer
+
+--- a/run-parts.c
++++ b/run-parts.c
+@@ -501,7 +501,7 @@
+                     != 0)
+             pt_regex = &tradre;
+ 
+-    } else if ( (err = regcomp(&classicalre, "^[a-zA-Z0-9_-]+$",
++    } else if ( (err = regcomp(&classicalre, "^[a-zA-Z0-9_-][a-zA-Z0-9._-]+$",
+                     REG_EXTENDED | REG_NOSUB)) != 0)
+         pt_regex = &classicalre;
+