Merge from app-arch/debhelper (Bug #223979) and version dump.

(Portage version: 2.1.5.2)

4 files changed, 109 insertions, 2 deletions

diff --git a/dev-util/debhelper/ChangeLog b/dev-util/debhelper/ChangeLog
index 763a87acb3de..35ddbb558ae9 100644
--- a/dev-util/debhelper/ChangeLog
+++ b/dev-util/debhelper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/debhelper
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/ChangeLog,v 1.1 2008/04/09 03:18:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/ChangeLog,v 1.2 2008/05/29 15:35:09 yvasilev Exp $
+
+*debhelper-7.0.9 (29 May 2008)
+
+  29 May 2008; Yuri Vasilevski <yvasilev@gentoo.org>
+  +files/debhelper-7.0.9-conditional-nls.patch, metadata.xml,
+  +debhelper-7.0.9.ebuild:
+  Merge from app-arch/debhelper (Bug #223979) and version dump.
 
 *debhelper-6.0.11 (09 Apr 2008)
 
diff --git a/dev-util/debhelper/debhelper-7.0.9.ebuild b/dev-util/debhelper/debhelper-7.0.9.ebuild
new file mode 100644
index 000000000000..16ca511a2815
--- /dev/null
+++ b/dev-util/debhelper/debhelper-7.0.9.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2008-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-7.0.9.ebuild,v 1.1 2008/05/29 15:35:09 yvasilev Exp $
+
+inherit eutils
+
+DESCRIPTION="A collection of programs that can be used in a debian/rules file to automate common tasks related to building debian packages."
+HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://kitenet.net/~joey/code/debhelper.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${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
+	dev-lang/perl"
+
+DEPEND="${RDEPEND}
+	nls? ( >=app-text/po4a-0.24 )"
+
+S="${WORKDIR}"/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-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.0.9-conditional-nls.patch b/dev-util/debhelper/files/debhelper-7.0.9-conditional-nls.patch
new file mode 100644
index 000000000000..1d48ab28518b
--- /dev/null
+++ b/dev-util/debhelper/files/debhelper-7.0.9-conditional-nls.patch
@@ -0,0 +1,33 @@
+diff -Naurp debhelper.orig/Makefile debhelper/Makefile
+--- debhelper.orig/Makefile	2008-05-04 14:57:07.000000000 -0500
++++ debhelper/Makefile	2008-05-15 16:31:34.000000000 -0500
+@@ -27,8 +27,12 @@ PERLLIBDIR=$(shell perl -MConfig -e 'pri
+ 
+ POD2MAN=pod2man -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
+ 	find . -maxdepth 1 -type f -perm +100 -name "dh*" \
+@@ -36,6 +40,7 @@ build: version
+ 	cat debhelper.pod | \
+ 		$(MAKEMANLIST) `find . -maxdepth 1 -type f -perm +100 -name "dh_*" | sort` | \
+ 		$(POD2MAN) --name="debhelper" --section=7  > debhelper.7
++ifeq ($(USE_NLS),yes)
+ 	po4a man/po4a/po4a.cfg 
+ 	set -e; \
+ 	for lang in $(LANGS); do \
+@@ -48,6 +53,7 @@ build: version
+ 			$(MAKEMANLIST) `find $$dir -type f -maxdepth 1 -name "dh_*.pod" | sort` | \
+ 			$(POD2MAN) --name="debhelper" --section=7 > debhelper.$$lang.7; \
+ 	done
++endif
+ 
+ version:
+ 	printf "package Debian::Debhelper::Dh_Version;\n\$$version='$(VERSION)';\n1" > \
diff --git a/dev-util/debhelper/metadata.xml b/dev-util/debhelper/metadata.xml
index 96a2d586367d..7ab5593a0faa 100644
--- a/dev-util/debhelper/metadata.xml
+++ b/dev-util/debhelper/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<herd>deb-tools</herd>
+<maintainer>
+<email>yvasilev@gentoo.org</email>
+<name>Yuri Vasilevski</name>
+</maintainer>
 </pkgmetadata>