Version bump.

Package-Manager: portage-2.2.0_alpha93/cvs/Linux x86_64

18 files changed, 28 insertions, 891 deletions

diff --git a/dev-util/debhelper/ChangeLog b/dev-util/debhelper/ChangeLog
index 30927cdfe4b6..1ed9f4bb9fd1 100644
--- a/dev-util/debhelper/ChangeLog
+++ b/dev-util/debhelper/ChangeLog
@@ -1,6 +1,17 @@
 # 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.33 2012/03/15 02:14:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/ChangeLog,v 1.34 2012/03/20 21:28:42 jer Exp $
+
+*debhelper-9.20120312 (20 Mar 2012)
+
+  20 Mar 2012; Jeroen Roovers <jer@gentoo.org> debhelper-7.0.16.ebuild,
+  -files/debhelper-7.2.16-conditional-nls.patch, -debhelper-7.4.13.ebuild,
+  -debhelper-7.4.17.ebuild, -debhelper-7.4.20.ebuild, -debhelper-7.9.1.ebuild,
+  -debhelper-8.0.0.ebuild, -debhelper-8.1.0.ebuild, -debhelper-8.1.1.ebuild,
+  -debhelper-8.1.3.ebuild, -debhelper-8.1.4.ebuild, -debhelper-8.1.6.ebuild,
+  -debhelper-8.9.2.ebuild, -debhelper-8.9.3.ebuild, -debhelper-8.9.14.ebuild,
+  debhelper-9.20120115.ebuild, +debhelper-9.20120312.ebuild:
+  Version bump.
 
   15 Mar 2012; Jeroen Roovers <jer@gentoo.org> debhelper-9.20120115.ebuild:
   Stable for HPPA (bug #368627).
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 0b2e3c3af56e..470535c67a32 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -2,44 +2,19 @@
 Hash: SHA1
 
 AUX debhelper-7.0.9-conditional-nls.patch 1151 RMD160 e58ded2daf651d327f726c66a828ed329cd1b818 SHA1 6e306e0315552041ea095592030738f9c64aafcf SHA256 f9b9117e1ddbdedb8019740c19bbee0a762eb3ecacf61b6d4ec18f68039a4c97
-AUX debhelper-7.2.16-conditional-nls.patch 1160 RMD160 451811b2701336d44114080b4a874371d5357b6b SHA1 e65194f41143c94ded49e597cc9a57988f3426a2 SHA256 7a344dfef21793360be470d9a26b25f7b10c3657fe0c81d376cd3174882dd08b
 AUX debhelper-7.4.13-conditional-nls.patch 965 RMD160 0c9acf589fd454f9b30422f31d877ae61a5990b4 SHA1 82cfdfcdce3c367247db69ebe846490eb67a52f2 SHA256 96a74345609b80e5c97b8dd78cf247dc7ab1545147372b5232ee334e1196c02c
 DIST debhelper_7.0.16.tar.gz 293646 RMD160 b03cffb9fb7b82a2ef9cd7d34ce4358f0951a23d SHA1 1068652fe2bf593c8e80746aae5ca5e7c19efd37 SHA256 1d0c1211563562535d9ab53b640d7a2b5be5832e9f1d2933cf8e86d6834d9975
-DIST debhelper_7.4.13.tar.gz 352733 RMD160 54eb7f8d757de7c8389673dcc1d28c1113b61b83 SHA1 d3ba2b916ce4fda7ed76054ae5180540da2404c8 SHA256 881076ee0f42ce7bd43157064dd14d4025db93fab4d023e761fad02b823de612
-DIST debhelper_7.4.17.tar.gz 357241 RMD160 be9b1d405aaaadae43a55b363fe2ae0f9200e653 SHA1 d0518ed761b055d80dead2525482af0055c6b03a SHA256 6cf24f054fa673ca14d2b133900085be6c2fafdf49774ce36ddf356cbd6ea301
-DIST debhelper_7.4.20.tar.gz 357810 RMD160 7a64a310e6e0ece4079947f54efc5bf72354240a SHA1 d9bdeabdc37fd81e646c08e6453bbda818da5fe5 SHA256 332f6e88f905aa1295881c16758dae9d976aa483e83928b8c894a50881e28806
-DIST debhelper_7.9.1.tar.gz 359388 RMD160 c15358a0216165dd584fc31dc8da6b0203537e56 SHA1 77eb4657ddd4f7b8ae8eef1538c8edb8e81f4f10 SHA256 63c330132da3fce734017fa0ff94d7a94a1a773d943026357676fecc3ff4e462
-DIST debhelper_8.0.0.tar.gz 369017 RMD160 e0b288ab10394f364fb6fc407bbe4bdd27dccdb6 SHA1 fa93ccd06db7d5ce79c2c7dd7443a1714be3cbf1 SHA256 690f876298843d041280b2499a4f8e071881203c16e456557e22c279b19a6e35
-DIST debhelper_8.1.0.tar.gz 378114 RMD160 961eba348074962637252c96ba0b293c1927c117 SHA1 9e3a673a4a90c6e7ccaadab091843fc440d4417b SHA256 6e662b28111e7eec7b0bcd88cb45fb81c2ac0175d887443cf932ab83cb34ad86
-DIST debhelper_8.1.1.tar.gz 378596 RMD160 34dc98195c3c47b1bc24a0a9deb135ee3444ee8d SHA1 0811c5db0911d77746cedd84709a72b2ae9da6fc SHA256 e0ea80cf3033140c69a2bc2091f24e83f13103485e523bec1d244feaa503b475
-DIST debhelper_8.1.3.tar.gz 380118 RMD160 3532a0a8d58ad438410c9e0ac1d366acf8d4524d SHA1 5e8d12fb68e22c28863c30ebe4d8d452e0cf9da6 SHA256 ce4a08a008faf4306fcc77f574c2ded1559bde58aa81d2bdc6c4abb90fd4ddec
-DIST debhelper_8.1.4.tar.gz 380051 RMD160 c646722817a1670a617754b770553b723a5dc7c2 SHA1 f358f178215e2f245ec76ec8ef33b964c9888dab SHA256 9815b407c07ca5baaf33276b5a6e5a14d44c28f43bb395d67ee7f582f555c0f2
-DIST debhelper_8.1.6.tar.gz 380933 RMD160 00ea41a864708065fa68ddf5cf6a1427fe9dcf36 SHA1 259cf48631378233fcd11913ebd396600470c3a6 SHA256 22b4f212fb86d7d6a50bb667a3667494e24a769a205a6ec15879511f4b4f6bf7
-DIST debhelper_8.9.14.tar.gz 460388 RMD160 20442017ff69a02d5a85c2a297b692ea9e4ce5f2 SHA1 25b197c3515a247fb3c86d1520a03e2c35c1797d SHA256 ca9dd349f25c244955d627311e26cbf1622b1dfff365979c2a94294c5a71e3ad
-DIST debhelper_8.9.2.tar.gz 385448 RMD160 d44b9fc20f81eb0c73f6ac98070b75f0a1f2733e SHA1 73dee047e44f94db3d771faf8ab48983823b24e7 SHA256 90944b19ddd039ae703c1713acebd1894ed8e2a12019f071e7e1b104c748d3ae
-DIST debhelper_8.9.3.tar.gz 385402 RMD160 633d5080acfe2b2c983d628a97e8a5bf277e5b20 SHA1 a8720e5d1686c50d2e9239a3c6aa419105163ff9 SHA256 bebb44215fd2d12c07a4ace0c114abc165204a29c177cd102e99fd10db9e485a
 DIST debhelper_9.20120115.tar.gz 461544 RMD160 4df4f3c9205b344533ab52e9b8b710a20300bb19 SHA1 e37cbea6ccbd5a712c02f929b7c49194de76cfd9 SHA256 be935f693533fdd8c1f9bafd6b4bf746e4e9542a15a4f64d87a8cdd7a57524a4
-EBUILD debhelper-7.0.16.ebuild 1603 RMD160 dbfcce5b731bc849f03be7db6d274d2a9f95ac8f SHA1 c68b40264c45c8228ef0b85b0a729155e093d586 SHA256 0b46bd97ecbcefa9029a589c98925dd7f009c6d113ba391e7cf903b167387651
-EBUILD debhelper-7.4.13.ebuild 1699 RMD160 161c359df461c75b6cbc1471e18077f9bf8d12a5 SHA1 2dd2f8d0a7a65f64f6b68ecb67b98be0f3f54553 SHA256 34f0e2e4e32362591d033bf7988f215b7adb23d3c5df7d1b40a749a30d5323e8
-EBUILD debhelper-7.4.17.ebuild 1698 RMD160 6d14b145ef035f5000c564737c938d91a9ab15c7 SHA1 3df857ac78bc29c35d435dd3732983504d0fb037 SHA256 fece2c933d31186b21d1bbefe351a22495ef6c6b5bd768696c1afdf8ae395d97
-EBUILD debhelper-7.4.20.ebuild 1698 RMD160 c85f5b4a5bbc016d3f41697da8e6066af1c9e8f9 SHA1 58754fcec6bee230a8ab593791eeb0b6bf632f42 SHA256 9f4b4ca0ddc6b8089955efcd23a07c388bcbd6d441549c4740d710174e3bec1b
-EBUILD debhelper-7.9.1.ebuild 1697 RMD160 858847f768ef7938d216460094929ae96ef275e1 SHA1 67b8a5824c1a177d39af3a2b091eacdf0246605e SHA256 7b731a6b76c5e1c89bf073a59a1b8d6db00bf74810164300a8d96406385dbf66
-EBUILD debhelper-8.0.0.ebuild 1697 RMD160 71ce53ed9ecd091fd30f1af1c033013c5dd41628 SHA1 f077a6471f86dc1cd81c867e1f6dbd71d576d8e7 SHA256 4774101de567d1cc0b86c7f4d935bc697764e52409e00bdf978d3d505939b516
-EBUILD debhelper-8.1.0.ebuild 1726 RMD160 2725e615a3a894353c7293539f71ffc3f03af7d5 SHA1 10afd70332765e5c0e1d67aa800871cd3ca55146 SHA256 b10165f67be0119ce9b4b494b70095b68e9c7cb513263ed232183a8d6370f6ec
-EBUILD debhelper-8.1.1.ebuild 1726 RMD160 5e963a41d679be7c76b8ebd46ef1d377efd7b06d SHA1 4ad831566cc6eff4fda2840c4aedaf656cb5dac5 SHA256 ebbf887d1f09ebb445e7ab4e65573f88ac8ce73595c9e4b30c0ea0007899f71f
-EBUILD debhelper-8.1.3.ebuild 1694 RMD160 20b275b95bb0900373663770aa69bb6c42964c74 SHA1 78175aecf6cec2a9e446b894e17a3eb5b7dc5fb9 SHA256 39c4afad0853126e75cf118f31db3f65346c73077a3de3e14e54d228c3fa846e
-EBUILD debhelper-8.1.4.ebuild 1694 RMD160 bd89e0db3ca06be12cc977373ba93a093cf9a1e0 SHA1 b3972381437a2c9a8676cf412a01a98dc974ff9b SHA256 a2f641c86857c2cd2c8269298f91ae023cf9032b50fb0494b9afdff00e36b114
-EBUILD debhelper-8.1.6.ebuild 1694 RMD160 6a3ebbc87c15f265a74136f2858c19a406f017bf SHA1 524e9452cb3cbfa79719fe560058203b041ca94d SHA256 a09d4c04a416fe28ffeccf48bb36771a9aa6ff4089c051c556cf5e064d968025
-EBUILD debhelper-8.9.14.ebuild 1789 RMD160 72810bb0aaa68c2d4e841984203791109eee0db3 SHA1 f6c33b2b1d561c2435970315ec730ed10333f07e SHA256 010ad81dab0cdd8570bc60d8572b5d55f6b13d6d0fb9e0aebbd93adc24e39e71
-EBUILD debhelper-8.9.2.ebuild 1699 RMD160 365d901463eb4c5af8759d4042a66dd1ba0665e8 SHA1 5d19f770b4cc9ade1f2815766fc991d664009520 SHA256 a244078da57707fc516dd981dc8eefcc64e5b7a9ad6324024a6ea67c0cba9992
-EBUILD debhelper-8.9.3.ebuild 1694 RMD160 4f775ee40e56225898ba7484f1eb4011d61586e3 SHA1 22b48f219e6e483104f2ef9e455fa808c5c981d8 SHA256 14d22e21c2f7180b440532ba47ca76b80941e183d00d5d12acc27e3f4b08a2c2
-EBUILD debhelper-9.20120115.ebuild 1789 RMD160 9e627fe67d4a69df87bb68001886fd8df6884964 SHA1 c6e09134b4d1aa530140b59ac2a4751ec691a581 SHA256 97b32f6bce6fe6e4ce7b9f62c28e6d0bce94ac788d773e6fcbf715835b5a4009
-MISC ChangeLog 5278 RMD160 5ecf1377a418006d8f19d2f7ff3287d4b163b431 SHA1 5a0b6a6639436ef68c466357ece8312a9b18e6ce SHA256 67b77737eaa8c06558324a8d2f6b75e4116f0967a88a749ee1f9c859d668a1c3
+DIST debhelper_9.20120312.tar.gz 462033 RMD160 887b6990cfe6d0d31753614df564b8d6057ae241 SHA1 f0ea6145dd10fab57841af1bae0d85fe342ca2f7 SHA256 64826e98d2d315a5e4ab7e7eaf260db76b3ee00521eacb972c4d1660e807c083
+EBUILD debhelper-7.0.16.ebuild 1576 RMD160 994079b30336323b0a84850c07a5863ae726582f SHA1 dd8d6f6dc4e6ee04d920a7374ea0ae9c646af7e9 SHA256 7b3894252c8963e3e56e2a875d1d2f66d1e8662a39d3e8fa5afa600595a02e24
+EBUILD debhelper-9.20120115.ebuild 1765 RMD160 fa4a2c3c4d2d99b149d09491027f6bea11c7494a SHA1 8aa3803eb002e4079a36a66df7de3fe3b1d758dc SHA256 07642c02673641cec2096cb75f299d4c074363c539224192d2b1b63402cb24bf
+EBUILD debhelper-9.20120312.ebuild 1769 RMD160 86a3e3b135b0265260edd0a429366cad47e86d34 SHA1 88571fde106d1fc9166628d9bdf2cfe959a68e21 SHA256 03b51df427fb9b40ca180b4f8838e84e7803b454b19a9bce46e8d15636facf26
+MISC ChangeLog 5851 RMD160 19336dd951fe37520b169fd5a97f44828d457a21 SHA1 0e8d424afe658421dd08372b53a873689b119d28 SHA256 a63b7e3f1fdf0b948aa1f175748dbf00215f365b6d4a370fb9c35d289b101676
 MISC metadata.xml 162 RMD160 ebe445a93e16f05a392ebdf3882b56b92931e37e SHA1 8bc26eb7c98535f3e31d2288f25fba83838857e5 SHA256 316a32c1e8ee9f6548707abec9a803d0a19feea1be10a19273cc04e0cd357644
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9hUKIACgkQVWmRsqeSphNtTwCeMwWhcPGbN2ddj5De0RVMhJPg
-RAIAn0HmW9gDPiyV0Oyn+yCUilJGtdGw
-=+uIj
+iEYEARECAAYFAk9o9pAACgkQVWmRsqeSphMi9QCfSowubX+oAatceUXcfhl6vWLx
+zL8An0DK6MxGyiniMXTJird05+F3hJo7
+=yzzn
 -----END PGP SIGNATURE-----
diff --git a/dev-util/debhelper/debhelper-7.0.16.ebuild b/dev-util/debhelper/debhelper-7.0.16.ebuild
index 9d7a409d0470..3cc65d5031f0 100644
--- a/dev-util/debhelper/debhelper-7.0.16.ebuild
+++ b/dev-util/debhelper/debhelper-7.0.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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-7.0.16.ebuild,v 1.6 2008/11/04 09:40:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-7.0.16.ebuild,v 1.7 2012/03/20 21:28:42 jer Exp $
 
 inherit eutils
 
@@ -22,13 +22,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${PN}
 
-PATCH_VER=7.0.9
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${PN}-${PATCH_VER}-conditional-nls.patch
+	epatch "${FILESDIR}"/${PN}-7.0.9-conditional-nls.patch
 }
 
 src_compile() {
diff --git a/dev-util/debhelper/debhelper-7.4.13.ebuild b/dev-util/debhelper/debhelper-7.4.13.ebuild
deleted file mode 100644
index 4397d3b59f98..000000000000
--- a/dev-util/debhelper/debhelper-7.4.13.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.2 2010/02/15 18:07:53 mr_bones_ 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 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}
-
-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/debhelper-7.4.17.ebuild b/dev-util/debhelper/debhelper-7.4.17.ebuild
deleted file mode 100644
index 9c5a10c9b250..000000000000
--- a/dev-util/debhelper/debhelper-7.4.17.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.17.ebuild,v 1.1 2010/04/09 05:50:54 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 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}
-
-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/debhelper-7.4.20.ebuild b/dev-util/debhelper/debhelper-7.4.20.ebuild
deleted file mode 100644
index 9325bc2128bf..000000000000
--- a/dev-util/debhelper/debhelper-7.4.20.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.20.ebuild,v 1.1 2010/06/25 04:32:41 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 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}
-
-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/debhelper-7.9.1.ebuild b/dev-util/debhelper/debhelper-7.9.1.ebuild
deleted file mode 100644
index 72ed841bc484..000000000000
--- a/dev-util/debhelper/debhelper-7.9.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.9.1.ebuild,v 1.1 2010/06/25 04:32:41 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 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}
-
-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/debhelper-8.0.0.ebuild b/dev-util/debhelper/debhelper-8.0.0.ebuild
deleted file mode 100644
index 0a3e573239b4..000000000000
--- a/dev-util/debhelper/debhelper-8.0.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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-8.0.0.ebuild,v 1.1 2010/08/29 05:04:33 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 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}
-
-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/debhelper-8.1.0.ebuild b/dev-util/debhelper/debhelper-8.1.0.ebuild
deleted file mode 100644
index acb7c0628749..000000000000
--- a/dev-util/debhelper/debhelper-8.1.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-8.1.0.ebuild,v 1.2 2011/02/14 14:17:19 jer 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="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 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}
-
-PATCH_VER=7.4.13
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-${PATCH_VER}-conditional-nls.patch
-
-	# Romove broken test
-	rm -f t/override_target
-}
-
-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/debhelper-8.1.1.ebuild b/dev-util/debhelper/debhelper-8.1.1.ebuild
deleted file mode 100644
index ba43741166bb..000000000000
--- a/dev-util/debhelper/debhelper-8.1.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-8.1.1.ebuild,v 1.2 2011/02/14 14:17:19 jer 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="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 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}
-
-PATCH_VER=7.4.13
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-${PATCH_VER}-conditional-nls.patch
-
-	# Romove broken test
-	rm -f t/override_target
-}
-
-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/debhelper-8.1.3.ebuild b/dev-util/debhelper/debhelper-8.1.3.ebuild
deleted file mode 100644
index 5496fe65b2c8..000000000000
--- a/dev-util/debhelper/debhelper-8.1.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-8.1.3.ebuild,v 1.1 2011/04/12 00:53:07 jer Exp $
-
-EAPI="3"
-
-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://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 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}
-
-PATCH_VER=7.4.13
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-${PATCH_VER}-conditional-nls.patch
-}
-
-src_compile() {
-	tc-export CC
-	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/debhelper-8.1.4.ebuild b/dev-util/debhelper/debhelper-8.1.4.ebuild
deleted file mode 100644
index 669a7542634d..000000000000
--- a/dev-util/debhelper/debhelper-8.1.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-8.1.4.ebuild,v 1.1 2011/04/27 00:10:35 jer Exp $
-
-EAPI="3"
-
-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://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 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}
-
-PATCH_VER=7.4.13
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-${PATCH_VER}-conditional-nls.patch
-}
-
-src_compile() {
-	tc-export CC
-	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/debhelper-8.1.6.ebuild b/dev-util/debhelper/debhelper-8.1.6.ebuild
deleted file mode 100644
index af0bc6cb5ee2..000000000000
--- a/dev-util/debhelper/debhelper-8.1.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-8.1.6.ebuild,v 1.1 2011/05/04 14:32:40 jer Exp $
-
-EAPI="3"
-
-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://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 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}
-
-PATCH_VER=7.4.13
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-${PATCH_VER}-conditional-nls.patch
-}
-
-src_compile() {
-	tc-export CC
-	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/debhelper-8.9.2.ebuild b/dev-util/debhelper/debhelper-8.9.2.ebuild
deleted file mode 100644
index 433dd933fe45..000000000000
--- a/dev-util/debhelper/debhelper-8.9.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-8.9.2.ebuild,v 1.1 2011/07/24 07:07:23 yvasilev Exp $
-
-EAPI="3"
-
-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://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 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}
-
-PATCH_VER=7.4.13
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-${PATCH_VER}-conditional-nls.patch
-}
-
-src_compile() {
-	tc-export CC
-	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/debhelper-8.9.3.ebuild b/dev-util/debhelper/debhelper-8.9.3.ebuild
deleted file mode 100644
index 5e30beccd7e3..000000000000
--- a/dev-util/debhelper/debhelper-8.9.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-8.9.3.ebuild,v 1.1 2011/07/26 01:16:52 jer Exp $
-
-EAPI="3"
-
-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://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 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}
-
-PATCH_VER=7.4.13
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-${PATCH_VER}-conditional-nls.patch
-}
-
-src_compile() {
-	tc-export CC
-	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/debhelper-9.20120115.ebuild b/dev-util/debhelper/debhelper-9.20120115.ebuild
index 04e965a0805e..f30e13d2a052 100644
--- a/dev-util/debhelper/debhelper-9.20120115.ebuild
+++ b/dev-util/debhelper/debhelper-9.20120115.ebuild
@@ -1,6 +1,6 @@
 # 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.20120115.ebuild,v 1.5 2012/03/15 02:14:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20120115.ebuild,v 1.6 2012/03/20 21:28:42 jer Exp $
 
 EAPI="4"
 
@@ -26,10 +26,8 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}
 
-PATCH_VER=7.4.13
-
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-${PATCH_VER}-conditional-nls.patch
+	epatch "${FILESDIR}"/${PN}-7.4.13-conditional-nls.patch
 }
 
 src_compile() {
diff --git a/dev-util/debhelper/debhelper-8.9.14.ebuild b/dev-util/debhelper/debhelper-9.20120312.ebuild
index a1cd776322de..fffb3e664732 100644
--- a/dev-util/debhelper/debhelper-8.9.14.ebuild
+++ b/dev-util/debhelper/debhelper-9.20120312.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-8.9.14.ebuild,v 1.1 2011/12/28 04:06:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20120312.ebuild,v 1.1 2012/03/20 21:28:42 jer Exp $
 
 EAPI="4"
 
@@ -26,10 +26,8 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}
 
-PATCH_VER=7.4.13
-
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-${PATCH_VER}-conditional-nls.patch
+	epatch "${FILESDIR}"/${PN}-7.4.13-conditional-nls.patch
 }
 
 src_compile() {
diff --git a/dev-util/debhelper/files/debhelper-7.2.16-conditional-nls.patch b/dev-util/debhelper/files/debhelper-7.2.16-conditional-nls.patch
deleted file mode 100644
index 764f53fdc2d6..000000000000
--- a/dev-util/debhelper/files/debhelper-7.2.16-conditional-nls.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naurp debhelper.orig/Makefile debhelper/Makefile
---- debhelper.orig/Makefile	2009-05-14 18:23:40.000000000 +0000
-+++ debhelper/Makefile	2009-06-22 14:10:47.000000000 +0000
-@@ -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 -L UTF-8 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" > \