remove old versions wrt #362459.

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

5 files changed, 9 insertions, 289 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index 9dd8a04200be..70406866fd2f 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,10 @@
 # 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.317 2011/04/11 17:45:22 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.318 2011/04/11 19:35:11 williamh Exp $
+
+  11 Apr 2011; William Hubbs <williamh@gentoo.org> -dhcpcd-4.0.15.ebuild,
+  -dhcpcd-5.2.10-r2.ebuild, -dhcpcd-5.2.11.ebuild:
+  remove old versions wrt #362459.
 
   11 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org> dhcpcd-5.2.12.ebuild:
   ppc64 stable wrt #362459
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 1aca437b8d24..8c343741ebdb 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -3,22 +3,14 @@ Hash: SHA1
 
 AUX dhcpcd.initd 327 RMD160 5391020a6e28fb411fde4ae1610182dcc27abc59 SHA1 2f255cce666c11b1082593e8ff2ef67ad6c3e0a0 SHA256 72b42c9939fda3fb56666813513029ed36194c1708bddce06bcb3e131e547492
 AUX dhcpcd.initd-1 500 RMD160 154c421adaee89a5ad6a95479d3707d58d4949f2 SHA1 8073c2cc3a5cfe12aa214744e895a96ef633ad16 SHA256 96ea2b4110bcddb8a06690e9ecec42f55937cb5c6f5cf7ec59516df70ab8056e
-DIST dhcpcd-4.0.15.tar.bz2 52767 RMD160 a6b00ed30ce850cbe58c4aed1937f4bb8dcfd043 SHA1 bb1bbbe5b97bc8fd1fc1d4bea7067fe76f59182d SHA256 8ad7619eea8414851225b2ad2e204678911aca22791941f4caa49db435b2bca0
-DIST dhcpcd-5.2.10.tar.bz2 71140 RMD160 da982b48bd5a1a9dc2a6208b1e3390d78199e923 SHA1 3ff749f8a6ebc6231a011547ffe6cc7b4267f335 SHA256 d3325c697d6e2a2d09c80cedb358bb78561da33304183874d7c44f96fd5d9f5f
-DIST dhcpcd-5.2.11.tar.bz2 71055 RMD160 fd1b27354f098b5745a47601c7642a1058640ee0 SHA1 3b170b45af314f84008650bb7447320655969241 SHA256 c936b30adc39564328efa21d09673173cbc0323af6cd3dbeb848a3ce86a3aa84
 DIST dhcpcd-5.2.12.tar.bz2 72177 RMD160 588a6e508b3ed7e07e044c4da77512eebc9bd607 SHA1 27378a251705c7888332e6d60eea7805d1f8aeb5 SHA256 55da7dcf64cd3dda5217d0e01748a3d980ab0cd625bae0efc00420eadd7f559b
-EBUILD dhcpcd-4.0.15.ebuild 2824 RMD160 19259ffd4642c02dd0c581040c08356adfadeac3 SHA1 d35baa045b9eb62dc70457b200daa3caca5a9435 SHA256 8f2ff68d4110a5bfd0aba9014fb017c0bb03e005122d3a789d01ecbcc5d16325
-EBUILD dhcpcd-5.2.10-r2.ebuild 2897 RMD160 f2df3707704a48e502977a892c1ce764ed888c94 SHA1 4061bee4453a7c553951d01c20ea50e0f6b3e44e SHA256 513134a6334b99c60f1f1fc7abbdec867cdd1819a0551d63770f07ac57ebf024
-EBUILD dhcpcd-5.2.11.ebuild 2903 RMD160 2745f2edcbf9b5174265c8480dd56330a53aa468 SHA1 94f61789701cd1d42d7b62ad86d522bfc416ada9 SHA256 24b64582e8b4e0f4ff7e8ba0f8cb6ed70dfa719f7ffd68c3776260a1d76c8de4
 EBUILD dhcpcd-5.2.12.ebuild 2894 RMD160 ad72ce1ed9de24950cbff0a4708af43e7a2665cf SHA1 9c6304ed8820e1290f71f2f137974ce40879d7a2 SHA256 083467f154a95a55eb7b4cfec32aedb420903cc7cd6f50dc92b1d4bda7efac8e
-MISC ChangeLog 44582 RMD160 7e257041144695f3f1a7a46c26d19997771d806a SHA1 ad9fe0da2b43a657a99e79dd1fc1a2ac41bfc24b SHA256 4b2cea462c4f2bf2441ea4abf0810906ba9fc94d5434ec5dc00d28b4982ec9e9
+MISC ChangeLog 44741 RMD160 f61c562376b86521b7591f0e2d04db9f5e2feea4 SHA1 ea658a4ef894498eccc4a55f6e44be19aafb9a1a SHA256 943f1cbed98207f0d80911e5a2b8acf18e5f76f6a2ff48f0c0b268067be843f3
 MISC metadata.xml 364 RMD160 76c08f52a8358f3e62f42aaa5ee53820c452a104 SHA1 e9161300025ae9ff41c7b68eec327f64be57fcac SHA256 598b041b465927b424f29c9c843a34165bd12bd75dfd2422d79907a1b3b05b32
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk2jPjgACgkQIiMqcbOVdxTNtQP/WYKvdqSLbTAt7mstWFR8Ocj6
-24iAFx4NtpTTlN84s2Y0UE2W0fqZ+vAmO8Z3sDEIYsIwi1WioGxmzQVTuWxXrdiG
-ScJyOywUF/CFQ9v7Dyiz8VrqEpTxyDUfYOv5H09zlhZkoTG6NC6ErqNOEkI8XyGK
-LQfOXyKWaMGZLDUsvrM=
-=uMM8
+iEYEARECAAYFAk2jV7oACgkQblQW9DDEZThyugCfdOlE9AMGD3CItFzVfOaoiv5E
+Y80AoLqdDajAC85SoUvSt+IHr3Tb9xcy
+=WSKW
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.15.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.15.ebuild
deleted file mode 100644
index 7b7a64354615..000000000000
--- a/net-misc/dhcpcd/dhcpcd-4.0.15.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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-4.0.15.ebuild,v 1.11 2011/01/03 18:49:18 williamh 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 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="+compat +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
-
-	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"
-	use compat && hooks="${hooks} 50-dhcpcd-compat"
-	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
-	if ! use compat; then
-		elog
-		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 ''"
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-5.2.10-r2.ebuild b/net-misc/dhcpcd/dhcpcd-5.2.10-r2.ebuild
deleted file mode 100644
index d06372227a0f..000000000000
--- a/net-misc/dhcpcd/dhcpcd-5.2.10-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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-r2.ebuild,v 1.9 2011/03/23 21:08:10 xarthisius 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="!<sys-apps/openrc-0.6.0"
-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-1 ${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."
-}
diff --git a/net-misc/dhcpcd/dhcpcd-5.2.11.ebuild b/net-misc/dhcpcd/dhcpcd-5.2.11.ebuild
deleted file mode 100644
index df0b9f4c4599..000000000000
--- a/net-misc/dhcpcd/dhcpcd-5.2.11.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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.11.ebuild,v 1.1 2011/02/25 20:28:18 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="!<sys-apps/openrc-0.6.0"
-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-1 ${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."
-}