Version bump to latest upstream stable (7.4.20) and testing (7.9.1) + old versions cleanup.

(Portage version: 2.1.7.17/cvs/Linux i686)

6 files changed, 27 insertions, 211 deletions

diff --git a/dev-util/debhelper/ChangeLog b/dev-util/debhelper/ChangeLog
index bfbd1b43f8a6..64537c0f6bf4 100644
--- a/dev-util/debhelper/ChangeLog
+++ b/dev-util/debhelper/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-util/debhelper
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/ChangeLog,v 1.16 2010/04/09 05:50:54 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/ChangeLog,v 1.17 2010/06/25 04:32:41 yvasilev Exp $
+
+*debhelper-7.9.1 (25 Jun 2010)
+*debhelper-7.4.20 (25 Jun 2010)
+
+  25 Jun 2010; Yuri Vasilevski <yvasilev@gentoo.org>
+  -debhelper-7.0.17.ebuild, -debhelper-7.1.1-r1.ebuild,
+  -debhelper-7.2.16.ebuild, -debhelper-7.3.9.ebuild,
+  -debhelper-7.3.13.ebuild, +debhelper-7.4.20.ebuild,
+  +debhelper-7.9.1.ebuild:
+  Version bump to latest upstream stable (7.4.20) and testing (7.9.1) + old
+  versions cleanup.
 
 *debhelper-7.4.17 (09 Apr 2010)
 
diff --git a/dev-util/debhelper/debhelper-7.0.17.ebuild b/dev-util/debhelper/debhelper-7.0.17.ebuild
deleted file mode 100644
index 4219536a42ae..000000000000
--- a/dev-util/debhelper/debhelper-7.0.17.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.17.ebuild,v 1.1 2008/10/20 20:19:00 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="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}
-
-PATCH_VER=7.0.9
-
-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.1.1-r1.ebuild b/dev-util/debhelper/debhelper-7.1.1-r1.ebuild
deleted file mode 100644
index 8b9fe636789d..000000000000
--- a/dev-util/debhelper/debhelper-7.1.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2008-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-7.1.1-r1.ebuild,v 1.1 2009/04/02 16:59:48 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="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
-	virtual/perl-Getopt-Long
-	dev-lang/perl"
-
-DEPEND="${RDEPEND}
-	nls? ( >=app-text/po4a-0.24 )"
-
-S="${WORKDIR}"/${PN}
-
-PATCH_VER=7.0.9
-
-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.2.16.ebuild b/dev-util/debhelper/debhelper-7.2.16.ebuild
deleted file mode 100644
index be9b9b2b2361..000000000000
--- a/dev-util/debhelper/debhelper-7.2.16.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-7.2.16.ebuild,v 1.1 2009/06/22 14:22:00 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="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
-	virtual/perl-Getopt-Long
-	dev-lang/perl"
-
-DEPEND="${RDEPEND}
-	nls? ( >=app-text/po4a-0.24 )"
-
-S="${WORKDIR}"/${PN}
-
-PATCH_VER=7.2.16
-
-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.3.9.ebuild b/dev-util/debhelper/debhelper-7.4.20.ebuild
index 17014e21a573..9325bc2128bf 100644
--- a/dev-util/debhelper/debhelper-7.3.9.ebuild
+++ b/dev-util/debhelper/debhelper-7.4.20.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.3.9.ebuild,v 1.1 2009/08/05 14:19:19 yvasilev Exp $
+# $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="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
+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"
+IUSE="nls linguas_es linguas_fr test"
 
 RDEPEND="app-arch/dpkg
 	dev-perl/TimeDate
 	virtual/perl-Getopt-Long
-	dev-lang/perl"
+	>=dev-lang/perl-5.10"
 
 DEPEND="${RDEPEND}
-	nls? ( >=app-text/po4a-0.24 )"
+	nls? ( >=app-text/po4a-0.24 )
+	test? ( dev-perl/Test-Pod )"
 
 S="${WORKDIR}"/${PN}
 
-PATCH_VER=7.2.16
+PATCH_VER=7.4.13
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-util/debhelper/debhelper-7.3.13.ebuild b/dev-util/debhelper/debhelper-7.9.1.ebuild
index 66e02b0751f7..72ed841bc484 100644
--- a/dev-util/debhelper/debhelper-7.3.13.ebuild
+++ b/dev-util/debhelper/debhelper-7.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.3.13.ebuild,v 1.1 2009/09/29 18:00:42 yvasilev Exp $
+# $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
 
@@ -11,19 +11,20 @@ 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"
+IUSE="nls linguas_es linguas_fr test"
 
 RDEPEND="app-arch/dpkg
 	dev-perl/TimeDate
 	virtual/perl-Getopt-Long
-	dev-lang/perl"
+	>=dev-lang/perl-5.10"
 
 DEPEND="${RDEPEND}
-	nls? ( >=app-text/po4a-0.24 )"
+	nls? ( >=app-text/po4a-0.24 )
+	test? ( dev-perl/Test-Pod )"
 
 S="${WORKDIR}"/${PN}
 
-PATCH_VER=7.2.16
+PATCH_VER=7.4.13
 
 src_unpack() {
 	unpack ${A}