Remove old version.

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

5 files changed, 17 insertions, 637 deletions

diff --git a/net-misc/pump/ChangeLog b/net-misc/pump/ChangeLog
index bc91a47ee89b..7991365358a4 100644
--- a/net-misc/pump/ChangeLog
+++ b/net-misc/pump/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/pump
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pump/ChangeLog,v 1.47 2009/04/29 12:32:09 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pump/ChangeLog,v 1.48 2009/05/02 20:45:15 nelchael Exp $
+
+  02 May 2009; Krzysiek Pawlik <nelchael@gentoo.org> -pump-0.8.24.ebuild,
+  -files/pump-0.8.24-gentoo.patch, -files/pump-0.8.24-redefinition.patch:
+  Remove old version.
 
   29 Apr 2009; Jeroen Roovers <jer@gentoo.org> pump-0.8.24-r3.ebuild:
   Stable for HPPA (bug #264688).
diff --git a/net-misc/pump/Manifest b/net-misc/pump/Manifest
index a73ece7cefa1..8b79fd1b8d69 100644
--- a/net-misc/pump/Manifest
+++ b/net-misc/pump/Manifest
@@ -1,10 +1,16 @@
-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
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST pump-0.8.24-1-patches.tar.bz2 6381 RMD160 04e5e9e8803f79d143b4fce33750c937bec90484 SHA1 9e170626cd47103ce2ce6fb2e1657593500fcfb5 SHA256 8d2d642c263e4d0f5bcaef1f23495b8fb6c2a098d52a332965026bcb62bf5d95
-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-r3.ebuild 1409 RMD160 7b2b6c3d9ffb797036bbb3e4c48f63c597d1e987 SHA1 45a1e0bf97e25ea8825ad5c98fddfe3d35de0595 SHA256 22489d46d315c7422f75c585aef381a9c3f81ddb3f0945906d6142714ec4f575
-EBUILD pump-0.8.24.ebuild 1690 RMD160 d7cbcc60b2c4974acb47e71606484cffd7337cae SHA1 7e5e2863e77d99f52933d1a6d28220d044cf44e6 SHA256 683aa4d1c97c1f357801f92a0762ece98164610ba7d64d749ea23e90d42e233b
-MISC ChangeLog 7525 RMD160 69bf213f7bb4e6520d883f3dc4c1935247867bab SHA1 6a92daa8ad33ed1500462d5ff0dc6db31fb872e8 SHA256 4fc93fb9fc4e961e82918f42d920f4526704e83e3587b4bd3238bcfb1a706bd2
+MISC ChangeLog 7701 RMD160 e5f3021dc933d1646b4304359a6090e532c2a581 SHA1 be965b1fdf1c616cf0aa428d553b448b30f28c95 SHA256 3b9e129b072eb82c7cd44499fbd9acd23d80fd7986117dd49e73f1e60d770b66
 MISC metadata.xml 298 RMD160 c300c459409c3038d406ceb4638ef004f666a282 SHA1 b2a9e5dd5436bace3723e31fa1544c7460f7f58e SHA256 eefdf9a89dc8777fa34efb1d3df7fdb02c4f6e23db528546bff28e71f40ff7a9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkn8sOAACgkQgo/w9rxVVVEzJwCeJcLpJ/Uh6kFgUNEukzU5LwGB
+2h0AmwQrv/ZOHm4pnE0Q8jY/VYWbMnSz
+=hyd/
+-----END PGP SIGNATURE-----
diff --git a/net-misc/pump/files/pump-0.8.24-gentoo.patch b/net-misc/pump/files/pump-0.8.24-gentoo.patch
deleted file mode 100644
index 1e57ed9cc638..000000000000
--- a/net-misc/pump/files/pump-0.8.24-gentoo.patch
+++ /dev/null
@@ -1,552 +0,0 @@
---- pump-0.8.24/config.c
-+++ pump-0.8.24/config.c
-@@ -155,15 +155,26 @@
- 	    }
- 
- 	    override->numRetries = num;
--	} else if (!strcmp(start, "domainsearch")) {
--	    size_t len;
-+	} else if (!strcmp(start, "routemetric")) {
-+	    poptParseArgvString(rest, &argc, &argv);
- 
--	    if (overrideList != override) {
--		parseError(*lineNum, "domainsearch directive may not occur "
--			   "inside of device specification");
-+	    if (argc != 1) {
-+		parseError(*lineNum, "routemetric directive expects a "
-+			   "single argument");
- 		return 1;
- 	    }
- 
-+	    num = strtol(argv[0], &chptr, 0);
-+	    if (*chptr) {
-+		parseError(*lineNum, "routemetric requires a numeric "
-+			   "argument");
-+		return 1;
-+	    }
-+
-+	    override->routeMetric = num;
-+	} else if (!strcmp(start, "domainsearch")) {
-+	    size_t len;
-+
- 	    poptParseArgvString(rest, &argc, &argv);
- 
- 	    if (argc != 1) {
-@@ -209,6 +220,12 @@
- 		return 1;
- 	    }
- 	    override->flags |= OVERRIDE_FLAG_NONISDOMAIN;
-+	} else if (!strcmp(start, "nontp")) {
-+	    if (*rest) {
-+		parseError(*lineNum, "unexpected argument to nontp directive");
-+		return 1;
-+	    }
-+	    override->flags |= OVERRIDE_FLAG_NONTP;
- 	} else if (!strcmp(start, "nosetup")) {
- 	    if (*rest) {
- 		parseError(*lineNum, "unexpected argument to nosetup directive");
-@@ -228,12 +245,6 @@
- 	} else if (!strcmp(start, "script")) {
- 	    size_t len;
- 
--	    if (overrideList != override) {
--		parseError(*lineNum, "script directive may not occur "
--			   "inside of device specification");
--		return 1;
--	    }
--
- 	    poptParseArgvString(rest, &argc, &argv);
- 
- 	    if (argc != 1) {
---- pump-0.8.24/dhcp.c
-+++ pump-0.8.24/dhcp.c
-@@ -204,16 +204,30 @@
- 
- char * pumpDisableInterface(struct pumpNetIntf * intf) {
-     struct ifreq req;
-+    struct sockaddr_in * addrp;
-     int s;
- 
-     if (intf->flags & PUMP_FLAG_NOSETUP)
- 	return NULL;
- 
-     s = socket(AF_INET, SOCK_DGRAM, 0);
--	
--    memset(&req,0,sizeof(req));
- 
-+    memset(&req,0,sizeof(req));
-     strcpy(req.ifr_name, intf->device);
-+
-+    addrp = (struct sockaddr_in *) &req.ifr_addr;
-+    addrp->sin_family = AF_INET;
-+    addrp->sin_addr.s_addr = 0;
-+    if (ioctl(s, SIOCSIFADDR, &req)) {
-+	close(s);
-+	return perrorstr("SIOCSIFADDR");
-+    }
-+
-+    if (intf->override.flags & OVERRIDE_FLAG_KEEPUP) {
-+	close(s);
-+	return NULL;
-+    }
-+    
-     if (ioctl(s, SIOCGIFFLAGS, &req)) {
- 	close(s);
- 	return perrorstr("SIOCGIFFLAGS");
-@@ -291,18 +305,27 @@
- 	goto out;
-     }
- 
--    if (!strcmp(intf->device, "lo")) {
--	/* add a route for this network */
--	route.rt_dev = intf->device;
--	route.rt_flags = RTF_UP;
--	route.rt_metric = 0;
-+    route.rt_dev = intf->device;
-+    route.rt_flags = RTF_UP;
-+    route.rt_metric = 0;
-+
-+    addrp->sin_family = AF_INET;
-+    addrp->sin_port = 0;
-+    addrp->sin_addr = intf->network;
-+    memcpy(&route.rt_dst, addrp, sizeof(*addrp));
-+    addrp->sin_addr = intf->netmask;
-+    memcpy(&route.rt_genmask, addrp, sizeof(*addrp));
-+    
-+    if (strcmp(intf->device,"lo") && intf->override.routeMetric) {
-+	if (ioctl(s, SIOCDELRT, &route)) {
-+	    rc = perrorstr("SIOCDELRT");
-+	    goto out;
-+	}
-+    }
- 
--	addrp->sin_family = AF_INET;
--	addrp->sin_port = 0;
--	addrp->sin_addr = intf->network;
--	memcpy(&route.rt_dst, addrp, sizeof(*addrp));
--	addrp->sin_addr = intf->netmask;
--	memcpy(&route.rt_genmask, addrp, sizeof(*addrp));
-+    if (!strcmp(intf->device, "lo") || intf->override.routeMetric) {
-+	if (intf->override.routeMetric)
-+	    route.rt_metric = intf->override.routeMetric + 1;
- 
- 	if (ioctl(s, SIOCADDRT, &route)) {
- 	    /* the route cannot already exist, as we've taken the device down */
-@@ -316,31 +339,37 @@
-     return rc;
- }
- 
--int pumpSetupDefaultGateway(struct in_addr * gw) {
-+int pumpSetupDefaultGateway(struct pumpNetIntf * intf) {
-     struct sockaddr_in addr;
-     struct rtentry route;
-     int s;
-+    int i;
- 
-     s = socket(AF_INET, SOCK_DGRAM, 0);
--	
--    memset(&addr,0,sizeof(addr));
--    memset(&route,0,sizeof(route));
--    addr.sin_family = AF_INET;
--    addr.sin_port = 0;
--    addr.sin_addr.s_addr = INADDR_ANY;
--    memcpy(&route.rt_dst, &addr, sizeof(addr));
--    memcpy(&route.rt_genmask, &addr, sizeof(addr));
--    addr.sin_addr = *gw;
--    memcpy(&route.rt_gateway, &addr, sizeof(addr));
--    
--    route.rt_flags = RTF_UP | RTF_GATEWAY;
--    route.rt_metric = 0;
--    route.rt_dev = NULL;
- 
--    if (ioctl(s, SIOCADDRT, &route)) {
--	close(s);
--	syslog(LOG_ERR, "failed to set default route: %s", strerror(errno));
--	return -1;
-+    for (i = intf->numGateways - 1; i >= 0; i--) {
-+	memset(&addr,0,sizeof(addr));
-+	memset(&route,0,sizeof(route));
-+	addr.sin_family = AF_INET;
-+	addr.sin_port = 0;
-+	addr.sin_addr.s_addr = INADDR_ANY;
-+	memcpy(&route.rt_dst, &addr, sizeof(addr));
-+	memcpy(&route.rt_genmask, &addr, sizeof(addr));
-+	addr.sin_addr = intf->gateways[i];
-+	memcpy(&route.rt_gateway, &addr, sizeof(addr));
-+
-+	route.rt_flags = RTF_UP | RTF_GATEWAY;
-+	route.rt_dev = intf->device;
-+	if (intf->override.routeMetric)
-+	    route.rt_metric = intf->override.routeMetric + 1;
-+	else
-+	    route.rt_metric = 0;
-+
-+	if (ioctl(s, SIOCADDRT, &route)) {
-+	    close(s);
-+	    syslog(LOG_ERR, "failed to set default route: %s", strerror(errno));
-+	    return -1;
-+	}
-     }
- 
-     close(s);
-@@ -386,7 +415,7 @@
-     unsigned char option, length;
- 
-    
--    chptr = response->vendor;
-+    chptr = (unsigned char *) response->vendor;
- 
-     chptr += 4;
-     while (*chptr != 0xFF) {
-@@ -463,7 +492,7 @@
-     intf->set |= PUMP_INTFINFO_HAS_NEXTSERVER;
-     syslog (LOG_DEBUG, "intf: next server: %s", inet_ntoa (intf->nextServer));
- 
--    chptr = breq->vendor;
-+    chptr = (unsigned char *) breq->vendor;
-     chptr += 4;
-     while (*chptr != 0xFF && (void *) chptr < (void *) breq->vendor + DHCP_VENDOR_LENGTH) {
- 	option = *chptr++;
-@@ -729,7 +758,7 @@
-     syslog (LOG_DEBUG, "%s: servername: %s", name, breq->servername);
-     syslog (LOG_DEBUG, "%s: bootfile: %s", name, breq->bootfile);
-     
--    vndptr = breq->vendor;
-+    vndptr = (unsigned char *) breq->vendor;
-     sprintf (vendor, "0x%02x 0x%02x 0x%02x 0x%02x", vndptr[0], vndptr[1], vndptr[2], vndptr[3]);
-     vndptr += 4;
-     syslog (LOG_DEBUG, "%s: vendor: %s", name, vendor);
-@@ -741,7 +770,7 @@
- 	if (option == 0xFF)
- 	  {
- 	    sprintf (vendor, "0x%02x", option);
--	    vndptr = breq->vendor + DHCP_VENDOR_LENGTH;
-+	    vndptr = (unsigned char *)breq->vendor + DHCP_VENDOR_LENGTH;
- 	  }
- 	else if (option == 0x00)
- 	  {
-@@ -990,7 +1019,7 @@
-     unsigned char * chptr;
-     int theOption, theLength;
- 
--    chptr = breq->vendor;
-+    chptr = (unsigned char *) breq->vendor;
-     chptr += 4;
-     while (*chptr != 0xFF && *chptr != option) {
- 	theOption = *chptr++;
-@@ -1010,7 +1039,7 @@
-     unsigned char * chptr;
-     unsigned int length, theOption;
- 
--    chptr = bresp->vendor;
-+    chptr = (unsigned char *) bresp->vendor;
-     chptr += 4;
-     while (*chptr != 0xFF && *chptr != option) {
- 	theOption = *chptr++;
---- pump-0.8.24/pump.8
-+++ pump-0.8.24/pump.8
-@@ -1,5 +1,6 @@
- .\" Copyright 1999 Red Hat Software, Inc.
- .\" August 2004: Updated by Thomas Hood <jdthood@yahoo.co.uk>
-+.\" July 2005: Updated by Roy Marples <uberlord@gentoo.org>
- .\"
- .\" This man page is free documentation; you can redistribute it and/or modify
- .\" it under the terms of the GNU General Public License as published by
-@@ -29,8 +30,10 @@
- .IR IFACE ]
- .BR "" [ \-l | \-\-lease
- .IR HOURS ]
-+.BR "" [ \-m | \-\-route\-metric
-+.IR METRIC ]
- .BR "" [ \-\-lookup\-hostname ]
--.BR "" [ \-\-no\-dns "] [" \-\-no\-gateway "] [" \-\-no\-setup "] [" \-\-no\-resolvconf ]
-+.BR "" [ \-\-no\-dns "] [" \-\-no\-gateway "] [" \-\- no\-ntp "] [" \-\-no\-setup "]
- .BR "" [ \-\-release "] [" \-\-renew "] [" \-\-script =
- .IR ISCRIPT ]
- .BR "" [ \-\-status ]
-@@ -67,13 +70,16 @@
- \-d	\-\-no\-dns	Don't update DNS resolver configuration
- \-h	\-\-hostname=\fIHOSTNAME\fR	Request \fIHOSTNAME\fR
- \-i	\-\-interface=\fIIFACE\fR	Manage \fIIFACE\fR rather than eth0
-+	\-\-keep\-up	Keep the interface up when released
- \-k	\-\-kill	Kill daemon (and disable all interfaces)
- \-l	\-\-lease=\fIHOURS\fR	Request least time of \fIHOURS\fR
- 	\-\-lookup\-hostname	Look up hostname in DNS
- \-R	\-\-renew	Renew lease immediately
- \-r	\-\-release	Release interface
-+\-m	\-\-route-metric=\fIMETRIC\fR	Metric to use on routes (normally 0)
-   	\-\-no\-gateway	Don't configurate a default route for this interface
-   	\-\-no\-resolvconf	Don't use the \fBresolvconf\fR program to update resolv.conf
-+  	\-\-no\-ntp	Don't update ntp.conf
-   	\-\-no\-setup	Don't set up anything
-   	\-\-script=\fISCRIPT\fR	Call \fISCRIPT\fR (or null string to disable)
- \-s	\-\-status	Display interface status
-@@ -164,8 +170,13 @@
- Use \fISEARCHPATH\fR as the DNS search path instead of the domain
- name returned by the server or the domain part of the fully
- qualified hostname.
--As a machine only has a single DNS search path, this directive may
--only be used globally. 
-+
-+.TP
-+\fBkeepup\fR
-+Keep the interface up when released.
-+Normally \fBpump\fR brings the interface down when it releases its
-+lease, but some daemons such as ifplugd or wpa_supplicant still need the
-+interface to be up so that they can still work.
- 
- .TP
- \fBnonisdomain\fR
-@@ -173,22 +184,24 @@
- Normally \fBpump\fR sets the system's NIS domain
- if an NIS domain is specified by the DHCP server
- and the current NIS domain is empty or \fBlocaldomain\fR.
--This directive may only be used within a \fBdevice\fR directive.
- 
- .TP
- \fBnodns\fR
- Don't update /etc/resolv.conf when the interface is configured.
--This directive may only be used within a \fBdevice\fR directive.
- 
- .TP
- \fBnogateway\fR
- Ignore any default gateway suggested by the DHCP server for this device.
--This can be useful on machines with multiple Ethernet cards.
-+This can be useful on machines with multiple devices.
-+
-+.TP
-+\fBnontp\fR
-+Don't update /etc/ntp.conf when the interface is configured.
- 
- .TP
- \fBnosetup\fR
- Don't set up anything on the local machine as a result of DHCP operations.
--This implies \fBnodns\fR, \fBnonisdomain\fR and \fBnogateway\fR.
-+This implies \fBnodns\fR, \fBnonisdomain\fR, \fBnogateway\fR and \fBnontp\fR.
- This option is useful, for example,
- if you want to perform setup in customised scripts.
- 
---- pump-0.8.24/pump.c
-+++ pump-0.8.24/pump.c
-@@ -188,9 +188,17 @@
- 
-     errno = 0;
- 
--    if (domain)
--	if(fprintf(f, "search %s\n", domain) < 0)
--	    syslog(LOG_ERR, "failed to write resolver configuration data\n");
-+    fprintf(f, "# Generated by pump for interface %s\n", intf->device);
-+    
-+    if (domain) {
-+	if (strchr(domain, ' ')) {
-+	    if(fprintf(f, "search %s\n", domain) < 0)
-+		syslog(LOG_ERR, "failed to write resolver configuration data\n");
-+	} else {
-+	    if(fprintf(f, "search %s\n", domain) < 0)
-+		syslog(LOG_ERR, "failed to write resolver configuration data\n");
-+	}
-+    }
- 
-     for (i = 0; i < intf->numDns; i++)
- 	if(fprintf(f, "nameserver %s\n", inet_ntoa(intf->dnsServers[i])) < 0)
-@@ -301,35 +309,6 @@
-     free(arg);
- }
- 
--static void callIfupPost(struct pumpNetIntf* intf) {
--#ifdef debian
--    /* can/should we call a debian one? */
--    return;
--#else
--    pid_t child;
--    char * argv[3];
--    char arg[64];
--
--    argv[0] = "/etc/sysconfig/network-scripts/ifup-post";
--    snprintf(arg,64,"ifcfg-%s",intf->device);
--    argv[1] = arg;
--    argv[2] = NULL;
--
--    if (!(child = fork())) {
--	/* send the script to init */
--	if (fork()) _exit(0);
--
--	execvp(argv[0], argv);
--
--	syslog(LOG_ERR,"failed to run %s: %s", argv[0], strerror(errno));
--
--	_exit(0);
--    }
--
--    waitpid(child, NULL, 0);
--#endif
--}
--
- static void callScript(char* script,int msg,struct pumpNetIntf* intf) {
-     pid_t child;
-     char * argv[20];
-@@ -392,12 +371,8 @@
- 
-     syslog(LOG_INFO, "configured interface %s", intf->device);
- 
--    if (!(o->flags & OVERRIDE_FLAG_NOGATEWAY)) {
--	int i;
--
--	for (i = intf->numGateways - 1; i >= 0; i--)
--	    pumpSetupDefaultGateway(&intf->gateways[i]);
--    }
-+    if (!(o->flags & OVERRIDE_FLAG_NOGATEWAY))
-+	pumpSetupDefaultGateway(intf);
- 
-     setupDns(intf, o);
-     setupDomain(intf, o);
-@@ -509,7 +484,6 @@
- 		    } else {
- 			callScript(intf[closest].override.script,
- 				   PUMP_SCRIPT_RENEWAL, &intf[closest]);
--			callIfupPost(&intf[closest]);
- 		    }
- 
- 		    continue;	    /* recheck timeouts */
-@@ -612,7 +586,6 @@
- 		    if (!cmd.u.result) {
- 			callScript(intf[i].override.script,
- 				   PUMP_SCRIPT_RENEWAL, intf + i);
--			callIfupPost(intf + i);
- 		    }
- 		}
- 		break;
-@@ -841,7 +814,6 @@
-     printf("\tNext server %s\n", inet_ntoa(i.nextServer));
- 
-     if (i.numGateways) {
--	printf("\tGateway: %s\n", inet_ntoa(i.gateways[0]));
- 	printf("\tGateways:");
- 	for (j = 0; j < i.numGateways; j++)
- 	    printf(" %s", inet_ntoa(i.gateways[j]));
-@@ -925,12 +897,15 @@
-     int killDaemon = 0;
-     int winId = 0;
-     int release = 0, renew = 0, status = 0, lookupHostname = 0, nodns = 0;
--    int nogateway = 0, nobootp = 0;
-+    int nogateway = 0, nobootp = 0, nontp = 0;
-     int nosetup = 0;
-     int noresolvconf = 0;
-+    int routeMetric = 0;
-+    int keepUp = 0;
-     struct command cmd, response;
-     char * configFile = "/etc/pump.conf";
-     char * script = NULL;
-+    char * searchPath = NULL;
-     struct pumpOverrideInfo * overrides;
-     int cont;
-     struct poptOption options[] = {
-@@ -942,6 +917,8 @@
-             { "interface", 'i', POPT_ARG_STRING, &device, 0, 
- 			N_("Interface to configure (normally eth0)"), 
- 			N_("iface") },
-+	    { "keep-up", 'u', POPT_ARG_NONE, &keepUp, 0,
-+			N_("Keep the interface up when releasing it") },
- 	    { "kill", 'k', POPT_ARG_NONE, &killDaemon, 0,
- 			N_("Kill daemon (and disable all interfaces)"), NULL },
- 	    { "lease", 'l', POPT_ARG_INT, &lease_hrs, 0,
-@@ -954,7 +931,9 @@
- 			N_("Release interface"), NULL },
- 	    { "renew", 'R', POPT_ARG_NONE, &renew, 0,
- 			N_("Force immediate lease renewal"), NULL },
--            { "verbose", 'v', POPT_ARG_NONE, &verbose, 0,
-+	    { "route-metric", 'm', POPT_ARG_INT, &routeMetric, 0,
-+			N_("Metric applied to routes (normally 0)"), N_("(metric)") },
-+	    { "verbose", 'v', POPT_ARG_NONE, &verbose, 0,
-                         N_("Log verbose debug info"), NULL },
- 	    { "status", 's', POPT_ARG_NONE, &status, 0,
- 			N_("Display interface status"), NULL },
-@@ -962,12 +941,16 @@
- 			N_("Don't update resolv.conf"), NULL },
- 	    { "no-gateway", '\0', POPT_ARG_NONE, &nogateway, 0,
- 			N_("Don't set a gateway for this interface"), NULL },
-+	    { "no-ntp", '\0', POPT_ARG_NONE, &nontp, 0,
-+			N_("Don't update ntp.conf"), NULL },
- 	    { "no-setup", '\0', POPT_ARG_NONE, &nosetup, 0,
- 			N_("Don't set up anything"), NULL },
- 	    { "no-resolvconf", '\0', POPT_ARG_NONE, &noresolvconf, 0,
- 			N_("Don't set up resolvconf"), NULL },
- 	    { "no-bootp", '\0', POPT_ARG_NONE, &nobootp, 0,
- 	                N_("Ignore non-DHCP BOOTP responses"), NULL },
-+	    { "search-path", 'p', POPT_ARG_STRING, &searchPath, 0,
-+			N_("Use this DNS search path instead of the supplied one"), NULL },
- 	    { "script", '\0', POPT_ARG_STRING, &script, 0,
- 			N_("Script to use") },
- 	    { "win-client-ident", '\0', POPT_ARG_NONE, &winId, 0,
-@@ -1014,6 +997,11 @@
- 	return 1;
-     }
- 
-+    if (searchPath && strlen(searchPath) > sizeof(overrides->searchPath)) {
-+	fprintf(stderr, _("%s: --search-path argument is to long\n"), PROGNAME);
-+	return 1;
-+    }
-+    
-     if (script && strlen(script) > sizeof(overrides->script)) {
- 	fprintf(stderr, _("%s: --script argument is too long\n"), PROGNAME);
- 	return 1;
-@@ -1033,7 +1021,7 @@
- 	flags |= PUMP_FLAG_WINCLIENTID;
-     if (lookupHostname)
- 	flags |= PUMP_FLAG_FORCEHNLOOKUP;
--
-+    
-     if (killDaemon) {
- 	cmd.type = CMD_DIE;
-     } else if (status) {
-@@ -1069,14 +1057,22 @@
- 	    o->flags |= OVERRIDE_FLAG_NOBOOTP;
- 	if (nogateway)
- 	    o->flags |= OVERRIDE_FLAG_NOGATEWAY;
-+	if (nontp)
-+	    o->flags |= OVERRIDE_FLAG_NONTP;
- 	if (nosetup)
- 	    o->flags |=
- 		OVERRIDE_FLAG_NOSETUP |
- 		OVERRIDE_FLAG_NODNS |
- 		OVERRIDE_FLAG_NOGATEWAY |
-+		OVERRIDE_FLAG_NONTP |
- 		OVERRIDE_FLAG_NONISDOMAIN;
- 	if (noresolvconf)
- 	    o->flags |= OVERRIDE_FLAG_NORESOLVCONF;
-+	if (keepUp)
-+	    o->flags |= OVERRIDE_FLAG_KEEPUP;
-+	o->routeMetric = routeMetric;
-+	if (searchPath)
-+	    strcpy(o->searchPath, searchPath);
- 	if (script)
- 	    strcpy(o->script, script);
-  
---- pump-0.8.24/pump.h
-+++ pump-0.8.24/pump.h
-@@ -55,6 +55,8 @@
- #define OVERRIDE_FLAG_NOBOOTP           (1 << 3)
- #define OVERRIDE_FLAG_NOSETUP		(1 << 4)
- #define OVERRIDE_FLAG_NORESOLVCONF	(1 << 5)
-+#define OVERRIDE_FLAG_NONTP		(1 << 6)
-+#define OVERRIDE_FLAG_KEEPUP		(1 << 7)
- 
- struct pumpOverrideInfo {
-     char device[10];
-@@ -63,6 +65,7 @@
-     int numRetries;
-     int timeout;
-     char script[1024];
-+    int routeMetric;
- };
- 
- /* all of these in_addr things are in network byte order! */
-@@ -113,7 +116,7 @@
- char * pumpDisableInterface(struct pumpNetIntf * intf);
- int pumpDhcpRenew(struct pumpNetIntf * intf);
- int pumpDhcpRelease(struct pumpNetIntf * intf);
--int pumpSetupDefaultGateway(struct in_addr * gw);
-+int pumpSetupDefaultGateway(struct pumpNetIntf * intf);
- time_t pumpUptime(void);
- 
- #define RESULT_OKAY		0
diff --git a/net-misc/pump/files/pump-0.8.24-redefinition.patch b/net-misc/pump/files/pump-0.8.24-redefinition.patch
deleted file mode 100644
index 83543379b74d..000000000000
--- a/net-misc/pump/files/pump-0.8.24-redefinition.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index 8c16e66cabdf..000000000000
--- a/net-misc/pump/pump-0.8.24.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.10 2007/12/29 20:05:38 phreak Exp $
-
-inherit eutils
-
-PATCHLEVEL="1"
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc sparc x86"
-IUSE=""
-
-DEPEND=">=dev-libs/popt-1.5"
-PROVIDE="virtual/dhcpc"
-
-src_unpack() {
-	cd "${WORKDIR}"
-	unpack "${PN}_${PV}.orig.tar.gz"
-	cd "${S}"
-
-	# Apply Debians pump patchset - they fix things good :)
-	epatch "${DISTDIR}/${PN}_${PV}-${PATCHLEVEL}.diff.gz"
-
-	# 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"
-
-	# Add an if defined around the definition of foo, just like in popt.h
-	epatch "${FILESDIR}/${P}-redefinition.patch"
-
-	# Only install specific po files if LINGUAS is set
-	if [[ -n ${LINGUAS} ]]; then
-		cd po
-		local p
-		for l in $(ls *.po) ; do
-			[[ " ${LINGUAS} " != *" ${l%%.po} "* ]] && rm -f "${l}"
-		done
-	fi
-}
-
-src_compile() {
-	make DEB_CFLAGS="-fPIC ${CFLAGS}" pump || die
-}
-
-src_install() {
-	into /
-	dosbin pump || die
-
-	doman pump.8
-	dodoc CREDITS
-
-	into /usr
-	dolib.a libpump.a || die
-	insinto /usr/include
-	doins pump.h || die
-
-	make -C po install datadir="${D}/usr/share/"
-}