Forced a version bump on these ebuilds. Basically -r0 is now -r4, -r2 is now -r5 and -r3 is now -r6. The reason for the revision bump was to make this package PROVIDE virtual/dhcp. Closes a long-standing bloat-reduction request made on gentoo-dev mailing list by: William Hubbs <kc5eiv@kc5eiv.homeip.net> at http://article.gmane.org/gmane.linux.gentoo.devel/11579

8 files changed, 61 insertions, 39 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 7e895208b8ff..3a3726c434a7 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.35 2004/03/08 23:02:24 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.36 2004/03/08 23:45:35 seemant Exp $
+
+*dhcp-3.0_p2-r5 (08 Mar 2004)
+
+  08 Mar 2004; Seemant Kulleen <seemant@gentoo.org> dhcp-3.0_p2-r2.ebuild,
+  dhcp-3.0_p2-r3.ebuild, dhcp-3.0_p2-r4.ebuild, dhcp-3.0_p2-r5.ebuild,
+  dhcp-3.0_p2-r6.ebuild, dhcp-3.0_p2.ebuild:
+  Forced a version bump on these ebuilds. Basically -r0 is now -r4, -r2 is now
+  -r5 and -r3 is now -r6. The reason for the revision bump was to make this
+  package PROVIDE virtual/dhcp. Closes a long-standing bloat-reduction request
+  made on gentoo-dev mailing list by: William Hubbs <kc5eiv@kc5eiv.homeip.net>
+  at http://article.gmane.org/gmane.linux.gentoo.devel/11579
 
   09 Mar 2004; Bartosch Pixa <darkspecter@gentoo.org> dhcp-3.0_p2-r2.ebuild:
   set ppc in keywords
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index f925bab62837..47afbb825d4b 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,17 +1,17 @@
+MD5 29b07a55514bc637a4c9551e3831ab1f dhcp-3.0_p2-r4.ebuild 2764
+MD5 3496bc4f42e0fc24d9c4e5c29fa35f60 dhcp-3.0_p2-r6.ebuild 4050
+MD5 acd88204ca093a36f5342c90e063c5d5 dhcp-3.0_p2-r5.ebuild 3874
 MD5 403c6bb685696eec8558f62080cdc92c ChangeLog 5754
-MD5 2688d353bf0ff8abf3789129a4a2b2b2 dhcp-3.0_p2.ebuild 2744
 MD5 9384ae7ba3e9f56b8027ea92f607042d metadata.xml 215
-MD5 ec7337fbd11f64b3204ccd875c8c1c22 dhcp-3.0_p2-r2.ebuild 3848
-MD5 ef085351101ecc5dc733a45548e7777a dhcp-3.0_p2-r3.ebuild 4017
-MD5 063e8ff79e456cfa7d29604bd4ba11ac files/conf.dhcpd 388
+MD5 b2e221805d63d5ea9f403fb63d39b8cc files/dhcp.conf 641
 MD5 498a3eb0e9deaf705f17fff3834f5b90 files/dhclient.c-3.0-dw-cli-fix.patch 734
+MD5 35c670df0455b8758adc60b15bfc1ea8 files/dhcrelay.rc6 571
+MD5 063e8ff79e456cfa7d29604bd4ba11ac files/conf.dhcpd 388
+MD5 d6ae01f5dcc87b11d4d96a34e7cc52a3 files/digest-dhcp-3.0_p2-r4 63
+MD5 a941fa952582373e42b07b61bd66a168 files/digest-dhcp-3.0_p2-r5 129
+MD5 a941fa952582373e42b07b61bd66a168 files/digest-dhcp-3.0_p2-r6 129
+MD5 60a68862dcb861fb6ec9f789fdb94d64 files/dhcrelay.conf 512
 MD5 322dca2a8f001a76dd817a3f2f9fd34d files/dhcp.rc6 1107
 MD5 03ea1fadd836c88a60b890650ea5edb6 files/dhcp.rc7 774
-MD5 d6ae01f5dcc87b11d4d96a34e7cc52a3 files/digest-dhcp-3.0_p2 63
-MD5 b2e221805d63d5ea9f403fb63d39b8cc files/dhcp.conf 641
 MD5 28ebabb4ad513afb04314634ecd9db25 files/dhcp-3.0pl2-user-option-fix.patch 1519
-MD5 a941fa952582373e42b07b61bd66a168 files/digest-dhcp-3.0_p2-r2 129
 MD5 d909d81a4d4ea39ddfc9898d33488c73 files/dhcp-3.0pl2-fix-perms.patch 485
-MD5 60a68862dcb861fb6ec9f789fdb94d64 files/dhcrelay.conf 512
-MD5 35c670df0455b8758adc60b15bfc1ea8 files/dhcrelay.rc6 571
-MD5 a941fa952582373e42b07b61bd66a168 files/digest-dhcp-3.0_p2-r3 129
diff --git a/net-misc/dhcp/dhcp-3.0_p2.ebuild b/net-misc/dhcp/dhcp-3.0_p2-r4.ebuild
index ee831f150254..c9e5f9725ee6 100644
--- a/net-misc/dhcp/dhcp-3.0_p2.ebuild
+++ b/net-misc/dhcp/dhcp-3.0_p2-r4.ebuild
@@ -1,37 +1,33 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0_p2.ebuild,v 1.7 2004/01/15 01:04:44 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0_p2-r4.ebuild,v 1.1 2004/03/08 23:45:35 seemant Exp $
 
-#This should be fairly consistant now, unless we have any _pre releases...
-MYP="${P/_p/pl}"
+IUSE=""
 
-# 01/Mar/2003: Fix for bug #11960 by Jason Wever <weeve@gentoo.org>
-# start fix
 inherit flag-o-matic
-if [ ${ARCH} = "sparc" ]
-then
-	filter-flags "-O3"
-	filter-flags "-O2"
-	filter-flags "-O"
-fi
-# end fix
-
-S=${WORKDIR}/${MYP}
+
+#This should be fairly consistant now, unless we have any _pre releases...
+MY_P="${P/_p/pl}"
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="ISC Dynamic Host Configuration Protocol"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MYP}.tar.gz"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
 HOMEPAGE="http://www.isc.org/products/DHCP"
+
+SLOT="0"
 LICENSE="isc-dhcp"
 KEYWORDS="x86 ppc sparc ~mips amd64"
 
-SLOT="0"
-DEPEND="virtual/glibc sys-apps/groff"
 RDEPEND="virtual/glibc"
+DEPEND="${RDEPEND}
+	sys-apps/groff"
+
+PROVIDE="virtual/dhcpc"
 
 src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	patch -p0 < ${FILESDIR}/dhclient.c-3.0-dw-cli-fix.patch || die
+	epatch ${FILESDIR}/dhclient.c-3.0-dw-cli-fix.patch
 
 	cd ${S}/includes
 	cat <<- END >> site.h
@@ -42,6 +38,15 @@ src_unpack() {
 }
 
 src_compile() {
+	# 01/Mar/2003: Fix for bug #11960 by Jason Wever <weeve@gentoo.org>
+	# start fix
+	if [ ${ARCH} = "sparc" ]
+	then
+		filter-flags "-O3"
+		filter-flags "-O2"
+		filter-flags "-O"
+	fi
+	# end fix
 	cat <<- END > site.conf
 CC = gcc ${CFLAGS}
 ETC = /etc/dhcp
@@ -61,7 +66,7 @@ src_install() {
 
 	cd ${S}/work.linux-2.2/client
 	into / ; dosbin dhclient
-	into /usr ; doman *.5 *.8
+	doman *.5 *.8
 
 	cd ../dhcpctl ; dolib libdhcpctl.a ; doman *.3
 	insinto /usr/include ; doins dhcpctl.h
diff --git a/net-misc/dhcp/dhcp-3.0_p2-r2.ebuild b/net-misc/dhcp/dhcp-3.0_p2-r5.ebuild
index 9da175cafbac..0260299348d3 100644
--- a/net-misc/dhcp/dhcp-3.0_p2-r2.ebuild
+++ b/net-misc/dhcp/dhcp-3.0_p2-r5.ebuild
@@ -1,23 +1,26 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0_p2-r2.ebuild,v 1.11 2004/03/08 23:02:24 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0_p2-r5.ebuild,v 1.1 2004/03/08 23:45:35 seemant Exp $
+
+IUSE="static"
 
 inherit eutils flag-o-matic
 
+MY_P=${P/_p/pl}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="ISC Dynamic Host Configuration Protocol."
 HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${P/_p/pl}.tar.gz
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 	http://www.episec.com/people/edelkind/patches/dhcp/dhcp-3.0+paranoia.patch"
 
 LICENSE="isc-dhcp"
 SLOT="0"
 KEYWORDS="x86 ppc sparc ~mips ppc64 hppa"
-IUSE="static"
 
 DEPEND="virtual/glibc
 	>=sys-apps/sed-4"
 
-S="${WORKDIR}/${P/_p/pl}"
+PROVIDE="virtual/dhcpc"
 
 src_unpack() {
 	unpack ${A} && cd "${S}"
diff --git a/net-misc/dhcp/dhcp-3.0_p2-r3.ebuild b/net-misc/dhcp/dhcp-3.0_p2-r6.ebuild
index c2181385f65e..2e404c27b283 100644
--- a/net-misc/dhcp/dhcp-3.0_p2-r3.ebuild
+++ b/net-misc/dhcp/dhcp-3.0_p2-r6.ebuild
@@ -1,25 +1,28 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0_p2-r3.ebuild,v 1.6 2004/03/04 15:52:40 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0_p2-r6.ebuild,v 1.1 2004/03/08 23:45:35 seemant Exp $
+
+IUSE="static"
 
 inherit eutils flag-o-matic
 
+MY_P=${P/_p/pl}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="ISC Dynamic Host Configuration Protocol."
 HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${P/_p/pl}.tar.gz
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 	http://www.episec.com/people/edelkind/patches/dhcp/dhcp-3.0+paranoia.patch"
 
-LICENSE="isc-dhcp"
 SLOT="0"
+LICENSE="isc-dhcp"
 KEYWORDS="x86 ~ppc ~ppc64 sparc ~mips hppa"
-IUSE="static"
 
 RDEPEND="virtual/glibc"
 
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
-S="${WORKDIR}/${P/_p/pl}"
+PROVIDE="virtual/dhcpc"
 
 src_unpack() {
 	unpack ${A} && cd "${S}"
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0_p2 b/net-misc/dhcp/files/digest-dhcp-3.0_p2-r4
index 69ed0169648a..69ed0169648a 100644
--- a/net-misc/dhcp/files/digest-dhcp-3.0_p2
+++ b/net-misc/dhcp/files/digest-dhcp-3.0_p2-r4
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0_p2-r2 b/net-misc/dhcp/files/digest-dhcp-3.0_p2-r5
index 5c34b82115a3..5c34b82115a3 100644
--- a/net-misc/dhcp/files/digest-dhcp-3.0_p2-r2
+++ b/net-misc/dhcp/files/digest-dhcp-3.0_p2-r5
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0_p2-r3 b/net-misc/dhcp/files/digest-dhcp-3.0_p2-r6
index 5c34b82115a3..5c34b82115a3 100644
--- a/net-misc/dhcp/files/digest-dhcp-3.0_p2-r3
+++ b/net-misc/dhcp/files/digest-dhcp-3.0_p2-r6