Version bump.

(Portage version: 2.2.0_alpha93/cvs/Linux x86_64)

17 files changed, 20 insertions, 858 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/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" > \