Punted old version.

Package-Manager: portage-2.1_pre4-r1

3 files changed, 3 insertions, 190 deletions

diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 6679570e6878..61f94163d7ca 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -10,9 +10,6 @@ SHA256 75583cb8a1b1b04b413eb11c3770005c32b1364f789d9451c3f5c11ebfedf039 dhcp-3.0
 MD5 a1ff0304f61140d593e6f3cabfc854d9 dhcp-3.0.3-r5.ebuild 5468
 RMD160 ff9591a3c4c9b5393a060894082be0065afb1272 dhcp-3.0.3-r5.ebuild 5468
 SHA256 e0a02a614159b12f5f3b80a9ad69e7ac78b5cbd2c9e9d94608d8cdb59247d74c dhcp-3.0.3-r5.ebuild 5468
-MD5 94560e49876791ae073ee7ae5b6e6ef5 dhcp-3.0.4_beta2-r1.ebuild 5302
-RMD160 5a58aeee6b7d1faff518a4ed75ae572b751d20aa dhcp-3.0.4_beta2-r1.ebuild 5302
-SHA256 c9c88313e7f58245f46850e2541c6ba618d334de0331485c97726dc25e18d3d6 dhcp-3.0.4_beta2-r1.ebuild 5302
 MD5 f677852daf8a329699efbd75a9f5961d dhcp-3.0.4_beta2-r2.ebuild 5400
 RMD160 183ded79270f2c878f06f613a211536599e11a4b dhcp-3.0.4_beta2-r2.ebuild 5400
 SHA256 3d5586f733e037440ce8e1a74bfe163a6095a4b5ad530f6771cd5867cecc4cfe dhcp-3.0.4_beta2-r2.ebuild 5400
@@ -61,9 +58,6 @@ SHA256 cbcca1aed82577796a5287973fc78c3d4f5011a7279852b5fdf3e3e368067f14 files/di
 MD5 414325430622f5011079cd7fd5517485 files/digest-dhcp-3.0.3-r5 232
 RMD160 a8cec86f840528ab049182c2d0f0768d7eaa03dc files/digest-dhcp-3.0.3-r5 232
 SHA256 cbcca1aed82577796a5287973fc78c3d4f5011a7279852b5fdf3e3e368067f14 files/digest-dhcp-3.0.3-r5 232
-MD5 f57c85892cf988656b213b419bf69c55 files/digest-dhcp-3.0.4_beta2-r1 238
-RMD160 962392441afe513bad3b200d84203d46b14b8be5 files/digest-dhcp-3.0.4_beta2-r1 238
-SHA256 6c5131c539857b1b0105c0b878f70fffe0c4553d484f47cb12b95b5c316c952a files/digest-dhcp-3.0.4_beta2-r1 238
 MD5 f57c85892cf988656b213b419bf69c55 files/digest-dhcp-3.0.4_beta2-r2 238
 RMD160 962392441afe513bad3b200d84203d46b14b8be5 files/digest-dhcp-3.0.4_beta2-r2 238
 SHA256 6c5131c539857b1b0105c0b878f70fffe0c4553d484f47cb12b95b5c316c952a files/digest-dhcp-3.0.4_beta2-r2 238
@@ -73,7 +67,7 @@ SHA256 456ab9c26235fa4c1eda6b53b163e901869d5f64ba442b30db1fe86c57fe56af metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD0DBQFD/v4AEbVyYKaZ/NERAt6PAKCQ8FwDQrgDHqPY3nZwMZkUZtoF8wCNEXVy
-Tb9AVZltjDg4eyNXKj1T
-=zumJ
+iD8DBQFD/v5JEbVyYKaZ/NERAo7fAJ0XXrIFlZAlE5qdLGkMp2+w8habawCfWo5S
+Wg7fhuiGbttJh+q3Qt5tjFU=
+=w+i9
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dhcp/dhcp-3.0.4_beta2-r1.ebuild b/net-misc/dhcp/dhcp-3.0.4_beta2-r1.ebuild
deleted file mode 100644
index 106fa0a42ce7..000000000000
--- a/net-misc/dhcp/dhcp-3.0.4_beta2-r1.ebuild
+++ /dev/null
@@ -1,178 +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_beta2-r1.ebuild,v 1.4 2006/02/23 13:04:07 uberlord Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="ISC Dynamic Host Configuration Protocol"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-
-MY_PV="${PV//_beta/b}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="isc-dhcp"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static selinux"
-
-RDEPEND="virtual/libc
-	selinux? ( sec-policy/selinux-dhcp )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-PROVIDE="virtual/dhcpc"
-
-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, fixed #63868
-	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-ntp.patch"
-	# Quiet the isc blurb
-	epatch "${FILESDIR}/${PN}-3.0.3-no_isc_blurb.patch"
-
-	# General fixes which will probably be accepted upstream eventually
-	# Fix token ring compiling, #102473 
-	epatch "${FILESDIR}/${PN}-3.0.3-libdst.patch"
-	# Fix building on Gentoo/FreeBSD
-	epatch "${FILESDIR}/${PN}-3.0.2-gmake.patch"
-
-	# Brand the version with Gentoo
-	# include revision if >0
-	local newver="${MY_PV}-Gentoo"
-	[[ ${PR} != "r0" ]] && newver="${newver}-${PR}"
-	sed -i -e '/^#define DHCP_VERSION[ \t]\+/ s/'"${MY_PV}/${newver}/g" \
-		includes/version.h
-
-	# Tart up the scripts for Gentoo baselayout
-	local comment="# This script is not called by Gentoo net scripts\n"
-	comment="${comment}# and is inluded purely for reference.\n"
-	comment="${comment}# We do however call /etc/dhcp/dhclient-exit-hooks\n"
-	sed -i -e '1 a '"${comment}" \
-		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
-		client/scripts/*
-
-	# Remove these options from the sample config as they conflict
-	# with baselayout network scripts
-	sed -i -e "/\(script\|host-name\|domain-name\) / d" client/dhclient.conf
-
-	# 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() {
-	# 01/Mar/2003: Fix for bug #11960 by Jason Wever <weeve@gentoo.org>
-	[[ ${ARCH} == "sparc" ]] && filter-flags -O3 -O2 -O
-
-	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_DB "/var/lib/dhcp/dhclient.leases"
-	#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
-	FFMANDIR = /usr/share/man/man5
-	LIBMANDIR = /usr/share/man/man3
-	USRMANDIR = /usr/share/man/man1
-	END
-
-	./configure --copts "-DPARANOIA -DEARLY_CHROOT ${CFLAGS}" \
-		|| die "configure failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-
-	insinto /etc/dhcp
-	newins server/dhcpd.conf dhcpd.conf.sample
-	newins client/dhclient.conf dhclient.conf.sample
-
-	dodoc README RELNOTES doc/*
-	newdoc client/dhclient.conf dhclient.conf.sample
-	newdoc client/scripts/linux dhclient-script.sample
-	newdoc server/dhcpd.conf dhcpd.conf.sample
-
-	newinitd "${FILESDIR}/dhcp.init" dhcp
-	newinitd "${FILESDIR}/dhcrelay.init" dhcrelay
-	insinto /etc/conf.d
-	newins "${FILESDIR}/dhcp.conf" dhcp
-	newins "${FILESDIR}/dhcrelay.conf" dhcrelay
-
-	keepdir /var/{lib,run}/dhcp
-}
-
-pkg_preinst() {
-	enewgroup dhcp
-	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-}
-
-pkg_postinst() {
-	chown dhcp:dhcp "${ROOT}"/var/{lib,run}/dhcp
-
-	einfo "You can edit /etc/conf.d/dhcp to customize dhcp settings."
-	einfo
-	einfo "The DHCP ebuild now includes chroot support."
-	einfo "If you would like to run dhcpd in a chroot, simply configure the"
-	einfo "CHROOT directory in /etc/conf.d/dhcp and then run:"
-	einfo "  emerge --config =${PF}"
-}
-
-pkg_config() {
-	CHROOT="$(
-		sed -n 's/^[[:blank:]]\?CHROOT="*\([^#"]\+\)"*/\1/p' \
-		/etc/conf.d/dhcp
-	)"
-
-	if [[ -z ${CHROOT} ]]; then
-		eerror "CHROOT not defined in /etc/conf.d/dhcp"
-		return 1
-	fi
-
-	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"
-	chown -R dhcp:dhcp "${CHROOT}"/var/{lib,run}/dhcp
-	eend
-
-	local logger="$(best_version virtual/logger)"
-	einfo "To enable logging from the DHCP server, configure your"
-	einfo "logger (${logger}) to listen on ${CHROOT}/dev/log"
-}
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0.4_beta2-r1 b/net-misc/dhcp/files/digest-dhcp-3.0.4_beta2-r1
deleted file mode 100644
index 267960b1b5e8..000000000000
--- a/net-misc/dhcp/files/digest-dhcp-3.0.4_beta2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b82565e091832a4d16fb713c4ab48412 dhcp-3.0.4b2.tar.gz 879844
-RMD160 5a5026d0dfe697406f369ccb8509309b4eaf1f4c dhcp-3.0.4b2.tar.gz 879844
-SHA256 e1d207047b5f9c17bbe13653a3ec28b2b91347446ee2bffd9db6876a976eeb4b dhcp-3.0.4b2.tar.gz 879844