gentoo resync : 18.11.2018

7 files changed, 131 insertions, 274 deletions

diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index c59785df7be8..7f8d16d62a33 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1,21 +1,14 @@
+AUX keepalived-2.0.10-snmp-crash-fix.patch 3843 BLAKE2B 246ac57c0f25df09357a8dd6f1f504dfbaa3b690fa68b353643bb1ce1d4811178b00e6c6ef2b1fa886c8e2a343379e9ebc077b49b8c921744afef24aa9e667f9 SHA512 26b4c222966b793bb8029b8d125203ecdfd6381928812ffb1ff99a056bbdff8b85ab2b350a263459e24bc282f4af05f6dd02fea78a7162197450604694a39fac
 AUX keepalived.confd 171 BLAKE2B ad9baf96333182a2acdb10a4be7220de1dc0827c4932af07ae8aae17d72233c3cb9bac637acc4c918503da664c8612a8815f4e2eec0aa18d10715fb2e8e3a71f SHA512 468d176d22f1ce308871829f24624b33e6ba3b234a413395599a67a865f3cf815cc24a10c244dffd1421a0acf5352fe51027a2d3b282cd3822dfeadc8a1d4df0
 AUX keepalived.confd-r1 63 BLAKE2B 8925b12c9936aaccf828132720a0cb74fddc4a4c8642aaa2ad08099e17e5db0170070966a4465de7bfc06317f812194d9a7928da2559ea41a994c5f8e832b9c7 SHA512 8aed0ece9d67956006c5056543bbb31c354b73b7b555f6cce039f9507da24e40e2ad15ac057dd2e39244de5319f5b9a19659e8ee5c2c7116e202f18c88e6ed74
 AUX keepalived.init 792 BLAKE2B a3e98861fbb9a193b4d63aabde8a44a041603b7983a02af7815c4db0062691dc2ea905c704d7d123588355a8cfbde124e2a5732d621eb5c664169a83ec81f6ed SHA512 240201b81bcca7b213bd3ec45fc286f0305d72a6952a3baf485d717df413df3a2da0f4b018eaa050b0b12cda78767f5c4ae60ec75e5802cfe57cb29951e86ba0
 AUX keepalived.init-r1 539 BLAKE2B 90675bc2863c7a2b704c14807ca39c7cd35e2f9281384700a7bc4e1a381f106a4734f19e3f740ad00a83c065f45ac620d8224fd125f76ed0a96ec285d3abf393 SHA512 5a5057f50c29c6e2c9f2451acf1e2aa2cdd9218a5882d3eea1a148a4ae8b259b5937387b95feab919b242a65d706e48c5afa3ed280215092295b8e8d44d1f543
 AUX keepalived.service 293 BLAKE2B e80be18a91569d73e64d12ff74622c866efc03522640f33e1cb89e4d232f39bb65b3d2aa7c093e93a5fbe41937a5ab4fe3a77d6864f335e04dea6bf898d4ba84 SHA512 c9d9c190a7892b3c9535ab51da45893bf6ff6738e64f832f52e22f435e4ef4e014f74dcb63f51b76a624ba39dc4dbd3542ada1971d361fd3da966bb649355ec7
 AUX keepalived.service.conf 47 BLAKE2B b6e32bf8c8a602186af776d85c6c457aad2408becfd24af4db6db6123946fba2443f51fae3df0d220a4ebf9ae81a02f4bc1ee0d1d1a7a4b050802336c029c87e SHA512 ecf081bd59c57d6be3627ab42183bdebe58f65355c9cfa3e753a9b1fbf64e7731a7b26ec3ef2bf0422c1a6de4eb1d8d84787ca4d3def2d1f12caed9b64b5063a
-DIST keepalived-1.2.24.tar.gz 601873 BLAKE2B d2bbf6189f789dd2b61207e80d4262ca6ff8a653268e9d5f4dada7def7cc6ab7d8f8fd49d9b97b228922ff56495213a22c459a44943a92a14abd91b787c491a8 SHA512 a5e555dd955173887896155a04b1f6bb0c2f2a758008472abd5433b057be3fd85e4f270a7b7eb2f36a1c16e46b235ef930b1844938276528ff61bbdd783bb1f5
-DIST keepalived-1.3.5.tar.gz 683183 BLAKE2B 6242cbe61e8cbe80d094dbad3882b0116fc3cd129c5f0f082ec821d794dff53ab22a661feb1c11d2c5386bcea3c2727ed899ea2968dfa8a7ed4272b8596f0839 SHA512 ebd710167becd4b99b665877953d19477c11f1d1c736eb580a05dedd4946363b756553e20607f34aa6c35f57b7252d8a22287beedc316b62a745fccc4243a720
 DIST keepalived-1.4.3.tar.gz 744680 BLAKE2B d9ea5ef277bb0d11c489bbc8770f46528f1ddde14b2e8fb72fdccd543ff4583426aa2bb214e00e3964518e726377b049560ed35daf38f4cafcd4e7c43a13b78d SHA512 bbf734123edeee4c807788e8db626975d7b626003ce2a6b901fbac3b7985b11c222db78e2806a7e7211980a748a6a302847736b14f3f8ed32b7337dbde6f4eac
 DIST keepalived-1.4.5.tar.gz 749813 BLAKE2B ff379d46b5f5a4912feeb1e9a039a95a76027a50868ade8ac31bc4dea22573a51489939bb29bc20c0eb912f78b1e57fbc6ac18e4b8e38d6493d271e135f8332f SHA512 0786ecbef6dd840c8852f619cad1ea6a9c98b86a6c26bc6b104b38825212af689fbeb45148404b94dc6e3cdf7626cb6b2c902685b03586d05177578dff957bd5
-DIST keepalived-2.0.4.tar.gz 845498 BLAKE2B f05b25b04e1dddbf5f6a90de6b4088b7fbd453f628130343f0688147ae40094e74a0892f3c30d91e41bad31c029692e7a1be6462d2906cdf53e4b82a98b4935c SHA512 b5df152b49a7b5187612b8719328c05fada57e8625c0e8053261c1d5f7afd09cc9b67200052d7a58ce596d1c718915109f5a9bf03520d80e0710157e938f72fb
-DIST keepalived-2.0.6.tar.gz 853859 BLAKE2B 19cfc81d22026e607b0780612b1040ab7e2f9857038a612298b8676814b9bd1b7a43de905c62e5b853174b0298f53787e7fb52a3d35163e33336aad3c0a01f0a SHA512 9e340825b443c02ba1afe27d9ad97afc34722d80a27fc9a5f934157ec04ff15cef0a82b68c8917712415dc7ef079e27af88ac29a372ef42c87fcc9f9b8ab751e
-DIST keepalived-2.0.7.tar.gz 873480 BLAKE2B dae0b5416aedf0526437ec1a282b59e93b3e368246f3640ddd7de835009a55562160b9eb9e40e4e9d3ead3ffd6a9806a1decbfbffe57f9a4bc2dfad623754daf SHA512 5ba269afb334d25c17305b7adbbf5ed1ebd62480106945d7d382aab99285691968e26e90a69507c2fed20d7a721dfce187fde803835213c3b915e06177268088
-EBUILD keepalived-1.2.24.ebuild 1412 BLAKE2B 4319c70c9cf0acae2ed7e6cf283fee6aa86b2149367b94ba7500b5ac885a723cd6fc266f57c1e25618394f1f0ff114019b73c3ef1ea7fbf622870ee2a67973fb SHA512 3c4a6951cf0cb39bdd604af88f41f3895d5cf72c283d022b506c0fae841cb86adda7b11aa1d23247be17e26cd6cdf826fd45bae39b018f3477820a4dd2c26588
-EBUILD keepalived-1.3.5.ebuild 1532 BLAKE2B 273a9f41e4a1d190a6ffd882b230f95fdc536cfc7d92a1b1b8f0e465165d80de282a6f4bc1d2450b6cecf6ea6086384602e6f8d8a639ff0fba9ba1f4b6cb1b57 SHA512 79052c15fd3329bb2493fb5833d951f70620d04cbe4077964416a029fe9ec953732061f751913b35c7c64a1f73c230a6d0691454d18ba9610270578397fc52f8
+DIST keepalived-2.0.10.tar.gz 927631 BLAKE2B 0cb4c5c613ae2c58f993930c446cdcafdff8a049a9fb1e31f61d7afe2406b2dde2258d450913577ef8ee18d0171f57e4ad01727d9e0f489cfe25b35826770181 SHA512 e76562e5d9d9dc945f0c9702f5f3c6be6acd8c66a59aea1f8287810a2eeb4c65b6cb7e1cd84c1e478978f7db94dba7f8a918ca4847f90a6554b20d757addd2db
 EBUILD keepalived-1.4.3.ebuild 1588 BLAKE2B 883a6e48223274e117fe82c86e02a3a7358ce4d8f8aeec823701d72f795680526248475caa163c44696007cd07183fe84490ff519805069d559b7f74292df668 SHA512 360c4e72a3e88903f99e8a2ed91df6b914254e42236cb974162bc67f0f392ecc50444d17bd1a6233d2fa8ec0fa981891dbd8eb4cb789d495a82912ae32cdd0ce
 EBUILD keepalived-1.4.5.ebuild 1595 BLAKE2B d58bf0c8d4ca830f54a427886abc61fe3190460c9d70df3f4d5801aaedb6792bef21dc7bb96986490366558693014475a4b4fc021fbd9234e0770796be74c1d3 SHA512 19d32a2f32bb3b554ee727b6561e3514ba4e4d3e1a386d629e09b1d943260a50de8a866a50f20a2bfe3e70cecdccefc01c3160ac19377d2aac40e4169856e764
-EBUILD keepalived-2.0.4.ebuild 1595 BLAKE2B d58bf0c8d4ca830f54a427886abc61fe3190460c9d70df3f4d5801aaedb6792bef21dc7bb96986490366558693014475a4b4fc021fbd9234e0770796be74c1d3 SHA512 19d32a2f32bb3b554ee727b6561e3514ba4e4d3e1a386d629e09b1d943260a50de8a866a50f20a2bfe3e70cecdccefc01c3160ac19377d2aac40e4169856e764
-EBUILD keepalived-2.0.6.ebuild 1595 BLAKE2B d58bf0c8d4ca830f54a427886abc61fe3190460c9d70df3f4d5801aaedb6792bef21dc7bb96986490366558693014475a4b4fc021fbd9234e0770796be74c1d3 SHA512 19d32a2f32bb3b554ee727b6561e3514ba4e4d3e1a386d629e09b1d943260a50de8a866a50f20a2bfe3e70cecdccefc01c3160ac19377d2aac40e4169856e764
-EBUILD keepalived-2.0.7.ebuild 1728 BLAKE2B 70154cb22c3cda4ba8fb907888d63eadcc51a4de4a080417db056c40593f994ece0bff49921cfcbed85982232ddc156d0c3371e6b11d7c25f16fc012c523f4a9 SHA512 e8252fbe067493ca81494ccdc3426ba30c8552ecad637a1a81ddf08c032ea75513a191bbbe1a2c0706479ec78d0bad6cd00658a1d8106e6165ea4b8ec8829df7
+EBUILD keepalived-2.0.10-r1.ebuild 1777 BLAKE2B 437b7bb72f0b4a63ef35cdde21cbf1cf54428dfc62c1633cff40359aaf6fbfdc118f0dd246dda12c5f41b47a235bc1baa6e07635c063044446ad4d62422a0bd0 SHA512 2a6867ddd3c85d5160fdb4b6c6beb6cf10f5664ffd5c105f7274edf2045c30361cae0131735f4bd920653a8497f1ad14d157f932163a0ca231518c1f6f3389da
 MISC metadata.xml 471 BLAKE2B 2dfba9fe3d7d39f8484baa1f1be9a59b5da8f6cc0da4a3af1ec07e5daf4f2522f802af51048463dfad54bfbffe0286ce8a3b9ff8889139ca32693bad378937e3 SHA512 203c93aaf60f7d0dcc6150fff2a4a3dd61fa4d6cfab26452d8efeed1d79096b17db7e47700582475b7e6607ae70521c32cc91015e7852dde22a7d828740946af
diff --git a/sys-cluster/keepalived/files/keepalived-2.0.10-snmp-crash-fix.patch b/sys-cluster/keepalived/files/keepalived-2.0.10-snmp-crash-fix.patch
new file mode 100644
index 000000000000..c1a5ab36180c
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived-2.0.10-snmp-crash-fix.patch
@@ -0,0 +1,122 @@
+diff --git a/keepalived/check/check_snmp.c b/keepalived/check/check_snmp.c
+index 67ae0e4f9..95c6e6f83 100644
+--- a/keepalived/check/check_snmp.c
++++ b/keepalived/check/check_snmp.c
+@@ -1451,6 +1451,9 @@ static struct variable8 check_vars[] = {
+ void
+ check_snmp_agent_init(const char *snmp_socket)
+ {
++	if (snmp_running)
++		return;
++
+ 	/* We handle the global oid if we are running SNMP */
+ 	snmp_agent_init(snmp_socket, true);
+ 	snmp_register_mib(check_oid, OID_LENGTH(check_oid), "Healthchecker",
+@@ -1462,6 +1465,9 @@ check_snmp_agent_init(const char *snmp_socket)
+ void
+ check_snmp_agent_close()
+ {
++	if (!snmp_running)
++		return;
++
+ 	snmp_unregister_mib(check_oid, OID_LENGTH(check_oid));
+ 	snmp_agent_close(true);
+ }
+diff --git a/keepalived/core/snmp.c b/keepalived/core/snmp.c
+index a9472feae..eb5bed20a 100644
+--- a/keepalived/core/snmp.c
++++ b/keepalived/core/snmp.c
+@@ -325,6 +325,9 @@ snmp_unregister_mib(oid *myoid, size_t len)
+ void
+ snmp_agent_init(const char *snmp_socket, bool base_mib)
+ {
++	if (snmp_running)
++		return;
++
+ 	log_message(LOG_INFO, "Starting SNMP subagent");
+ 	netsnmp_enable_subagent();
+ 	snmp_disable_log();
+@@ -378,6 +381,9 @@ snmp_agent_init(const char *snmp_socket, bool base_mib)
+ void
+ snmp_agent_close(bool base_mib)
+ {
++	if (!snmp_running)
++		return;
++
+ 	if (base_mib)
+ 		snmp_unregister_mib(global_oid, OID_LENGTH(global_oid));
+ 	snmp_shutdown(global_name);
+diff --git a/keepalived/vrrp/vrrp_snmp.c b/keepalived/vrrp/vrrp_snmp.c
+index ca9d46768..db696159c 100644
+--- a/keepalived/vrrp/vrrp_snmp.c
++++ b/keepalived/vrrp/vrrp_snmp.c
+@@ -4552,6 +4552,9 @@ vrrp_handles_global_oid(void)
+ void
+ vrrp_snmp_agent_init(const char *snmp_socket)
+ {
++	if (snmp_running)
++		return;
++
+ 	/* We let the check process handle the global OID if it is running and with snmp */
+ 	snmp_agent_init(snmp_socket, vrrp_handles_global_oid());
+ 
+@@ -4581,6 +4584,9 @@ vrrp_snmp_agent_init(const char *snmp_socket)
+ void
+ vrrp_snmp_agent_close(void)
+ {
++	if (!snmp_running)
++		return;
++
+ #ifdef _WITH_SNMP_VRRP_
+ 	if (global_data->enable_snmp_vrrp)
+ 		snmp_unregister_mib(vrrp_oid, OID_LENGTH(vrrp_oid));
+diff --git a/lib/scheduler.c b/lib/scheduler.c
+index 0a1c334c3..9090a7f88 100644
+--- a/lib/scheduler.c
++++ b/lib/scheduler.c
+@@ -1630,7 +1630,7 @@ thread_fetch_next_queue(thread_master_t *m)
+ 				if (!ev->read) {
+ 					log_message(LOG_INFO, "scheduler: No read thread bound on fd:%d (fl:0x%.4X)"
+ 						      , ev->fd, ep_ev->events);
+-					assert(0);
++					continue;
+ 				}
+ 				thread_move_ready(m, &m->read, ev->read, THREAD_READY_FD);
+ 				ev->read = NULL;
+@@ -1641,7 +1641,7 @@ thread_fetch_next_queue(thread_master_t *m)
+ 				if (!ev->write) {
+ 					log_message(LOG_INFO, "scheduler: No write thread bound on fd:%d (fl:0x%.4X)"
+ 						      , ev->fd, ep_ev->events);
+-					assert(0);
++					continue;
+ 				}
+ 				thread_move_ready(m, &m->write, ev->write, THREAD_READY_FD);
+ 				ev->write = NULL;
+@@ -1710,7 +1710,12 @@ process_threads(thread_master_t *m)
+ 		thread = thread_trim_head(thread_list);
+ 		if (!shutting_down ||
+ 		    (thread->type == THREAD_READY_FD &&
+-		     (thread->u.fd == m->timer_fd || thread->u.fd == m->signal_fd)) ||
++		     (thread->u.fd == m->timer_fd ||
++		      thread->u.fd == m->signal_fd
++#ifdef _WITH_SNMP_
++		      || FD_ISSET(thread->u.fd, &m->snmp_fdset)
++#endif
++							       )) ||
+ 		    thread->type == THREAD_CHILD ||
+ 		    thread->type == THREAD_CHILD_TIMEOUT ||
+ 		    thread->type == THREAD_CHILD_TERMINATED ||
+diff --git a/lib/utils.c b/lib/utils.c
+index 6f9ec254d..e5b82b524 100644
+--- a/lib/utils.c
++++ b/lib/utils.c
+@@ -789,7 +789,9 @@ FILE *fopen_safe(const char *path, const char *mode)
+ {
+ 	int fd;
+ 	FILE *file;
++#ifdef ENABLE_LOG_FILE_APPEND
+ 	int flags = O_NOFOLLOW | O_CREAT | O_CLOEXEC;
++#endif
+ 	int sav_errno;
+ 	char file_tmp_name[] = "/tmp/keepalivedXXXXXX";
+ 
diff --git a/sys-cluster/keepalived/keepalived-1.2.24.ebuild b/sys-cluster/keepalived/keepalived-1.2.24.ebuild
deleted file mode 100644
index 56d96bf45ccf..000000000000
--- a/sys-cluster/keepalived/keepalived-1.2.24.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
-HOMEPAGE="http://www.keepalived.org/"
-SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="debug ipv6 snmp"
-
-RDEPEND="dev-libs/popt
-	sys-apps/iproute2
-	dev-libs/libnl:=
-	dev-libs/openssl:=
-	snmp? ( net-analyzer/net-snmp )
-	net-libs/libnfnetlink"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4.4"
-
-DOCS=( README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
-	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt )
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-src_configure() {
-	STRIP=/bin/true \
-	econf \
-		--with-kernel-dir=/usr \
-		--enable-vrrp \
-		$(use_enable debug) \
-		$(use_enable snmp)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/keepalived.init keepalived
-	newconfd "${FILESDIR}"/keepalived.confd keepalived
-
-	use snmp && dodoc doc/KEEPALIVED-MIB
-
-	docinto genhash
-	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
-	# This was badly named by upstream, it's more HOWTO than anything else.
-	newdoc INSTALL INSTALL+HOWTO
-
-	# Security risk to bundle SSL certs
-	rm -f "${ED}"/etc/keepalived/samples/*.pem
-	# Clean up sysvinit files
-	rm -rf "${ED}"/etc/sysconfig "${ED}"/etc/rc.d/
-}
diff --git a/sys-cluster/keepalived/keepalived-1.3.5.ebuild b/sys-cluster/keepalived/keepalived-1.3.5.ebuild
deleted file mode 100644
index c4ece547bce8..000000000000
--- a/sys-cluster/keepalived/keepalived-1.3.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
-HOMEPAGE="http://www.keepalived.org/"
-SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~s390 ~sparc x86"
-IUSE="dbus debug ipv6 snmp"
-
-RDEPEND="dev-libs/libnl:=
-	dev-libs/openssl:=
-	dev-libs/popt
-	net-libs/libnfnetlink
-	sys-apps/iproute2
-	dbus? ( sys-apps/dbus )
-	snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4.4"
-
-DOCS=( README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
-	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt )
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-src_configure() {
-	STRIP=/bin/true \
-	econf \
-		--with-kernel-dir=/usr \
-		--enable-sha1 \
-		--enable-vrrp \
-		$(use_enable dbus) \
-		$(use_enable dbus dbus-create-instance) \
-		$(use_enable debug) \
-		$(use_enable snmp)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/keepalived.init keepalived
-	newconfd "${FILESDIR}"/keepalived.confd keepalived
-
-	use snmp && dodoc doc/KEEPALIVED-MIB.txt
-
-	docinto genhash
-	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
-	# This was badly named by upstream, it's more HOWTO than anything else.
-	newdoc INSTALL INSTALL+HOWTO
-
-	# Security risk to bundle SSL certs
-	rm -f "${ED}"/etc/keepalived/samples/*.pem
-	# Clean up sysvinit files
-	rm -rf "${ED}"/etc/sysconfig "${ED}"/etc/rc.d/
-}
diff --git a/sys-cluster/keepalived/keepalived-2.0.7.ebuild b/sys-cluster/keepalived/keepalived-2.0.10-r1.ebuild
index bdcb75a0c522..a9e8dd029002 100644
--- a/sys-cluster/keepalived/keepalived-2.0.7.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.0.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
 IUSE="dbus debug ipv6 -json snmp"
 
 RDEPEND="dev-libs/libnl:=
@@ -30,6 +30,10 @@ DOCS=(
 	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
 )
 
+PATCHES=(
+	"${FILESDIR}/${P}-snmp-crash-fix.patch"
+)
+
 src_prepare() {
 	default
 
diff --git a/sys-cluster/keepalived/keepalived-2.0.4.ebuild b/sys-cluster/keepalived/keepalived-2.0.4.ebuild
deleted file mode 100644
index 9ec3a8f5d741..000000000000
--- a/sys-cluster/keepalived/keepalived-2.0.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
-HOMEPAGE="http://www.keepalived.org/"
-SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="dbus debug ipv6 -json snmp"
-
-RDEPEND="dev-libs/libnl:=
-	dev-libs/openssl:=
-	dev-libs/popt
-	net-libs/libnfnetlink
-	sys-apps/iproute2
-	dbus? ( sys-apps/dbus )
-	json? ( dev-libs/json-c:= )
-	snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4.4"
-
-DOCS=(
-	README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
-	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	STRIP=/bin/true \
-	econf \
-		--with-kernel-dir=/usr \
-		--enable-sha1 \
-		--enable-vrrp \
-		$(use_enable dbus) \
-		$(use_enable dbus dbus-create-instance) \
-		$(use_enable debug) \
-		$(use_enable json) \
-		$(use_enable snmp)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/keepalived.init keepalived
-	newconfd "${FILESDIR}"/keepalived.confd keepalived
-
-	use snmp && dodoc doc/KEEPALIVED-MIB.txt
-
-	docinto genhash
-	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
-	# This was badly named by upstream, it's more HOWTO than anything else.
-	newdoc INSTALL INSTALL+HOWTO
-
-	# Security risk to bundle SSL certs
-	rm -v "${ED}"/etc/keepalived/samples/*.pem || die
-	# Clean up sysvinit files
-	rm -rv "${ED}"/etc/sysconfig || die
-}
diff --git a/sys-cluster/keepalived/keepalived-2.0.6.ebuild b/sys-cluster/keepalived/keepalived-2.0.6.ebuild
deleted file mode 100644
index 9ec3a8f5d741..000000000000
--- a/sys-cluster/keepalived/keepalived-2.0.6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
-HOMEPAGE="http://www.keepalived.org/"
-SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="dbus debug ipv6 -json snmp"
-
-RDEPEND="dev-libs/libnl:=
-	dev-libs/openssl:=
-	dev-libs/popt
-	net-libs/libnfnetlink
-	sys-apps/iproute2
-	dbus? ( sys-apps/dbus )
-	json? ( dev-libs/json-c:= )
-	snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4.4"
-
-DOCS=(
-	README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
-	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	STRIP=/bin/true \
-	econf \
-		--with-kernel-dir=/usr \
-		--enable-sha1 \
-		--enable-vrrp \
-		$(use_enable dbus) \
-		$(use_enable dbus dbus-create-instance) \
-		$(use_enable debug) \
-		$(use_enable json) \
-		$(use_enable snmp)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/keepalived.init keepalived
-	newconfd "${FILESDIR}"/keepalived.confd keepalived
-
-	use snmp && dodoc doc/KEEPALIVED-MIB.txt
-
-	docinto genhash
-	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
-	# This was badly named by upstream, it's more HOWTO than anything else.
-	newdoc INSTALL INSTALL+HOWTO
-
-	# Security risk to bundle SSL certs
-	rm -v "${ED}"/etc/keepalived/samples/*.pem || die
-	# Clean up sysvinit files
-	rm -rv "${ED}"/etc/sysconfig || die
-}