Version bump

Package-Manager: portage-2.1.4.4

3 files changed, 96 insertions, 2 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index 7fef83ec7ae9..3924800b79ce 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.191 2008/05/19 11:02:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.192 2008/05/19 14:01:39 armin76 Exp $
+
+*dhcpcd-4.0.0_beta4 (19 May 2008)
+
+  19 May 2008; Raúl Porcel <armin76@gentoo.org> +dhcpcd-4.0.0_beta4.ebuild:
+  Version bump
 
   19 May 2008; Raúl Porcel <armin76@gentoo.org> dhcpcd-4.0.0_beta3.ebuild:
   Add keepdir /var/lib/dhcpcd, per Uberlord's request
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index a3af9ae16deb..fc6fd97b90a6 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -8,6 +8,7 @@ DIST dhcpcd-3.2.3.tar.bz2 45030 RMD160 4319dc97c97f08124a6466d096eeb2a21b4d069d
 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
 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
@@ -16,5 +17,6 @@ EBUILD dhcpcd-3.2.3.ebuild 2616 RMD160 0fd64284267ee4563b2fcb981bb0b242594dbcf1
 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
-MISC ChangeLog 26882 RMD160 ec5503540d1dc05977c966f65a6beb13724205d9 SHA1 9abbee5919e4d7ed26fd7412e92308a43ddf7ba3 SHA256 35fac62d6cab6fa26549ba42cc83d904666594264c97cb948f4c2a2590825648
+EBUILD dhcpcd-4.0.0_beta4.ebuild 2340 RMD160 617842c1decd9205a33a0b9a53a6d5b62b749898 SHA1 d5f7efc941b48202994512ceb6f7623fd5269bfe SHA256 ee8bd6d86efdadc5aa64a0668da4e8637d5c83867729d93d1b56840cc59f9aee
+MISC ChangeLog 27010 RMD160 c8e331735fc0ff06f22df63dd60ccd3d25119c67 SHA1 9f3e909634519fbd88cfbf69166ce4de5c5333e9 SHA256 8f6bf92d774310f83c30d92756459d1520d969ed1358717c54607299798d3fe8
 MISC metadata.xml 294 RMD160 a4a156d187ceb572e144d1e83ffbb07652114eaa SHA1 18a4bc93e056a51f051f2e277d8eef144b6584ca SHA256 35cda940f329b0522dd2f0486a24a763f5da0560eacf0045a5faf940ddd883fa
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.0_beta4.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.0_beta4.ebuild
new file mode 100644
index 000000000000..6977a0c87db2
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-4.0.0_beta4.ebuild
@@ -0,0 +1,87 @@
+# 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
+}