Adding patch for compilation against dev-libs/popt-1.12, as N is already defined in popt.h. This keeps it working with current stable dev-libs/popt, which doesn't have the define in popt.h. Thanks to Preston Crow <pc_gentoo_bugzilla at crowcastle.net> in #201958 for the idea.

Package-Manager: portage-2.1.3.19

4 files changed, 38 insertions, 21 deletions

diff --git a/net-misc/pump/ChangeLog b/net-misc/pump/ChangeLog
index f1f0355d6368..72abc838e464 100644
--- a/net-misc/pump/ChangeLog
+++ b/net-misc/pump/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/pump
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pump/ChangeLog,v 1.38 2007/12/25 16:26:45 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pump/ChangeLog,v 1.39 2007/12/29 20:04:20 phreak Exp $
+
+  29 Dec 2007; Christian Heim <phreak@gentoo.org>
+  +files/pump-0.8.24-redefinition.patch, pump-0.8.24.ebuild:
+  Adding patch for compilation against dev-libs/popt-1.12, as N is already
+  defined in popt.h. This keeps it working with current stable dev-libs/popt,
+  which doesn't have the define in popt.h. Thanks to Preston Crow
+  <pc_gentoo_bugzilla at crowcastle.net> in #201958 for the idea.
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing uberlord from metadata.xml as per #199318. Assigning to
diff --git a/net-misc/pump/Manifest b/net-misc/pump/Manifest
index 17e712f74d18..8a61a6ae351d 100644
--- a/net-misc/pump/Manifest
+++ b/net-misc/pump/Manifest
@@ -1,20 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pump-0.8.24-gentoo.patch 17176 RMD160 e3f082c03b6ec24063318aa94f25759f4f69727f SHA1 4bf9893ea888f9ce39d3cd3e1a5d5a492eea13bd SHA256 c68a0f43797d0c845fa3a08a33134035032a9c1bec1dc2cf612a1768d81117fa
 MD5 cc32c61fb2421420bb01e8a55babb951 files/pump-0.8.24-gentoo.patch 17176
 RMD160 e3f082c03b6ec24063318aa94f25759f4f69727f files/pump-0.8.24-gentoo.patch 17176
 SHA256 c68a0f43797d0c845fa3a08a33134035032a9c1bec1dc2cf612a1768d81117fa files/pump-0.8.24-gentoo.patch 17176
+AUX pump-0.8.24-redefinition.patch 294 RMD160 29be68f849eeec0009d6519939739334ebd1b52f SHA1 673073391e3b84c8dd05203751293d4414c94fd1 SHA256 5a1084f5047fdba99470ae355ec645bd915ce2f188ae80c6d247d6434766866c
+MD5 cdfa8db0b9b55028aedb887eceea9d87 files/pump-0.8.24-redefinition.patch 294
+RMD160 29be68f849eeec0009d6519939739334ebd1b52f files/pump-0.8.24-redefinition.patch 294
+SHA256 5a1084f5047fdba99470ae355ec645bd915ce2f188ae80c6d247d6434766866c files/pump-0.8.24-redefinition.patch 294
 DIST pump_0.8.24-1.diff.gz 22547 RMD160 c6e34a72ea360f267801d20e15c9064eaa3728c7 SHA1 da384261d0bcba72c1fb8f99bcc4dbf3fb48b6bb SHA256 fa08bbcf061171b3aaecaea854061316bfeee860921ba77f742c2ffa099cea85
 DIST pump_0.8.24.orig.tar.gz 79790 RMD160 5bb96340dc6f1016b354e2a22e6396e7098d23f4 SHA1 e4b5f39419f9f2f0f88ef53ce0647dab40d35058 SHA256 cbb423942a4295a07a23b76a02d645b76b4ac0b58c3a30076ad42c2ab80c2dba
-EBUILD pump-0.8.24.ebuild 1571 RMD160 252a317b8bf77f96e1846158d9b556c4b2579551 SHA1 a43ed55ce07fe89c908b677a0138e0d510cd47d9 SHA256 92f56b11629bcb5eab3b4c5456d50065a74fc7a429543b47f9e6b73650ccb0fc
-MD5 acf5bcdb5afed26e27dad945ece2e881 pump-0.8.24.ebuild 1571
-RMD160 252a317b8bf77f96e1846158d9b556c4b2579551 pump-0.8.24.ebuild 1571
-SHA256 92f56b11629bcb5eab3b4c5456d50065a74fc7a429543b47f9e6b73650ccb0fc pump-0.8.24.ebuild 1571
-MISC ChangeLog 6054 RMD160 a85c9d5fac32b3b9e6dd39aacefe2192e9ce1300 SHA1 2860fc49b5d6de01c3b0a28d4e59fd0d5377ce4d SHA256 66ad6b357bab01e2190085ff67a4a55a298bd097e613d477a4352b9ee7ab2297
-MD5 514fbeebad2bdedd792c03576bec8ad8 ChangeLog 6054
-RMD160 a85c9d5fac32b3b9e6dd39aacefe2192e9ce1300 ChangeLog 6054
-SHA256 66ad6b357bab01e2190085ff67a4a55a298bd097e613d477a4352b9ee7ab2297 ChangeLog 6054
+EBUILD pump-0.8.24.ebuild 1706 RMD160 f933ac8ff43205ef62d5b95907c475f1d5cc5449 SHA1 b43636c1b46bbe63c29a679dd47935fd3e0155d9 SHA256 492401ab348bb64725523080605459b3377e936536ee740ed7cd57f99dcd7a1b
+MD5 45e67018ba8bedfd6bd99d9f965924c5 pump-0.8.24.ebuild 1706
+RMD160 f933ac8ff43205ef62d5b95907c475f1d5cc5449 pump-0.8.24.ebuild 1706
+SHA256 492401ab348bb64725523080605459b3377e936536ee740ed7cd57f99dcd7a1b pump-0.8.24.ebuild 1706
+MISC ChangeLog 6451 RMD160 0b87788f8fdb9ec5f97bdf67c686189cd37804ca SHA1 a08d7a1fa00066fd3ae1d1a3ca0f5b08593a7a8d SHA256 a4412d0ceed20fbe7d2f098090d7961897801c9b8dc5305458b69101d8f1483b
+MD5 1aecf4fee732fa7f3fa37647d88dd348 ChangeLog 6451
+RMD160 0b87788f8fdb9ec5f97bdf67c686189cd37804ca ChangeLog 6451
+SHA256 a4412d0ceed20fbe7d2f098090d7961897801c9b8dc5305458b69101d8f1483b ChangeLog 6451
 MISC metadata.xml 307 RMD160 90264fc5e479e9e96de3f4c24d4bd8d9e0890dad SHA1 6bf7b7bbb736d5762ccc767fad61898dcd1bf267 SHA256 e2aea9a329b57b924dc5cfddbd3de11c64079f87c5bd1c5f7373d75e1eea9d55
 MD5 3b2d9539cc96e8de37aa75b9a0683705 metadata.xml 307
 RMD160 90264fc5e479e9e96de3f4c24d4bd8d9e0890dad metadata.xml 307
@@ -22,10 +23,3 @@ SHA256 e2aea9a329b57b924dc5cfddbd3de11c64079f87c5bd1c5f7373d75e1eea9d55 metadata
 MD5 f6532b7d7e0ae1c2bd4ae1d80a966600 files/digest-pump-0.8.24 488
 RMD160 16093ffa996de074ae0080a66737294d361d01c2 files/digest-pump-0.8.24 488
 SHA256 62904a92b319e7d3ebfb55427522872444019ce276134bfb016f4d4fcb55d006 files/digest-pump-0.8.24 488
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHcS9KyuNVb5qfaOYRAp4uAJ9we6rTmylN4ulA0qH1WYwCVKUjkACfQzMM
-IuaPWhuypD3yVM4hUZBZiag=
-=mJpd
------END PGP SIGNATURE-----
diff --git a/net-misc/pump/files/pump-0.8.24-redefinition.patch b/net-misc/pump/files/pump-0.8.24-redefinition.patch
new file mode 100644
index 000000000000..83543379b74d
--- /dev/null
+++ b/net-misc/pump/files/pump-0.8.24-redefinition.patch
@@ -0,0 +1,12 @@
+--- pump-0.8.24/pump.c.orig	2007-12-29 19:51:22.000000000 +0000
++++ pump-0.8.24/pump.c	2007-12-29 19:52:00.000000000 +0000
+@@ -58,7 +58,9 @@
+ int bootp_server_port;
+ #endif
+ 
++#if !defined(N_)
+ #define N_(foo) (foo)
++#endif
+ 
+ #define PROGNAME "pump"
+ #define CONTROLSOCKET "/var/run/pump.sock"
\ No newline at end of file
diff --git a/net-misc/pump/pump-0.8.24.ebuild b/net-misc/pump/pump-0.8.24.ebuild
index 695212d49614..37712834ccdb 100644
--- a/net-misc/pump/pump-0.8.24.ebuild
+++ b/net-misc/pump/pump-0.8.24.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.ebuild,v 1.8 2006/09/26 05:37:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pump/pump-0.8.24.ebuild,v 1.9 2007/12/29 20:04:20 phreak Exp $
 
 inherit eutils
 
@@ -33,6 +33,10 @@ src_unpack() {
 	# Enable the creation of /etc/ntp.conf and the --no-ntp option
 	epatch "${FILESDIR}/pump-${PV}-gentoo.patch"
 
+	# Add an if defined around the definition of foo, just like in popt.h
+	# Fixes #201958
+	epatch "${FILESDIR}/${P}-redefinition.patch"
+
 	# Only install specific po files if LINGUAS is set
 	if [[ -n ${LINGUAS} ]]; then
 		cd po