Add blocker for bootparamd

Package-Manager: portage-2.1.3.16

5 files changed, 12 insertions, 61 deletions

diff --git a/net-misc/netkit-bootpd/ChangeLog b/net-misc/netkit-bootpd/ChangeLog
index 8a979e2d871a..1c741edabbbf 100644
--- a/net-misc/netkit-bootpd/ChangeLog
+++ b/net-misc/netkit-bootpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/netkit-bootpd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-bootpd/ChangeLog,v 1.16 2007/10/24 16:53:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-bootpd/ChangeLog,v 1.17 2007/11/01 21:29:45 jokey Exp $
+
+  01 Nov 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/0.17-jumpstart.patch, -netkit-bootpd-0.17-r1.ebuild,
+  netkit-bootpd-2.4.ebuild:
+  Add blocker for bootparamd
 
   24 Oct 2007; Jeroen Roovers <jer@gentoo.org> netkit-bootpd-0.17-r1.ebuild:
   Marked ~hppa (bug #194704).
diff --git a/net-misc/netkit-bootpd/files/0.17-jumpstart.patch b/net-misc/netkit-bootpd/files/0.17-jumpstart.patch
deleted file mode 100644
index 41b471b5075f..000000000000
--- a/net-misc/netkit-bootpd/files/0.17-jumpstart.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urN netkit-bootparamd-0.17.old/rpc.bootparamd/rpc.bootparamd.c netkit-bootparamd-0.17/rpc.bootparamd/rpc.bootparamd.c
---- netkit-bootparamd-0.17.old/rpc.bootparamd/rpc.bootparamd.c	2000-07-22 12:23:56.000000000 -0400
-+++ netkit-bootparamd-0.17/rpc.bootparamd/rpc.bootparamd.c	2004-09-13 17:42:43.000000000 -0400
-@@ -136,11 +136,16 @@
- 	    strncpy(path, where, sizeof(path));
- 	    path[sizeof(path)-1] = 0;
- 	    he = gethostbyname(hostname);
--	    if (!he) goto failed;
--	    bcopy( he->h_addr, &res.server_address.bp_address_u.ip_addr, 4);
--	    res.server_name = hostname;
--	    res.server_path = path;
--	    res.server_address.address_type = IP_ADDR_TYPE;
-+	    if (!he) {	/* jumpstart parameters are not valid hosts */
-+		res.server_name = hostname;
-+		res.server_path = path;
-+		bzero(&res.server_address.bp_address_u.ip_addr,4);
-+	    } else {
-+	    	bcopy( he->h_addr, &res.server_address.bp_address_u.ip_addr, 4);
-+	        res.server_name = hostname;
-+		res.server_path = path;
-+		res.server_address.address_type = IP_ADDR_TYPE;
-+	    }
- 	}
- 	else { /* special for dump, answer with null strings */
- 	    if (!strcmp(getfile->file_id, "dump")) {
diff --git a/net-misc/netkit-bootpd/files/digest-netkit-bootpd-0.17-r1 b/net-misc/netkit-bootpd/files/digest-netkit-bootpd-0.17-r1
deleted file mode 100644
index 90888042fc97..000000000000
--- a/net-misc/netkit-bootpd/files/digest-netkit-bootpd-0.17-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 00d211115b11aec2e214b701fe72f397 netkit-bootparamd_0.17.orig.tar.gz 13934
-RMD160 f71e5449823b87c4f188be0ef63575ee58cdb241 netkit-bootparamd_0.17.orig.tar.gz 13934
-SHA256 7fd44b14f7ee5bf930bdd03b0c3a15bdb6efb60a862af47269b05361c4ed395c netkit-bootparamd_0.17.orig.tar.gz 13934
diff --git a/net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild b/net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild
deleted file mode 100644
index 4848d21ba964..000000000000
--- a/net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild
+++ /dev/null
@@ -1,30 +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/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild,v 1.24 2007/10/24 16:53:00 jer Exp $
-
-MY_PN=${PN/pd/paramd}
-S=${WORKDIR}/${MY_PN}-${PV}
-DESCRIPTION="Netkit - bootp"
-HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
-SRC_URI="mirror://debian/pool/main/n/netkit-bootparamd/${MY_PN}_${PV}.orig.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~hppa mips ppc sparc x86"
-IUSE=""
-
-src_compile() {
-	./configure || die
-	make || die
-}
-
-src_install() {
-	into /usr
-	dosbin rpc.bootparamd/bootparamd || die
-	dosym bootparamd /usr/sbin/rpc.bootparamd
-	doman rpc.bootparamd/bootparamd.8
-	dosym bootparamd.8 /usr/share/man/man8/rpc.bootparamd.8
-	doman rpc.bootparamd/bootparams.5
-	dodoc README ChangeLog
-	newdoc rpc.bootparamd/README README.bootparamd
-}
diff --git a/net-misc/netkit-bootpd/netkit-bootpd-2.4.ebuild b/net-misc/netkit-bootpd/netkit-bootpd-2.4.ebuild
index 14be76bcbbcc..3544b6d46b80 100644
--- a/net-misc/netkit-bootpd/netkit-bootpd-2.4.ebuild
+++ b/net-misc/netkit-bootpd/netkit-bootpd-2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-bootpd/netkit-bootpd-2.4.ebuild,v 1.4 2007/10/12 13:35:34 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-bootpd/netkit-bootpd-2.4.ebuild,v 1.5 2007/11/01 21:29:45 jokey Exp $
 
 inherit eutils
 
@@ -13,11 +13,15 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~hppa ~mips ppc ~sparc x86"
 IUSE=""
+
+DEPEND="!<=net-misc/netkit-bootpd-0.17-r2"
+RDEPEND=${DEPEND}
+
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-misc.patch
+	epatch "${FILESDIR}"/${P}-misc.patch
 }
 
 src_compile() {