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

Package-Manager: portage-2.1.7.17/cvs/Linux i686

7 files changed, 32 insertions, 222 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/Manifest b/dev-util/debhelper/Manifest
index a9e4a802192f..aeabeff74ad2 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -2,20 +2,14 @@ AUX debhelper-7.0.9-conditional-nls.patch 1151 RMD160 e58ded2daf651d327f726c66a8
 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.0.17.tar.gz 293812 RMD160 6293f07f378876f7faec23204c61cdaf6d8a6c3b SHA1 2e56c9e4c16d8942402b9bd2698a77410670c798 SHA256 626c669b4f6429fd9facc3ad4b4b5249a4f389936a60ba7ac5893764490a5c8a
-DIST debhelper_7.1.1.tar.gz 294685 RMD160 2c7e6e12149c59c0fef36ec631cc987c40fcffc0 SHA1 f715eddaf751f522cb6db8aa7bf717761fea277a SHA256 e226628deadbe44b03327512393fb9a6397245dbe402bd6935675bc5d3a1416c
-DIST debhelper_7.2.16.tar.gz 296705 RMD160 277308c59e58b354a8c5c68a324acb6f7963bdc6 SHA1 f8bb4c4a3c2f7534e4b456a9ce774cbfa1f3b797 SHA256 27ae471ccf60e347f64ad26d1e060ab9621c5be92443f4ff41a6c63b5817af68
-DIST debhelper_7.3.13.tar.gz 316532 RMD160 a3bb62959c7ad6dc5c418ec89c10a91bb6c4f051 SHA1 e9f1228baa9d209e746f6c6cd1bbb54c3121e43f SHA256 aa5fb5ae37ac280b21e02e621456fb1727c7c9079b70d4e7feeb2325acb489d8
-DIST debhelper_7.3.9.tar.gz 314035 RMD160 acf8331dd5419a8b747e893fceb71c8ce1363726 SHA1 067139f8b8ecd9a25465248da89e5db1188ff381 SHA256 f06cce1396613139b7d420077be6106c73d456146dc1b6a8ce0648d58794ab7b
 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
 EBUILD debhelper-7.0.16.ebuild 1603 RMD160 dbfcce5b731bc849f03be7db6d274d2a9f95ac8f SHA1 c68b40264c45c8228ef0b85b0a729155e093d586 SHA256 0b46bd97ecbcefa9029a589c98925dd7f009c6d113ba391e7cf903b167387651
-EBUILD debhelper-7.0.17.ebuild 1616 RMD160 085447c53983fc847514914d86f0b470e6422596 SHA1 abef39b0913cce14f9e6025bc94a465bbc42e483 SHA256 a9302db94945e1bda42f2229203f6ac304c54839b86ce1a8708f77f8b5f84603
-EBUILD debhelper-7.1.1-r1.ebuild 1644 RMD160 8872ebada39583bfc18c850409ff0f852c8a5af7 SHA1 3d73b1e7a92e97650fe2b7e67a47112eeb2f5fb4 SHA256 a1ec799f00cdcb08d8189039ee16143bd50863fd8e34c1bfcd0c071323ed99ca
-EBUILD debhelper-7.2.16.ebuild 1643 RMD160 68fd838474d3250a784552ee1d4142b766e21f2d SHA1 697e2afbe119673cc69dba6e97d63e064e4517cb SHA256 5088cd8eaeef738cfd180ab6148831a4d8428993985897c2f2b44b7d7c559748
-EBUILD debhelper-7.3.13.ebuild 1657 RMD160 50e6767c6ee265549f559982853810e791226ade SHA1 805bd61795a554618ac26068eb611f9151394595 SHA256 18393b123dafcc954ddc95998f8d82d4ba4357a5c22b47bbf3936324b4dc8f11
-EBUILD debhelper-7.3.9.ebuild 1642 RMD160 dcf47d0e7add15c96e6479bf122793470f2ce2cb SHA1 e9ea86c45ddc312cec2438a50b611d64911e4a12 SHA256 db938295c39a8835a9c27424d1d62193cfdb6fd536cdd07ae272724f4c9971bf
 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
-MISC ChangeLog 2788 RMD160 b53c2965f22087b0e07e6b470a21e158559d9870 SHA1 e4c646e9a6b4c05abe3082588a565e6471348be3 SHA256 55e747a834e97b1549b4c5abcab3ea9350413356929a6beaa8e826bbfb457287
+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
+MISC ChangeLog 3192 RMD160 ef90feb23a269c9819fc580e656643e3beef3876 SHA1 cfccb4d52021e04464077d9327545cfbb7f36dd1 SHA256 efacebfcc1c34c9c5f2f32c00b3cb1c407ba42ed8ffe00da9fe5dbff1097572d
 MISC metadata.xml 253 RMD160 61cf86d8c5005ed70e9a49dc153d8e18026f757c SHA1 3e444c2c43228d444ce9f7c76b0a94b7a6c4f676 SHA256 48311d41cb1ee3746c22ec0fd732ba3161677e785010c3f30e91888603cc1fa1
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}