fix the libdir on non-multilib systems for bug #350511.

Thanks to Jory Pratt for the patch.

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

3 files changed, 99 insertions, 2 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index c47624f2c791..06a7274b7cb7 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.297 2011/01/03 18:49:18 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.298 2011/01/04 23:13:45 williamh Exp $
+
+*dhcpcd-5.2.10-r1 (04 Jan 2011)
+
+  04 Jan 2011; William Hubbs <williamh@gentoo.org> +dhcpcd-5.2.10-r1.ebuild:
+  fix the libdir on non-multilib systems for bug #350511.
+  Thanks to Jory Pratt for the patch.
 
   03 Jan 2011; William Hubbs <williamh@gentoo.org> dhcpcd-4.0.15.ebuild,
   dhcpcd-5.2.6.ebuild, dhcpcd-5.2.7.ebuild, dhcpcd-5.2.8.ebuild,
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 05678b91370d..47af1b887f81 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -6,10 +6,11 @@ DIST dhcpcd-5.2.7.tar.bz2 69019 RMD160 383eabbb3c80d499a3e0fcae7c805d24c92ea2a8
 DIST dhcpcd-5.2.8.tar.bz2 70069 RMD160 29833dfa04e21d90ad7dbb9541d0883af275e4cd SHA1 3a7ffc6d3599fd4146791853b083dc577d8dd9c0 SHA256 8a5c3f36ded39465062328868e6e06d7cc7ccd5b011aad16256d163a6eb9d14e
 DIST dhcpcd-5.2.9.tar.bz2 71101 RMD160 3e5f87b6febc8644c7df34f411573aacbde7eaaa SHA1 434397b1e881ddf3a97abe44c4cbadd5ff19436b SHA256 368a931dabe91842da4fcccb9b8ef2606b72e025191e4e32856a1ba3f2516756
 EBUILD dhcpcd-4.0.15.ebuild 2824 RMD160 19259ffd4642c02dd0c581040c08356adfadeac3 SHA1 d35baa045b9eb62dc70457b200daa3caca5a9435 SHA256 8f2ff68d4110a5bfd0aba9014fb017c0bb03e005122d3a789d01ecbcc5d16325
+EBUILD dhcpcd-5.2.10-r1.ebuild 2881 RMD160 b1aee6c7ac8430a9afd28a4adf1b3c0cf8902730 SHA1 e46b45771dde3b896d832223863525ff291f92ec SHA256 ff8d35c17a0dbd2b21f5d104dac03979add5a6fba6d7f5f65df96db9f018e0ea
 EBUILD dhcpcd-5.2.10.ebuild 2868 RMD160 fc9f6d38a1b3f6094d49fcfb868511ee822e7a7e SHA1 4eba78811de4e458149d2a9251c6301c91ffafe2 SHA256 6412710efb35e97a04ca2cec47a3a1e128e54d1ef9055e18e3e1327929a30f31
 EBUILD dhcpcd-5.2.6.ebuild 2666 RMD160 eab16c67ae1c34b3d2f1115dacf783608782ce64 SHA1 afe531921993ac3d4c254988a124562a4dcb9b89 SHA256 1c81db20783f7a8629e015f0c738dc48171f953a9712208f241c3af4193eb605
 EBUILD dhcpcd-5.2.7.ebuild 2666 RMD160 a12f4a1b773796e5bf22850aebb57663066160a7 SHA1 36a5628efc05fc789f28020b4ede3cedc06603ad SHA256 9806dcab64800a03b2adb7f36e66f8c325d644b74293588212e795b9eb2a2600
 EBUILD dhcpcd-5.2.8.ebuild 2656 RMD160 f6c36ef68aac0abd19aa981bbedae5e0260095f9 SHA1 5b718cc23cc219f2e6974f0a5300d23267270a6f SHA256 c2d32303d416dadb1ed3ad52a8025a305ddd92d4f674deb9507f484a5d95a82b
 EBUILD dhcpcd-5.2.9.ebuild 2666 RMD160 4f197b83eb39e68b3dc8e828641eefb9f643806c SHA1 b00e0ca845da416e85d92eca065684bf9acce160 SHA256 ba22eba6a5dbc4780381cc52c724f6cb43d9dd8f0b49378c15c57687a9df869b
-MISC ChangeLog 42010 RMD160 24feb901b10f08e9a77b5e9682d0ed701294f394 SHA1 09233fb170e66e58801a0891795e7f7cd7347d67 SHA256 72353671f468781fb8d62ca8f8b18cf2678c7d4ffd8dd71e4c6860f5c5bae8e0
+MISC ChangeLog 42217 RMD160 9f6b5423b9076dc7c0bae00e8ab5d472bc31f347 SHA1 e1bd7e4294ddeb85cb77289c4cb0c9a3ced44ab4 SHA256 fe5f2a858c1631da672d46948c475013614c4406700857016762dbe37ec5c70b
 MISC metadata.xml 364 RMD160 76c08f52a8358f3e62f42aaa5ee53820c452a104 SHA1 e9161300025ae9ff41c7b68eec327f64be57fcac SHA256 598b041b465927b424f29c9c843a34165bd12bd75dfd2422d79907a1b3b05b32
diff --git a/net-misc/dhcpcd/dhcpcd-5.2.10-r1.ebuild b/net-misc/dhcpcd/dhcpcd-5.2.10-r1.ebuild
new file mode 100644
index 000000000000..02f5abdf02ea
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-5.2.10-r1.ebuild
@@ -0,0 +1,90 @@
+# 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.10-r1.ebuild,v 1.1 2011/01/04 23:13:45 williamh Exp $
+
+EAPI=1
+
+inherit eutils
+
+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=""
+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
+}
+
+src_compile() {
+	local hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	econf --prefix= --libexecdir=/$(get_libdir)/dhcpcd --dbdir=/var/lib/dhcpcd \
+		--localstatedir=/var ${hooks}
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}
+
+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."
+}