Old.

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

4 files changed, 9 insertions, 105 deletions

diff --git a/dev-util/debhelper/ChangeLog b/dev-util/debhelper/ChangeLog
index 2eebba60cc34..c8da08677d90 100644
--- a/dev-util/debhelper/ChangeLog
+++ b/dev-util/debhelper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/debhelper
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/ChangeLog,v 1.91 2013/09/22 14:11:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/ChangeLog,v 1.92 2013/09/29 15:07:23 jer Exp $
+
+  29 Sep 2013; Jeroen Roovers <jer@gentoo.org> -debhelper-9.20120909.ebuild,
+  -files/debhelper-7.4.13-conditional-nls.patch:
+  Old.
 
 *debhelper-9.20130921 (22 Sep 2013)
 
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 9d1c86ff5f81..701fd26b49e2 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX debhelper-7.4.13-conditional-nls.patch 837 SHA256 c1113c3dca083c42f4a765e3135c933c0615f1094967e5161836ec4f0c21af6f SHA512 ee7402ac675af95323312758fc07868e126d0e5bed95a2923b0660a0bdf2f3a773705c5792f3f0037f321d18f8092b2739dba272920b2053e22fff62135e9877 WHIRLPOOL e7a0e27124f895851cb996d87fc28df654496150a9d4201b160d3366a32d5c03b667e1162cf54615d88a8b21b198fe5edda3f038f5a018770daa9cdce5ea0c32
-DIST debhelper_9.20120909.tar.gz 464785 SHA256 fabcdb9c41975ea0a1ccc66d6e065e424ed7a2119f6f1a6f7bfb7d06701370af SHA512 f1c417f0610b703d1b6ad9989078f03c67b11f45b1aa61f7d3f2fe8578dbc4d060da955c872c8e6326553ab4e7bbc21a1d9bebd9237e54d74c97f1297981384e WHIRLPOOL 72440752da24e29e5bb2e142d02b18b77472bf373b9c5a79ced790a5e6bb6e1cdec7521eb6e76b8833295441bd1062b9a94170d92dd9e9d5ed984e1ec6d9c88e
 DIST debhelper_9.20130630.tar.gz 474476 SHA256 fca28ff0dac3fdb21eb6ed154acc3cc39588211c395be3c3e7f684a7b8d11d46 SHA512 e6bff3582b6ea6b84fd71782ff9fd8584f1ef545ee9c42118aa61e2025f64bf7fb136241b809055a2aaf889e621764b1512c62e781abcbf8d8c0f0508f818712 WHIRLPOOL df2328dd62d44197229bdb9803842843d4e5bb7c9b1a58cc8c4b2db981d9cb21d72a3354881b6e4d97ade0d1cd8802073b05a917fa62772bfdbc75dd6a3ffbcd
 DIST debhelper_9.20130720.tar.gz 471494 SHA256 4128575e19c2a6dbe8bfe2af591976b6bc737bb9b5d89e91492c6d72c487b01f SHA512 3eebd766b22e28b0491e7f849a7f7b9cff323f6ab70fec97f62d5e3651aab199c3ecab7f5cc6543d024dcca55b99245db0085169d2bacb71169c984132f5155b WHIRLPOOL b339fc8a30bad83dbcf6137d419e9950a5dec823986e712a5b5cc8a19a379265d07e97b1ecde7b6a339cccf42522416ac88b0aa737db2b563f91c5093de33aa3
 DIST debhelper_9.20130921.tar.gz 471484 SHA256 c97315ee9781122ab1ed0fe247b7fc75067c2c31c24fda6f9cb6ef78e243a139 SHA512 f2daef5e6fcc1babc135a8375bef256ddbd78ce70a2a063d5c863469067b36f8210c5ac099d6778b0f5113c6916250e71beb067b25b80ee51c381bd95c2a55c0 WHIRLPOOL 897d00398c122c18876b853f479b57a747fd0ac2ed8f45c0ff0e898dd53a1f42e53966d71b958fb050252c4118f9458151d4103d3ef96d351f843e846eb4d8d9
-EBUILD debhelper-9.20120909.ebuild 1754 SHA256 b56191d5109dec66b936801c36ad13c0eff2a3048d7317e23fd4653c30cacf98 SHA512 c8c49652d084e4283d7ea2a1cc6a7b6291af3ecbd011e101add6821c7466ab5220a32aaad006e5c10d586ebe2360f3891198e4b6d3dc005aee2d35a96232355c WHIRLPOOL e54dfc1e54dc6fd13483a3643cdaf014fbf01a46fe4abd5fc8554ba00f4ffb098fac40fbb72ce21c5fd579029d346a646b50a7125ff2591c482422fbc9af2ab5
 EBUILD debhelper-9.20130630.ebuild 1669 SHA256 9f58bf51842886ed0bd0b275bdc979e5df605ff6b17f5c9fbefd2bd5ad6278f3 SHA512 8b88583de2d4a34e9c361f7416b0041042e85f11ca37ee63173b02a82d110752ffb1e87ba4d42e841c47981ebd145c9c066be0d9078861e1aae4dd2afa1f3240 WHIRLPOOL 72062a66fa13cb8262c66a21449d13bb3e8cad1b10472d207f9f0ff02a8e1dec1da8d1604ff5477ec5834829a56f553a3785dbbb1025bc1a7e62ceda782cc2f8
 EBUILD debhelper-9.20130720.ebuild 1678 SHA256 8a60bd7eac800ec25510293202ac517b3e9883243deabd96296b3530937bcfae SHA512 43a30deea7aa62899746ad01557ee8fae4aa3b86a5f921b0aab859e873bd4045e396f5dac5b961f247b8e84f705630f7f1a50ad1e2fe43a4c3ed24838a020848 WHIRLPOOL d0c02161a1137883e11af6fcaedfa54c428cbe83d93ccdb57261b926223b179314285bb86145825f12986a5530140cf6f9b738972d68df6cf6ebc0b613dec841
 EBUILD debhelper-9.20130921.ebuild 1678 SHA256 2b509a5cd933e3ad7fa1d22a84bf62a8dc87e8d7268673b8c5e55e8fa158ebd3 SHA512 f807bdb6b573d7457ecbafce92ab81fd3bb983618ceed437230ca532700a3d6496efd5b914ab2399c7f6ef55c7b5ee6c10847dc4e9119a1eee59e6cf7a419910 WHIRLPOOL fcedffa9dc2bb54c239c160cb6c219a510b530bb1a9aaef896a73080da3d9738e7b3d50c35ea22b31a0aa355739aa9711619e189688c2e4dc3d54680f1d37209
-MISC ChangeLog 13355 SHA256 92a7900b06b6f18547a759cabdd9256471861e68db51bfcab188e8dbe6f9ac99 SHA512 2df2f2391dc9f45ed94ee2bf78d9ca951859df54197cc8876860a04f5f9a8a1cffab67f4d63496df49c7f9043524b88231bdc1b903971ccf7655250dc7df297b WHIRLPOOL 3ce6995619157240941a342851ccfb1276b6f1db099abec8a8e8c6fa5e22e57de852b7158b16c2941a8f77965da89311fc96f4386304d953d2f8513f51f1ca58
+MISC ChangeLog 13489 SHA256 e98f955fda260de8de3337a1b4de359a7fa535c277025f9b886791a49aa1ceb4 SHA512 d20ad97de720ffe4e68380c170c5d408e58deeff5d0a023b2887a605bb3cbc22e88084e292dbba605a1c7f0867e0018c371725731fb4e6ca601c342373582e1f WHIRLPOOL 97f5995eb7811d30813602e5a02d43d108e2b3863b2888ff31ab2b1c643db5ee77539ee18269cc026055314b857bc7ef332204ef0c4303114e2ac27600f76c99
 MISC metadata.xml 162 SHA256 316a32c1e8ee9f6548707abec9a803d0a19feea1be10a19273cc04e0cd357644 SHA512 89446121b0be8d0f8bb5160fd33ecddf47ae2994022c0e6fe5caba7bbb9b0bb35337011373c20734bb683d8e172ff88a19aab3ea7354f7786832a5e5fcaf39a8 WHIRLPOOL b214dc4f7f8de7edc5034a877c2ca2c18fbe6b5a1db3a758f0e21328b25d7139961a6b18feed6ac5c09e09d8f61ebd38eed03362212d81aa6f468e8c41c7ca55
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlI++ngACgkQVWmRsqeSphOGIQCdG1rvIE/rjn6kW5ALPNbyilFY
-W5AAn3JuXtXC1rAYBmhMBw7/lOvvAZQ0
-=mejx
+iEYEAREIAAYFAlJIQiwACgkQVWmRsqeSphPEOACfTSkVzvx6O74ciNtteQWt+DNk
+3MoAn3Gizt6ZqN+n4egQZyBDL0QQ2tCJ
+=5qAH
 -----END PGP SIGNATURE-----
diff --git a/dev-util/debhelper/debhelper-9.20120909.ebuild b/dev-util/debhelper/debhelper-9.20120909.ebuild
deleted file mode 100644
index 741951b9fb6b..000000000000
--- a/dev-util/debhelper/debhelper-9.20120909.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20120909.ebuild,v 1.7 2012/10/14 18:55:24 armin76 Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
-IUSE="nls linguas_de linguas_es linguas_fr test"
-
-RDEPEND="app-arch/dpkg
-	dev-perl/TimeDate
-	virtual/perl-Getopt-Long
-	>=dev-lang/perl-5.10"
-
-DEPEND="${RDEPEND}
-	nls? ( >=app-text/po4a-0.24 )
-	test? ( dev-perl/Test-Pod )"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7.4.13-conditional-nls.patch
-}
-
-src_compile() {
-	tc-export CC
-	local USE_NLS=no LANGS=""
-
-	use nls && USE_NLS=yes
-
-	use linguas_de && LANGS="${LANGS} de"
-	use linguas_es && LANGS="${LANGS} es"
-	use linguas_fr && LANGS="${LANGS} fr"
-
-	emake USE_NLS=${USE_NLS} LANGS="${LANGS}" build
-}
-
-src_install() {
-	default
-	dodoc doc/* debian/changelog
-	docinto examples
-	dodoc examples/*
-	for manfile in *.1 *.7 ; do
-		case ${manfile} in
-			*.de.?)	use linguas_de \
-					&& cp ${manfile} "${T}"/${manfile/.de/} \
-					&& doman -i18n=de "${T}"/${manfile/.de/}
-				;;
-			*.es.?)	use linguas_es \
-					&& cp ${manfile} "${T}"/${manfile/.es/} \
-					&& doman -i18n=es "${T}"/${manfile/.es/}
-				;;
-			*.fr.?)	use linguas_fr \
-					&& cp ${manfile} "${T}"/${manfile/.fr/} \
-					&& doman -i18n=fr "${T}"/${manfile/.fr/}
-				;;
-			*)	doman ${manfile}
-				;;
-		esac
-	done
-}
diff --git a/dev-util/debhelper/files/debhelper-7.4.13-conditional-nls.patch b/dev-util/debhelper/files/debhelper-7.4.13-conditional-nls.patch
deleted file mode 100644
index 391fa1dcf92e..000000000000
--- a/dev-util/debhelper/files/debhelper-7.4.13-conditional-nls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/debhelper/Makefile
-+++ b/debhelper/Makefile
-@@ -34,12 +34,17 @@ PERLLIBDIR=$(shell perl -MConfig -e 'pri
- 
- POD2MAN=pod2man --utf8 -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 debhelper.7
- 	find . -maxdepth 1 -type f -perm +100 -name "dh*" \
- 		-exec $(POD2MAN) {} {}.1 \;
-+ifeq ($(USE_NLS),yes)
- 	po4a --previous -L UTF-8 man/po4a/po4a.cfg 
- 	set -e; \
- 	for lang in $(LANGS); do \
-@@ -54,6 +59,7 @@ build: version debhelper.7
- 				$(POD2MAN) --name="debhelper" --section=7 > debhelper.$$lang.7; \
- 		fi; \
- 	done
-+endif
- 
- version:
- 	printf "package Debian::Debhelper::Dh_Version;\n\$$version='$(VERSION)';\n1" > \