Version bump.

Package-Manager: portage-2.1.1_rc1-r2

3 files changed, 12 insertions, 85 deletions

diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index ab0a381a7f77..9f0f35150a26 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -66,14 +66,6 @@ AUX dhcp-3.0.4-dhclient-stdin-conf.patch 2176 RMD160 fae08899f6b57da3ec7ab0068e2
 MD5 f47ef574359340021a78f5c2f67e4954 files/dhcp-3.0.4-dhclient-stdin-conf.patch 2176
 RMD160 fae08899f6b57da3ec7ab0068e288bbdf2fbf2ae files/dhcp-3.0.4-dhclient-stdin-conf.patch 2176
 SHA256 80141fe71e52774f1c7b1a02f2cbd49bc646f19753ceefc1c3605104df0cae5f files/dhcp-3.0.4-dhclient-stdin-conf.patch 2176
-AUX dhcp.conf 792 RMD160 7c4ffbe4f47f4fad210c48eb4f92ee15cf651f72 SHA1 b1730b8bc57800e7201bb304be7b5af7d91374b4 SHA256 dad532fc00d98edce2da5c1fcce16db42a0084eefc6da00599a7fcfb8faac0f0
-MD5 0ab9c8e1c34a43a23d47d9649cd3ddcf files/dhcp.conf 792
-RMD160 7c4ffbe4f47f4fad210c48eb4f92ee15cf651f72 files/dhcp.conf 792
-SHA256 dad532fc00d98edce2da5c1fcce16db42a0084eefc6da00599a7fcfb8faac0f0 files/dhcp.conf 792
-AUX dhcp.init 1530 RMD160 3a26ae62f15a8a3a3c92c68f8afe8bd4d61e9ec2 SHA1 6ce14226da6fd8c160984b00fdf9f7f994efe5c5 SHA256 fb142b26646c3b0ffb95001e437658da1caaf82e263b341c3e75a61cb2a6cf57
-MD5 a68019721576cb5e96df2d55130c9e9e files/dhcp.init 1530
-RMD160 3a26ae62f15a8a3a3c92c68f8afe8bd4d61e9ec2 files/dhcp.init 1530
-SHA256 fb142b26646c3b0ffb95001e437658da1caaf82e263b341c3e75a61cb2a6cf57 files/dhcp.init 1530
 AUX dhcpd.conf 1092 RMD160 936bb112c7cdf8e669b695599252d1f6626be2f3 SHA1 cbabbcea73a0cbc9692462683b983c96d6f18b0c SHA256 b86d27e0560689057b01a352474582fceb3a398eaf3b17f901378ec56284c4d5
 MD5 3f165a207e98ea92deb7ebfbbf4c2cf7 files/dhcpd.conf 1092
 RMD160 936bb112c7cdf8e669b695599252d1f6626be2f3 files/dhcpd.conf 1092
@@ -93,6 +85,7 @@ SHA256 0d16910b1197946165da7812acffecef8ee3b31cdf8f9a596ca6ecb19756fcee files/dh
 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.5b1.tar.gz 882916 RMD160 165c5c1911cbc220afd3a215409c2a3f6d71e36f SHA1 99d6f00e76f56613c8c21b644b01e361a935acff SHA256 c3ace29b42aaeb0d940492b1f5632d0f3160c000289504bcc2afe06bdf3fb9fc
+DIST dhcp-3.0.5rc2.tar.gz 876507 RMD160 6f0f776c550d00528ab77f8585a3bc93408a2372 SHA1 c0b014c0458dc60c11fc073de054cf36030ef780 SHA256 01f66158315489084e349d92fbb390e0754eb9a094926d4a500b2d5804b1fad4
 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
@@ -105,10 +98,14 @@ EBUILD dhcp-3.0.5_beta1.ebuild 7032 RMD160 885b8a99bbbbaae1a0c0e91fe43729dd83a0d
 MD5 233a4872d49fc463f304fa4797753e69 dhcp-3.0.5_beta1.ebuild 7032
 RMD160 885b8a99bbbbaae1a0c0e91fe43729dd83a0db5b dhcp-3.0.5_beta1.ebuild 7032
 SHA256 f131c7e68f9433bb76327ad4079063988e10a46795d9850e36b6406ca424ff37 dhcp-3.0.5_beta1.ebuild 7032
-MISC ChangeLog 19370 RMD160 781c50288b2319585abad8a044844813b433259e SHA1 3d14f03838a0e26653fc3f6b6c72159822d0d73c SHA256 14b01a762cdb9d2c4683045d9fa78c0d07bbc8b3625302c8120e3db897659a59
-MD5 72e4fdb18a01a21686843b1b4f07b845 ChangeLog 19370
-RMD160 781c50288b2319585abad8a044844813b433259e ChangeLog 19370
-SHA256 14b01a762cdb9d2c4683045d9fa78c0d07bbc8b3625302c8120e3db897659a59 ChangeLog 19370
+EBUILD dhcp-3.0.5_rc2.ebuild 7030 RMD160 814370771efc7fdcf43976d3e9a03e54328d8571 SHA1 1b54f64e2181f27740aa1e8514e51d795fcec2ba SHA256 22b5b7578b85a3718a2749e77d43af16952c33e5267a0a60aef8c58efe47a1f3
+MD5 1ad1fb06f9c609b5425f06b3e7da216a dhcp-3.0.5_rc2.ebuild 7030
+RMD160 814370771efc7fdcf43976d3e9a03e54328d8571 dhcp-3.0.5_rc2.ebuild 7030
+SHA256 22b5b7578b85a3718a2749e77d43af16952c33e5267a0a60aef8c58efe47a1f3 dhcp-3.0.5_rc2.ebuild 7030
+MISC ChangeLog 19496 RMD160 b369a5a33318bbfe28c2c049753df4694f02ecaa SHA1 36e9b870964472323132f4ae5b419a1392ac349e SHA256 86c4140d09bbe671edda77a8f7ebc9b06f15421219bf3bd1c5e356ccbd1f7df8
+MD5 4553437e7380fb8750de7a21e4089fcc ChangeLog 19496
+RMD160 b369a5a33318bbfe28c2c049753df4694f02ecaa ChangeLog 19496
+SHA256 86c4140d09bbe671edda77a8f7ebc9b06f15421219bf3bd1c5e356ccbd1f7df8 ChangeLog 19496
 MISC metadata.xml 441 RMD160 489c700355a49fda7d249a7b3f72066add57e779 SHA1 f2013226d45685a4bd06c3f7723df78e134486d4 SHA256 16dccfd59e8db49b0c9b9bb34f99188f9773a2ef00757d4fb429fea4293ac44e
 MD5 3ccab43e194be4b8df2632546cbd028e metadata.xml 441
 RMD160 489c700355a49fda7d249a7b3f72066add57e779 metadata.xml 441
@@ -122,3 +119,6 @@ SHA256 fbea6a9170dda5da61af6c7c6f629d33b642ca3fbfa7f64537bd783e283be420 files/di
 MD5 f9d2f721bc98c31ccb50bb163d58bd46 files/digest-dhcp-3.0.5_beta1 238
 RMD160 958a9d61623530100a8841f3165db627c6bf8d9b files/digest-dhcp-3.0.5_beta1 238
 SHA256 4ca44e043c938abd65e07c142c076af509b34727f91b4a7d68087eeaefaabeaf files/digest-dhcp-3.0.5_beta1 238
+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
diff --git a/net-misc/dhcp/files/dhcp.conf b/net-misc/dhcp/files/dhcp.conf
deleted file mode 100644
index d2c385fa98cf..000000000000
--- a/net-misc/dhcp/files/dhcp.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# /etc/conf.d/dhcp: config file for /etc/init.d/dhcp
-
-# Configure which interface or interfaces to for dhcp to listen on
-# list all interfaces space separated. If this is not specified then
-# we listen on all interfaces.
-#IFACE=""
-
-# Insert any other dhcp options - see the man page for a full list.
-#DHCPD_OPTS=""
-
-# If you wish to run dhcp in a chroot, run:
-# ebuild /var/db/pkg/net-misc/<dhcp version>/<dhcp-version>.ebuild config
-# and un-comment the following line.
-# You can specify a different chroot directory but MAKE SURE it's empty.
-#CHROOT="/chroot/dhcp"
-
-# If you need name resolution under a chroot, you need to ensure that
-# you have a working /etc/resolv.conf in your chroot and you
-# uncomment the following:
-#export LD_PRELOAD="/usr/lib/libresolv.so /usr/lib/libnss_dns.so"
diff --git a/net-misc/dhcp/files/dhcp.init b/net-misc/dhcp/files/dhcp.init
deleted file mode 100644
index cbbca9e29830..000000000000
--- a/net-misc/dhcp/files/dhcp.init
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.init,v 1.6 2006/02/23 16:21:24 uberlord Exp $
-
-depend() {
-	need net
-	use logger dns
-}
-
-get_var() {
-	sed -n 's/^[[:blank:]]\?'"$1"' "*\([^#";]\+\).*/\1/p' \
-		"${CHROOT}/etc/dhcp/dhcpd.conf"
-}
-
-start() {
-	if [[ ! -f "${CHROOT}/etc/dhcp/dhcpd.conf" ]] ; then
-		eerror "${CHROOT}/etc/dhcp/dhcpd.conf does not exist"
-		return 1
-	fi
-
-	local leasefile="$(get_var lease-file-name)"
-	leasefile="${CHROOT}/${leasefile:-/var/lib/dhcp/dhcpd.leases}"
-	if [[ ! -f ${leasefile} ]] ; then
-		ebegin "Creating ${leasefile}"
-		touch "${leasefile}"
-		chown dhcp:dhcp "${leasefile}"
-		eend $? || return 1
-	fi
-
-	# Ensure that LD_PRELOAD is really exported
-	[[ -n ${LD_PRELOAD} ]] && export LD_PRELOAD="${LD_PRELOAD}"
-
-	local pidfile="$(get_var pid-file-name)"
-	pidfile="${pidfile:-/var/run/dhcp/dhcpd.pid}"
-
-	ebegin "Starting ${CHROOT:+chrooted }dhcpd"
-	start-stop-daemon --start --exec /usr/sbin/dhcpd \
-		--pidfile "${CHROOT}/${pidfile}" \
-		-- -q -pf "${pidfile}" \
-		-user dhcp -group dhcp ${DHCPD_OPTS} \
-		${CHROOT:+-chroot} ${CHROOT} ${IFACE}
-	eend $? && save_options pidfile "${CHROOT}/${pidfile}"
-}
-
-stop() {
-	local pidfile="$(get_options pidfile)" chrooted=""
-	[[ ${pidfile} != //var/run/dhcp/dhcpd.pid ]] && chrooted="chrooted "
-	ebegin "Stopping ${chrooted}dhcpd"
-	start-stop-daemon --stop --exec /usr/sbin/dhcpd \
-	    --pidfile "${pidfile}"
-	eend $?
-}