Version bump to solve bug #239098 with no file generation with compat mode.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.27-rc6-00521-gcdbf87e x86_64

3 files changed, 96 insertions, 2 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index 514c0c853ead..454f23b3be82 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.212 2008/10/01 14:39:31 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.213 2008/10/01 20:51:36 robbat2 Exp $
+
+*dhcpcd-4.0.2 (01 Oct 2008)
+
+  01 Oct 2008; Robin H. Johnson <robbat2@gentoo.org> +dhcpcd-4.0.2.ebuild:
+  Version bump to solve bug #239098 with no file generation with compat
+  mode.
 
   01 Oct 2008; Brent Baude <ranger@gentoo.org> dhcpcd-4.0.1-r1.ebuild:
   stable ppc64, bug 238731
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 5a3f94faaaf8..4c6491d7eb0d 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -10,6 +10,7 @@ DIST dhcpcd-3.2.3.tar.bz2 45030 RMD160 4319dc97c97f08124a6466d096eeb2a21b4d069d
 DIST dhcpcd-4.0.0-rc5.tar.bz2 51241 RMD160 35bfa384431833eaa131015cd2acb4ea57164ea2 SHA1 ba300384f211d5846b3d1e4c722b9759b3048978 SHA256 cd03d3d457ddb4dadb09118cb048a8c4097d750a0c47cdc687137a577985ddf7
 DIST dhcpcd-4.0.0.tar.bz2 51674 RMD160 62bef2c676f656dd846ce5c3260866cb841e1a11 SHA1 cb8c04d727ae48ccbcec9872b3b7d3fca09f5afd SHA256 b895e51b0863a2053652eaad9ca6d12e5fb9e393bc7ff54a1fd958cc83355093
 DIST dhcpcd-4.0.1.tar.bz2 51697 RMD160 4a539349a02af358b93bdfc0998db4ccaad5970b SHA1 a73b8fa730b37655cdfbd3bec0584c5d82ff1877 SHA256 de53eb2b9dd6cf7220c28f73727c491c3d3b8e6e10049d25b4f6db3faad0e8ec
+DIST dhcpcd-4.0.2.tar.bz2 51625 RMD160 e2bf8fce66404e70f03f331de2fc83503bdbf077 SHA1 3224bb58fd82efb2f86e6a1f76dce6bff20cdc1d SHA256 19aba85cf98906ea38397fadf2d23841c343bce9d995d8684d0c083524bf6523
 DIST dhcpcd-4.99.2.tar.bz2 54946 RMD160 a2e3e8b37e41f0b3356f7a7cba6c606dbaf6db0a SHA1 8b49f3dffb47c754ba1629aa971fbf14e137bd26 SHA256 513a6ab9d4010ebc495425816155c44074f7195f7d1550d9653a2dc2c8ecfa95
 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
@@ -20,6 +21,7 @@ EBUILD dhcpcd-4.0.0.ebuild 2284 RMD160 668e78d5f86ac17d0702e8916473643ce0b95ccf
 EBUILD dhcpcd-4.0.0_rc5.ebuild 2288 RMD160 d4384039fb30761826dd4b4ac057a2594695f27f SHA1 c02dba6e6e3a1f1063339beb14d4641337c6f0d4 SHA256 020af651289eba68f9bf020e0cadc85ad126a78e14133cdf269b3c7c9c0a9211
 EBUILD dhcpcd-4.0.1-r1.ebuild 2365 RMD160 32fc4dcabe7835d77c57081d43592b065091a84a SHA1 189a45e8a302930e19fb23c17e26a4651020bab1 SHA256 66be900ded4a1e0247e8da635068a9f71ef8a8a8f756090ae3e223d93c393a01
 EBUILD dhcpcd-4.0.1.ebuild 2281 RMD160 7c0f461f47bc8bbee92cdf045991b1434527e3e2 SHA1 6f8064ced3f85b08e93ab8be1a796458b2158110 SHA256 5efaa6e8c7cdc7578dd761db185dc0f89be26ab34c878746f4f2076fa49f7c78
+EBUILD dhcpcd-4.0.2.ebuild 2310 RMD160 f19b8d69d4dde1f2635973fcdbb7ee060d886147 SHA1 8d67040b28f9675b089b16e7e84302eb888131c3 SHA256 32f486e61e5f1255f45e3d635b26cb7d4f3c7c429aea848dc0d9e8183cdce071
 EBUILD dhcpcd-4.99.2.ebuild 2152 RMD160 216e84b7b49cf2610e2c60ad7509f98f471b6a80 SHA1 80436a2435f962664a40eb1af9d3e0f725b34114 SHA256 d04f691b3b9d28d2afc1083ffdaaa65fbdbe519606198aaf11ebde61756fd08b
-MISC ChangeLog 30098 RMD160 eeb940ef68e77863ec38448a77a7721fff78a467 SHA1 e7494cb7280099feb5aa44f3b7f2309e8ccbeb87 SHA256 90664878936e012ada1a474d91cdba1c7ab8a25af86c2aaf79b655a32e0820ec
+MISC ChangeLog 30284 RMD160 6635a4e65a0799337fb444ac16c8628578ca9266 SHA1 5501bcd207ad1db535fa096662966aa2e82b2992 SHA256 45d6f837aa36d2655076756021e7eef9e98348dab3b32267baf3bfeaed80ff97
 MISC metadata.xml 474 RMD160 a0dd1b7ce940eac39d4c9d32f0a5473e44ea291b SHA1 a007fba723b719e14bbb5cb2b8d9f2d62d1e87da SHA256 ed92d0ec6aff23c23eaf1bf7c36357a7a7cd63723b6312caccbb2becb3bd0c72
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.2.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.2.ebuild
new file mode 100644
index 000000000000..d449bbb0428a
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-4.0.2.ebuild
@@ -0,0 +1,86 @@
+# 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.2.ebuild,v 1.1 2008/10/01 20:51:36 robbat2 Exp $
+
+EAPI=1
+
+inherit toolchain-funcs eutils
+
+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"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd"
+SRC_URI="http://roy.marples.name/downloads/${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
+}
+
+pkg_setup() {
+	MAKE_ARGS="DBDIR=/var/lib/dhcpcd LIBEXECDIR=/lib/dhcpcd"
+}
+
+src_compile() {
+	[ -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 ${MAKE_ARGS} HOOKSCRIPTS="${hooks}" DESTDIR="${D}" install || die
+}
+
+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
+}