Version bump

(Portage version: 2.1.4.4)

9 files changed, 19 insertions, 592 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/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() {