Version bump wrt #219321 by Roy Marples.

Package-Manager: portage-2.1.5_rc6

3 files changed, 94 insertions, 12 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index 89bd6225db23..b4781bf73cd7 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.186 2008/05/02 15:57:03 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.187 2008/05/06 14:28:55 drac Exp $
+
+*dhcpcd-4.0.0_beta1 (06 May 2008)
+
+  06 May 2008; Samuli Suominen <drac@gentoo.org> +dhcpcd-4.0.0_beta1.ebuild:
+  Version bump wrt #219321 by Roy Marples.
 
   02 May 2008; Doug Goldstein <cardoe@gentoo.org> dhcpcd-2.0.5-r1.ebuild:
   bug #218657 berlios mirror
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 672cafb67482..59d85ef355e9 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dhcpcd-2.0.0-alwaysup.patch 269 RMD160 32639a49176d07495704da4c9cae6237fe12333a SHA1 b9d1107ef2e06dd9f97e9530eddc5b1c25d5dd9b SHA256 6c8bb55db74b400cd98d406c6f96e18956f33efb2e814f12d974a43799f0f902
 AUX dhcpcd-3.0.16-min-message.patch 531 RMD160 8407d4009490cda04100456f095aed5da89f2168 SHA1 335f121022a494082afe6872c4d2c7b921fd67b8 SHA256 0229c7272be152ee6c8d2f8c0fd7e31f6cb05ac9d508b3e785739723a1acd2c9
 AUX dhcpcd-3.1.6-zeroconf.patch 1796 RMD160 78c74542cfa9d27eaac45c1e295dae52c6f0cca6 SHA1 06ba268855c8d0a49506fe926afadd69bee7493c SHA256 ed8ff8566fafc87560997786fc939d10c05fb077d44fdaff2ba125e1f5610f02
@@ -15,6 +12,7 @@ DIST dhcpcd-3.2.0.tar.bz2 43896 RMD160 ac0ce60e50671a82edc14166bf9f745e297cd305
 DIST dhcpcd-3.2.1.tar.bz2 43938 RMD160 c38226c8cb66d99d03103c11ca945585b153baf2 SHA1 0c017b14095ac66c23f3e4d172feb4db8a0cb729 SHA256 493ecb4c3848aec9f3dc31d70d0c63ade86942b75e33ecd72bacbae024256aff
 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
 EBUILD dhcpcd-2.0.5-r1.ebuild 1422 RMD160 3b55769e3825e59ded7c45d7add69fc404d96856 SHA1 77a18a3ab32fe3f78407fb27a181f3d6df5ff8a9 SHA256 434c0c25a7da5c18255f99b9bec7ea8af5ede8335610e0f7a091b939322b66df
 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
@@ -28,12 +26,6 @@ EBUILD dhcpcd-3.2.0.ebuild 2629 RMD160 e2b8f2e9d71150e5756ab62d91883ca0deeb8d66
 EBUILD dhcpcd-3.2.1.ebuild 2627 RMD160 06ec59690da78f7e05e7bb010c6091932dbb5f05 SHA1 fb1bf292618a32d77d7ff46a0605a4f78ccac603 SHA256 47ad42fc5a3dbc83b35aad7475ae59adab8dffb810cad5570a50c9dc3faf571e
 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
-MISC ChangeLog 26318 RMD160 789920e03bc8cf559cc7c09a9681345328930b66 SHA1 6e8ccf29a30187e2469dfb953603137604a50df0 SHA256 136bc883da29913fc1f6cb429f79548ee3afa676b8955fe33216c912dc089ed7
+EBUILD dhcpcd-4.0.0_beta1.ebuild 2311 RMD160 80132e44d4ae7e0206d8d7ceb935ae48ea3ef99b SHA1 b9e73ed2f6378db75dd3f8b34b6d3dfb61a72fc4 SHA256 2455729aee8e614dac0df70298fe2e6522f11c859f34de78fb64cb5796fc13d2
+MISC ChangeLog 26472 RMD160 37b93d469a623104212a62c321775ad04794cce4 SHA1 dffd09b6bcd85466b7d705e1ffdb474e67dba08e SHA256 2f33f1229a7d5617556244040d2868c3c5262dfd15a4d7c3305c26b44c1ca556
 MISC metadata.xml 294 RMD160 a4a156d187ceb572e144d1e83ffbb07652114eaa SHA1 18a4bc93e056a51f051f2e277d8eef144b6584ca SHA256 35cda940f329b0522dd2f0486a24a763f5da0560eacf0045a5faf940ddd883fa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgbOd4ACgkQoeSe8B0zEfxXPACeJSdkTMsl3u2C67EdjWx4bxbd
-7XMAniwvQWBDH0rSofaY39asgfbAjizW
-=hLmC
------END PGP SIGNATURE-----
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.0_beta1.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.0_beta1.ebuild
new file mode 100644
index 000000000000..5bfe8622eca9
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-4.0.0_beta1.ebuild
@@ -0,0 +1,85 @@
+# 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
+}