Version bump

Package-Manager: portage-2.1.4.4

10 files changed, 22 insertions, 609 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index a4fad48d697c..c87bf162b4c3 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/dhcpcd
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.197 2008/07/08 16:13:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.198 2008/07/22 09:43:07 armin76 Exp $
+
+*dhcpcd-4.0.0_rc1 (22 Jul 2008)
+
+  22 Jul 2008; Raúl Porcel <armin76@gentoo.org> -dhcpcd-4.0.0_beta1.ebuild,
+  -dhcpcd-4.0.0_beta2.ebuild, -dhcpcd-4.0.0_beta3.ebuild,
+  -dhcpcd-4.0.0_beta4.ebuild, -dhcpcd-4.0.0_beta5.ebuild,
+  -dhcpcd-4.0.0_beta6.ebuild, -dhcpcd-4.0.0_beta7.ebuild,
+  -dhcpcd-4.0.0_beta8.ebuild, +dhcpcd-4.0.0_rc1.ebuild:
+  Version bump
 
 *dhcpcd-4.0.0_beta9 (08 Jul 2008)
 
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 1b82fd5e8acd..e281eedbb44b 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -5,28 +5,14 @@ DIST dhcpcd-3.0.16.tar.bz2 31639 RMD160 24ab33bf453a0eb3301fc879e7e98f607aaf14d6
 DIST dhcpcd-3.1.5.tar.bz2 40958 RMD160 a00b50c2aadcce5f23d0dcca7691dea173d219fa SHA1 17396b60ffd780c0dd08035e98e23b35c7f3ca39 SHA256 ce98a97a2002d672de67d32bb0226d12146788bd16b1c5ef1a319c82b7933e0e
 DIST dhcpcd-3.2.2.tar.bz2 44779 RMD160 14ad80c09ad2a8ace6840f628fa4e5fa09a33df4 SHA1 b74645c5572a2dab0043c71da880ecd8db782678 SHA256 f77136eec579ed74dcb3ff27bf655f5885b8eeb5632cde12d5283812442ebdff
 DIST dhcpcd-3.2.3.tar.bz2 45030 RMD160 4319dc97c97f08124a6466d096eeb2a21b4d069d SHA1 666d6bafd86c9986efe28076d0b7e5d3349006e2 SHA256 89d5fc05d7fd643200333116400d8a0eda9adf1c7f2a70e6cbca977c8d3843fe
-DIST dhcpcd-4.0.0-beta1.tar.bz2 43796 RMD160 7ecfc05118faae86d461fc39805460bbbd2329ad SHA1 e6afa90d86b7ae6ecee4958234fc14ef61dcc807 SHA256 f11b02faa240df6919ebf3c0f153bca4dab7a67122606dce8ddac0deb28cfebc
-DIST dhcpcd-4.0.0-beta2.tar.bz2 43908 RMD160 8a0603319d996644a72b05c5f1fd625c6f541eac SHA1 0e4bfff3f1472b1327ed83e5e8dc068bb9cd123e SHA256 ca0647321404ce2dd5a1cca58e399cdd7209f2691f6a40b573fb6b1ecd7f244c
-DIST dhcpcd-4.0.0-beta3.tar.bz2 44410 RMD160 e1e1539d7298d372102ed723827cbe66c1e9bab3 SHA1 74f63e7e87dacdf22d4a7712847502abef7ee2d5 SHA256 590c33f41c7c81f7680e2fac46d6811808019e054a04d52052d24e7c88b87f31
-DIST dhcpcd-4.0.0-beta4.tar.bz2 44640 RMD160 c330a102d4cf28bb1087157e7e1f7c65d8f665f2 SHA1 53fab816b04b412a60e04354eac4564399c98e2c SHA256 9c8e1514df4dc189a6cdd35817da183110f966966cb1a2394eed854384cb79e9
-DIST dhcpcd-4.0.0-beta5.tar.bz2 46024 RMD160 fc1c64840347989b3419c3c4c360d75bb2f62157 SHA1 81747eeb7aaa95c94075b888f85fac79ef7cc5ee SHA256 f9a7cb273a32bdc9a83537d8743de94bb6722a108c25a135fa63f31823540670
-DIST dhcpcd-4.0.0-beta6.tar.bz2 46933 RMD160 3462dc3873bf6b1a057c2f3ea62bbcc862e82ba0 SHA1 424f6966803f0ddb975d3a1e5d085eb3bb117b8c SHA256 7f69e1e78e8d0037215784f45bd973e6a1c8a15db4e103c72d7b882054a01e8b
-DIST dhcpcd-4.0.0-beta7.tar.bz2 46925 RMD160 70418dee05182ab8741a7a4e6c8d29bbb9cd59f7 SHA1 045b8373ea084156cd212ce3ea2c508cc1b46102 SHA256 58f92c8bc05d4760333d2032768fc53c45ef953341b83dfbb8d9fcfe41ca0764
-DIST dhcpcd-4.0.0-beta8.tar.bz2 48000 RMD160 3c5b5f0548eeef395898d5c781db2bb89edc13b3 SHA1 310b18e0cdd132521c16275b23611b701b5d0bb7 SHA256 b9bec26b95145557c88032e83f22f610fcf3fb551463db1477c4e921ee942208
 DIST dhcpcd-4.0.0-beta9.tar.bz2 48081 RMD160 d038c4f0b3e6f3851667c99f742a2e24382c6eac SHA1 aae02289c9ad5bbacb51940ef176e86ed6d71688 SHA256 595837c96916d8f7dae1b6f521f04e9bb59f2fc53a6a63db06e72164ef814ec4
+DIST dhcpcd-4.0.0-rc1.tar.bz2 49816 RMD160 79fcc9858ddc703ef0ea943614bb1a6ca7519aec SHA1 ceb1e864cb551b839679767de807d5620275af86 SHA256 1d96d9c826502e918059fe9c7f7ec3b538f2c113d20435051062f998e94754fc
 EBUILD dhcpcd-2.0.5-r1.ebuild 1418 RMD160 d99f4100936bb4ec364a7432dd7c87d1ef909b80 SHA1 05abf531156b25459f7e2d4f8d8015ede8437de3 SHA256 dd23842eab6793416fb5565f8499e728282d5e00c4838a5f93325a00f5bd63f4
 EBUILD dhcpcd-3.0.16-r1.ebuild 953 RMD160 82b53e937a113c528e36aeace26cf705c0140ed9 SHA1 24e50b8e6effdba118f7b5389d24b0d3db94c9a9 SHA256 d6b9ee3c8da4c740bd0a5ca50c148874605ef33c5244680185b191749b6a5888
 EBUILD dhcpcd-3.1.5-r1.ebuild 1969 RMD160 0b5565aaa6466acbcf68dfae7c34896227fc8f1e SHA1 63ebd2efc08fa00e8bdfbc9314ee1736aede7495 SHA256 9ee0903aeff1102be6fe98a14259dbf2b8f9b0bb106716057c5ff495f7ff6b96
 EBUILD dhcpcd-3.2.2.ebuild 2624 RMD160 803c8bea3619c62397c45b7791860279e1fd52b4 SHA1 ee27ac4e4884fbb1f881c68ed5fb83e1064e6389 SHA256 4e5c4398cd6a1a385be847a0301325ba5432c3315c5c17c50618bed9abef26f4
 EBUILD dhcpcd-3.2.3.ebuild 2616 RMD160 0fd64284267ee4563b2fcb981bb0b242594dbcf1 SHA1 8f6c1fd86f767bc8b78f86154799b7f036a789f0 SHA256 cfc4316ad4039f3b359d129af0ae7f2a64d001e728cadbd1f36e3c0a441ccb0d
-EBUILD dhcpcd-4.0.0_beta1.ebuild 2311 RMD160 80132e44d4ae7e0206d8d7ceb935ae48ea3ef99b SHA1 b9e73ed2f6378db75dd3f8b34b6d3dfb61a72fc4 SHA256 2455729aee8e614dac0df70298fe2e6522f11c859f34de78fb64cb5796fc13d2
-EBUILD dhcpcd-4.0.0_beta2.ebuild 2314 RMD160 21c9ded9309053bc313e410c7803f6e37fd02a9e SHA1 7c602e0993d3e89c922a21010c1d9d5162e3c4b9 SHA256 b6fd65abb8baa946eddc9cebdec8558896b889a76c8fd069d73f82ab476c0a3f
-EBUILD dhcpcd-4.0.0_beta3.ebuild 2340 RMD160 e20bebe2672e866ee8a390285f2c18196d239427 SHA1 e0b612eeb299033c4d2d5609be975502509693cb SHA256 5041c008ce3b07a398956f550a30934e6f163cc982e138e57380bc06f1d70aff
-EBUILD dhcpcd-4.0.0_beta4.ebuild 2340 RMD160 617842c1decd9205a33a0b9a53a6d5b62b749898 SHA1 d5f7efc941b48202994512ceb6f7623fd5269bfe SHA256 ee8bd6d86efdadc5aa64a0668da4e8637d5c83867729d93d1b56840cc59f9aee
-EBUILD dhcpcd-4.0.0_beta5.ebuild 2208 RMD160 38f36460faddfc42ef3f3150b879214b235483f2 SHA1 1cafa97439c21218d69adc7b9b41f53bab284f90 SHA256 716e7f893ab21d726b515a82297d13758bb4f468b04d733b976d58a32139c08b
-EBUILD dhcpcd-4.0.0_beta6.ebuild 2208 RMD160 6cb1903343ce858f36f8bf9543c8ee3480eae57a SHA1 60acf280a269477654d9c0b793be013be5147000 SHA256 4fc0d165454c3cbdc89ecc3ae3c0b5a72e382adbc3921a3fddb9d3a722e47328
-EBUILD dhcpcd-4.0.0_beta7.ebuild 2209 RMD160 2890b95ec045342cdc1fe54e518a8b8220b51842 SHA1 b0bc356cc7cf456a6ad8cd8ef710aeed26610444 SHA256 08a060848a436527f61d8ba439f312083e1b6dcda3880495cb5cd9fe8449bd86
-EBUILD dhcpcd-4.0.0_beta8.ebuild 2208 RMD160 824d2b1cec9a0c11b2836f991394d789a2956ce2 SHA1 e11cf9522851af53e15fc0ccf75adc31395924a9 SHA256 9f4dd69e42c4a9dc3ba0338674c9e5856e398e9bcc0e43cc487caece5b8f3caa
 EBUILD dhcpcd-4.0.0_beta9.ebuild 2208 RMD160 50d7dd51153fedb74446ea6da2f353a31e5009a7 SHA1 6b9bd12e5c9f0d530735ddf6405dac1dd8703325 SHA256 77f01b00217d6a22db673d1b9b6810b9b0c9e5f892c0efb24887e14ae57ab2a9
-MISC ChangeLog 27661 RMD160 3d9cbbc07e084bdeb67014b4b415b486cbf93747 SHA1 5d0ee9045eb17dc3762986d714fec247845c9794 SHA256 d340ea29bbf4971d4994cc2030f2b148c748f0ce72c769f20c54ce3ab75c114b
+EBUILD dhcpcd-4.0.0_rc1.ebuild 2288 RMD160 794c5e9273b17c815b6cfee1e549516e3ee98655 SHA1 de1dead6ccdde32ad41a9122f38fe6205f40bff8 SHA256 8026b1805252d1d18247d98a077dc775badff9be3b4219eea595c1cced63fe43
+MISC ChangeLog 28017 RMD160 469b0d886f52fbd7687f865802a0c2b74059a49c SHA1 633c37a949b13c3c7255f93930c5c3c93f01a765 SHA256 7c9141472c5ed6ac8ea617e99ca72974fed16bdc5ba252de2cad8100534f493a
 MISC metadata.xml 294 RMD160 a4a156d187ceb572e144d1e83ffbb07652114eaa SHA1 18a4bc93e056a51f051f2e277d8eef144b6584ca SHA256 35cda940f329b0522dd2f0486a24a763f5da0560eacf0045a5faf940ddd883fa
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.0_beta1.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.0_beta1.ebuild
deleted file mode 100644
index 5bfe8622eca9..000000000000
--- a/net-misc/dhcpcd/dhcpcd-4.0.0_beta1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-4.0.0_beta1.ebuild,v 1.1 2008/05/06 14:28:55 drac Exp $
-
-EAPI=1
-
-inherit toolchain-funcs
-
-MY_P="${P/_alpha/-alpha}"
-MY_P="${MY_P/_beta/-beta}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A DHCP client"
-HOMEPAGE="http://roy.marples.name/dhcpcd"
-SRC_URI="http://roy.marples.name/${PN}/${MY_P}.tar.bz2"
-LICENSE="BSD-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
-SLOT="0"
-IUSE="+compat zeroconf"
-
-DEPEND=""
-PROVIDE="virtual/dhcpc"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use zeroconf; then
-		elog "Disabling zeroconf support"
-		{
-			echo
-			echo "# dhcpcd ebuild requested no zeroconf"
-			echo "noipv4ll"
-		} >> dhcpcd.conf
-	fi
-
-	if use compat; then
-		elog "dhcpcd-3 command line support enabled"
-		{
-			echo
-			echo "/* User indicated command line compatability */"
-			echo "#define CMDLINE_COMPAT"
-		} >> config.h
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" DBDIR=/var/lib/dhcpcd || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodir /etc/dhcpcd/dhcpcd-exit-hook.d
-	insinto /etc/dhcpcd/dhcpcd-exit-hook.d
-	# The sample ntp script only works with with NTP, not openntp
-	doins hook-samples/ntp.sh
-	# The sample ypbind script only works with linux
-	use elibc_glibc && doins hook-samples/ypbind.sh
-}
-
-pkg_postinst() {
-	# Upgrade the duid file to the new format if needed
-	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local new_duid="${ROOT}"/etc/dhcpcd/dhcpcd.duid
-	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
-		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
-	fi
-
-	# Move the duid to /etc, a more sensible location
-	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
-		cp -p "${old_duid}" "${new_duid}"
-	fi
-
-	if use zeroconf; then
-		elog "You have installed dhcpcd with zeroconf support."
-		elog "This means that it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the -L flag."
-		elog "See the dhcpcd man page for more details."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.0_beta2.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.0_beta2.ebuild
deleted file mode 100644
index a4aa328e7f8e..000000000000
--- a/net-misc/dhcpcd/dhcpcd-4.0.0_beta2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-4.0.0_beta2.ebuild,v 1.1 2008/05/08 21:02:45 armin76 Exp $
-
-EAPI=1
-
-inherit toolchain-funcs
-
-MY_P="${P/_alpha/-alpha}"
-MY_P="${MY_P/_beta/-beta}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A DHCP client"
-HOMEPAGE="http://roy.marples.name/dhcpcd"
-SRC_URI="http://roy.marples.name/${PN}/${MY_P}.tar.bz2"
-LICENSE="BSD-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
-SLOT="0"
-IUSE="+compat zeroconf"
-
-DEPEND=""
-PROVIDE="virtual/dhcpc"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use zeroconf; then
-		elog "Disabling zeroconf support"
-		{
-			echo
-			echo "# dhcpcd ebuild requested no zeroconf"
-			echo "noipv4ll"
-		} >> dhcpcd.conf
-	fi
-
-	if use compat; then
-		elog "dhcpcd-3 command line support enabled"
-		{
-			echo
-			echo "/* User indicated command line compatability */"
-			echo "#define CMDLINE_COMPAT"
-		} >> config.h
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" DBDIR=/var/lib/dhcpcd || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodir /etc/dhcpcd/dhcpcd-exit-hook.d
-	insinto /etc/dhcpcd/dhcpcd-exit-hook.d
-	# The sample ntp script only works with with NTP, not openntp
-	doins hook-samples/ntp.sh
-	# The sample ypbind script only works with linux
-	use elibc_glibc && doins hook-samples/ypbind.sh
-}
-
-pkg_postinst() {
-	# Upgrade the duid file to the new format if needed
-	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local new_duid="${ROOT}"/etc/dhcpcd/dhcpcd.duid
-	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
-		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
-	fi
-
-	# Move the duid to /etc, a more sensible location
-	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
-		cp -p "${old_duid}" "${new_duid}"
-	fi
-
-	if use zeroconf; then
-		elog "You have installed dhcpcd with zeroconf support."
-		elog "This means that it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the -L flag."
-		elog "See the dhcpcd man page for more details."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.0_beta3.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.0_beta3.ebuild
deleted file mode 100644
index bc3a3222d4ad..000000000000
--- a/net-misc/dhcpcd/dhcpcd-4.0.0_beta3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-4.0.0_beta3.ebuild,v 1.2 2008/05/19 11:02:53 armin76 Exp $
-
-EAPI=1
-
-inherit toolchain-funcs
-
-MY_P="${P/_alpha/-alpha}"
-MY_P="${MY_P/_beta/-beta}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A DHCP client"
-HOMEPAGE="http://roy.marples.name/dhcpcd"
-SRC_URI="http://roy.marples.name/${PN}/${MY_P}.tar.bz2"
-LICENSE="BSD-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
-SLOT="0"
-IUSE="+compat zeroconf"
-
-DEPEND=""
-PROVIDE="virtual/dhcpc"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use zeroconf; then
-		elog "Disabling zeroconf support"
-		{
-			echo
-			echo "# dhcpcd ebuild requested no zeroconf"
-			echo "noipv4ll"
-		} >> dhcpcd.conf
-	fi
-
-	if use compat; then
-		elog "dhcpcd-3 command line support enabled"
-		{
-			echo
-			echo "/* User indicated command line compatability */"
-			echo "#define CMDLINE_COMPAT"
-		} >> config.h
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" DBDIR=/var/lib/dhcpcd || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodir /etc/dhcpcd/dhcpcd-exit-hook.d
-	insinto /etc/dhcpcd/dhcpcd-exit-hook.d
-	# The sample ntp script only works with with NTP, not openntp
-	doins hook-samples/ntp.sh
-	# The sample ypbind script only works with linux
-	use elibc_glibc && doins hook-samples/ypbind.sh
-
-	keepdir /var/lib/dhcpcd
-}
-
-pkg_postinst() {
-	# Upgrade the duid file to the new format if needed
-	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local new_duid="${ROOT}"/etc/dhcpcd/dhcpcd.duid
-	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
-		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
-	fi
-
-	# Move the duid to /etc, a more sensible location
-	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
-		cp -p "${old_duid}" "${new_duid}"
-	fi
-
-	if use zeroconf; then
-		elog "You have installed dhcpcd with zeroconf support."
-		elog "This means that it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the -L flag."
-		elog "See the dhcpcd man page for more details."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.0_beta4.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.0_beta4.ebuild
deleted file mode 100644
index 6977a0c87db2..000000000000
--- a/net-misc/dhcpcd/dhcpcd-4.0.0_beta4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-4.0.0_beta4.ebuild,v 1.1 2008/05/19 14:01:39 armin76 Exp $
-
-EAPI=1
-
-inherit toolchain-funcs
-
-MY_P="${P/_alpha/-alpha}"
-MY_P="${MY_P/_beta/-beta}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A DHCP client"
-HOMEPAGE="http://roy.marples.name/dhcpcd"
-SRC_URI="http://roy.marples.name/${PN}/${MY_P}.tar.bz2"
-LICENSE="BSD-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
-SLOT="0"
-IUSE="+compat zeroconf"
-
-DEPEND=""
-PROVIDE="virtual/dhcpc"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use zeroconf; then
-		elog "Disabling zeroconf support"
-		{
-			echo
-			echo "# dhcpcd ebuild requested no zeroconf"
-			echo "noipv4ll"
-		} >> dhcpcd.conf
-	fi
-
-	if use compat; then
-		elog "dhcpcd-3 command line support enabled"
-		{
-			echo
-			echo "/* User indicated command line compatability */"
-			echo "#define CMDLINE_COMPAT"
-		} >> config.h
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" DBDIR=/var/lib/dhcpcd || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodir /etc/dhcpcd/dhcpcd-exit-hook.d
-	insinto /etc/dhcpcd/dhcpcd-exit-hook.d
-	# The sample ntp script only works with with NTP, not openntp
-	doins hook-samples/ntp.sh
-	# The sample ypbind script only works with linux
-	use elibc_glibc && doins hook-samples/ypbind.sh
-
-	keepdir /var/lib/dhcpcd
-}
-
-pkg_postinst() {
-	# Upgrade the duid file to the new format if needed
-	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local new_duid="${ROOT}"/etc/dhcpcd/dhcpcd.duid
-	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
-		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
-	fi
-
-	# Move the duid to /etc, a more sensible location
-	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
-		cp -p "${old_duid}" "${new_duid}"
-	fi
-
-	if use zeroconf; then
-		elog "You have installed dhcpcd with zeroconf support."
-		elog "This means that it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the -L flag."
-		elog "See the dhcpcd man page for more details."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.0_beta5.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.0_beta5.ebuild
deleted file mode 100644
index 3407bdd85a72..000000000000
--- a/net-misc/dhcpcd/dhcpcd-4.0.0_beta5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-4.0.0_beta5.ebuild,v 1.1 2008/05/25 09:42:30 armin76 Exp $
-
-EAPI=1
-
-inherit toolchain-funcs
-
-MY_P="${P/_alpha/-alpha}"
-MY_P="${MY_P/_beta/-beta}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A DHCP client"
-HOMEPAGE="http://roy.marples.name/dhcpcd"
-SRC_URI="http://roy.marples.name/${PN}/${MY_P}.tar.bz2"
-LICENSE="BSD-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
-SLOT="0"
-IUSE="+compat zeroconf"
-
-DEPEND=""
-PROVIDE="virtual/dhcpc"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use zeroconf; then
-		elog "Disabling zeroconf support"
-		{
-			echo
-			echo "# dhcpcd ebuild requested no zeroconf"
-			echo "noipv4ll"
-		} >> dhcpcd.conf
-	fi
-
-	if use compat; then
-		elog "dhcpcd-3 command line support enabled"
-		{
-			echo
-			echo "/* User indicated command line compatability */"
-			echo "#define CMDLINE_COMPAT"
-		} >> config.h
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" DBDIR=/var/lib/dhcpcd LIBEXECDIR=/lib/dhcpcd || die
-}
-
-src_install() {
-	local hooks="50-ntp.conf"
-	use elibc_glibc && hooks="${hooks} 50-yp.conf"
-	emake LIBEXECDIR=/lib/dhcpcd HOOKSCRIPTS="${hooks}" DESTDIR="${D}" install || die
-	keepdir /var/lib/dhcpcd
-}
-
-pkg_postinst() {
-	# Upgrade the duid file to the new format if needed
-	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local new_duid="${ROOT}"/etc/dhcpcd.duid
-	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
-		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
-	fi
-
-	# Move the duid to /etc, a more sensible location
-	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
-		cp -p "${old_duid}" "${new_duid}"
-	fi
-
-	if use zeroconf; then
-		elog "You have installed dhcpcd with zeroconf support."
-		elog "This means that it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the -L flag."
-		elog "See the dhcpcd man page for more details."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.0_beta6.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.0_beta6.ebuild
deleted file mode 100644
index 67ec590d6b7f..000000000000
--- a/net-misc/dhcpcd/dhcpcd-4.0.0_beta6.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-4.0.0_beta6.ebuild,v 1.1 2008/06/18 10:43:25 armin76 Exp $
-
-EAPI=1
-
-inherit toolchain-funcs
-
-MY_P="${P/_alpha/-alpha}"
-MY_P="${MY_P/_beta/-beta}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A DHCP client"
-HOMEPAGE="http://roy.marples.name/dhcpcd"
-SRC_URI="http://roy.marples.name/${PN}/${MY_P}.tar.bz2"
-LICENSE="BSD-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
-SLOT="0"
-IUSE="+compat zeroconf"
-
-DEPEND=""
-PROVIDE="virtual/dhcpc"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use zeroconf; then
-		elog "Disabling zeroconf support"
-		{
-			echo
-			echo "# dhcpcd ebuild requested no zeroconf"
-			echo "noipv4ll"
-		} >> dhcpcd.conf
-	fi
-
-	if use compat; then
-		elog "dhcpcd-3 command line support enabled"
-		{
-			echo
-			echo "/* User indicated command line compatability */"
-			echo "#define CMDLINE_COMPAT"
-		} >> config.h
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" DBDIR=/var/lib/dhcpcd LIBEXECDIR=/lib/dhcpcd || die
-}
-
-src_install() {
-	local hooks="50-ntp.conf"
-	use elibc_glibc && hooks="${hooks} 50-yp.conf"
-	emake LIBEXECDIR=/lib/dhcpcd HOOKSCRIPTS="${hooks}" DESTDIR="${D}" install || die
-	keepdir /var/lib/dhcpcd
-}
-
-pkg_postinst() {
-	# Upgrade the duid file to the new format if needed
-	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local new_duid="${ROOT}"/etc/dhcpcd.duid
-	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
-		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
-	fi
-
-	# Move the duid to /etc, a more sensible location
-	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
-		cp -p "${old_duid}" "${new_duid}"
-	fi
-
-	if use zeroconf; then
-		elog "You have installed dhcpcd with zeroconf support."
-		elog "This means that it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the -L flag."
-		elog "See the dhcpcd man page for more details."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.0_beta7.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.0_beta7.ebuild
deleted file mode 100644
index 03d4092f6950..000000000000
--- a/net-misc/dhcpcd/dhcpcd-4.0.0_beta7.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-4.0.0_beta7.ebuild,v 1.1 2008/06/20 07:49:16 the_paya Exp $
-
-EAPI=1
-
-inherit toolchain-funcs
-
-MY_P="${P/_alpha/-alpha}"
-MY_P="${MY_P/_beta/-beta}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A DHCP client"
-HOMEPAGE="http://roy.marples.name/dhcpcd"
-SRC_URI="http://roy.marples.name/${PN}/${MY_P}.tar.bz2"
-LICENSE="BSD-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
-SLOT="0"
-IUSE="+compat zeroconf"
-
-DEPEND=""
-PROVIDE="virtual/dhcpc"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use zeroconf; then
-		elog "Disabling zeroconf support"
-		{
-			echo
-			echo "# dhcpcd ebuild requested no zeroconf"
-			echo "noipv4ll"
-		} >> dhcpcd.conf
-	fi
-
-	if use compat; then
-		elog "dhcpcd-3 command line support enabled"
-		{
-			echo
-			echo "/* User indicated command line compatability */"
-			echo "#define CMDLINE_COMPAT"
-		} >> config.h
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" DBDIR=/var/lib/dhcpcd LIBEXECDIR=/lib/dhcpcd || die
-}
-
-src_install() {
-	local hooks="50-ntp.conf"
-	use elibc_glibc && hooks="${hooks} 50-yp.conf"
-	emake LIBEXECDIR=/lib/dhcpcd HOOKSCRIPTS="${hooks}" DESTDIR="${D}" install || die
-	keepdir /var/lib/dhcpcd
-}
-
-pkg_postinst() {
-	# Upgrade the duid file to the new format if needed
-	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local new_duid="${ROOT}"/etc/dhcpcd.duid
-	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
-		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
-	fi
-
-	# Move the duid to /etc, a more sensible location
-	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
-		cp -p "${old_duid}" "${new_duid}"
-	fi
-
-	if use zeroconf; then
-		elog "You have installed dhcpcd with zeroconf support."
-		elog "This means that it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the -L flag."
-		elog "See the dhcpcd man page for more details."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.0_beta8.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.0_rc1.ebuild
index 8db444261f46..f1650da078ed 100644
--- a/net-misc/dhcpcd/dhcpcd-4.0.0_beta8.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-4.0.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-4.0.0_beta8.ebuild,v 1.1 2008/07/05 15:25:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-4.0.0_rc1.ebuild,v 1.1 2008/07/22 09:43:07 armin76 Exp $
 
 EAPI=1
 
@@ -8,6 +8,7 @@ inherit toolchain-funcs
 
 MY_P="${P/_alpha/-alpha}"
 MY_P="${MY_P/_beta/-beta}"
+MY_P="${MY_P/_rc/-rc}"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="A DHCP client"
@@ -46,15 +47,19 @@ src_unpack() {
 	fi
 }
 
+pkg_setup() {
+	MAKE_ARGS="DBDIR=/var/lib/dhcpcd LIBEXECDIR=/lib/dhcpcd"
+}
+
 src_compile() {
-	emake CC="$(tc-getCC)" DBDIR=/var/lib/dhcpcd LIBEXECDIR=/lib/dhcpcd || die
+	[ -z "${MAKE_ARGS}" ] && die "MAKE_ARGS is empty"
+	emake CC="$(tc-getCC)" ${MAKE_ARGS} || die
 }
 
 src_install() {
 	local hooks="50-ntp.conf"
 	use elibc_glibc && hooks="${hooks} 50-yp.conf"
-	emake LIBEXECDIR=/lib/dhcpcd HOOKSCRIPTS="${hooks}" DESTDIR="${D}" install || die
-	keepdir /var/lib/dhcpcd
+	emake ${MAKE_ARGS} HOOKSCRIPTS="${hooks}" DESTDIR="${D}" install || die
 }
 
 pkg_postinst() {