Version dump to 7.4.13, after pod2man from perl-5.10.1 became unmasked. Fixes bug #286962

(Portage version: 2.1.7.17/cvs/Linux i686)

3 files changed, 106 insertions, 2 deletions

diff --git a/dev-util/debhelper/ChangeLog b/dev-util/debhelper/ChangeLog
index 02ca88a6747e..5c925d9c36bb 100644
--- a/dev-util/debhelper/ChangeLog
+++ b/dev-util/debhelper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/debhelper
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/ChangeLog,v 1.14 2009/09/29 18:00:42 yvasilev Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/ChangeLog,v 1.15 2010/02/14 04:16:10 yvasilev Exp $
+
+*debhelper-7.4.13 (14 Feb 2010)
+
+  14 Feb 2010; Yuri Vasilevski <yvasilev@gentoo.org>
+  +debhelper-7.4.13.ebuild, +files/debhelper-7.4.13-conditional-nls.patch:
+  Version dump to 7.4.13, after pod2man from perl-5.10.1 became unmasked.
+  Fixes bug #286962
 
 *debhelper-7.3.13 (29 Sep 2009)
 
diff --git a/dev-util/debhelper/debhelper-7.4.13.ebuild b/dev-util/debhelper/debhelper-7.4.13.ebuild
new file mode 100644
index 000000000000..95e10ec01fb7
--- /dev/null
+++ b/dev-util/debhelper/debhelper-7.4.13.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-7.4.13.ebuild,v 1.1 2010/02/14 04:16:10 yvasilev Exp $
+
+inherit eutils
+
+DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
+HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://kitenet.net/~joey/code/debhelper.html"
+SRC_URI="http://launchpad.net/${PN}/main/${PV}/+download/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE="nls linguas_es linguas_fr"
+
+RDEPEND="app-arch/dpkg
+	dev-perl/TimeDate
+	virtual/perl-Getopt-Long
+	>=dev-lang/perl-5.10"
+
+DEPEND="${RDEPEND}
+	nls? ( >=app-text/po4a-0.24 )
+	test? ( dev-perl/Test-Pod )"
+
+S="${WORKDIR}"/${PN}
+
+PATCH_VER=7.4.13
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-${PATCH_VER}-conditional-nls.patch
+}
+
+src_compile() {
+	local USE_NLS=no LANGS=""
+
+	use nls && USE_NLS=yes
+
+	use linguas_es && LANGS="${LANGS} es"
+	use linguas_fr && LANGS="${LANGS} fr"
+
+	emake USE_NLS=${USE_NLS} LANGS="${LANGS}" build \
+		|| die "Compilation failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation failed"
+	dodoc doc/* debian/changelog
+	docinto examples
+	dodoc examples/*
+	for manfile in *.1 *.7 ; do
+		case ${manfile} in
+			*.es.?)	use linguas_es \
+					&& cp ${manfile} "${T}"/${manfile/.es/} \
+					&& doman -i18n=es "${T}"/${manfile/.es/}
+				;;
+			*.fr.?)	use linguas_fr \
+					&& cp ${manfile} "${T}"/${manfile/.fr/} \
+					&& doman -i18n=fr "${T}"/${manfile/.fr/}
+				;;
+			*)	doman ${manfile}
+				;;
+		esac
+	done
+}
diff --git a/dev-util/debhelper/files/debhelper-7.4.13-conditional-nls.patch b/dev-util/debhelper/files/debhelper-7.4.13-conditional-nls.patch
new file mode 100644
index 000000000000..779307a74a69
--- /dev/null
+++ b/dev-util/debhelper/files/debhelper-7.4.13-conditional-nls.patch
@@ -0,0 +1,30 @@
+diff -Naurp debhelper.orig/Makefile debhelper/Makefile
+--- debhelper.orig/Makefile	2009-12-04 19:56:11.000000000 +0000
++++ debhelper/Makefile	2010-02-14 03:45:08.000000000 +0000
+@@ -34,12 +34,17 @@ PERLLIBDIR=$(shell perl -MConfig -e 'pri
+ 
+ POD2MAN=pod2man --utf8 -c Debhelper -r "$(VERSION)"
+ 
++ifeq ($(USE_NLS),yes)
+ # l10n to be built is determined from .po files
+-LANGS=$(notdir $(basename $(wildcard man/po4a/po/*.po)))
++LANGS?=$(notdir $(basename $(wildcard man/po4a/po/*.po)))
++else
++LANGS=
++endif
+ 
+ build: version debhelper.7
+ 	find . -maxdepth 1 -type f -perm +100 -name "dh*" \
+ 		-exec $(POD2MAN) {} {}.1 \;
++ifeq ($(USE_NLS),yes)
+ 	po4a --previous -L UTF-8 man/po4a/po4a.cfg 
+ 	set -e; \
+ 	for lang in $(LANGS); do \
+@@ -54,6 +59,7 @@ build: version debhelper.7
+ 				$(POD2MAN) --name="debhelper" --section=7 > debhelper.$$lang.7; \
+ 		fi; \
+ 	done
++endif
+ 
+ version:
+ 	printf "package Debian::Debhelper::Dh_Version;\n\$$version='$(VERSION)';\n1" > \