New 3.0_p1 version (just a rename of 3.0-r4 to fix version to proper name) and cleanups

11 files changed, 11 insertions, 344 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 05bb7eff9afd..32ec49b1c7e9 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.10 2002/12/13 11:00:11 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.11 2002/12/29 23:55:38 drobbins Exp $
+
+*dhcp-3.0_p1 (29 Dec 2002)
+
+  29 Dec 2002; Daniel Robbins <drobbins@gentoo.org>: Renamed from 3.0-r4 to
+  reflect the version (3.0_pl1) of the sources being used.
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/net-misc/dhcp/dhcp-3.0-r1.ebuild b/net-misc/dhcp/dhcp-3.0-r1.ebuild
deleted file mode 100644
index 3b3d931c79e2..000000000000
--- a/net-misc/dhcp/dhcp-3.0-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2002 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-r1.ebuild,v 1.7 2002/12/09 04:33:15 manson Exp $
-
-#This is only needed for a release with pl1 at the end.
-P="dhcp-3.0pl1"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="ISC Dynamic Host Configuration Protocol"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${P}.tar.gz"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-LICENSE="isc-dhcp"
-KEYWORDS="x86 ppc sparc "
-
-SLOT="0"
-DEPEND="virtual/glibc sys-apps/groff"
-RDEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/includes
-	cat <<- END >> site.h
-#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
-#define _PATH_DHCLIENT_DB "/var/lib/dhcp/dhclient.leases"
-#define _PATH_DHCPD_DB "/var/lib/dhcp/dhcpd.leases"
-	END
-}
-
-src_compile() {
-	cat <<- END > site.conf
-CC = gcc ${CFLAGS}
-ETC = /etc/dhcp
-VARDB = /var/lib/dhcp
-ADMMANDIR = /usr/share/man/man8
-FFMANDIR = /usr/share/man/man5
-LIBMANDIR = /usr/share/man/man3
-END
-	./configure --with-nsupdate || die
-	emake || die
-}
-
-src_install() {
-	dodir /var/lib/dhcp
-
-	cd ${S}/work.linux-2.2/client
-	into / ; dosbin dhclient
-	into /usr ; doman *.5 *.8
-
-	cd ../dhcpctl ; dolib libdhcpctl.a ; doman *.3
-	insinto /usr/include ; doins dhcpctl.h
-
-	cd ../omapip ; dolib libomapi.a ; doman *.3
-	cd ../relay ; dosbin dhcrelay ; doman *.8
-	cd ../common ; doman *.5
-	cd ../server ; dosbin dhcpd ; doman *.5 *.8
-
-	cd ${S}/client
-	# admins might wanna edit dhclient-script, so /etc is proper for it.
-	dosed "s:/etc/dhclient-script:/etc/dhcp/dhclient-script:" dhclient.conf
-	insinto /etc/dhcp ; newins dhclient.conf dhclient.conf.sample
-	exeinto /etc/dhcp ; newexe scripts/linux dhclient-script.sample
-
-	cd ${S}/server
-	insinto /etc/dhcp ; newins dhcpd.conf dhcpd.conf.sample
-
-	cd ${S}/includes/omapip
-	insinto /usr/include/omapip ; doins alloc.h buffer.h omapip.h
-
-	cd ${S}/includes/isc-dhcp
-	insinto /usr/include/isc-dhcp
-	doins boolean.h dst.h int.h lang.h list.h result.h types.h
-
-	cd ${S}
-	dodoc ANONCVS CHANGES COPYRIGHT README RELNOTES
-	newdoc client/dhclient.conf dhclient.conf.sample
-	newdoc client/scripts/linux dhclient-script.sample
-	newdoc server/dhcpd.conf dhcpd.conf.sample
-	docinto doc ; dodoc doc/*
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/dhcp.rc6 dhcp
-}
diff --git a/net-misc/dhcp/dhcp-3.0-r2.ebuild b/net-misc/dhcp/dhcp-3.0-r2.ebuild
deleted file mode 100644
index 27301132b3ca..000000000000
--- a/net-misc/dhcp/dhcp-3.0-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2002 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-r2.ebuild,v 1.7 2002/12/09 04:33:15 manson Exp $
-
-#This is only needed for a release with pl1 at the end.
-P="dhcp-3.0pl1"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="ISC Dynamic Host Configuration Protocol"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${P}.tar.gz"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-LICENSE="isc-dhcp"
-KEYWORDS="x86 ppc sparc "
-
-SLOT="0"
-DEPEND="virtual/glibc sys-apps/groff"
-RDEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/includes
-	cat <<- END >> site.h
-#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
-#define _PATH_DHCLIENT_DB "/var/lib/dhcp/dhclient.leases"
-#define _PATH_DHCPD_DB "/var/lib/dhcp/dhcpd.leases"
-	END
-}
-
-src_compile() {
-	cat <<- END > site.conf
-CC = gcc ${CFLAGS}
-ETC = /etc/dhcp
-VARDB = /var/lib/dhcp
-ADMMANDIR = /usr/share/man/man8
-FFMANDIR = /usr/share/man/man5
-LIBMANDIR = /usr/share/man/man3
-END
-	./configure --with-nsupdate || die
-	emake || die
-}
-
-src_install() {
-	dodir /var/lib/dhcp
-	touch ${D}/var/lib/dhcp/dhclient.leases
-
-	cd ${S}/work.linux-2.2/client
-	into / ; dosbin dhclient
-	into /usr ; doman *.5 *.8
-
-	cd ../dhcpctl ; dolib libdhcpctl.a ; doman *.3
-	insinto /usr/include ; doins dhcpctl.h
-
-	cd ../omapip ; dolib libomapi.a ; doman *.3
-	cd ../relay ; dosbin dhcrelay ; doman *.8
-	cd ../common ; doman *.5
-	cd ../server ; dosbin dhcpd ; doman *.5 *.8
-
-	cd ${S}/client
-	# admins might wanna edit dhclient-script, so /etc is proper for it.
-	dosed "s:/etc/dhclient-script:/etc/dhcp/dhclient-script:" dhclient.conf
-	insinto /etc/dhcp ; newins dhclient.conf dhclient.conf.sample
-	exeinto /etc/dhcp ; newexe scripts/linux dhclient-script.sample
-
-	cd ${S}/server
-	insinto /etc/dhcp ; newins dhcpd.conf dhcpd.conf.sample
-
-	cd ${S}/includes/omapip
-	insinto /usr/include/omapip ; doins alloc.h buffer.h omapip.h
-
-	cd ${S}/includes/isc-dhcp
-	insinto /usr/include/isc-dhcp
-	doins boolean.h dst.h int.h lang.h list.h result.h types.h
-
-	cd ${S}
-	dodoc ANONCVS CHANGES COPYRIGHT README RELNOTES
-	newdoc client/dhclient.conf dhclient.conf.sample
-	newdoc client/scripts/linux dhclient-script.sample
-	newdoc server/dhcpd.conf dhcpd.conf.sample
-	docinto doc ; dodoc doc/*
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.dhcpd dhcp
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/dhcp.rc7 dhcp
-}
diff --git a/net-misc/dhcp/dhcp-3.0-r3.ebuild b/net-misc/dhcp/dhcp-3.0-r3.ebuild
deleted file mode 100644
index 47878a6cc9c4..000000000000
--- a/net-misc/dhcp/dhcp-3.0-r3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2002 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-r3.ebuild,v 1.3 2002/12/09 04:33:15 manson Exp $
-
-#This is only needed for a release with pl1 at the end.
-P="dhcp-3.0pl1"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="ISC Dynamic Host Configuration Protocol"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${P}.tar.gz"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-LICENSE="isc-dhcp"
-KEYWORDS="x86 ppc sparc "
-
-SLOT="0"
-DEPEND="virtual/glibc sys-apps/groff"
-RDEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/includes
-	cat <<- END >> site.h
-#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
-#define _PATH_DHCLIENT_DB "/var/lib/dhcp/dhclient.leases"
-#define _PATH_DHCPD_DB "/var/lib/dhcp/dhcpd.leases"
-	END
-}
-
-src_compile() {
-	cat <<- END > site.conf
-CC = gcc ${CFLAGS}
-ETC = /etc/dhcp
-VARDB = /var/lib/dhcp
-ADMMANDIR = /usr/share/man/man8
-FFMANDIR = /usr/share/man/man5
-LIBMANDIR = /usr/share/man/man3
-END
-	./configure --with-nsupdate || die
-	emake || die
-}
-
-src_install() {
-	dodir /var/lib/dhcp
-	touch ${D}/var/lib/dhcp/dhclient.leases
-	touch ${D}/var/lib/dhcp/dhcpd.leases
-
-	cd ${S}/work.linux-2.2/client
-	into / ; dosbin dhclient
-	into /usr ; doman *.5 *.8
-
-	cd ../dhcpctl ; dolib libdhcpctl.a ; doman *.3
-	insinto /usr/include ; doins dhcpctl.h
-
-	cd ../omapip ; dolib libomapi.a ; doman *.3
-	cd ../relay ; dosbin dhcrelay ; doman *.8
-	cd ../common ; doman *.5
-	cd ../server ; dosbin dhcpd ; doman *.5 *.8
-
-	cd ${S}/client
-	# admins might wanna edit dhclient-script, so /etc is proper for it.
-	dosed "s:/etc/dhclient-script:/etc/dhcp/dhclient-script:" dhclient.conf
-	insinto /etc/dhcp ; newins dhclient.conf dhclient.conf.sample
-	exeinto /etc/dhcp ; newexe scripts/linux dhclient-script.sample
-
-	cd ${S}/server
-	insinto /etc/dhcp ; newins dhcpd.conf dhcpd.conf.sample
-
-	cd ${S}/includes/omapip
-	insinto /usr/include/omapip ; doins alloc.h buffer.h omapip.h
-
-	cd ${S}/includes/isc-dhcp
-	insinto /usr/include/isc-dhcp
-	doins boolean.h dst.h int.h lang.h list.h result.h types.h
-
-	cd ${S}
-	dodoc ANONCVS CHANGES COPYRIGHT README RELNOTES
-	newdoc client/dhclient.conf dhclient.conf.sample
-	newdoc client/scripts/linux dhclient-script.sample
-	newdoc server/dhcpd.conf dhcpd.conf.sample
-	docinto doc ; dodoc doc/*
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.dhcpd dhcp
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/dhcp.rc7 dhcp
-}
diff --git a/net-misc/dhcp/dhcp-3.0.ebuild b/net-misc/dhcp/dhcp-3.0.ebuild
deleted file mode 100644
index af43d0b3a48e..000000000000
--- a/net-misc/dhcp/dhcp-3.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2002 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.ebuild,v 1.8 2002/12/09 04:33:15 manson Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="ISC Dynamic Host Configuration Protocol"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${P}.tar.gz"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-LICENSE="isc-dhcp"
-KEYWORDS="x86 ppc sparc "
-SLOT="0"
-
-DEPEND="virtual/glibc sys-apps/groff"
-RDEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/includes
-	cat <<- END >> site.h
-#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
-#define _PATH_DHCLIENT_DB "/var/lib/dhcp/dhclient.leases"
-#define _PATH_DHCPD_DB "/var/lib/dhcp/dhcpd.leases"
-	END
-}
-
-src_compile() {
-	cat <<- END > site.conf
-CC = gcc ${CFLAGS}
-ETC = /etc/dhcp
-VARDB = /var/lib/dhcp
-ADMMANDIR = /usr/share/man/man8
-FFMANDIR = /usr/share/man/man5
-LIBMANDIR = /usr/share/man/man3
-END
-	./configure --with-nsupdate || die
-	emake || die
-}
-
-src_install() {
-	dodir /var/lib/dhcp
-
-	cd ${S}/work.linux-2.2/client
-	into / ; dosbin dhclient
-	into /usr ; doman *.5 *.8
-
-	cd ../dhcpctl ; dolib libdhcpctl.a ; doman *.3
-	insinto /usr/include ; doins dhcpctl.h
-
-	cd ../omapip ; dolib libomapi.a ; doman *.3
-	cd ../relay ; dosbin dhcrelay ; doman *.8
-	cd ../common ; doman *.5
-	cd ../server ; dosbin dhcpd ; doman *.5 *.8
-
-	cd ${S}/client
-	# admins might wanna edit dhclient-script, so /etc is proper for it.
-	dosed "s:/etc/dhclient-script:/etc/dhcp/dhclient-script:" dhclient.conf
-	insinto /etc/dhcp ; newins dhclient.conf dhclient.conf.sample
-	exeinto /etc/dhcp ; newexe scripts/linux dhclient-script.sample
-
-	cd ${S}/server
-	insinto /etc/dhcp ; newins dhcpd.conf dhcpd.conf.sample
-
-	cd ${S}/includes/omapip
-	insinto /usr/include/omapip ; doins alloc.h buffer.h omapip.h
-
-	cd ${S}/includes/isc-dhcp
-	insinto /usr/include/isc-dhcp
-	doins boolean.h dst.h int.h lang.h list.h result.h types.h
-
-	cd ${S}
-	dodoc ANONCVS CHANGES COPYRIGHT README RELNOTES
-	newdoc client/dhclient.conf dhclient.conf.sample
-	newdoc client/scripts/linux dhclient-script.sample
-	newdoc server/dhcpd.conf dhcpd.conf.sample
-	docinto doc ; dodoc doc/*
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/dhcp.rc6 dhcp
-}
diff --git a/net-misc/dhcp/dhcp-3.0-r4.ebuild b/net-misc/dhcp/dhcp-3.0_p1.ebuild
index d6137edfa7f3..d1727c0eeb6b 100644
--- a/net-misc/dhcp/dhcp-3.0-r4.ebuild
+++ b/net-misc/dhcp/dhcp-3.0_p1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2002 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-r4.ebuild,v 1.3 2002/12/09 04:33:15 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0_p1.ebuild,v 1.1 2002/12/29 23:55:38 drobbins Exp $
 
 #This is only needed for a release with pl1 at the end.
-P="dhcp-3.0pl1"
+MYP="dhcp-3.0pl1"
 
-S=${WORKDIR}/${P}
+S=${WORKDIR}/${MYP}
 DESCRIPTION="ISC Dynamic Host Configuration Protocol"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${P}.tar.gz"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MYP}.tar.gz"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 LICENSE="isc-dhcp"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 ppc sparc"
 
 SLOT="0"
 DEPEND="virtual/glibc sys-apps/groff"
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0 b/net-misc/dhcp/files/digest-dhcp-3.0
deleted file mode 100644
index ce85fb901832..000000000000
--- a/net-misc/dhcp/files/digest-dhcp-3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 06e0247fe787d356ac00933633e1fe71 dhcp-3.0.tar.gz 864786
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0-r2 b/net-misc/dhcp/files/digest-dhcp-3.0-r2
deleted file mode 100644
index 6b2999d46c71..000000000000
--- a/net-misc/dhcp/files/digest-dhcp-3.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 85164daf66b2a46b59923750c5716fd1 dhcp-3.0pl1.tar.gz 865096
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0-r3 b/net-misc/dhcp/files/digest-dhcp-3.0-r3
deleted file mode 100644
index 6b2999d46c71..000000000000
--- a/net-misc/dhcp/files/digest-dhcp-3.0-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 85164daf66b2a46b59923750c5716fd1 dhcp-3.0pl1.tar.gz 865096
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0-r4 b/net-misc/dhcp/files/digest-dhcp-3.0-r4
deleted file mode 100644
index 6b2999d46c71..000000000000
--- a/net-misc/dhcp/files/digest-dhcp-3.0-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 85164daf66b2a46b59923750c5716fd1 dhcp-3.0pl1.tar.gz 865096
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0-r1 b/net-misc/dhcp/files/digest-dhcp-3.0_p1
index 6b2999d46c71..6b2999d46c71 100644
--- a/net-misc/dhcp/files/digest-dhcp-3.0-r1
+++ b/net-misc/dhcp/files/digest-dhcp-3.0_p1