Punt old versions

(Portage version: 2.1.2_rc3-r8)

8 files changed, 0 insertions, 821 deletions

diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 08c2681d6760..bbae4d228a84 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -58,10 +58,6 @@ AUX dhcp-3.0.3-x-option.patch 6478 RMD160 a0fa5b3c7caf2d303a76c3d6fc135783cfa2bb
 MD5 1145d8fd3020b1997955cd84b9730702 files/dhcp-3.0.3-x-option.patch 6478
 RMD160 a0fa5b3c7caf2d303a76c3d6fc135783cfa2bbc6 files/dhcp-3.0.3-x-option.patch 6478
 SHA256 6628629a95ee7e711f9dbce6b7d527b15f98eaf7592a1d0855d7bf65961bc3f7 files/dhcp-3.0.3-x-option.patch 6478
-AUX dhcp-3.0.4-64bit.patch 3110 RMD160 a98c38d7346e93e0c18973e0ee48cdc24c1ae6f7 SHA1 ebffb19e02a89f773a750081061f44ce4da3382b SHA256 f1e2ccc54600aa9e09aab308863234016a0fae81502f08a1723341d3cac608cf
-MD5 902137e63d140df01a8377f02f18401f files/dhcp-3.0.4-64bit.patch 3110
-RMD160 a98c38d7346e93e0c18973e0ee48cdc24c1ae6f7 files/dhcp-3.0.4-64bit.patch 3110
-SHA256 f1e2ccc54600aa9e09aab308863234016a0fae81502f08a1723341d3cac608cf files/dhcp-3.0.4-64bit.patch 3110
 AUX dhcp-3.0.4-dhclient-stdin-conf.patch 2176 RMD160 fae08899f6b57da3ec7ab0068e288bbdf2fbf2ae SHA1 c10c35dcf4a94f45f4bc98147a70e9dcf3f01dd5 SHA256 80141fe71e52774f1c7b1a02f2cbd49bc646f19753ceefc1c3605104df0cae5f
 MD5 f47ef574359340021a78f5c2f67e4954 files/dhcp-3.0.4-dhclient-stdin-conf.patch 2176
 RMD160 fae08899f6b57da3ec7ab0068e288bbdf2fbf2ae files/dhcp-3.0.4-dhclient-stdin-conf.patch 2176
@@ -95,31 +91,16 @@ MD5 6e2bc3e08290c60d4f339ab9182fce07 files/dhcrelay.init 748
 RMD160 da83794f49e52f072924386b2fd4511d07d985e6 files/dhcrelay.init 748
 SHA256 0d16910b1197946165da7812acffecef8ee3b31cdf8f9a596ca6ecb19756fcee files/dhcrelay.init 748
 DIST dhcp-3.0.3.tar.gz 870240 RMD160 bcbd1f8b49f17809a3473103a7b5e096c45855d7 SHA1 1e2e6c3ecdb8046a39aaabe1a36171e1d45d21e4 SHA256 c96bcd884dde06c22a709cfb9e84f7e32f6577dcd52aa7f12186aa22b5e63afe
-DIST dhcp-3.0.4.tar.gz 883245 RMD160 f5636d87e1e2138bd239157f54d8f73c73af73ac SHA1 2efe316d69563bf2440cbb4efc2bc06ef9445db3 SHA256 89171155b7a9225f5eb81c83ff63f071168b87eacab05fb859b8397d36809bf7
 DIST dhcp-3.0.5.tar.gz 876591 RMD160 b968e7520fd936bd6f888f77734f3db7df23a636 SHA1 6501ba0e3dbd83ff57d3274538c4e4a1848ffc64 SHA256 dd445fb2a341cdd69e85693dce6f8fda1a1c9d0e98d34c01afc3e68d8037ffb6
-DIST dhcp-3.0.5rc2.tar.gz 876507 RMD160 6f0f776c550d00528ab77f8585a3bc93408a2372 SHA1 c0b014c0458dc60c11fc073de054cf36030ef780 SHA256 01f66158315489084e349d92fbb390e0754eb9a094926d4a500b2d5804b1fad4
-DIST dhcp-3.1.0a1.tar.gz 773828 RMD160 4ededc197e668219d404a054816cd48e71ac8a39 SHA1 d9f0e71d049f79fbfd99ca4de6e6d12e9ff86548 SHA256 80f610a6bdfe2ac2d2dd50886d903217141c2983c1a22af23fb223998769651b
 DIST dhcp-3.1.0a2.tar.gz 776040 RMD160 21419b31dc75fce67d86222277282ffa2a9c9007 SHA1 cc8eca9477f7d60f74c77ff0c556212835aa6b8f SHA256 81e4e068df774f473c36999236fab16d742e3c74ae162dfb990db7b134e87a85
 EBUILD dhcp-3.0.3-r9.ebuild 7090 RMD160 39faccca29004357a6982530b476a58ef0724eac SHA1 627289ef0d63eb7acaf5c7855b39c2ecac5286ff SHA256 a98505b8c62a03cb7e712b2f5fc1b7190f64314eb4a9bacdf5b45f373dc53aca
 MD5 91749ab205c46ac726bcc8b75279e6de dhcp-3.0.3-r9.ebuild 7090
 RMD160 39faccca29004357a6982530b476a58ef0724eac dhcp-3.0.3-r9.ebuild 7090
 SHA256 a98505b8c62a03cb7e712b2f5fc1b7190f64314eb4a9bacdf5b45f373dc53aca dhcp-3.0.3-r9.ebuild 7090
-EBUILD dhcp-3.0.4-r2.ebuild 7221 RMD160 d13d26bbd33d0fe85808590469895c388d08345e SHA1 fef75e2ef0f13b5def70ab34807c77b49645f1af SHA256 29b1d5c0b563826395dc30d10c5f4c077b16115d531f4231e218dc42fa855391
-MD5 53484e87af57cfd9d4a08ab643a2ef89 dhcp-3.0.4-r2.ebuild 7221
-RMD160 d13d26bbd33d0fe85808590469895c388d08345e dhcp-3.0.4-r2.ebuild 7221
-SHA256 29b1d5c0b563826395dc30d10c5f4c077b16115d531f4231e218dc42fa855391 dhcp-3.0.4-r2.ebuild 7221
 EBUILD dhcp-3.0.5.ebuild 7327 RMD160 67a8073856cf20171a58bb379e78ef00c0639702 SHA1 6a9c2e2f9a736365e6dd77810d838690d7c722df SHA256 121da4e6de2ea1f09798616c4209ea0cbd0bbf9c89d1085091488957eb6a8748
 MD5 1b7c5d90f4175a525c7ef9e834b3a07e dhcp-3.0.5.ebuild 7327
 RMD160 67a8073856cf20171a58bb379e78ef00c0639702 dhcp-3.0.5.ebuild 7327
 SHA256 121da4e6de2ea1f09798616c4209ea0cbd0bbf9c89d1085091488957eb6a8748 dhcp-3.0.5.ebuild 7327
-EBUILD dhcp-3.0.5_rc2.ebuild 7331 RMD160 158495da0a5220b5369b0c5920628835cd54ae91 SHA1 2457c28ccaff0af2360abe4f484cf1cd83ac4e2f SHA256 a49d758a96a7516c97dcf5c475a7e9fb1417985c0020ef46d6b354b5948bb497
-MD5 f566c157f51b7c82b936d572cb233e79 dhcp-3.0.5_rc2.ebuild 7331
-RMD160 158495da0a5220b5369b0c5920628835cd54ae91 dhcp-3.0.5_rc2.ebuild 7331
-SHA256 a49d758a96a7516c97dcf5c475a7e9fb1417985c0020ef46d6b354b5948bb497 dhcp-3.0.5_rc2.ebuild 7331
-EBUILD dhcp-3.1.0_alpha1.ebuild 7365 RMD160 e69f025fd9402f0da5ab5399d9ca55506eacb0d0 SHA1 15ec4ec707a0211019ed57a5eb0d6a68ea590223 SHA256 e32c80bc37b8ebce7c08b0edf3a31f3160dc7cc2f99487df24195f30d7c38d20
-MD5 405d52e1ff6cace078291948ea31bd66 dhcp-3.1.0_alpha1.ebuild 7365
-RMD160 e69f025fd9402f0da5ab5399d9ca55506eacb0d0 dhcp-3.1.0_alpha1.ebuild 7365
-SHA256 e32c80bc37b8ebce7c08b0edf3a31f3160dc7cc2f99487df24195f30d7c38d20 dhcp-3.1.0_alpha1.ebuild 7365
 EBUILD dhcp-3.1.0_alpha2.ebuild 7365 RMD160 6ff4c8a27483a9d1ba7726e61e8fb5fd8b2a4e8c SHA1 b9870df36088ffac3e0148201d6280c67adde11f SHA256 1d1fac9804aa7a93bc3c91559687c2896eb3b3a062c4affd7af36274ddffe1e1
 MD5 3a350e42276b7b8863a0423d4f9dde10 dhcp-3.1.0_alpha2.ebuild 7365
 RMD160 6ff4c8a27483a9d1ba7726e61e8fb5fd8b2a4e8c dhcp-3.1.0_alpha2.ebuild 7365
@@ -135,18 +116,9 @@ SHA256 16dccfd59e8db49b0c9b9bb34f99188f9773a2ef00757d4fb429fea4293ac44e metadata
 MD5 414325430622f5011079cd7fd5517485 files/digest-dhcp-3.0.3-r9 232
 RMD160 a8cec86f840528ab049182c2d0f0768d7eaa03dc files/digest-dhcp-3.0.3-r9 232
 SHA256 cbcca1aed82577796a5287973fc78c3d4f5011a7279852b5fdf3e3e368067f14 files/digest-dhcp-3.0.3-r9 232
-MD5 3ac42f4c7431bc78613c2e61b0a79075 files/digest-dhcp-3.0.4-r2 232
-RMD160 d5e0c33365d8dc2d37caf86a277a0dbfe0b98565 files/digest-dhcp-3.0.4-r2 232
-SHA256 fbea6a9170dda5da61af6c7c6f629d33b642ca3fbfa7f64537bd783e283be420 files/digest-dhcp-3.0.4-r2 232
 MD5 baa5fba0594aaaf320323529af67db24 files/digest-dhcp-3.0.5 232
 RMD160 412ca9be8de7ae69927b5914b742d8a3e367d7b2 files/digest-dhcp-3.0.5 232
 SHA256 3dc56e680549f1bbbce372b339d5bf1d0474bfd8a45d950f5542bec89117606d files/digest-dhcp-3.0.5 232
-MD5 9bcfd0200ea79ae1610d34029cf2e864 files/digest-dhcp-3.0.5_rc2 241
-RMD160 921c145bf03455eb145900a3e8177fcaaadf43d8 files/digest-dhcp-3.0.5_rc2 241
-SHA256 9394bc332009daadfd256fe921d30a1d4021d421d3840a02fb93f46e8c0b2cae files/digest-dhcp-3.0.5_rc2 241
-MD5 9eadfd8d6702b780408ee4e8013097d4 files/digest-dhcp-3.1.0_alpha1 238
-RMD160 872cf1cb4babcb908f4753d69dd7705ffd488c5c files/digest-dhcp-3.1.0_alpha1 238
-SHA256 69241c8b8610ce8aa684cc62eb072b3db23c43fc5bca173c77e57cfa64d25005 files/digest-dhcp-3.1.0_alpha1 238
 MD5 633acdd0f53ac5b689ccf0d9876382d5 files/digest-dhcp-3.1.0_alpha2 238
 RMD160 6f829c6a9788269b89e5909a83c8e806cd7b955a files/digest-dhcp-3.1.0_alpha2 238
 SHA256 7d2825096cbc840a2559d57c682abc42d901d689a9f2333c46c6dcc180d4e59b files/digest-dhcp-3.1.0_alpha2 238
diff --git a/net-misc/dhcp/dhcp-3.0.4-r2.ebuild b/net-misc/dhcp/dhcp-3.0.4-r2.ebuild
deleted file mode 100644
index d7729ef8fc68..000000000000
--- a/net-misc/dhcp/dhcp-3.0.4-r2.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.4-r2.ebuild,v 1.2 2006/09/13 09:21:30 uberlord Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_PV="${PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="ISC Dynamic Host Configuration Protocol"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
-
-LICENSE="isc-dhcp"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc minimal static selinux"
-
-DEPEND="selinux? ( sec-policy/selinux-dhcp )
-	kernel_linux? ( sys-apps/net-tools )"
-
-PROVIDE="virtual/dhcpc"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Gentoo patches - these will probably never be accepted upstream
-	# Enable chroot support
-	epatch "${FILESDIR}/${PN}"-3.0-paranoia.patch
-	# Fix some permission issues
-	epatch "${FILESDIR}/${PN}"-3.0-fix-perms.patch
-	# Enable dhclient to equery NTP servers
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-ntp.patch
-	# resolvconf support in dhclient-script
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-resolvconf.patch
-	# Fix setting hostnames on Linux
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-hostname.patch
-	# Allow mtu settings
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-mtu.patch
-	# Allow dhclient to use IF_METRIC to set route metrics
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-metric.patch
-	# Stop downing the interface on Linux as that breaks link dameons
-	# such as wpa_supplicant and netplug
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-no-down.patch
-	# Quiet the isc blurb
-	epatch "${FILESDIR}/${PN}"-3.0.3-no_isc_blurb.patch
-	# Enable dhclient to get extra configuration from stdin
-	epatch "${FILESDIR}/${PN}"-3.0.4-dhclient-stdin-conf.patch
-
-	# General fixes which will probably be accepted upstream eventually
-	# Install libdst, #75544
-	epatch "${FILESDIR}/${PN}"-3.0.3-libdst.patch
-	# Fix building on Gentoo/FreeBSD
-	epatch "${FILESDIR}/${PN}"-3.0.2-gmake.patch
-	# Fix 64-bit servers, #133905
-	epatch "${FILESDIR}/${PN}"-3.0.4-64bit.patch
-
-	# NetworkManager support patches
-	# If they fail to apply to future versions they will be dropped
-	# Enable eXtended options
-	epatch "${FILESDIR}/${PN}"-3.0.3-x-option.patch
-	# Add dbus support to dhclient
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-dbus.patch
-
-	# Brand the version with Gentoo
-	# include revision if >0
-	local newver="${MY_PV}-Gentoo"
-	[[ ${PR} != "r0" ]] && newver="${newver}-${PR}"
-	sed -i '/^#define DHCP_VERSION[ \t]\+/ s/'"${MY_PV}/${newver}/g" \
-		includes/version.h || die
-
-	# Change the hook script locations of the scripts
-	sed -i -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
-		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
-		client/scripts/* || die
-
-	# Quiet the freebsd logger a little
-	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
-	# Remove these options from the sample config
-	sed -i -e "/\(script\|host-name\|domain-name\) / d" \
-		client/dhclient.conf || die
-
-	# Build sed man pages as we don't ever support BSD 4.4 and older, #130251.
-	local x=
-	for x in Makefile.dist $(ls */Makefile.dist) ; do
-		sed -i -e 's/$(CATMANPAGES)/$(SEDMANPAGES)/g' "${x}" || die
-	done
-
-	# Only install different man pages if we don't have en
-	if [[ " ${LINGUAS} " != *" en "* ]]; then
-		# Install Japanese man pages
-		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
-			einfo "Installing Japanese documention"
-			cp doc/ja_JP.eucJP/dhclient* client
-			cp doc/ja_JP.eucJP/dhcp* common
-		fi
-	fi
-
-	# Now remove the non-english docs so there are no errors later
-	[[ -d doc/ja_JP.eucJP ]] && rm -rf doc/ja_JP.eucJP
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	cat <<-END >> includes/site.h
-	#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
-	#define _PATH_DHCPD_PID "/var/run/dhcp/dhcpd.pid"
-	#define _PATH_DHCPD_DB "/var/lib/dhcp/dhcpd.leases"
-	#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
-	#define _PATH_DHCLIENT_DB "/var/lib/dhcp/dhclient.leases"
-	#define _PATH_DHCLIENT_PID "/var/run/dhcp/dhclient.pid"
-	#define DHCPD_LOG_FACILITY LOG_LOCAL1
-	END
-
-	cat <<-END > site.conf
-	CC = $(tc-getCC)
-	LFLAGS = ${LDFLAGS}
-	LIBDIR = /usr/$(get_libdir)
-	INCDIR = /usr/include
-	ETC = /etc/dhcp
-	VARDB = /var/lib/dhcp
-	VARRUN = /var/run/dhcp
-	ADMMANDIR = /usr/share/man/man8
-	ADMMANEXT = .8
-	FFMANDIR = /usr/share/man/man5
-	FFMANEXT = .5
-	LIBMANDIR = /usr/share/man/man3
-	LIBMANEXT = .3
-	USRMANDIR = /usr/share/man/man1
-	USRMANEXT = .1
-	MANCAT = man
-	END
-
-	./configure --copts "-DPARANOIA -DEARLY_CHROOT -DEXTENDED_NEW_OPTION_INFO \
-		${CFLAGS}" || die "configure failed"
-
-	# Remove server support from the Makefile
-	# We still install some extra crud though
-	if use minimal ; then
-		sed -i -e 's/\(server\|relay\|dhcpctl\)/ /g' work.*/Makefile || die
-	fi
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	use doc && dodoc README RELNOTES doc/*
-
-	insinto /etc/dhcp
-	newins client/dhclient.conf dhclient.conf.sample
-	keepdir /var/{lib,run}/dhcp
-
-	# Install our server files
-	if ! use minimal ; then
-		insinto /etc/dhcp
-		newins server/dhcpd.conf dhcpd.conf.sample
-		newinitd "${FILESDIR}"/dhcpd.init dhcpd
-		newinitd "${FILESDIR}"/dhcrelay.init dhcrelay
-		insinto /etc/conf.d
-		newins "${FILESDIR}"/dhcpd.conf dhcpd
-		newins "${FILESDIR}"/dhcrelay.conf dhcrelay
-	fi
-}
-
-pkg_preinst() {
-	if ! use minimal ; then
-		enewgroup dhcp
-		enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-	fi
-}
-
-pkg_postinst() {
-	use minimal && return
-
-	chown dhcp:dhcp "${ROOT}"/var/{lib,run}/dhcp
-
-	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
-		ewarn
-		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
-		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
-		ewarn "and dhcp should be removed from the default runlevel"
-		ewarn
-	fi
-
-	einfo "You can edit /etc/conf.d/dhcpd to customize dhcp settings."
-	einfo
-	einfo "If you would like to run dhcpd in a chroot, simply configure the"
-	einfo "DHCPD_CHROOT directory in /etc/conf.d/dhcpd and then run:"
-	einfo "  emerge --config =${PF}"
-}
-
-pkg_config() {
-	if use minimal ; then
-		eerror "${PN} has not been compiled for server support"
-		eerror "emerge ${PN} without the minimal USE flag to use dhcp sever"
-		return 1
-	fi
-
-	local CHROOT="$(
-		sed -n -e 's/^[[:blank:]]\?DHCPD_CHROOT="*\([^#"]\+\)"*/\1/p' \
-		"${ROOT}"/etc/conf.d/dhcpd
-	)"
-
-	if [[ -z ${CHROOT} ]]; then
-		eerror "CHROOT not defined in /etc/conf.d/dhcpd"
-		return 1
-	fi
-
-	CHROOT="${ROOT}/${CHROOT}"
-
-	if [[ -d ${CHROOT} ]] ; then
-		ewarn "${CHROOT} already exists - aborting"
-		return 0
-	fi
-
-	ebegin "Setting up the chroot directory"
-	mkdir -m 0755 -p "${CHROOT}/"{dev,etc,var/lib,var/run/dhcp}
-	cp /etc/{localtime,resolv.conf} "${CHROOT}"/etc
-	cp -R /etc/dhcp "${CHROOT}"/etc
-	cp -R /var/lib/dhcp "${CHROOT}"/var/lib
-	ln -s ../../var/lib/dhcp "${CHROOT}"/etc/dhcp/lib
-	chown -R dhcp:dhcp "${CHROOT}"/var/{lib,run}/dhcp
-	eend 0
-
-	local logger="$(best_version virtual/logger)"
-	einfo "To enable logging from the dhcpd server, configure your"
-	einfo "logger (${logger}) to listen on ${CHROOT}/dev/log"
-}
diff --git a/net-misc/dhcp/dhcp-3.0.5_rc2.ebuild b/net-misc/dhcp/dhcp-3.0.5_rc2.ebuild
deleted file mode 100644
index f9626bb22a18..000000000000
--- a/net-misc/dhcp/dhcp-3.0.5_rc2.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.5_rc2.ebuild,v 1.6 2006/10/17 13:30:01 uberlord Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_PV="${PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="ISC Dynamic Host Configuration Protocol"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
-
-LICENSE="isc-dhcp"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="doc minimal static selinux kernel_linux"
-
-DEPEND="selinux? ( sec-policy/selinux-dhcp )
-	kernel_linux? ( sys-apps/net-tools )"
-
-PROVIDE="virtual/dhcpc"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Gentoo patches - these will probably never be accepted upstream
-	# Enable chroot support
-	epatch "${FILESDIR}/${PN}"-3.0-paranoia.patch
-	# Fix some permission issues
-	epatch "${FILESDIR}/${PN}"-3.0-fix-perms.patch
-	# Enable dhclient to equery NTP servers
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-ntp.patch
-	# resolvconf support in dhclient-script
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-resolvconf.patch
-	# Fix setting hostnames on Linux
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-hostname.patch
-	# Allow mtu settings
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-mtu.patch
-	# Allow dhclient to use IF_METRIC to set route metrics
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-metric.patch
-	# Stop downing the interface on Linux as that breaks link dameons
-	# such as wpa_supplicant and netplug
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-no-down.patch
-	# Quiet the isc blurb
-	epatch "${FILESDIR}/${PN}"-3.0.3-no_isc_blurb.patch
-	# Enable dhclient to get extra configuration from stdin
-	epatch "${FILESDIR}/${PN}"-3.0.4-dhclient-stdin-conf.patch
-	# Disable fallback interfaces when using BPF
-	# This allows more than one dhclient instance on the BSD's
-	epatch "${FILESDIR}/${PN}"-3.0.5-bpf-nofallback.patch
-
-	# General fixes which will probably be accepted upstream eventually
-	# Install libdst, #75544
-	epatch "${FILESDIR}/${PN}"-3.0.3-libdst.patch
-	# Fix building on Gentoo/FreeBSD
-	epatch "${FILESDIR}/${PN}"-3.0.2-gmake.patch
-
-	# NetworkManager support patches
-	# If they fail to apply to future versions they will be dropped
-	# Enable eXtended options
-	epatch "${FILESDIR}/${PN}"-3.0.3-x-option.patch
-	# Add dbus support to dhclient
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-dbus.patch
-
-	# Brand the version with Gentoo
-	# include revision if >0
-	local newver="${MY_PV}-Gentoo"
-	[[ ${PR} != "r0" ]] && newver="${newver}-${PR}"
-	sed -i '/^#define DHCP_VERSION[ \t]\+/ s/'"${MY_PV}/${newver}/g" \
-		includes/version.h || die
-
-	# Change the hook script locations of the scripts
-	sed -i -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
-		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
-		client/scripts/* || die
-
-	# Quiet the freebsd logger a little
-	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
-	# Remove these options from the sample config
-	sed -i -e "/\(script\|host-name\|domain-name\) / d" \
-		client/dhclient.conf || die
-
-	# Build sed man pages as we don't ever support BSD 4.4 and older, #130251.
-	local x=
-	for x in Makefile.dist $(ls */Makefile.dist) ; do
-		sed -i -e 's/$(CATMANPAGES)/$(SEDMANPAGES)/g' "${x}" || die
-	done
-
-	# Only install different man pages if we don't have en
-	if [[ " ${LINGUAS} " != *" en "* ]]; then
-		# Install Japanese man pages
-		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
-			einfo "Installing Japanese documention"
-			cp doc/ja_JP.eucJP/dhclient* client
-			cp doc/ja_JP.eucJP/dhcp* common
-		fi
-	fi
-
-	# Now remove the non-english docs so there are no errors later
-	[[ -d doc/ja_JP.eucJP ]] && rm -rf doc/ja_JP.eucJP
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	cat <<-END >> includes/site.h
-	#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
-	#define _PATH_DHCPD_PID "/var/run/dhcp/dhcpd.pid"
-	#define _PATH_DHCPD_DB "/var/lib/dhcp/dhcpd.leases"
-	#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
-	#define _PATH_DHCLIENT_DB "/var/lib/dhcp/dhclient.leases"
-	#define _PATH_DHCLIENT_PID "/var/run/dhcp/dhclient.pid"
-	#define DHCPD_LOG_FACILITY LOG_LOCAL1
-	END
-
-	cat <<-END > site.conf
-	CC = $(tc-getCC)
-	LFLAGS = ${LDFLAGS}
-	LIBDIR = /usr/$(get_libdir)
-	INCDIR = /usr/include
-	ETC = /etc/dhcp
-	VARDB = /var/lib/dhcp
-	VARRUN = /var/run/dhcp
-	ADMMANDIR = /usr/share/man/man8
-	ADMMANEXT = .8
-	FFMANDIR = /usr/share/man/man5
-	FFMANEXT = .5
-	LIBMANDIR = /usr/share/man/man3
-	LIBMANEXT = .3
-	USRMANDIR = /usr/share/man/man1
-	USRMANEXT = .1
-	MANCAT = man
-	END
-
-	./configure --copts "-DPARANOIA -DEARLY_CHROOT -DEXTENDED_NEW_OPTION_INFO \
-		${CFLAGS}" || die "configure failed"
-
-	# Remove server support from the Makefile
-	# We still install some extra crud though
-	if use minimal ; then
-		sed -i -e 's/\(server\|relay\|dhcpctl\)/ /g' work.*/Makefile || die
-	fi
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	use doc && dodoc README RELNOTES doc/*
-
-	insinto /etc/dhcp
-	newins client/dhclient.conf dhclient.conf.sample
-	keepdir /var/{lib,run}/dhcp
-
-	# Install our server files
-	if ! use minimal ; then
-		insinto /etc/dhcp
-		newins server/dhcpd.conf dhcpd.conf.sample
-		newinitd "${FILESDIR}"/dhcpd.init dhcpd
-		newinitd "${FILESDIR}"/dhcrelay.init dhcrelay
-		insinto /etc/conf.d
-		newins "${FILESDIR}"/dhcpd.conf dhcpd
-		newins "${FILESDIR}"/dhcrelay.conf dhcrelay
-	fi
-}
-
-pkg_preinst() {
-	if ! use minimal ; then
-		enewgroup dhcp
-		enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-	fi
-}
-
-pkg_postinst() {
-	use minimal && return
-
-	chown dhcp:dhcp "${ROOT}"/var/{lib,run}/dhcp
-
-	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
-		ewarn
-		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
-		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
-		ewarn "and dhcp should be removed from the default runlevel"
-		ewarn
-	fi
-
-	einfo "You can edit /etc/conf.d/dhcpd to customize dhcp settings."
-	einfo
-	einfo "If you would like to run dhcpd in a chroot, simply configure the"
-	einfo "DHCPD_CHROOT directory in /etc/conf.d/dhcpd and then run:"
-	einfo "  emerge --config =${PF}"
-}
-
-pkg_config() {
-	if use minimal ; then
-		eerror "${PN} has not been compiled for server support"
-		eerror "emerge ${PN} without the minimal USE flag to use dhcp sever"
-		return 1
-	fi
-
-	local CHROOT="$(
-		sed -n -e 's/^[[:blank:]]\?DHCPD_CHROOT="*\([^#"]\+\)"*/\1/p' \
-		"${ROOT}"/etc/conf.d/dhcpd
-	)"
-
-	if [[ -z ${CHROOT} ]]; then
-		eerror "CHROOT not defined in /etc/conf.d/dhcpd"
-		return 1
-	fi
-
-	CHROOT="${ROOT}/${CHROOT}"
-
-	if [[ -d ${CHROOT} ]] ; then
-		ewarn "${CHROOT} already exists - aborting"
-		return 0
-	fi
-
-	ebegin "Setting up the chroot directory"
-	mkdir -m 0755 -p "${CHROOT}/"{dev,etc,var/lib,var/run/dhcp}
-	cp /etc/{localtime,resolv.conf} "${CHROOT}"/etc
-	cp -R /etc/dhcp "${CHROOT}"/etc
-	cp -R /var/lib/dhcp "${CHROOT}"/var/lib
-	ln -s ../../var/lib/dhcp "${CHROOT}"/etc/dhcp/lib
-	chown -R dhcp:dhcp "${CHROOT}"/var/{lib,run}/dhcp
-	eend 0
-
-	local logger="$(best_version virtual/logger)"
-	einfo "To enable logging from the dhcpd server, configure your"
-	einfo "logger (${logger}) to listen on ${CHROOT}/dev/log"
-}
diff --git a/net-misc/dhcp/dhcp-3.1.0_alpha1.ebuild b/net-misc/dhcp/dhcp-3.1.0_alpha1.ebuild
deleted file mode 100644
index bfed025d298c..000000000000
--- a/net-misc/dhcp/dhcp-3.1.0_alpha1.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.0_alpha1.ebuild,v 1.4 2006/10/17 13:30:01 uberlord Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="ISC Dynamic Host Configuration Protocol"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
-
-LICENSE="isc-dhcp"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="doc minimal static selinux kernel_linux"
-
-DEPEND="selinux? ( sec-policy/selinux-dhcp )
-	kernel_linux? ( sys-apps/net-tools )"
-
-PROVIDE="virtual/dhcpc"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Gentoo patches - these will probably never be accepted upstream
-	# Enable chroot support
-	epatch "${FILESDIR}/${PN}"-3.0-paranoia.patch
-	# Fix some permission issues
-	epatch "${FILESDIR}/${PN}"-3.0-fix-perms.patch
-	# Enable dhclient to equery NTP servers
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-ntp.patch
-	# resolvconf support in dhclient-script
-	epatch "${FILESDIR}/${PN}"-3.1.0a1-dhclient-resolvconf.patch
-	# Fix setting hostnames on Linux
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-hostname.patch
-	# Allow mtu settings
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-mtu.patch
-	# Allow dhclient to use IF_METRIC to set route metrics
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-metric.patch
-	# Stop downing the interface on Linux as that breaks link dameons
-	# such as wpa_supplicant and netplug
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-no-down.patch
-	# Quiet the isc blurb
-	epatch "${FILESDIR}/${PN}"-3.0.3-no_isc_blurb.patch
-	# Enable dhclient to get extra configuration from stdin
-	epatch "${FILESDIR}/${PN}"-3.0.4-dhclient-stdin-conf.patch
-	# Disable fallback interfaces when using BPF
-	# This allows more than one dhclient instance on the BSD's
-	epatch "${FILESDIR}/${PN}"-3.0.5-bpf-nofallback.patch
-
-	# General fixes which will probably be accepted upstream eventually
-	# Install libdst, #75544
-	epatch "${FILESDIR}/${PN}"-3.0.3-libdst.patch
-	# Fix building on Gentoo/FreeBSD
-	epatch "${FILESDIR}/${PN}"-3.0.2-gmake.patch
-
-	# NetworkManager support patches
-	# If they fail to apply to future versions they will be dropped
-	# Enable eXtended options
-	epatch "${FILESDIR}/${PN}"-3.1.0a1-x-option.patch
-	# Add dbus support to dhclient
-	epatch "${FILESDIR}/${PN}"-3.0.3-dhclient-dbus.patch
-
-	# Brand the version with Gentoo
-	# include revision if >0
-	local newver="${MY_PV}-Gentoo"
-	[[ ${PR} != "r0" ]] && newver="${newver}-${PR}"
-	sed -i '/^#define DHCP_VERSION[ \t]\+/ s/'"${MY_PV}/${newver}/g" \
-		includes/version.h || die
-
-	# Change the hook script locations of the scripts
-	sed -i -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
-		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
-		client/scripts/* || die
-
-	# Quiet the freebsd logger a little
-	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
-	# Remove these options from the sample config
-	sed -i -e "/\(script\|host-name\|domain-name\) / d" \
-		client/dhclient.conf || die
-
-	# Build sed man pages as we don't ever support BSD 4.4 and older, #130251.
-	local x=
-	for x in Makefile.dist $(ls */Makefile.dist) ; do
-		sed -i -e 's/$(CATMANPAGES)/$(SEDMANPAGES)/g' "${x}" || die
-	done
-
-	# Only install different man pages if we don't have en
-	if [[ " ${LINGUAS} " != *" en "* ]]; then
-		# Install Japanese man pages
-		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
-			einfo "Installing Japanese documention"
-			cp doc/ja_JP.eucJP/dhclient* client
-			cp doc/ja_JP.eucJP/dhcp* common
-		fi
-	fi
-
-	# Now remove the non-english docs so there are no errors later
-	[[ -d doc/ja_JP.eucJP ]] && rm -rf doc/ja_JP.eucJP
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	cat <<-END >> includes/site.h
-	#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
-	#define _PATH_DHCPD_PID "/var/run/dhcp/dhcpd.pid"
-	#define _PATH_DHCPD_DB "/var/lib/dhcp/dhcpd.leases"
-	#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
-	#define _PATH_DHCLIENT_DB "/var/lib/dhcp/dhclient.leases"
-	#define _PATH_DHCLIENT_PID "/var/run/dhcp/dhclient.pid"
-	#define DHCPD_LOG_FACILITY LOG_LOCAL1
-	END
-
-	cat <<-END > site.conf
-	CC = $(tc-getCC)
-	LFLAGS = ${LDFLAGS}
-	LIBDIR = /usr/$(get_libdir)
-	INCDIR = /usr/include
-	ETC = /etc/dhcp
-	VARDB = /var/lib/dhcp
-	VARRUN = /var/run/dhcp
-	ADMMANDIR = /usr/share/man/man8
-	ADMMANEXT = .8
-	FFMANDIR = /usr/share/man/man5
-	FFMANEXT = .5
-	LIBMANDIR = /usr/share/man/man3
-	LIBMANEXT = .3
-	USRMANDIR = /usr/share/man/man1
-	USRMANEXT = .1
-	MANCAT = man
-	END
-
-	./configure --copts "-DPARANOIA -DEARLY_CHROOT -DEXTENDED_NEW_OPTION_INFO \
-		${CFLAGS}" || die "configure failed"
-
-	# Remove server support from the Makefile
-	# We still install some extra crud though
-	if use minimal ; then
-		sed -i -e 's/\(server\|relay\|dhcpctl\)/ /g' work.*/Makefile || die
-	fi
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	use doc && dodoc README RELNOTES doc/*
-
-	insinto /etc/dhcp
-	newins client/dhclient.conf dhclient.conf.sample
-	keepdir /var/{lib,run}/dhcp
-
-	# Install our server files
-	if ! use minimal ; then
-		insinto /etc/dhcp
-		newins server/dhcpd.conf dhcpd.conf.sample
-		newinitd "${FILESDIR}"/dhcpd.init dhcpd
-		newinitd "${FILESDIR}"/dhcrelay.init dhcrelay
-		insinto /etc/conf.d
-		newins "${FILESDIR}"/dhcpd.conf dhcpd
-		newins "${FILESDIR}"/dhcrelay.conf dhcrelay
-	fi
-}
-
-pkg_preinst() {
-	if ! use minimal ; then
-		enewgroup dhcp
-		enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-	fi
-}
-
-pkg_postinst() {
-	use minimal && return
-
-	chown dhcp:dhcp "${ROOT}"/var/{lib,run}/dhcp
-
-	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
-		ewarn
-		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
-		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
-		ewarn "and dhcp should be removed from the default runlevel"
-		ewarn
-	fi
-
-	einfo "You can edit /etc/conf.d/dhcpd to customize dhcp settings."
-	einfo
-	einfo "If you would like to run dhcpd in a chroot, simply configure the"
-	einfo "DHCPD_CHROOT directory in /etc/conf.d/dhcpd and then run:"
-	einfo "  emerge --config =${PF}"
-}
-
-pkg_config() {
-	if use minimal ; then
-		eerror "${PN} has not been compiled for server support"
-		eerror "emerge ${PN} without the minimal USE flag to use dhcp sever"
-		return 1
-	fi
-
-	local CHROOT="$(
-		sed -n -e 's/^[[:blank:]]\?DHCPD_CHROOT="*\([^#"]\+\)"*/\1/p' \
-		"${ROOT}"/etc/conf.d/dhcpd
-	)"
-
-	if [[ -z ${CHROOT} ]]; then
-		eerror "CHROOT not defined in /etc/conf.d/dhcpd"
-		return 1
-	fi
-
-	CHROOT="${ROOT}/${CHROOT}"
-
-	if [[ -d ${CHROOT} ]] ; then
-		ewarn "${CHROOT} already exists - aborting"
-		return 0
-	fi
-
-	ebegin "Setting up the chroot directory"
-	mkdir -m 0755 -p "${CHROOT}/"{dev,etc,var/lib,var/run/dhcp}
-	cp /etc/{localtime,resolv.conf} "${CHROOT}"/etc
-	cp -R /etc/dhcp "${CHROOT}"/etc
-	cp -R /var/lib/dhcp "${CHROOT}"/var/lib
-	ln -s ../../var/lib/dhcp "${CHROOT}"/etc/dhcp/lib
-	chown -R dhcp:dhcp "${CHROOT}"/var/{lib,run}/dhcp
-	eend 0
-
-	local logger="$(best_version virtual/logger)"
-	einfo "To enable logging from the dhcpd server, configure your"
-	einfo "logger (${logger}) to listen on ${CHROOT}/dev/log"
-}
diff --git a/net-misc/dhcp/files/dhcp-3.0.4-64bit.patch b/net-misc/dhcp/files/dhcp-3.0.4-64bit.patch
deleted file mode 100644
index 1f19e909b3a9..000000000000
--- a/net-misc/dhcp/files/dhcp-3.0.4-64bit.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-# Fix 64 bit machines, Gentoo bug #133905
-
---- dhcp-3.0.4/includes/dhcpd.h
-+++ dhcp-3.0.4/includes/dhcpd.h
-@@ -339,7 +339,7 @@
- 	struct option_state *options;
- 	struct data_string parameter_request_list;
- 	int max_message_size;
--	TIME expiry, renewal, rebind;
-+	unsigned char expiry[4], renewal[4], rebind[4];
- 	struct data_string filename, server_name;
- 	int got_requested_address;
- 	int got_server_identifier;
---- dhcp-3.0.4/server/dhcp.c
-+++ dhcp-3.0.4/server/dhcp.c
-@@ -2442,18 +2442,15 @@
- 		offered_lease_time =
- 			state -> offered_expiry - cur_time;
- 
--		putULong ((unsigned char *)&state -> expiry,
--			  (unsigned long)offered_lease_time);
-+		putULong(state->expiry, (u_int32_t)offered_lease_time);
- 		i = DHO_DHCP_LEASE_TIME;
- 		if (lookup_option (&dhcp_universe, state -> options, i))
- 			log_error ("dhcp-lease-time option for %s overridden.",
- 			      inet_ntoa (state -> ciaddr));
- 		oc = (struct option_cache *)0;
- 		if (option_cache_allocate (&oc, MDL)) {
--			if (make_const_data (&oc -> expression,
--					     (unsigned char *)&state -> expiry,
--					     sizeof state -> expiry,
--					     0, 0, MDL)) {
-+			if (make_const_data(&oc->expression, state->expiry,
-+					    4, 0, 0, MDL)) {
- 				oc -> option = dhcp_universe.options [i];
- 				save_option (&dhcp_universe,
- 					     state -> options, oc);
-@@ -2463,19 +2460,15 @@
- 
- 		/* Renewal time is lease time * 0.5. */
- 		offered_lease_time /= 2;
--		putULong ((unsigned char *)&state -> renewal,
--			  (unsigned long)offered_lease_time);
-+		putULong(state->renewal, (u_int32_t)offered_lease_time);
- 		i = DHO_DHCP_RENEWAL_TIME;
- 		if (lookup_option (&dhcp_universe, state -> options, i))
- 			log_error ("overriding dhcp-renewal-time for %s.",
- 				   inet_ntoa (state -> ciaddr));
- 		oc = (struct option_cache *)0;
- 		if (option_cache_allocate (&oc, MDL)) {
--			if (make_const_data (&oc -> expression,
--					     (unsigned char *)
--					     &state -> renewal,
--					     sizeof state -> renewal,
--					     0, 0, MDL)) {
-+			if (make_const_data(&oc->expression, state->renewal,
-+					    4, 0, 0, MDL)) {
- 				oc -> option = dhcp_universe.options [i];
- 				save_option (&dhcp_universe,
- 					     state -> options, oc);
-@@ -2486,18 +2479,15 @@
- 		/* Rebinding time is lease time * 0.875. */
- 		offered_lease_time += (offered_lease_time / 2
- 				       + offered_lease_time / 4);
--		putULong ((unsigned char *)&state -> rebind,
--			  (unsigned)offered_lease_time);
-+		putULong(state->rebind, (u_int32_t)offered_lease_time);
- 		i = DHO_DHCP_REBINDING_TIME;
- 		if (lookup_option (&dhcp_universe, state -> options, i))
- 			log_error ("overriding dhcp-rebinding-time for %s.",
- 			      inet_ntoa (state -> ciaddr));
- 		oc = (struct option_cache *)0;
- 		if (option_cache_allocate (&oc, MDL)) {
--			if (make_const_data (&oc -> expression,
--					     (unsigned char *)&state -> rebind,
--					     sizeof state -> rebind,
--					     0, 0, MDL)) {
-+			if (make_const_data(&oc->expression, state->rebind,
-+					    4, 0, 0, MDL)) {
- 				oc -> option = dhcp_universe.options [i];
- 				save_option (&dhcp_universe,
- 					     state -> options, oc);
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0.4-r2 b/net-misc/dhcp/files/digest-dhcp-3.0.4-r2
deleted file mode 100644
index 03ec8dae9fa3..000000000000
--- a/net-misc/dhcp/files/digest-dhcp-3.0.4-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 004ef935fd54b8046b16bdde31a9e151 dhcp-3.0.4.tar.gz 883245
-RMD160 f5636d87e1e2138bd239157f54d8f73c73af73ac dhcp-3.0.4.tar.gz 883245
-SHA256 89171155b7a9225f5eb81c83ff63f071168b87eacab05fb859b8397d36809bf7 dhcp-3.0.4.tar.gz 883245
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0.5_rc2 b/net-misc/dhcp/files/digest-dhcp-3.0.5_rc2
deleted file mode 100644
index b08ce8f4a8ed..000000000000
--- a/net-misc/dhcp/files/digest-dhcp-3.0.5_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f14122e6b414f5881e6926aa5d88c56a dhcp-3.0.5rc2.tar.gz 876507
-RMD160 6f0f776c550d00528ab77f8585a3bc93408a2372 dhcp-3.0.5rc2.tar.gz 876507
-SHA256 01f66158315489084e349d92fbb390e0754eb9a094926d4a500b2d5804b1fad4 dhcp-3.0.5rc2.tar.gz 876507
diff --git a/net-misc/dhcp/files/digest-dhcp-3.1.0_alpha1 b/net-misc/dhcp/files/digest-dhcp-3.1.0_alpha1
deleted file mode 100644
index 3b3d805f94ee..000000000000
--- a/net-misc/dhcp/files/digest-dhcp-3.1.0_alpha1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a326c6f135b9fa3ad24988312c784be5 dhcp-3.1.0a1.tar.gz 773828
-RMD160 4ededc197e668219d404a054816cd48e71ac8a39 dhcp-3.1.0a1.tar.gz 773828
-SHA256 80f610a6bdfe2ac2d2dd50886d903217141c2983c1a22af23fb223998769651b dhcp-3.1.0a1.tar.gz 773828