add live ebuild for bug #457762, thanks to Scott Bertilson.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux i686
Manifest-Sign-Key: 0x30C46538

3 files changed, 110 insertions, 5 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index 66b3860ea4d9..65f5804ffc69 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/dhcpcd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.350 2013/02/05 18:54:35 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.351 2013/02/17 15:56:34 williamh Exp $
+
+*dhcpcd-9999 (17 Feb 2013)
+
+  17 Feb 2013; William Hubbs <williamh@gentoo.org> +dhcpcd-9999.ebuild:
+  add live ebuild for bug #457762, thanks to Scott Bertilson.
 
 *dhcpcd-5.6.7 (05 Feb 2013)
 
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 7f90520a6d6c..3715262f17bf 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -11,12 +11,13 @@ DIST dhcpcd-5.6.7.tar.bz2 85983 SHA256 102cc37596216c0e2c0b230fe58bf880e993ec866
 EBUILD dhcpcd-5.6.4.ebuild 3426 SHA256 bb38c91f9bb8545bcd32ccb148d17adb25193a11e458eb14c55dc44707aa4ee4 SHA512 e9d3c05b44438dbf0ba491b7723e982c4d06d27181e629702e8dc2641f20cfed211959605c8e4ea9cc05e84c21a1ee3542ff4ec0bf8de407014176dc7564814d WHIRLPOOL a840f0c6d2feca17f6353ce7361047735875de4ee8dc2cb3544c0fa17095aaf70c0f0c67e65ec22fedf5b30f9cd7dcf7f007970d43aaf76bae0675f6339e8954
 EBUILD dhcpcd-5.6.6.ebuild 2724 SHA256 62a26bbbf8e5afcf5fa88b5bddc8ab24a3a575c7c5303b709ece5231a23a7bc6 SHA512 8e2a7f766f79618893fc5128e2f19f2312dce5b6f2dfb284345b63cea89a4c502c869699110746516a7aaaf08da19a5723cfac43d50745ebc3335556d96c9c6a WHIRLPOOL c7b13905a215a6afd267c128be4f73ee5378a9ada77d2b3acbff1e2055863dc9a9504e99a13db9d921830b6fd7d12992a921ae2aea23b64a27a1741bd2b4a127
 EBUILD dhcpcd-5.6.7.ebuild 2724 SHA256 6a71937985e9dd299e5869c1dd373b0db291a185c4264037e074c511d89eeadb SHA512 b38223815251eda1458d85041a7405cb43d494b02cecdbaee908875e0c11c7936d37dfdbcfb1a40e2c0ad6d43599a4fe6e04bd1b9717c12fc792873f6102cb34 WHIRLPOOL 65696ddce9b7e6fa268c101d9eabab983bd543ef3c5c5233ea0675fc059dd1df36eca8a21c1360b3f6bfb8f98755e6fd134990ed2c57fa4f8a09d5a4ef8611fa
-MISC ChangeLog 48872 SHA256 4073b00ff5c320ef24b7c2146ad692d4deb188a1de3f3b4bcbcb0d890ad9e257 SHA512 e855163d391a67b1750e130813ae662fa5cf54aa674939078bc8dbf7614b0a898b180154444360fb1375d7fd096ffbbec8ba2f59e1484ee5b052715d0f88c6a2 WHIRLPOOL 41bea5edcee9674e9545470be5454b2ca37697d7c2b43bc70ae9cd63fee1117c15940f0e750cbad8588ac8ad907f20f7aebeff71f82e6f0e8939a8a78e43a4cd
+EBUILD dhcpcd-9999.ebuild 2831 SHA256 40ef2eacc95023f63f1ad8151e545b6d734ceeecfd0980b4e2b2bfad73696eba SHA512 b4859dbdd8bef991a0a1f96913fe59376b908c507d0cef7747b19d0631fca3d8cff4dbb4e25b7f4121b75aaf23d43dbf597c3ccfc50ce5ec3de35824da469b6a WHIRLPOOL 04a32fe4b198fd4081c69c0ed7b3ddc382666bd6f66b1beddfc2d04779ba18cb8721f73df983604afc147114cc64e29b19ac75ff9e16312c2b050d89d2396160
+MISC ChangeLog 49035 SHA256 e21e5b7d841231f509f191727bc44250797e6016f871b0facebac0f4236079b3 SHA512 452ff0dfd29e5fd89348a223b7a3bcf2251af39009b69dd0d6d13ca7fafc1cd5355ada648fb2b24306cccba7a15bf252732722926840af9f9373f28ea8307e74 WHIRLPOOL a503753a8d6842ec7341fd188923fcfd42c122eefa8647c299866c96a420b529a19796f8a17199332cf3dab185f612adedaf0b43c9480d2f449510c53eb7689b
 MISC metadata.xml 267 SHA256 e49d3af922c81acd77a87c5432515be3bec34c7fd6646941acae7c5ea113a08e SHA512 f46e3eaac53a9ac66b00bb1eb071668d2c0b6086ba6b9da19d13442e58c3b4cffd424b3d160100d4a9e7160ca356af1fcb0f2ad75a27cbd5aaf12964191df2a9 WHIRLPOOL 409c00b28d63d076ef8a0ea26ece6a48405bcb5a4c72bb06eb412c8972f9ac9909613a82b415c3f8d7c0ebf34fcf6f953ac68c0976e9e8e5c01015caae15de5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlERVacACgkQblQW9DDEZTiMfwCfb2pksTaKCMCvZLKob8V/+yJO
-aekAnRkWldSqRi/WH9qq/at1mE1GAfbB
-=VFbh
+iEYEAREIAAYFAlEg/boACgkQblQW9DDEZTg0owCfbfhYZBXFjLBYMg8DH42YOirx
+fOEAniccrzc0DuWjix2U1aRq4mfWBaWZ
+=nASe
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
new file mode 100644
index 000000000000..3be8da7793d2
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-9999.ebuild,v 1.1 2013/02/17 15:56:34 williamh Exp $
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://roy.marples.name/${PN}.git"
+	inherit git-2
+else
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="+zeroconf elibc_glibc"
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare()
+{
+	epatch_user
+	if ! use zeroconf; then
+		elog "Disabling zeroconf support"
+		{
+			echo
+			echo "# dhcpcd ebuild requested no zeroconf"
+			echo "noipv4ll"
+		} >> dhcpcd.conf
+	fi
+}
+
+src_configure()
+{
+	local hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	econf \
+			--prefix="${EPREFIX}" \
+			--libexecdir="${EPREFIX}/lib/dhcpcd" \
+			--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_preinst()
+{
+	has_version 'net-misc/dhcpcd[zeroconf]' && prev_zero=true || prev_zero=false
+}
+
+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 && ! $prev_zero; 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
+
+	# Mea culpa, feel free to remove that after some time --mgorny.
+	if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${PN}.service ]]
+	then
+		ebegin "Moving ${PN}.service to multi-user.target"
+		mv "${ROOT}"/etc/systemd/system/network.target.wants/${PN}.service \
+			"${ROOT}"/etc/systemd/system/multi-user.target.wants/
+		eend ${?} \
+			"Please try to re-enable dhcpcd.service"
+	fi
+}