remove old unstable versions and patches

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x8568F528

6 files changed, 10 insertions, 195 deletions

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index b7a23311dba8..b5a4e85f6f7e 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/dhcpcd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.395 2014/03/23 01:56:05 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.396 2014/03/23 17:32:32 williamh Exp $
+
+  23 Mar 2014; William Hubbs <williamh@gentoo.org> -dhcpcd-6.3.1-r1.ebuild,
+  -files/dhcpcd-6.0.5-fix-build-without-ipv6.patch,
+  -files/dhcpcd-6.0.5-fix-segfault.patch, -files/dhcpcd-6.3.1-fix-udev.patch:
+  remove old unstable versions and patches
 
 *dhcpcd-6.3.2 (23 Mar 2014)
 
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index e6810ac2bd4e..35fcdcd8dcbb 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,28 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX dhcpcd-6.0.5-fix-build-without-ipv6.patch 574 SHA256 f1b0b7ec70804ab33f454c7d3cddc9a45a4792435747f70754f9715b4f4453e0 SHA512 166c70e493decd2dbbc9810c597b7a2ed821d5ff7cc30c330812bb17c3b5760714263deffb3817725916f26f19b9d1d6053d3215aedeb8de91e2dfc0fc0b726f WHIRLPOOL bb5c2633c2024434540d336bd62cf1ddbc5d314a0b85aeea53599a1499a27038df19a09a337b2e9dba94e84b8a2de26ccecf9bc4a007857ed2185396b9b4e8ca
-AUX dhcpcd-6.0.5-fix-segfault.patch 471 SHA256 bb79c32bf25b6ee036f9e45d89e74d31c8061a76d75c56cde03f9340ca43229d SHA512 140d9d34ced0d13c4eec19ae9863da6714e7b5dd81d7c18b685edd40fc8574f0b434b46416259e5baf511307e2949c961c1327464a0065c70ccf8a7b368bd47a WHIRLPOOL 7debe14b229ebbc4a1e776df0947ae9d59ce6b0b5a16c03ba705715a33f24f28e5d12ac43f187cbb69b78e91eae00c0895eacea66336462ed2925e53a72e301b
 AUX dhcpcd-6.2.0-dynamic-init.patch 6421 SHA256 5edeaf1322dab4dbc71efb4e7c4618561e606bdd2e71fb9230628c4208f35103 SHA512 e2aff69966c0fdd2b16bff1aef59e2c50068095a9afe8e9e634e1309e50d4c277734a2651078fc1bbac0b23a57187ecc46a557304e60b54e983aef65a8bfc84e WHIRLPOOL 6d9d97ce737b3cdbb41d608a4aebb1971ffd70c9fa08e3f0bc00c77ee15cef343fb0feed31a4bfeef0d8fd2be14deb6cbd70f1402f271170f849c073a4db4db3
 AUX dhcpcd-6.2.0-no_ipv6_fix.patch 1269 SHA256 cd26e5d587a833d9826a86b2eae832c3ad371ce695b933ba8e03bdc1debf411d SHA512 90763d8a0d63949f53166609a702176217fce32a27125ef7f5c095d571d1a6a65fca5434e6ceded258773d80867a90609bc5af67727d7b06086c3a6b4ad8f632 WHIRLPOOL 9b3328e6db8304794ec2aeaec3cd883ed2cde975cda606ac2d3e03b3455a7fad495f88297f1cccea2a821972df2ee33bc88c2d3d57235d0cada2b443c1ba643f
-AUX dhcpcd-6.3.1-fix-udev.patch 1103 SHA256 66db7109a4dfa9a1fbae9e10cf2137f1fe756727e5d4c394ca8da2ab971f39a9 SHA512 b96fdb6a271a22d06f807a304a9b77afe2ec7abe8eb2651c49efc36bd9c3c742ea4ae89679381e162a8ba4d6e58a28650446675d838954f4b33d29853eb1d72f WHIRLPOOL aa262a11648c7beaf915807d1a8bfa99ace96a32659fa08cdc6dc73d8ee78d58894218541d99b883f53eaf2bc0cfbe3faeda350aa3a8430ac8a78f3d6f6c864b
 AUX dhcpcd.initd 327 SHA256 72b42c9939fda3fb56666813513029ed36194c1708bddce06bcb3e131e547492 SHA512 0a188b67f0641a480ac6d3cf6a634dddc4b72b1b9b47df33b05fba5d802693dd88e0cece0bfe9b641009c03022c620595b1ce35cd53d5024ee87f4c81e9acf63 WHIRLPOOL b97b0cd52b52561e6726d5decd094a02dd046107b0647833f00635e3fc126ab9679b2a7f883f4d880c1221cdbd91b0b52efaaccfdfa44a5048cb28d47d022351
 AUX dhcpcd.service 183 SHA256 06aaf350b11b1cea6ced9e2b5c69011e1daf6eb0ac9b2a9f2c9f81a9be31f463 SHA512 9d4c99e984906fc80fca7f7dd436d2f12dfebec870e19cbc3c03c14b394ed81c664403c0ca3f3e3138572c54d1278c1a43d5495f963b442b1bbef229248b1dd4 WHIRLPOOL 1176c2d763f55a65a97a973bdfa907dfaa2e9b88e93013d749c1a492e06382a7f42fa23eb2bfe86f6eaabea6c65c34db138b6bf600e6c522336ec2d07f7d7044
 DIST dhcpcd-5.6.4.tar.bz2 85671 SHA256 4072999704585c16ac45458d459eb50186c3de91c3c14c3288896963cc30b594 SHA512 eb3892604b2f889b4f34835f4d8e0bb2d129f7d0d91da39760eeaf3f75883a6db0e1397ac65084a3ddc4a2968a389fc723e9f031a844ef5333451527be8cb7a2 WHIRLPOOL f8fba52a6f6d4e1822175069f6a636e83b09a1532bd258a4ec9b610e9eb196d35f1cfa0e855521f5d37edb840fb2dd4d46bffc8bf86ded0b205367711f4484ff
 DIST dhcpcd-6.2.0.tar.bz2 121614 SHA256 16ef25e8b6b15dcc0e53ff97a131b09828723dffb12a885f0da91b275296b362 SHA512 bf9394aa23c1b2978ac4b3bad1c7774798e99b6d6b147f57b94b5c1fba7edf80ac769cb8cab7f66203ebc0e93f81d7a05a44dc52f08344b68e8141bbbf1c33a9 WHIRLPOOL bff258cd8a0d2eea14bbc8bac792d4ad69e36d72ffced448f6d6081750ec52d99cb3f1f0aaf1bca42135c2969b2c7defaafa7d0ce875b96db9bbf1277f6bd982
-DIST dhcpcd-6.3.1.tar.bz2 137500 SHA256 dc198a729644cd077d2ac94d616185c6f17eb404f549a5d1d00c30c604aca09e SHA512 d32336fae2d5ab9bf856fc9ecde924c4cd693fce2933359278ca61fed2e0af3e77bfaa479a02ce5d649a07d5dc386e34b7ab5d5fcd6d49776535f89e3f9668ac WHIRLPOOL 82ebbb4ce02ffb76d6b10290e8b099dc462cc5214b1badf812f4dfc356a3f8aee34035688429098429b3bf44d10fb3af83cadecc9555e72228a7924c25bf62b1
 DIST dhcpcd-6.3.2.tar.bz2 136924 SHA256 b69c1ef06a92f327993ee1cc4cfd9145c296aa1ac6070ba2f9ac74931b2f55ec SHA512 fa5d3287e658064df39c426eaa960567d916dd8241be6b69315f5fa39bdf51c97fbd306222b3e062fa83ec54acd63481bac4c3f52a2f2e5e2a077c76e0bb4326 WHIRLPOOL f318061510a527a28ef6793ae262f09c1276ac96c72e4d49d217509b17baf53ffb9a11b8ceeecd7535d0274a87521090e5fd54c176bbf9f2622c1fd6d36436df
 EBUILD dhcpcd-5.6.4.ebuild 3431 SHA256 0210e4b9dd27d8334eb4cb5781ba10de8c084aeef740ccddb7d8ff2a228c303d SHA512 a0834bc94a795f059244b59b7f8abbaab73cdb79339a1bf14b9f62a0c5c2efdcbdfae42659810413a1c6ef963d40ef8c9defbf354d53208935dc6e392b79908f WHIRLPOOL b981b64477e43075c004a81471ccea70f1a0faa14a38f8a6cc70829cec15225f35c69f726a8cc635e2fe5c88eaf69b127afe2678ece7f31292cfae47df211036
 EBUILD dhcpcd-6.2.0-r1.ebuild 2964 SHA256 e7a3c6e461b74b4c006c2ff982b9aa067c414662ec3623b2949036fd299ac8c7 SHA512 82b80bf7ee199ded4266c672f788d2d1871209780ee772248ca293965dec02476be9bba1d64337191077a2e6cfa6ba8de4ffe76f537b4ca72edbf2f9dd0cff0e WHIRLPOOL 11c26d205057723f24bb26c92c7efe6fb25749df089763b347259aa23c7875e0ec21bce6516adb8f468edaded9fcfeccc1d44d5ffefc45b06d49c3fb59e6d0bd
-EBUILD dhcpcd-6.3.1-r1.ebuild 2939 SHA256 1171b490102b3fdd930671c18cf2af991d094a3eaf41370cbc43b43b59e34601 SHA512 bfa99d89b87637ef426942d119cbaef3175cd15a271d858dbf9f8df7e11a9b22c064273eb3fce843c1887bcd600d6b2905c047dbccfe0239f7e1d8d0eaefd4c2 WHIRLPOOL f334fd25bac00a606705e260608ac2f550825cb8b3ed191fe8a37736ba02db310c13190c22a774ab1e13881ce78caafa084fb8b801e6224e69c03f27d7d57137
 EBUILD dhcpcd-6.3.2.ebuild 3347 SHA256 69fc55fa06a652710e3897f674d180d7f359883be503b90329ebcae71655b64b SHA512 43e3688fb5e47815fa52612e30d0808036109c8cc16d279601d31856b8e7e302215cfd80e945cb44e1fb20e8a45434174d6eb9a4b1caa463b5fa47270f2681c0 WHIRLPOOL 76f347c52120ae8049aec068bb9639eff4f19fd60b0f61241857854669fba32c4095044f1195118df31d1d80d7c11f5ec2f950621459356cf78e2d316b740ef4
 EBUILD dhcpcd-9999.ebuild 3347 SHA256 728388931cfdf3a3cc39570545c1c9dff99089d53f1b2674df1190a1d765bd75 SHA512 44f18c3fedf2ebca34b5f38edf2c992b6275b09a6873096e2a028d8210eaa7c4822c290cb73b1b3891038ad486a068474e5fb2734f0831e6e2da91b8d1b22c82 WHIRLPOOL 0376295bc058c7a4fe9b3094ffc75cdba9457ee790c64edd418fe9601ed056f60ae0daf5dc07428b8da62f89a95b0f50569bcc27fd25186c2d28812dffcc2745
-MISC ChangeLog 55245 SHA256 a47bfb5af459bfe3ac30343b10b86e34cd4c31e47628cbf5fad143ed24f94320 SHA512 8e38a29b3c2b9353dbcea2bd81f8a97e28f8990a1d6ccf15f45f5924a3510732a583290da820bfab8f7f309d21b05c3f8969cf609364238ea81427f9f1e4aa20 WHIRLPOOL 19a1d580c949ab2d360501d25018aa7e8c59a75ee7db1748a340d8422814f8db166e4b86f5cfa8c02cf9a4b52481f8ca8886f683a4be680c144895a9b6a6daa0
+MISC ChangeLog 55495 SHA256 8e0158d9482c0cd89cca60cfbcb848f50c65efac6f1713bb802c6ee77caf4fe8 SHA512 477dc0bf8f763f04704449b37ae59036079c016a1fddb9595fc069bd809461a9aebd9d64351e6db2d576ada06fb4a4d7d3b2144cb5b795a26da8898b3141a376 WHIRLPOOL 17175d333fcb4c36091d54aca70d95f05fa3a2e35fc901bc59d74e61d4864fa13ad6af3cb581ad7ff007ab9339f8586f9bcda5762497ca72c182c1ba0b50500a
 MISC metadata.xml 358 SHA256 d2755afa7df7488d44b4904fd1922746bd9ecae448fd73496600e03fd0938707 SHA512 a592a6368f8dc90795b2972fff1c79775de8739d214a4c4403f0528aa1caf993f6e10eb374cb1a38accc915b5cd26c7fac723a712c4570f8a71848d3d9854eac WHIRLPOOL 481a14009c01f31e40ee09d81c273adc1da21b45b5976167cbada8a774775679de5b8233d3effc3f043794cc9f78b7a1705eaa59de4829c150ebe786c46097a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMuPzcACgkQblQW9DDEZTi2pwCggmj20Knn1sbTwf6iDfv4ZRBp
-H3MAn3nq1oGpti1M2lO4p8IqQNmBRpjg
-=1LJs
+iEYEAREIAAYFAlMvGrsACgkQblQW9DDEZTjWVwCfWXErwLegR8/Ag+YJmXHXIIsJ
+gJgAn34HXIbz7DQea8daVmjaKNf8mKpa
+=KVxu
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dhcpcd/dhcpcd-6.3.1-r1.ebuild b/net-misc/dhcpcd/dhcpcd-6.3.1-r1.ebuild
deleted file mode 100644
index 1f2224589c64..000000000000
--- a/net-misc/dhcpcd/dhcpcd-6.3.1-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-6.3.1-r1.ebuild,v 1.2 2014/03/20 03:52:09 floppym Exp $
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://roy.marples.name/${PN}.git"
-	inherit git-r3
-else
-	MY_P="${P/_alpha/-alpha}"
-	MY_P="${MY_P/_beta/-beta}"
-	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-inherit eutils systemd toolchain-funcs
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="elibc_glibc ipv6 kernel_linux +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare()
-{
-	epatch "${FILESDIR}"/${P}-fix-udev.patch
-	epatch_user
-}
-
-src_configure()
-{
-	local dev hooks rundir
-	use udev || dev="--without-dev --without-udev"
-	hooks="--with-hook=ntp.conf"
-	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
-	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
-	tc-export CC
-	econf \
-		--prefix="${EPREFIX}" \
-		--libexecdir="${EPREFIX}/lib/dhcpcd" \
-		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
-		--localstatedir="${EPREFIX}/var" \
-		${rundir} \
-		$(use_enable ipv6) \
-		${dev} \
-		${hooks}
-}
-
-src_install()
-{
-	default
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-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
-
-	elog
-	elog "dhcpcd has zeroconf support active by default."
-	elog "This means 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 noipv4ll configuration"
-	elog "file option or the -L command line switch."
-	elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-	elog
-	elog "Dhcpcd has duid enabled by default, and this may cause issues"
-	elog "with some dhcp servers. For more information, see"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/dhcpcd/files/dhcpcd-6.0.5-fix-build-without-ipv6.patch b/net-misc/dhcpcd/files/dhcpcd-6.0.5-fix-build-without-ipv6.patch
deleted file mode 100644
index 78722fcc552f..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-6.0.5-fix-build-without-ipv6.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 37708a7001c287ea0d86baf8110e2531a1057326 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Sat, 17 Aug 2013 11:00:07 +0100
-Subject: [PATCH] Fix build without IPv6
-
----
- platform.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/platform.h b/platform.h
-index 36086b5..46797c1 100644
---- a/platform.h
-+++ b/platform.h
-@@ -33,7 +33,7 @@ char *hardware_platform(void);
- int check_ipv6(const char *, int);
- int ipv6_dadtransmits(const char *);
- #else
--#define check_ipv6(a) 0
-+#define check_ipv6(a, b) -1
- #endif
- 
- #endif
--- 
-1.8.1.5
-
diff --git a/net-misc/dhcpcd/files/dhcpcd-6.0.5-fix-segfault.patch b/net-misc/dhcpcd/files/dhcpcd-6.0.5-fix-segfault.patch
deleted file mode 100644
index 120920844ae4..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-6.0.5-fix-segfault.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit d995aa130fcdadc3a99f948c89447d9960b8753e
-Author: Roy Marples <roy@marples.name>
-Date:   Mon Aug 19 10:09:32 2013 +0100
-
-    Add the cloned static route, not the original
-
-diff --git a/ipv4.c b/ipv4.c
-index c2be11d..845f386 100644
---- a/ipv4.c
-+++ b/ipv4.c
-@@ -390,7 +390,7 @@ get_routes(struct interface *ifp)
- 				return NULL;
- 			}
- 			memcpy(r, rt, sizeof(*r));
--			TAILQ_INSERT_TAIL(nrt, rt, next);
-+			TAILQ_INSERT_TAIL(nrt, r, next);
- 		}
- 		return nrt;
- 	}
diff --git a/net-misc/dhcpcd/files/dhcpcd-6.3.1-fix-udev.patch b/net-misc/dhcpcd/files/dhcpcd-6.3.1-fix-udev.patch
deleted file mode 100644
index 606ab11cf2dd..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-6.3.1-fix-udev.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: dev/udev.c
-==================================================================
---- dev/udev.c
-+++ dev/udev.c
-@@ -42,11 +42,11 @@
- 
- static const char udev_name[]="udev";
- static struct udev *udev;
- static struct udev_monitor *monitor;
- 
--static const struct dev_dhcpcd *dhcpcd;
-+static struct dev_dhcpcd dhcpcd;
- 
- static int
- udev_listening(void)
- {
- 
-@@ -90,13 +90,13 @@
- 
- 	/* udev filter documentation says "usually" so double check */
- 	if (strcmp(subsystem, "net") == 0) {
- 		syslog(LOG_DEBUG, "%s: libudev: %s", ifname, action);
- 		if (strcmp(action, "add") == 0 || strcmp(action, "move") == 0)
--			dhcpcd->handle_interface(ctx, 1, ifname);
-+			dhcpcd.handle_interface(ctx, 1, ifname);
- 		else if (strcmp(action, "remove") == 0)
--			dhcpcd->handle_interface(ctx, -1, ifname);
-+			dhcpcd.handle_interface(ctx, -1, ifname);
- 	}
- 
- 	udev_device_unref(device);
- 	return 1;
- }
-@@ -171,9 +171,9 @@
- 	dev->listening = udev_listening;
- 	dev->handle_device = udev_handle_device;
- 	dev->stop = udev_stop;
- 	dev->start = udev_start;
- 
--	dhcpcd =  dev_dhcpcd;
-+	dhcpcd = *dev_dhcpcd;
- 
- 	return 0;
- }
-