Revision bump, see bug #258582. Changed maintainer.

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

4 files changed, 38 insertions, 21 deletions

diff --git a/net-misc/pump/ChangeLog b/net-misc/pump/ChangeLog
index 73ff76e45797..75a6057a58a5 100644
--- a/net-misc/pump/ChangeLog
+++ b/net-misc/pump/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/pump
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pump/ChangeLog,v 1.40 2008/12/23 16:30:51 mpagano Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pump/ChangeLog,v 1.41 2009/02/12 20:37:12 nelchael Exp $
+
+*pump-0.8.24-r2 (12 Feb 2009)
+
+  12 Feb 2009; Krzysiek Pawlik <nelchael@gentoo.org> metadata.xml,
+  -pump-0.8.24-r1.ebuild, +pump-0.8.24-r2.ebuild:
+  Revision bump, see bug #258582. Changed maintainer.
 
 *pump-0.8.24-r1 (23 Dec 2008)
 
diff --git a/net-misc/pump/Manifest b/net-misc/pump/Manifest
index c824017ba7af..9a8ba29a9dca 100644
--- a/net-misc/pump/Manifest
+++ b/net-misc/pump/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pump-0.8.24-gentoo.patch 17176 RMD160 e3f082c03b6ec24063318aa94f25759f4f69727f SHA1 4bf9893ea888f9ce39d3cd3e1a5d5a492eea13bd SHA256 c68a0f43797d0c845fa3a08a33134035032a9c1bec1dc2cf612a1768d81117fa
 AUX pump-0.8.24-redefinition.patch 294 RMD160 29be68f849eeec0009d6519939739334ebd1b52f SHA1 673073391e3b84c8dd05203751293d4414c94fd1 SHA256 5a1084f5047fdba99470ae355ec645bd915ce2f188ae80c6d247d6434766866c
+DIST pump-0.8.24-patches.tar.bz2 5980 RMD160 06c89021e1bc619cfaca613ad68d4265a67b7929 SHA1 eaf093bc4b298a2200c3314f09848e71241ae275 SHA256 2c071cfc8987730f76e8b7205e80bc87d09b8e0af3558b4f134ec34f1696f03b
 DIST pump_0.8.24-1.diff.gz 22547 RMD160 c6e34a72ea360f267801d20e15c9064eaa3728c7 SHA1 da384261d0bcba72c1fb8f99bcc4dbf3fb48b6bb SHA256 fa08bbcf061171b3aaecaea854061316bfeee860921ba77f742c2ffa099cea85
 DIST pump_0.8.24-5.diff.gz 22842 RMD160 8136279c0f8752291f0d4c95a3248540db498438 SHA1 8b45f8973bbb2a231174dc003614096b4f762200 SHA256 211504a279927d74c08fe5ca734af6905b14d25a98072385a6133df803bc66fe
 DIST pump_0.8.24.orig.tar.gz 79790 RMD160 5bb96340dc6f1016b354e2a22e6396e7098d23f4 SHA1 e4b5f39419f9f2f0f88ef53ce0647dab40d35058 SHA256 cbb423942a4295a07a23b76a02d645b76b4ac0b58c3a30076ad42c2ab80c2dba
-EBUILD pump-0.8.24-r1.ebuild 1700 RMD160 627a5c768e85903b7a14f780a77b5d39bd378d83 SHA1 c555953cac7f86e303cc1d3f569b0590b3652377 SHA256 62ffa7e2618b9fadbc88cfc0351b0d35211e5c7175be59d11c8ade1ff73a8bac
+EBUILD pump-0.8.24-r2.ebuild 1485 RMD160 08b5db2c307658c614d83c770e3102d263bc30dc SHA1 646311b2da33c64ddcfce5b62bb25715d738e9b1 SHA256 b3611d682b4dade059776b47be03022cbcca5763d76ee9f30dba7ff7b9407f19
 EBUILD pump-0.8.24.ebuild 1690 RMD160 d7cbcc60b2c4974acb47e71606484cffd7337cae SHA1 7e5e2863e77d99f52933d1a6d28220d044cf44e6 SHA256 683aa4d1c97c1f357801f92a0762ece98164610ba7d64d749ea23e90d42e233b
-MISC ChangeLog 6617 RMD160 369578f05c0e7a604804922db923b58a503f9406 SHA1 29c8e6d1cf727b443869496d1c0374a9a95f7896 SHA256 793738d4bb69caddab0c4089c72353537a0db68e4d89b6eb7d4aa093ea8422d2
-MISC metadata.xml 307 RMD160 90264fc5e479e9e96de3f4c24d4bd8d9e0890dad SHA1 6bf7b7bbb736d5762ccc767fad61898dcd1bf267 SHA256 e2aea9a329b57b924dc5cfddbd3de11c64079f87c5bd1c5f7373d75e1eea9d55
+MISC ChangeLog 6821 RMD160 0a4cace10afa57a1120bd8c78d59b24012b3f351 SHA1 da432642e02869ccf8dea9aa39966206db561254 SHA256 6fa51f01c496fc88f5dd5e660a7af9b389d1564371c4323f1982b0d6a2f371ec
+MISC metadata.xml 298 RMD160 c300c459409c3038d406ceb4638ef004f666a282 SHA1 b2a9e5dd5436bace3723e31fa1544c7460f7f58e SHA256 eefdf9a89dc8777fa34efb1d3df7fdb02c4f6e23db528546bff28e71f40ff7a9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmUiH0ACgkQgo/w9rxVVVF3qQCgg1DfoBcoJBY+qmFkuDgh3fvj
+2LsAn3RaP1H8o+eTBvbZceCgkITHPduG
+=E2q/
+-----END PGP SIGNATURE-----
diff --git a/net-misc/pump/metadata.xml b/net-misc/pump/metadata.xml
index 3646b7c84d32..650d98155434 100644
--- a/net-misc/pump/metadata.xml
+++ b/net-misc/pump/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>nelchael@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">
 		A DHCP/BOOTP client
diff --git a/net-misc/pump/pump-0.8.24-r1.ebuild b/net-misc/pump/pump-0.8.24-r2.ebuild
index d8d77eaa0c59..fbe1f3ab5588 100644
--- a/net-misc/pump/pump-0.8.24-r1.ebuild
+++ b/net-misc/pump/pump-0.8.24-r2.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pump/pump-0.8.24-r1.ebuild,v 1.1 2008/12/23 16:30:51 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pump/pump-0.8.24-r2.ebuild,v 1.1 2009/02/12 20:37:12 nelchael Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 PATCHLEVEL="5"
 
 DESCRIPTION="This is the DHCP/BOOTP client written by RedHat"
 HOMEPAGE="http://ftp.debian.org/debian/pool/main/p/pump/"
 SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.gz
-	mirror://debian/pool/main/p/${PN}/${PN}_${PV}-${PATCHLEVEL}.diff.gz"
+	mirror://debian/pool/main/p/${PN}/${PN}_${PV}-${PATCHLEVEL}.diff.gz
+	mirror://gentoo/${P}-patches.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,24 +18,23 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=dev-libs/popt-1.5"
+RDEPEND="${DEPEND}"
 PROVIDE="virtual/dhcpc"
 
 src_unpack() {
-	cd "${WORKDIR}"
-	unpack "${PN}_${PV}.orig.tar.gz"
+	unpack ${A}
 	cd "${S}"
 
 	# Apply Debians pump patchset - they fix things good :)
-	epatch "${DISTDIR}/${PN}_${PV}-${PATCHLEVEL}.diff.gz"
+	epatch "${WORKDIR}/${PN}_${PV}-${PATCHLEVEL}.diff"
 
-	# Enable the -m (--route-metric) option to specify the default
-	# metric applied to routes
-	# Enable the --keep-up option to keep interfaces up when we release
-	# Enable the creation of /etc/ntp.conf and the --no-ntp option
-	epatch "${FILESDIR}/pump-${PV}-gentoo.patch"
+	for i in "${WORKDIR}/${PV}/"*; do
+		epatch "${i}"
+	done
 
-	# Add an if defined around the definition of foo, just like in popt.h
-	epatch "${FILESDIR}/${P}-redefinition.patch"
+	sed -i \
+		-e 's,-Werror -g,,' \
+		Makefile || die "sed failed"
 
 	# Only install specific po files if LINGUAS is set
 	if [[ -n ${LINGUAS} ]]; then
@@ -47,7 +47,7 @@ src_unpack() {
 }
 
 src_compile() {
-	make DEB_CFLAGS="-fPIC ${CFLAGS}" pump || die
+	make CC="$(tc-getCC)" DEB_CFLAGS="-fPIC ${CFLAGS}" pump || die
 }
 
 src_install() {