revert patch from bug 350511, add systemd support for bug 372437 and

migrate to eapi 4. Thanks to mgorny@gentoo.org for systemd support.

Package-Manager: portage-2.2.0_alpha41/cvs/Linux i686

4 files changed, 116 insertions, 5 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index ade909ae0356..fe7d9029d9ca 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/dhcpcd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.320 2011/04/15 21:39:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.321 2011/06/21 20:14:18 williamh Exp $
+
+*dhcpcd-5.2.12-r1 (21 Jun 2011)
+
+  21 Jun 2011; William Hubbs <williamh@gentoo.org> +dhcpcd-5.2.12-r1.ebuild,
+  +files/dhcpcd.service:
+  revert patch from bug 350511, add systemd support for bug 372437 and
+  migrate to eapi 4. Thanks to mgorny@gentoo.org for systemd support.
 
   15 Apr 2011; Ulrich Mueller <ulm@gentoo.org> dhcpcd-5.2.12.ebuild:
   Don't PROVIDE virtual/dhcpc, bug 358827.
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index c9f3814a7389..d43deeafa3e5 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -3,14 +3,16 @@ Hash: SHA1
 
 AUX dhcpcd.initd 327 RMD160 5391020a6e28fb411fde4ae1610182dcc27abc59 SHA1 2f255cce666c11b1082593e8ff2ef67ad6c3e0a0 SHA256 72b42c9939fda3fb56666813513029ed36194c1708bddce06bcb3e131e547492
 AUX dhcpcd.initd-1 500 RMD160 154c421adaee89a5ad6a95479d3707d58d4949f2 SHA1 8073c2cc3a5cfe12aa214744e895a96ef633ad16 SHA256 96ea2b4110bcddb8a06690e9ecec42f55937cb5c6f5cf7ec59516df70ab8056e
+AUX dhcpcd.service 137 RMD160 dc340a963666fe3e63274a108979217d5e3fb61c SHA1 be0f97c6c26f337bffe70f0c8464a6985965d21d SHA256 8fc320592e8aa2fe29f48c8780269826004bc027a97e0b58f69af347c21b66ed
 DIST dhcpcd-5.2.12.tar.bz2 72177 RMD160 588a6e508b3ed7e07e044c4da77512eebc9bd607 SHA1 27378a251705c7888332e6d60eea7805d1f8aeb5 SHA256 55da7dcf64cd3dda5217d0e01748a3d980ab0cd625bae0efc00420eadd7f559b
+EBUILD dhcpcd-5.2.12-r1.ebuild 2933 RMD160 609108a99b946b092a553ee53a15ea299a9be931 SHA1 714f29d03e21eba1432498b7a19a5a9859857296 SHA256 b35efd188c9ce73de8d31168eee66ca59cb25675fa0687c31eac5dc599ef9211
 EBUILD dhcpcd-5.2.12.ebuild 2863 RMD160 3a29e09878f8083bf2f83cde3870020690351b27 SHA1 aefc6a69c560f95011c918354badb9d90bbacf5d SHA256 ba7c42c6184c2dfdd2b907a974b199be13c6f7d30fed4b96fa7988615bcb651f
-MISC ChangeLog 44954 RMD160 8c1b92aecc4fe6bbcebe5e1c8e749edf7fae2c28 SHA1 f8f81a184d648fdf4435e549d46e8fa821fd3538 SHA256 7f2d3e56d4468f6b3615da6efef68dd0299c151cd4b6ed9f6facf69aebadd843
+MISC ChangeLog 45236 RMD160 18847a31cf538d00f83395034839385a3ada8182 SHA1 5bda6f8b09e7af433a1e41938d17d46221852915 SHA256 99956ed4200824c4faf46e201ae7c0c0cd2f111081809132bb39f65d2624ab60
 MISC metadata.xml 267 RMD160 b367f579205ecf0dee9655865b1d475b55ae23c3 SHA1 18d814d5103674d7e4f70cf384977757cb952160 SHA256 e49d3af922c81acd77a87c5432515be3bec34c7fd6646941acae7c5ea113a08e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2ou1cACgkQOeoy/oIi7uzNPwCggRhGI78SN6oO+cQJBh1SmHb6
-PF4An1dTVRw6V8Y2jOsiGc86xTW5szHz
-=z77E
+iEYEARECAAYFAk4A+30ACgkQblQW9DDEZTgAbgCdGcc+TV7BBIOb3fBMUkgz0Ku4
+08YAn2autMbp9XFbBCjLAjTElWU+pps0
+=DdRg
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild b/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild
new file mode 100644
index 000000000000..d230aba1ecbb
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild,v 1.1 2011/06/21 20:14:18 williamh Exp $
+
+EAPI=4
+
+inherit eutils systemd
+
+MY_P="${P/_alpha/-alpha}"
+MY_P="${MY_P/_beta/-beta}"
+MY_P="${MY_P/_rc/-rc}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant 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 ~x86 ~sparc-fbsd ~x86-fbsd"
+
+SLOT="0"
+IUSE="+zeroconf elibc_glibc"
+
+DEPEND=""
+RDEPEND="!<sys-apps/openrc-0.6.0"
+
+src_prepare() {
+	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= \
+			--libexecdir=/lib/dhcpcd \
+			--dbdir=/var/lib/dhcpcd \
+		--localstatedir=/var \
+		${hooks}
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README
+	newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service || 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
+
+	elog
+	elog "Users upgrading from 4.0 series should pay attention to removal"
+	elog "of compat useflag. This changes behavior of dhcp in wide manner:"
+	elog "dhcpcd no longer sends a default ClientID for ethernet interfaces."
+	elog "This is so we can re-use the address the kernel DHCP client found."
+	elog "To retain the old behaviour of sending a default ClientID based on the"
+	elog "hardware address for interface, simply add the keyword clientid"
+	elog "to dhcpcd.conf or use commandline parameter -I ''"
+	elog
+	elog "Also, users upgrading from 4.0 series should be aware that"
+	elog "the -N, -R and -Y command line options no longer exist."
+	elog "These are controled now by nohook options in dhcpcd.conf."
+}
diff --git a/net-misc/dhcpcd/files/dhcpcd.service b/net-misc/dhcpcd/files/dhcpcd.service
new file mode 100644
index 000000000000..46a6567e05e3
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Lightweight DHCP client daemon
+
+[Service]
+ExecStart=/sbin/dhcpcd -q --nobackground
+
+[Install]
+WantedBy=network.target