version bump for compile issue and remove old unstable version.

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

4 files changed, 14 insertions, 113 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index efb12a27a96d..9212840c3aff 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/dhcpcd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.327 2012/02/03 16:21:34 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.328 2012/02/03 16:35:13 williamh Exp $
+
+*dhcpcd-5.5.3 (03 Feb 2012)
+
+  03 Feb 2012; William Hubbs <williamh@gentoo.org> +dhcpcd-5.5.3.ebuild,
+  -dhcpcd-5.2.12-r1.ebuild, -dhcpcd-5.5.2.ebuild:
+  version bump for compile issue and remove old unstable version.
 
 *dhcpcd-5.5.2 (03 Feb 2012)
 
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 368c5cdeb215..57227369a43a 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -5,16 +5,15 @@ AUX dhcpcd.initd 327 RMD160 5391020a6e28fb411fde4ae1610182dcc27abc59 SHA1 2f255c
 AUX dhcpcd.initd-1 500 RMD160 154c421adaee89a5ad6a95479d3707d58d4949f2 SHA1 8073c2cc3a5cfe12aa214744e895a96ef633ad16 SHA256 96ea2b4110bcddb8a06690e9ecec42f55937cb5c6f5cf7ec59516df70ab8056e
 AUX dhcpcd.service 183 RMD160 7916062e706686d147052becb491cc9c32f10e2c SHA1 bf119fa6187d6110e3d2dc1dcd273bb8ec81bdc5 SHA256 06aaf350b11b1cea6ced9e2b5c69011e1daf6eb0ac9b2a9f2c9f81a9be31f463
 DIST dhcpcd-5.2.12.tar.bz2 72177 RMD160 588a6e508b3ed7e07e044c4da77512eebc9bd607 SHA1 27378a251705c7888332e6d60eea7805d1f8aeb5 SHA256 55da7dcf64cd3dda5217d0e01748a3d980ab0cd625bae0efc00420eadd7f559b
-DIST dhcpcd-5.5.2.tar.bz2 77077 RMD160 95ed03a21077727b5ab180e6139e29930bbbaca6 SHA1 fbe7d3d7e4ac150fb8da599ff603fb4d2b5147ff SHA256 4feb1630da2aa3a809c0d414702da6326134a1211541776075d89323abe35518
-EBUILD dhcpcd-5.2.12-r1.ebuild 3361 RMD160 b06d3907c4cbff2d320ff54b087c4bde76a7c436 SHA1 057b1b48acd0b4966ccb1bfb6784bd8d9f30424c SHA256 39e27f3a64abd86a43a01edaa6a4a381ccdd84f937fe6642bd525d3aa7538995
+DIST dhcpcd-5.5.3.tar.bz2 77096 RMD160 9fb47a2d07a482254b50af1bcdb2850a68788016 SHA1 ee6b5243e5171cd94b6f3a24d93eacca2955eb66 SHA256 793103c28f3b10a27f69828c4957bc043a716eb6f597cd55c09cd3edb37ab311
 EBUILD dhcpcd-5.2.12.ebuild 2846 RMD160 ea0f42b850231174d691eb2891524311a84ec7c0 SHA1 4b9536ec1e1fa7a6ab2b02ee7eed87f7b6af5e32 SHA256 bd71a60b9a0f22357d87cbd0ac1dfe57dd9a882f4966e1602cd727e3c3f3c49d
-EBUILD dhcpcd-5.5.2.ebuild 3287 RMD160 1d37881d751cc909402761a452706d170576ae99 SHA1 4bee97d91287774d43e09ef961770aa26cc9448d SHA256 230b291d9cd7d59c9f9da92c7999782fce3f95a0242f273c46c4818fb97ebf51
-MISC ChangeLog 46091 RMD160 7103a9436ce077cad73a7ebbd7c635ac82ab9d4d SHA1 649302af52a7893a3bc094546cac77cfd518c937 SHA256 ab34af9e267626a82b18936cd3e2c6f34e409f9cfe304c03d6500c03732fef57
+EBUILD dhcpcd-5.5.3.ebuild 3287 RMD160 f5785607644c88e72d86854a317e60084e4f619a SHA1 2e165e8b319dfa00a7eaf7f0bdb5ec6b5d2e8d0c SHA256 b88c97df45f093c0a1073985b365ec31ab3dfa1037d8f5a43a6e7e98743761ca
+MISC ChangeLog 46310 RMD160 0ec848621a0880b80157ad747845039cdbdb29b7 SHA1 52e17d1c25f682648d0387e19ec95005e410dc6d SHA256 7e44ea81c5bed240ac678375238a85f42d49ae9e51040f6be75249d5583128a3
 MISC metadata.xml 267 RMD160 b367f579205ecf0dee9655865b1d475b55ae23c3 SHA1 18d814d5103674d7e4f70cf384977757cb952160 SHA256 e49d3af922c81acd77a87c5432515be3bec34c7fd6646941acae7c5ea113a08e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8sCMoACgkQblQW9DDEZTjVjgCgivyL6/Ad/pbxa63VBh6GglAT
-0/YAnAnxG3rAhGzZe+HlJDVc9Y1qBIkx
-=1vv2
+iEYEARECAAYFAk8sC/8ACgkQblQW9DDEZThP6ACfZoVfYE2mDwOZXkPLytMuhYq9
+ktsAoLpINTQaHnESLI9WNu4Pv2wSwXxl
+=Cl28
 -----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
deleted file mode 100644
index aa22c1e68f11..000000000000
--- a/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2012 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.7 2012/02/03 16:21:34 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 ~x86-linux"
-
-SLOT="0"
-IUSE="+zeroconf elibc_glibc"
-
-DEPEND=""
-RDEPEND=""
-
-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="${EPREFIX}" \
-			--libexecdir="${EPREFIX}/lib/dhcpcd" \
-			--dbdir="${EPREFIX}/var/lib/dhcpcd" \
-		--localstatedir="${EPREFIX}/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."
-
-	# 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
-}
diff --git a/net-misc/dhcpcd/dhcpcd-5.5.2.ebuild b/net-misc/dhcpcd/dhcpcd-5.5.3.ebuild
index 21f3396ef952..b03d2884af39 100644
--- a/net-misc/dhcpcd/dhcpcd-5.5.2.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-5.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.5.2.ebuild,v 1.1 2012/02/03 16:21:35 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.5.3.ebuild,v 1.1 2012/02/03 16:35:13 williamh Exp $
 
 EAPI=4