Version bump. Rework patch for 3.4.2 and explain why.

(Portage version: 2.1.9.24/cvs/Linux i686)

3 files changed, 66 insertions, 1 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/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;
+