Clean up patch. Version bump.

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

6 files changed, 41 insertions, 173 deletions

diff --git a/dev-util/debhelper/ChangeLog b/dev-util/debhelper/ChangeLog
index ef649e5bad8b..e51bc7f59f9b 100644
--- a/dev-util/debhelper/ChangeLog
+++ b/dev-util/debhelper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/debhelper
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/ChangeLog,v 1.66 2012/10/14 18:55:24 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/ChangeLog,v 1.67 2013/05/05 14:08:52 jer Exp $
+
+*debhelper-9.20130504 (05 May 2013)
+
+  05 May 2013; Jeroen Roovers <jer@gentoo.org> +debhelper-9.20130504.ebuild,
+  -debhelper-9.20120322.ebuild, -debhelper-9.20120608.ebuild,
+  -debhelper-9.20120830.ebuild, files/debhelper-7.4.13-conditional-nls.patch:
+  Clean up patch. Version bump.
 
   14 Oct 2012; Raúl Porcel <armin76@gentoo.org> debhelper-9.20120909.ebuild:
   alpha/ia64/m68k/s390/sh/sparc/x86 stable wrt #437784
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 9b819fb9fd81..6acb6fca99a4 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,21 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX debhelper-7.4.13-conditional-nls.patch 965 SHA256 96a74345609b80e5c97b8dd78cf247dc7ab1545147372b5232ee334e1196c02c SHA512 9d9059eb1b2a5a62b36ab6d0ffb9f55adb94dbcd25a5e8d768749d42da209e843934cef5ba0ceb0d92ca5db542c684870651c2d1042f16701b1e038664fb0834 WHIRLPOOL 8d3954d204228b1a322166e414981e1d7423a1c4d7796b9ee9479c67e5a9b4faa7da53bc1d6f123deb40e5d45364f70c611e10b0e604aa35ea7821b4390a8bc7
-DIST debhelper_9.20120322.tar.gz 462352 SHA256 41c892f1a068ec63fbbe6a3a1e7b4535e4f77850c3b78af1375b5309f9181ae6 SHA512 8284f1320dc85a2394d0ab9cba24643315219232dbbd60fad22fc1d093b718535c83a391e79d9f9c2d4b297e194cf0b56eaca057fa41ba644ae3a25ff63ca1a1 WHIRLPOOL 28f0fae57295f264e0bd1f094e6a74f3e758b8cb10a32181212dd7018f1c9f62b92f43415786f012cc31ad3a3ea9e540eb2e10e174484114ef858edd458c4d53
-DIST debhelper_9.20120608.tar.gz 464230 SHA256 e6270a9b56563031912cda5cd8cb4c1224304d5b64b561432df3be7db9039ab8 SHA512 8e7ebf8e926d47d6340fe245a8d56d0293b4d55535cfa66c309a30e19f67cc7f481f5245d9447d855cc913089eb7a41b924b168fdba68d54a4bedeaae769800f WHIRLPOOL 922c049e885f80ca000b52b8cdd2f50454e928ee884481005918aadb267a2b1f5fa86eabf72382fc718eabc9d0fc996a23025b9ccb1618fa1e067b2a5df1279a
-DIST debhelper_9.20120830.tar.gz 464324 SHA256 3798a53fdf2e269bb7b74eb61af43444ceb102610fb0bfb6ba2a057d714363c9 SHA512 184a03949331273cf58fef51f65a25902c3a6511611192ff22160c908b3ad85fdb155bb92a0ef48ac945cc50733944aa39443917d1deabe99bddf62658ef079a WHIRLPOOL 1a8a20fe56729a9a23436b9797bac3e650773cf41befc2869cd2c76b52d1fb66a04e7c84e21990b0219e089c9043b0ef398cd2030cab94d73c18ddea0613513b
+AUX debhelper-7.4.13-conditional-nls.patch 837 SHA256 c1113c3dca083c42f4a765e3135c933c0615f1094967e5161836ec4f0c21af6f SHA512 ee7402ac675af95323312758fc07868e126d0e5bed95a2923b0660a0bdf2f3a773705c5792f3f0037f321d18f8092b2739dba272920b2053e22fff62135e9877 WHIRLPOOL e7a0e27124f895851cb996d87fc28df654496150a9d4201b160d3366a32d5c03b667e1162cf54615d88a8b21b198fe5edda3f038f5a018770daa9cdce5ea0c32
 DIST debhelper_9.20120909.tar.gz 464785 SHA256 fabcdb9c41975ea0a1ccc66d6e065e424ed7a2119f6f1a6f7bfb7d06701370af SHA512 f1c417f0610b703d1b6ad9989078f03c67b11f45b1aa61f7d3f2fe8578dbc4d060da955c872c8e6326553ab4e7bbc21a1d9bebd9237e54d74c97f1297981384e WHIRLPOOL 72440752da24e29e5bb2e142d02b18b77472bf373b9c5a79ced790a5e6bb6e1cdec7521eb6e76b8833295441bd1062b9a94170d92dd9e9d5ed984e1ec6d9c88e
-EBUILD debhelper-9.20120322.ebuild 1747 SHA256 5b75de7fdc7565252bf4ead95add3b0bc7740d47ec07f0fc3bed9554bf298684 SHA512 44ce172a48ac946121be69473ea4957b24e4c7a40c26c4fdca0d76c321af8a0e48ccfab83a7d191fdbad7643729bdcf6e1d3c399af0249866bd46b59afe0269a WHIRLPOOL 9194afebc5125169e633975c96865a523dfa7d9852f38b0aaff0ed55cf8479269859494f42ac1e954b6c6a445b405633b06f44127e60ba95f3db32a19b895aab
-EBUILD debhelper-9.20120608.ebuild 1748 SHA256 a7e5efffcf8637f2df5d44f033d5f4c737b5f56d9646660e97483ba71228e55f SHA512 b356f1f390e0b92205529abc0a82e0a8c90b68d91cbe2e1119e2fa63a53f2db15d0fa62a971167ffb080934dd47cffde50db26ca7688c151fee2262b7bc213ba WHIRLPOOL 742ef41dbc3e8c7e056f01a7071003a51f3d6e1644ecd68048fdab987327884b37a5bf5d1035075df6e4ee5da870c5d35a577e3012e37237a16169df6ba941ee
-EBUILD debhelper-9.20120830.ebuild 1755 SHA256 8aaa371892d605324a29978baa84a8faa9e6fcd63b92b08be5b373884f34df32 SHA512 382bbafefd30b54533c2d4c98c73c952a171040a6cde5386fea6c8a62ef51fb5f1d3a65b5b277bb989ab29a0ecfe563384faa82e019e3debf87e4a71baa10edb WHIRLPOOL 4669b27d78acd0fcec893348c9d8776ca33b4715bfbc4f91686cf06bf36f022e181d18291717d6bd38877323676aa08f86979fae83d0250fb82d835a2137624a
+DIST debhelper_9.20130504.tar.gz 470050 SHA256 7d6ee2657430afcb477396c32c4bc170aa7fae97332045aa8f4ebec889051f01 SHA512 79ac8c1f6eee72a69b759733f7cfd75eb28a2557eb10f7f8f5fee174a62a89436923c3ab28563b6e00e874224ed050bb5981f41a822a40cd35c1b796aec053f1 WHIRLPOOL 5d71fe9308268943adb1bfd97d3b7271b1aa0ef77001ff8fbe821a0e4aa373e89d9952401ccdf323bfaed0d9fcf033f15a0200753f723c6141afee8a618f9000
 EBUILD debhelper-9.20120909.ebuild 1754 SHA256 b56191d5109dec66b936801c36ad13c0eff2a3048d7317e23fd4653c30cacf98 SHA512 c8c49652d084e4283d7ea2a1cc6a7b6291af3ecbd011e101add6821c7466ab5220a32aaad006e5c10d586ebe2360f3891198e4b6d3dc005aee2d35a96232355c WHIRLPOOL e54dfc1e54dc6fd13483a3643cdaf014fbf01a46fe4abd5fc8554ba00f4ffb098fac40fbb72ce21c5fd579029d346a646b50a7125ff2591c482422fbc9af2ab5
-MISC ChangeLog 9906 SHA256 5f8a6a875dbb99d866363c8482d3f8751dceb1a3ffad48542c8bc32617b17b6e SHA512 9821b6815566f1b2172e8c0993229d6cfe8a41083f20fd4c668b6f76be7750cd403bc282084909af5ef0429dc7c378501b66a9b7f961ebdcc7b615aed668dad0 WHIRLPOOL f390f530b792e53261dc9aa842045468ecfb2d45c9291543f554afd208acc5f1b539006c3bfd676c13b35a7a5c2ef897b0d36b39bcec6e66ac0a796ea6c935e6
+EBUILD debhelper-9.20130504.ebuild 1699 SHA256 6c4af7e10768779595b71201a01d200ed8ae202335ded56bad027eeb3cd50437 SHA512 84d2a694e014d65c7221cd21c428574f6217d5b6b9dbc6b8f44aa59abfbd0af82f5783e31780b36fb75ae0edb242651798d511ad085acffbadf0c527a8500d1d WHIRLPOOL 634f658dd1014d581e7dc9ac44fd02dd02107b5e3f9d6720c04f1640068dbbff7cc9997d6484c283aad06149a6cdefbcfaf4163d1e4351fe70983014e8d2120a
+MISC ChangeLog 10189 SHA256 38f92c7257f52b39176ae59e917eb6c9ca9596a9d27a21a37f12bde6ec91995a SHA512 6c0af1f01155edc1ef1edde415b6340561e4f40251930a3e1d826647b1a73947760f3ce58947dc9d14e4dc93bfc2a1012d057c99a4abe64a0544837458c0855f WHIRLPOOL f996fa03f9995d2eaef47aa9930e0cd892c9838962ff20d1f8eeab3f7ab9fea944cbc7e1046d97218b83989ea28289607335fed2e18a4cad631cb9487801b3dd
 MISC metadata.xml 162 SHA256 316a32c1e8ee9f6548707abec9a803d0a19feea1be10a19273cc04e0cd357644 SHA512 89446121b0be8d0f8bb5160fd33ecddf47ae2994022c0e6fe5caba7bbb9b0bb35337011373c20734bb683d8e172ff88a19aab3ea7354f7786832a5e5fcaf39a8 WHIRLPOOL b214dc4f7f8de7edc5034a877c2ca2c18fbe6b5a1db3a758f0e21328b25d7139961a6b18feed6ac5c09e09d8f61ebd38eed03362212d81aa6f468e8c41c7ca55
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB7Cp4ACgkQuQc30/atMkCkKQCgvy+SKSxmvSmlDNszuNTiMuH8
-D9IAniiBmTHSWsttLfv2qdJEvmerCU5P
-=OqrC
+iEYEAREIAAYFAlGGZ/UACgkQVWmRsqeSphNzTgCfS3wv/LG0Da872kMc+Hc4NX3J
+/kMAmwf8sgNpkQvKL6f+/Qo3tyaJ8tYS
+=fXiI
 -----END PGP SIGNATURE-----
diff --git a/dev-util/debhelper/debhelper-9.20120608.ebuild b/dev-util/debhelper/debhelper-9.20120608.ebuild
deleted file mode 100644
index 03d81690a21e..000000000000
--- a/dev-util/debhelper/debhelper-9.20120608.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20120608.ebuild,v 1.8 2012/08/27 17:34:54 armin76 Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-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://joeyh.name/code/debhelper/"
-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_de linguas_es linguas_fr test"
-
-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}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7.4.13-conditional-nls.patch
-}
-
-src_compile() {
-	tc-export CC
-	local USE_NLS=no LANGS=""
-
-	use nls && USE_NLS=yes
-
-	use linguas_de && LANGS="${LANGS} de"
-	use linguas_es && LANGS="${LANGS} es"
-	use linguas_fr && LANGS="${LANGS} fr"
-
-	emake USE_NLS=${USE_NLS} LANGS="${LANGS}" build
-}
-
-src_install() {
-	default
-	dodoc doc/* debian/changelog
-	docinto examples
-	dodoc examples/*
-	for manfile in *.1 *.7 ; do
-		case ${manfile} in
-			*.de.?)	use linguas_de \
-					&& cp ${manfile} "${T}"/${manfile/.de/} \
-					&& doman -i18n=de "${T}"/${manfile/.de/}
-				;;
-			*.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/debhelper-9.20120830.ebuild b/dev-util/debhelper/debhelper-9.20120830.ebuild
deleted file mode 100644
index bd8e010887d4..000000000000
--- a/dev-util/debhelper/debhelper-9.20120830.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20120830.ebuild,v 1.1 2012/08/31 16:28:32 jer Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-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://joeyh.name/code/debhelper/"
-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_de linguas_es linguas_fr test"
-
-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}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7.4.13-conditional-nls.patch
-}
-
-src_compile() {
-	tc-export CC
-	local USE_NLS=no LANGS=""
-
-	use nls && USE_NLS=yes
-
-	use linguas_de && LANGS="${LANGS} de"
-	use linguas_es && LANGS="${LANGS} es"
-	use linguas_fr && LANGS="${LANGS} fr"
-
-	emake USE_NLS=${USE_NLS} LANGS="${LANGS}" build
-}
-
-src_install() {
-	default
-	dodoc doc/* debian/changelog
-	docinto examples
-	dodoc examples/*
-	for manfile in *.1 *.7 ; do
-		case ${manfile} in
-			*.de.?)	use linguas_de \
-					&& cp ${manfile} "${T}"/${manfile/.de/} \
-					&& doman -i18n=de "${T}"/${manfile/.de/}
-				;;
-			*.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/debhelper-9.20120322.ebuild b/dev-util/debhelper/debhelper-9.20130504.ebuild
index abd8af4b7f5d..ee90401b7988 100644
--- a/dev-util/debhelper/debhelper-9.20120322.ebuild
+++ b/dev-util/debhelper/debhelper-9.20130504.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20120322.ebuild,v 1.8 2012/07/08 15:17:33 jer Exp $
-
-EAPI="4"
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20130504.ebuild,v 1.1 2013/05/05 14:08:52 jer Exp $
 
+EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
@@ -12,35 +11,38 @@ 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_de linguas_es linguas_fr test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls test"
+DH_LINGUAS=( de es fr )
+IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
 
-RDEPEND="app-arch/dpkg
+RDEPEND="
+	>=dev-lang/perl-5.10
+	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 )"
+	test? ( dev-perl/Test-Pod )
+"
 
 S=${WORKDIR}/${PN}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7.4.13-conditional-nls.patch
-}
-
 src_compile() {
 	tc-export CC
-	local USE_NLS=no LANGS=""
-
-	use nls && USE_NLS=yes
 
-	use linguas_de && LANGS="${LANGS} de"
-	use linguas_es && LANGS="${LANGS} es"
-	use linguas_fr && LANGS="${LANGS} fr"
+	if use nls; then
+		local LANGS="" lingua
+		for lingua in ${DH_LINGUAS[@]}; do
+			use linguas_${lingua} && LANGS+=" ${lingua}"
+		done
+	fi
 
-	emake USE_NLS=${USE_NLS} LANGS="${LANGS}" build
+	emake \
+		USE_NLS=$(usex nls) \
+		LANGS="${LANGS}" \
+		build
 }
 
 src_install() {
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
index 779307a74a69..391fa1dcf92e 100644
--- a/dev-util/debhelper/files/debhelper-7.4.13-conditional-nls.patch
+++ b/dev-util/debhelper/files/debhelper-7.4.13-conditional-nls.patch
@@ -1,6 +1,5 @@
-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
+--- a/debhelper/Makefile
++++ b/debhelper/Makefile
 @@ -34,12 +34,17 @@ PERLLIBDIR=$(shell perl -MConfig -e 'pri
  
  POD2MAN=pod2man --utf8 -c Debhelper -r "$(VERSION)"