gentoo resync : 30.04.2018

40 files changed, 108 insertions, 1839 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 3aa7ea0f3efa..e01d5a60a0a8 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/drbd-kernel/Manifest b/sys-cluster/drbd-kernel/Manifest
deleted file mode 100644
index 66019b64b9b1..000000000000
--- a/sys-cluster/drbd-kernel/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX drbd-8.0.16-kernel-2.6.30-compile-fix.patch 394 BLAKE2B a04d33337ec1759bfa2aeb5d5d8a61ddfc4e74d35dfa27170810bfdc9aab65fba919e21a89fb908312f4252a8fd270993d68e296adf394b1f51c4a8d880f645b SHA512 ccdbee8ed89a06746914bcbb5b5120ddc32c7e671fe13f1c337fa86aef2d2bc2994efbbe3ac5030c325a164f5331d9cf30d9c1e7ffc9c46c06aadbd3705afcc7
-AUX drbd-kernel-8.0.0-scripts.adjust_drbd_config_h.sh.patch 679 BLAKE2B d2c4a0dc18b2377434aceeee110e1175b15fa2e57590e53a7bfb072694e3f027e60ef5aaa2875ecbb32742bc7245c99bdb442b23a6df2b058ee471e69f35da6c SHA512 872df2e12dc9a47785c37dd6a82e060e5af751f90b23962f2164c609f6e0ae64b9b9dfbc3e52f7b60422ab3c9069bf17aea20a9b1ad3042f300356d2084d7a31
-AUX drbd-kernel-8.3.6-linux-2.6.32.patch 1243 BLAKE2B 58eae23c20bc81e246527245cd2286c7f3530780fc75a25e971e72b9253ac4f0788549b1c7b3dfb06694775b37d251fb1bf88d2a75fb7a0b32c211ed608e827b SHA512 f41f4c6e5e9ce9a0425c813a384b8b86d8fc92730eac8a08be10dcc8eb1c912057923929cbf044d9807f292c1ae908bade7868ea636afd3ba4237fb5aae502de
-DIST drbd-8.0.16.tar.gz 322758 BLAKE2B 472207843ac2f437a4fe1baeab84265e8bf871e12fba56f9957145a4d93d5a376e0637175d1810c3cf0c64eaf53161f5c33b24fc40d5a83f3147476aaedd19fe SHA512 1b325e3789032656a1f7286b51ac9e90f709c53f8ff35c10ca9bb2e27b1cf822813485e0a49d55c62e7966bc975040b42a6d0ac8fa066a16afa2605e9df87a17
-DIST drbd-8.3.6.tar.gz 457469 BLAKE2B 4ddafea7e0523f85f3aa02d01a981e6b5056fd84204b6afff82f1eaaba5c9273cdb5639be423c555b3896e226454eb71dc098ac29c34a9dab0b6a9532133cfcb SHA512 0e817d514b60891c70532511b99d7cddf24e3fa261b605bc920ad7ab2d4530682f84b78eb0a2ed9c25a8458a43496e8de61addade63b8f6e252a36b6b1d50cef
-DIST drbd-8.3.8.1.tar.gz 482582 BLAKE2B 5967de376fed1085ffda4dadd8a6ddd8407cae07d54e9963d459cd7c387eaae4757c790fd33c887e03fc5f2e5cabc52490ec989fd2bb58eac32609135edfe1a4 SHA512 c43c6d065328058db66f708d47ce082603b766deb1530c57aa736a42b4908f780ede41f76395ca45c2691ef1dfd142147a4c98a7bcdb26ba7de73b149d8f9f5f
-EBUILD drbd-kernel-8.0.16.ebuild 1298 BLAKE2B f43ee135969ce6fc0b478fbe00ecc243b40b940a6984b258a21ec61821163b35eb43fe3de1c65ee218eb27ae0715dea464b7c4bf9d0f0a21f16e777c99119013 SHA512 90030164bf8e2061e4a8fddc2a77bae3ca9a4aecac6f2aed69182cbcb767f1e6f5ba48329dd32aabb0b486b75f1a08852df0f7accb2947135172238c6b6ce944
-EBUILD drbd-kernel-8.3.6.ebuild 1176 BLAKE2B 4ba1fed3541c02b3ac6cb813a6aa7ab8ac9bab55537ca7754818d6811b5ac4324bbfe77cf8aaaac1780d4cd8f91ec6672e46f51a0caeb0462ce2f82910684341 SHA512 e3e7215d2ba88cc360873f47710228f364d038e7de11221dcd8a6b4ac14ac784c13a3697768c3d9286f7e62205593164a51be6faa84fb6258c9737fbe39a4411
-EBUILD drbd-kernel-8.3.8.1.ebuild 1391 BLAKE2B b44904d2c82ede3478dc91de2b56462ac8b7386d8c68d063c65fd983269ed089ce07cf22d9d1059bfe788453f3f0034321ec81365bf476dca886cdcdd41a51d0 SHA512 88db68a055e22bb464885ca82a53dec55168a5698fd6cc623430517c60da49621a53dff2e64ee80814d136f4f4f21938592f68df7a21eee409af572658642d89
-MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild
deleted file mode 100644
index c7940d8f75ab..000000000000
--- a/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils versionator linux-mod
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-MY_PN="${PN/-kernel/}"
-MY_P="${MY_PN}-${PV}"
-MY_MAJ_PV="$(get_version_component_range 1-2 ${PV})"
-
-HOMEPAGE="http://www.drbd.org"
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${MY_PN}-${PV}.tar.gz"
-
-IUSE=""
-
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-SLOT="0"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! kernel_is -ge 2 6; then
-		die "Unsupported kernel, drbd-8.0.x needs kernel 2.6.x ."
-	fi
-
-	MODULE_NAMES="drbd(block:${S}/drbd)"
-	BUILD_TARGETS="default"
-	CONFIG_CHECK="CONNECTOR"
-	CONNECTOR_ERROR="You must enable \"CONNECTOR - unified userspace <-> kernelspace linker\" in your kernel configuration, because drbd needs it."
-	linux-mod_pkg_setup
-	BUILD_PARAMS="-j1 KDIR=${KERNEL_DIR} O=${KBUILD_OUTPUT}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-8.0.0-scripts.adjust_drbd_config_h.sh.patch || die
-	epatch "${FILESDIR}"/${MY_P}-kernel-2.6.30-compile-fix.patch || die
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "Please remember to re-emerge drbd when you upgrade your kernel!"
-	einfo ""
-}
diff --git a/sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild
deleted file mode 100644
index a204c0f4fc5a..000000000000
--- a/sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils versionator linux-mod
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-
-MY_PN="${PN/-kernel/}"
-MY_P="${MY_PN}-${PV}"
-MY_MAJ_PV="$(get_version_component_range 1-2 ${PV})"
-
-HOMEPAGE="http://www.drbd.org"
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${MY_PN}-${PV}.tar.gz"
-
-IUSE=""
-
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-SLOT="0"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-linux-2.6.32.patch
-}
-
-pkg_setup() {
-	if ! kernel_is -ge 2 6; then
-		die "Unsupported kernel, drbd-${PV} needs kernel 2.6.x ."
-	fi
-
-	MODULE_NAMES="drbd(block:${S}/drbd)"
-	BUILD_TARGETS="default"
-	CONFIG_CHECK="CONNECTOR"
-	CONNECTOR_ERROR="You must enable \"CONNECTOR - unified userspace <-> kernelspace linker\" in your kernel configuration, because drbd needs it."
-	linux-mod_pkg_setup
-	BUILD_PARAMS="-j1 KDIR=${KV_DIR} O=${KV_OUT_DIR}"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "Please remember to re-emerge drbd when you upgrade your kernel!"
-	einfo ""
-}
diff --git a/sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild
deleted file mode 100644
index 8c2a7bc6cdbb..000000000000
--- a/sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils versionator linux-mod
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-MY_PN=${PN/-kernel/}
-MY_P=${MY_PN}-${PV}
-MY_MAJ_PV=$(get_version_component_range 1-2 ${PV})
-
-HOMEPAGE="http://www.drbd.org"
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${MY_PN}-${PV}.tar.gz"
-
-IUSE=""
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-SLOT="0"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if ! kernel_is -ge 2 6; then
-		die "Unsupported kernel, drbd-${PV} needs kernel 2.6.x ."
-	elif [ ${KV_PATCH} -ge 33 ]; then
-		ewarn "Your kernel (${KV_FULL}) is too new to use this package."
-		ewarn "The DRBD module has been merged into kernel >= 2.6.33."
-		ewarn "Please compile the DRBD module from your current kernel."
-		die "${PN} is obsolete with kernel >= 2.6.33."
-	fi
-
-	MODULE_NAMES="drbd(block:${S}/drbd)"
-	BUILD_TARGETS="default"
-	CONFIG_CHECK="CONNECTOR"
-	CONNECTOR_ERROR="You must enable \"CONNECTOR - unified userspace <-> kernelspace linker\" in your kernel configuration, because drbd needs it."
-	linux-mod_pkg_setup
-	BUILD_PARAMS="-j1 KDIR=${KV_DIR} O=${KV_OUT_DIR}"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "Please remember to re-emerge drbd-kernel when you upgrade your kernel!"
-	einfo ""
-}
diff --git a/sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch b/sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch
deleted file mode 100644
index c7b4f814077e..000000000000
--- a/sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- drbd-8.0.16/drbd/drbd_main.c.orig	2009-08-04 17:55:52.000000000 +0300
-+++ drbd-8.0.16/drbd/drbd_main.c	2009-08-04 17:56:35.000000000 +0300
-@@ -2770,7 +2770,9 @@
- 	}
- 
- 	drbd_proc->proc_fops = &drbd_proc_fops;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
- 	drbd_proc->owner = THIS_MODULE;
-+#endif
- #else
- # error "Currently drbd depends on the proc file system (CONFIG_PROC_FS)"
- #endif
diff --git a/sys-cluster/drbd-kernel/files/drbd-kernel-8.0.0-scripts.adjust_drbd_config_h.sh.patch b/sys-cluster/drbd-kernel/files/drbd-kernel-8.0.0-scripts.adjust_drbd_config_h.sh.patch
deleted file mode 100644
index beb07fbdaeb9..000000000000
--- a/sys-cluster/drbd-kernel/files/drbd-kernel-8.0.0-scripts.adjust_drbd_config_h.sh.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- drbd-8.0.0/scripts/adjust_drbd_config_h.sh.orig	2007-02-05 01:20:58.000000000 +0100
-+++ drbd-8.0.0/scripts/adjust_drbd_config_h.sh	2007-02-05 01:21:28.000000000 +0100
-@@ -26,19 +26,7 @@
- pushd $KDIR
- 
- KDIR=${KDIR%/}
--if test -z "$O"; then
--	## just in case...
--	## detect if $KDIR points to something which is actually $O ...
--	X=$( make help | sed -ne '/ -C .* O=.* help$/p' | tr -s ' ' )
--	if [[ -n $X ]]; then
--		KDIR=${X##* -C }; KDIR=${KDIR%% *}; KDIR=$(cd $KDIR && pwd)
--		O=${X##* O=}; O=${O%% *}; O=$(cd $KDIR && cd $O && pwd)
--	else
--		O=$KDIR;
--	fi
--else
--	O=${O%/}
--fi
-+O=$KDIR;
- 
- # some paranoia: check that all files are where we expect them
- ls > /dev/null \
diff --git a/sys-cluster/drbd-kernel/files/drbd-kernel-8.3.6-linux-2.6.32.patch b/sys-cluster/drbd-kernel/files/drbd-kernel-8.3.6-linux-2.6.32.patch
deleted file mode 100644
index 893f9c2e21fe..000000000000
--- a/sys-cluster/drbd-kernel/files/drbd-kernel-8.3.6-linux-2.6.32.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- drbd-8.3.6/drbd/drbd_req.c
-+++ drbd-8.3.6/drbd/drbd_req.c
-@@ -55,13 +55,21 @@
- 	__disk_stat_inc(mdev->vdisk, ios[rw]);
- 	__disk_stat_add(mdev->vdisk, sectors[rw], bio_sectors(bio));
- 	disk_round_stats(mdev->vdisk);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-+	mdev->vdisk->in_flight[rw]++;
-+#else
-	mdev->vdisk->in_flight++;
-+#endif
- #else
- 	cpu = part_stat_lock();
- 	part_stat_inc(cpu, &mdev->vdisk->part0, ios[rw]);
- 	part_stat_add(cpu, &mdev->vdisk->part0, sectors[rw], bio_sectors(bio));
- 	part_stat_unlock();
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-+	mdev->vdisk->part0.in_flight[rw]++;
-+#else
-	mdev->vdisk->part0.in_flight++;
-+#endif
- #endif
- }
- 
-@@ -77,13 +85,21 @@
- #ifdef __disk_stat_add
- 	__disk_stat_add(mdev->vdisk, ticks[rw], duration);
- 	disk_round_stats(mdev->vdisk);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-+	mdev->vdisk->in_flight[rw]--;
-+#else
- 	mdev->vdisk->in_flight--;
-+#endif
- #else
- 	cpu = part_stat_lock();
- 	part_stat_add(cpu, &mdev->vdisk->part0, ticks[rw], duration);
- 	part_round_stats(cpu, &mdev->vdisk->part0);
- 	part_stat_unlock();
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-+	mdev->vdisk->part0.in_flight[rw]--;
-+#else
- 	mdev->vdisk->part0.in_flight--;
-+#endif
- #endif
- }
- 
diff --git a/sys-cluster/drbd-kernel/metadata.xml b/sys-cluster/drbd-kernel/metadata.xml
deleted file mode 100644
index 4a09d7ba8d61..000000000000
--- a/sys-cluster/drbd-kernel/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>cluster@gentoo.org</email>
-	<name>Gentoo Cluster Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-cluster/drbd/Manifest b/sys-cluster/drbd/Manifest
deleted file mode 100644
index 012c53d71c8e..000000000000
--- a/sys-cluster/drbd/Manifest
+++ /dev/null
@@ -1,30 +0,0 @@
-AUX drbd-8.0.rc 3043 BLAKE2B 3ca2ca025acf14adb3562e2d8596c195b26d94aa1019407417aebf1384e18f4d72e73904dd3a825836be2fd2aca3b0d75ed9ecdf62300b7b26153a1a8d97f034 SHA512 ab58790e063d66252c8334fa4df02d1a2f11f79749cd97553b1c9bd4f93b7b12ce6c35a4cc85e6be84c20e8043bd51de70256d1a67bd3d0c4b5e70d2ca63dcc4
-AUX drbd-8.3.11-kernel3.patch 762 BLAKE2B 4987acf1a1d9d9cab84bb496d28845694e9b4afd6e33df4778906d8facbdfaa91d921a98df0018a665be1ae92b60498f5277457f3bf155460c4b98ff0c9ad0a8 SHA512 b6760bec81d86c09544ad366a73eec84fd486fa1dd10f278cfbacf18be33aec9a132108a9fb8cdccae3840da868548cbe9e6c5799bb2049f2f75fa9e0fe6293f
-AUX drbd-8.3.8.1-implicits.patch 288 BLAKE2B 1c98ea15e334dda156da061c7c04d77e55a30fcedc7b01887071856427e785a6820874fa9063d2fa2d34a51e81613b7936c3c0c1ad063fb2e491db01e3e6a0ed SHA512 9cf9ae1d1f9716a3553b91d3a3fe1c5490b4aec017b6d4175a91d351245201d8f925fe3af2a7974d66f1cb22583678d669e38005d64a41a0971f2bcffe55a974
-AUX drbd-8.4.3-block-drbd.patch 536 BLAKE2B d441ba9dd84cfcd2716b06ca7a757479aad2a08dfabcbc57e8d461d3e7469e86010f81cce07481b146b74270e6bff786848567f32250555eb0c2b6649fd9e762 SHA512 3ddc60d944a7e54673e79e0b5123c21648f529fa553a04186a0f34f03cdfa3470dcaeceaab68deecc8821b3b57b28ae719ff10ae52a9c7c7c43efa678888073d
-DIST drbd-8.0.16.tar.gz 322758 BLAKE2B 472207843ac2f437a4fe1baeab84265e8bf871e12fba56f9957145a4d93d5a376e0637175d1810c3cf0c64eaf53161f5c33b24fc40d5a83f3147476aaedd19fe SHA512 1b325e3789032656a1f7286b51ac9e90f709c53f8ff35c10ca9bb2e27b1cf822813485e0a49d55c62e7966bc975040b42a6d0ac8fa066a16afa2605e9df87a17
-DIST drbd-8.3.10.tar.gz 521798 BLAKE2B 2d8228e9b24489f36077369f4a964ffdad0f84be0c7c69b4c2726542efd00e65b5e595a2c3aff1f174ade6f4e90221ff50a6922f0313726fe952201657c1b474 SHA512 8d904ada9c80732b47cbf149cf4172658d350856d8688f1dce92c16ce1c4e946a0b3b3a14bb3c9361684fc08b257207c58beaa2fdb534f2abf47ac45aa659389
-DIST drbd-8.3.11.tar.gz 526056 BLAKE2B 2f86dadfce93455648e947036a8c8ec0e5bff8e1d055dd62c1d9a113e2f92696588ac28056edfab967be6890dcb36d829b10669b79fc392e3c0b180bd84a7230 SHA512 2bbf16d69e897adcb247d451f1d844993bdb3ad201027a588f9a45b4fe43fa2f6e98ed6063e8dccc92b9a231ccebf0af85a8671e5672fa710aa986e555ae896d
-DIST drbd-8.3.12.tar.gz 530923 BLAKE2B 81287f6cde7ae1173beec721589b764f698693df215cca462178943404723522fef1492dc49aa66fb3576c6be800e48618f6c19caaa08732590d26459b0ffb6d SHA512 512e68adb9cda1f246c6c35b35e449d514deeb32adb998cbe0249c9245772d1979cbdc906c479500ba4e63a2a7ae675f527407262f235b897c4142bdcfa65b7e
-DIST drbd-8.3.13.tar.gz 541477 BLAKE2B 580aa323de82278f3b1bdaa140796f33565cda52c34b6463b1538d5c921548aec7c044c596171718cc4997f6aefeed0a2faeb90c15feba716d2c5bc9832e31c9 SHA512 fff72545ae569dad37d202bd7dcb075e443964e4d2e95ae124bbcac098762bee78f91e4863b56abfca2bdce2baa42bb3fdbdf9bb489f498d84aa679fa43ae702
-DIST drbd-8.3.15.tar.gz 550130 BLAKE2B d72959920c3fc29cbcccf0d8ddb1b3baf4b2612633cee9e419080716f9a0c3381e88088046423a6ab46005f7a8f9890a8bef04aeda3ead5c346e8a0b7b231d53 SHA512 ca78cddbbb614e90d63cdb3b5ec64ecc6b9c0730aced4348d1464edb5fe9b0f2c0e75fccc2c7cbe18daea454482cf46c847b55fb23e00f364b4f32ae0a3d8dca
-DIST drbd-8.3.7.tar.gz 462659 BLAKE2B 8f513726c8328ad8da4ad601646e791beef3a083c81ec7dd36d583851d234f8da7bae3eab44a93df25143843a0f13cfd32d94037e8f225ab5f6e3d7f7ed64183 SHA512 9ea576ed6a75d80009ade0f9540535b2a65ecee6d38b1a85fa3146a97aac8cb3add31154e2921630aa75121c7115d66bdcf45adb8e0fa481bdb27c011b1c9b15
-DIST drbd-8.3.8.1.tar.gz 482582 BLAKE2B 5967de376fed1085ffda4dadd8a6ddd8407cae07d54e9963d459cd7c387eaae4757c790fd33c887e03fc5f2e5cabc52490ec989fd2bb58eac32609135edfe1a4 SHA512 c43c6d065328058db66f708d47ce082603b766deb1530c57aa736a42b4908f780ede41f76395ca45c2691ef1dfd142147a4c98a7bcdb26ba7de73b149d8f9f5f
-DIST drbd-8.4.0.tar.gz 650733 BLAKE2B 4f8387f0c52fb490df8cae6cc7c2351a6aedf78438522828bc7db71d9387132181b141adb28a5c80cde3916107cc9ee8dbe62c8e79d7306a28a7f6011e9f810b SHA512 4e89f0941aa136f69dcf76efb47df14ac5a210f37159eb7abaea8cea5af801632d204de8a4e3374ee5522d3227f3163bc5c6931122a4bf6827463536b532d7a2
-DIST drbd-8.4.2.tar.gz 675803 BLAKE2B 2d6bf1432b393e20c772418d493f8679f6e9ea2869e3082c3a35b3f4b33645fc2393d10720677c7f3171f8457e0d7789e67c863d802a6864713c44b21baa640e SHA512 c32371e1fb89b479bf5136ee1c00d8e07dd15769654977dfcde71fcc24264c1dae2feda82e8f61b4caf57b9ac88e2861ee7270aa8c867f6245b52d65c45ada46
-DIST drbd-8.4.3.tar.gz 688328 BLAKE2B 1b524fc1e9c37da9d70acd617f48a8ff68fe652db78572955dc41932ddbb9b47a285597c14ef4f218b17e052802f61aaccafd5ffce32d3f6aef4657546ded0cc SHA512 cdc90bdd9491fe6d29e3b779d69ba2aac1aacdb336586f1ef414d0a0195d922dbefa8b2d9c4868a2476998a713c893403344a2934c7768ff6f4ba9f13bb7277a
-EBUILD drbd-8.0.16.ebuild 1285 BLAKE2B e94637d7c0a51a9202d219a6bdb969f87b6c6233d8db1e4f72b973b3f15c064bc3ef5c5e1af69c2c048e0ca383911370f3a5e0e657d6f417f67eeba454d34b11 SHA512 c5159dcb53cadfb9d4388ba6eff333baa18c4edd8a342c12ea6ecdd7d77c18966a4cbaa4c297580cf7bad8947d4f1a869ec78794ae0f1cd0a21e1048575fa959
-EBUILD drbd-8.3.10.ebuild 1936 BLAKE2B 272299b85a998b9480e2002c75d7253b52bf83e1660fd1625d1860b80f1363da25e21a6983c8787ab654a4b762d2495f3bb61b9b0c93734cd5661e697c445f8c SHA512 ce1a1c4d2530118b451623d53258a167208475c7055d71dda96ad709e0ea31a6cdadd43677e36c2083f9fcf6fc443a5fee641c11bde7adec7503f9c6d5d20fb8
-EBUILD drbd-8.3.11-r1.ebuild 1947 BLAKE2B e9c150223639a3f64b5ea6d411245e82ddcf3bd135563957c41682b3b88ff1882bd79130d9e7a91af078d5722f0e25b564af61a8921707d59a1260fbc1bd77e6 SHA512 c8682f2e7ad763daf73b033c944e9f730f9a24a0295b3342115317da63a596f4d8e61e56439175c483537ee7938c2c39566b0908554ee36a6dba8ed8bdc7e2c7
-EBUILD drbd-8.3.12.ebuild 2091 BLAKE2B 0c6b1e386859c05485b93923e51381f7602c07fb9fbdac40c90e38581f0436aa58ce4274c52cedb8e24bd6d0f01bf7cf343713beef017b4c4141ce5ab1351389 SHA512 c0a5816f13fe6cd87e59b3f822e0b71a9efdcbd70905ed3871a5abb98f5c65faa9e327efd609b13130e8e05f370762d76b7e9b87085122cfef55e2257fb717dc
-EBUILD drbd-8.3.13.ebuild 2094 BLAKE2B f249c3024a97c9b167bf43261a3bcdfec5331bb1c85b5e8c51302569b0572dcf80759e7014191921788c5d4a0f6bde0db1c8c214302ce3923a90418bf752edfc SHA512 4867ec28f0a4c5033f5cb1fcd98edb3ef989f1c6fdb64f7cf5fe80c7ec4e2f6c8752c3774275cd31a1af2cd0089593712ec7126cd1e81a313823370bc5c7f759
-EBUILD drbd-8.3.15.ebuild 2092 BLAKE2B b265f0bd06359e25970c9e12d06ca6a82fd593b2cf6e26637a536658b8cfc52831672db44f4d13adb22f9ae4bd64434d174e734f24017a5eb9b33450cebc2c00 SHA512 e23e2b74d0e6db3f07a290bdf48a016fc60f5163b4dfbeb72c4d355f882bee09f5e62adcf93cc78bd40a5e458adf775eb1b86f0fee1f3e49e697b5d38b770fef
-EBUILD drbd-8.3.7.ebuild 1965 BLAKE2B cf66e86049a31dccb9656cf567ddcab99a7e38b08bdc97239102e1bc2191df230cdec38ad048ef7f53748e11d5f71c7fa7867b93e40b56a570fe3f6247d431cd SHA512 86f85ca150997a9ac8f53877965245cd9b49ec2d5f8591c112887d472cc3160cd3d83f7070787fe7446fa4b4f49243709673bf63db506125f9c6377a6a8a24bf
-EBUILD drbd-8.3.8.1-r1.ebuild 2050 BLAKE2B 2633893fea89e5d861dedec2dbdf7b362e5636e1a128544a44c1eaabff3c6882b819284d5f5dcda763f4adc1d8f2ea3f89ff2045fdf330a4bd32d402771f67ca SHA512 416674c07c3815265a96dc1941ba7ddc2cc439f1f989bcaa5f184383c1dd99896ba47e6907c4dde5c4d1c2f8b9a3c99dab56ed841747c8b11e2c887e8643d9e6
-EBUILD drbd-8.3.8.1.ebuild 1963 BLAKE2B 5f209548d088190e6134d2d8819e77da08a18fb2ef390bc5f28d693fcdaf69e5063d375203b3d00c112d043ee9c89713d9c9e1576380aaa2368a5c3122766ac9 SHA512 d06a4ca42e1a5a6042527a78f9d119c0c8c2487ac439d8abe7f4c924b18835e6f427dfc2944b439cf4f2e3d3f7f7bd2913b4205ad16ce7b3515162da54e84b43
-EBUILD drbd-8.4.0.ebuild 2101 BLAKE2B d40c644bbb9796654637698ccbeb22f4a4742564fc9833e2cd7702a93e5bb87b71d7a43e17810d7375a36f535cf9db7e3d44b44fe6a8285478dfea0db2c7a440 SHA512 a429f6e9ff18c081e71aaa5b66226be9a78b7fd832540df7f1a3c3354ea73aafd4fe3752bbefd47a464bfe7d061977413f9fe771e19014acfcdab5ed2f37936d
-EBUILD drbd-8.4.2.ebuild 2183 BLAKE2B 3590c85933b3a8c2516c3f46d4e01fcaf7b8a094f1abfd72f92b8e8f67a59e00b80c14b9347d93af932edbefedd8f721dcc6e7572d6f85de378237f42f9e3b92 SHA512 4dcc5de55381eae447a6e4d8b4a98a7c17ca7d6d9092597e399129ea4baf86924329d338a682ae169468d1501e9a640028cc613e51687cc6b009ecc4ce65d9a8
-EBUILD drbd-8.4.3-r1.ebuild 2207 BLAKE2B f669a856f6a12ddbb174ead05e214d7af290e2d8d542942331fab6e712d49f8ea8fb44f5f5abd46519a58711d1d0712a1678232e75e9482d95104b9ebdd0858f SHA512 f41956308b8c81ed835ce4b6958ea0af6c8377cf5201592ef69cf69925f4cd77f37ea017166ca59ea67e41667aa6f1575a1cb921e13062edf5c10861e297be38
-EBUILD drbd-8.4.3-r2.ebuild 2288 BLAKE2B f79e3cf636fa90a258ccf64f24e99a5d2c49b069476df25a4873c7a1f0f2a20332234f5c22188d0516f9887fa8988e3e602cccd08faaad689b4cf2bcd3241468 SHA512 4dfbddf8116874939c2ba457a3218763363066abd0bbe91579a7111a1edb0d9e635cf3524437054e8f3c212e8a370b5b5e2c6a7675b673e51e03190b1b844dd6
-EBUILD drbd-8.4.3.ebuild 2207 BLAKE2B f669a856f6a12ddbb174ead05e214d7af290e2d8d542942331fab6e712d49f8ea8fb44f5f5abd46519a58711d1d0712a1678232e75e9482d95104b9ebdd0858f SHA512 f41956308b8c81ed835ce4b6958ea0af6c8377cf5201592ef69cf69925f4cd77f37ea017166ca59ea67e41667aa6f1575a1cb921e13062edf5c10861e297be38
-MISC metadata.xml 677 BLAKE2B 79183e6930396061e7cf5c881ced8b4e3082a2b0dfdb4520e9de6afd54269b35ba972efd7dd3c3bd67cd103fd7d40693575a9d87b7b437438d5226e6e3453b5e SHA512 b97a7c5bb6ffe6de872f535d595507cd155923c920b9e7836f9a50afa992300b0b27d43805491cbbe6c348ecf99fc24367c375b6416dae73bffb4b6706f4b89a
diff --git a/sys-cluster/drbd/drbd-8.0.16.ebuild b/sys-cluster/drbd/drbd-8.0.16.ebuild
deleted file mode 100644
index bb60780de596..000000000000
--- a/sys-cluster/drbd/drbd-8.0.16.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils versionator
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-MY_PV="${PV/_/}"
-MY_MAJ_PV="$(get_version_component_range 1-2 ${PV})"
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${PN}-${MY_PV}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-PDEPEND="~sys-cluster/drbd-kernel-${PV}"
-
-SLOT="0"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_compile() {
-	emake -j1 tools || die "compile problem"
-}
-
-src_install() {
-	emake PREFIX="${D}" install-tools || die "install problem"
-
-	# gentoo-ish init-script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN} || die
-
-	# docs
-	dodoc README ChangeLog ROADMAP
-
-	# we put drbd.conf into docs
-	# it doesnt make sense to install a default conf in /etc
-	# put it to the docs
-	rm -f "${D}"/etc/drbd.conf
-	dodoc scripts/drbd.conf || die
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "Please copy and gunzip the configuration file"
-	einfo "drbd.conf from /usr/share/doc/${PF} to /etc"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo ""
-}
diff --git a/sys-cluster/drbd/drbd-8.3.10.ebuild b/sys-cluster/drbd/drbd-8.3.10.ebuild
deleted file mode 100644
index 08e388dcc8d3..000000000000
--- a/sys-cluster/drbd/drbd-8.3.10.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils multilib versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="amd64 x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	# correct install paths
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools || die
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools || die
-	dodoc README ChangeLog || die
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN} || die
-
-	dodoc scripts/drbd.conf.example || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-}
diff --git a/sys-cluster/drbd/drbd-8.3.11-r1.ebuild b/sys-cluster/drbd/drbd-8.3.11-r1.ebuild
deleted file mode 100644
index 1b8377d9d570..000000000000
--- a/sys-cluster/drbd/drbd-8.3.11-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="amd64 x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	epatch "${FILESDIR}/drbd-8.3.11-kernel3.patch"
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	# correct install paths
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
-
-	dodoc scripts/drbd.conf.example
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-}
diff --git a/sys-cluster/drbd/drbd-8.3.12.ebuild b/sys-cluster/drbd/drbd-8.3.12.ebuild
deleted file mode 100644
index 7a1ba7159d6c..000000000000
--- a/sys-cluster/drbd/drbd-8.3.12.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	epatch "${FILESDIR}/drbd-8.3.11-kernel3.patch"
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/Makefile.in || die
-	# correct install paths
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
-
-	dodoc scripts/drbd.conf.example
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-}
diff --git a/sys-cluster/drbd/drbd-8.3.13.ebuild b/sys-cluster/drbd/drbd-8.3.13.ebuild
deleted file mode 100644
index 368253c78c5e..000000000000
--- a/sys-cluster/drbd/drbd-8.3.13.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib versionator udev
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="amd64 x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/Makefile.in || die
-	# correct install paths
-	sed -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		-e "s:\$(sysconfdir)/udev:$(get_udevdir):g" \
-		-i scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
-
-	dodoc scripts/drbd.conf.example
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-}
diff --git a/sys-cluster/drbd/drbd-8.3.15.ebuild b/sys-cluster/drbd/drbd-8.3.15.ebuild
deleted file mode 100644
index cf347bf1695d..000000000000
--- a/sys-cluster/drbd/drbd-8.3.15.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	#epatch "${FILESDIR}/drbd-8.3.11-kernel3.patch"
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/Makefile.in || die
-	# correct install paths
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
-
-	dodoc scripts/drbd.conf.example
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-}
diff --git a/sys-cluster/drbd/drbd-8.3.7.ebuild b/sys-cluster/drbd/drbd-8.3.7.ebuild
deleted file mode 100644
index b04226b05a83..000000000000
--- a/sys-cluster/drbd/drbd-8.3.7.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit multilib versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	# correct install paths
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		scripts/Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools || die
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools || die
-	dodoc README ChangeLog || die
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN} || die
-
-	# it doesnt make sense to install a default conf in /etc,
-	# so we put it to the docs
-	rm -f "${D}"/etc/drbd.conf
-	dodoc scripts/drbd.conf || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file"
-	einfo "from /usr/share/doc/${PF}/drbd.conf.bz2 to /etc"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-	elog "Or alternatively emerge sys-cluster/drbd-kernel package."
-}
diff --git a/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild b/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild
deleted file mode 100644
index 2839e4ed603a..000000000000
--- a/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils multilib versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/Makefile.in || die
-	# correct install paths
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		scripts/Makefile.in || die
-	epatch "${FILESDIR}"/${P}-implicits.patch
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools || die
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools || die
-	dodoc README ChangeLog || die
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN} || die
-
-	dodoc scripts/drbd.conf.example || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file"
-	einfo "from /usr/share/doc/${PF}/drbd.conf.bz2 to /etc"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-	elog "Or alternatively emerge sys-cluster/drbd-kernel package."
-}
diff --git a/sys-cluster/drbd/drbd-8.3.8.1.ebuild b/sys-cluster/drbd/drbd-8.3.8.1.ebuild
deleted file mode 100644
index 2006395ddef0..000000000000
--- a/sys-cluster/drbd/drbd-8.3.8.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit multilib versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="amd64 x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	# correct install paths
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		scripts/Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools || die
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools || die
-	dodoc README ChangeLog || die
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN} || die
-
-	# it doesnt make sense to install a default conf in /etc,
-	# so we put it to the docs
-	rm -f "${D}"/etc/drbd.conf
-	dodoc scripts/drbd.conf || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file"
-	einfo "from /usr/share/doc/${PF}/drbd.conf.bz2 to /etc"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-	elog "Or alternatively emerge sys-cluster/drbd-kernel package."
-}
diff --git a/sys-cluster/drbd/drbd-8.4.0.ebuild b/sys-cluster/drbd/drbd-8.4.0.ebuild
deleted file mode 100644
index 35f33e36c676..000000000000
--- a/sys-cluster/drbd/drbd-8.4.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	epatch "${FILESDIR}/drbd-8.3.11-kernel3.patch"
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/{,legacy/}Makefile.in || die
-	# correct install paths
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
-
-	dodoc scripts/drbd.conf.example
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-}
diff --git a/sys-cluster/drbd/drbd-8.4.2.ebuild b/sys-cluster/drbd/drbd-8.4.2.ebuild
deleted file mode 100644
index ffe8ffe7c70d..000000000000
--- a/sys-cluster/drbd/drbd-8.4.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib versionator udev
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="amd64 x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	#epatch "${FILESDIR}/drbd-8.3.11-kernel3.patch"
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/{,legacy/}Makefile.in || die
-	# correct install paths
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-	sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
-
-	dodoc scripts/drbd.conf.example
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-}
diff --git a/sys-cluster/drbd/drbd-8.4.3-r1.ebuild b/sys-cluster/drbd/drbd-8.4.3-r1.ebuild
deleted file mode 100644
index b192e831b583..000000000000
--- a/sys-cluster/drbd/drbd-8.4.3-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit bash-completion-r1 eutils multilib versionator udev
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	# respect LDFLAGS, #453442
-	sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
-		-e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
-		-i user{,/legacy}/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/{,legacy/}Makefile.in || die
-	# correct install paths (really correct this time)
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
-		scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-	sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		--with-bashcompletion \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
-
-	dodoc scripts/drbd.conf.example
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-}
diff --git a/sys-cluster/drbd/drbd-8.4.3-r2.ebuild b/sys-cluster/drbd/drbd-8.4.3-r2.ebuild
deleted file mode 100644
index 591e689314c0..000000000000
--- a/sys-cluster/drbd/drbd-8.4.3-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit bash-completion-r1 versionator udev
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="heartbeat pacemaker +udev xen"
-SLOT="0"
-
-PATCHES=(
-	# https://bugs.gentoo.org/show_bug.cgi?id=518774
-	"${FILESDIR}"/${P}-block-drbd.patch
-)
-
-src_prepare() {
-	default
-
-	# respect LDFLAGS, #453442
-	sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
-		-e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
-		-i user{,/legacy}/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/{,legacy/}Makefile.in || die
-	# correct install paths (really correct this time)
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
-		scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-	sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		--with-bashcompletion \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	einstalldocs
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
-
-	dodoc scripts/drbd.conf.example
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	einfo "Remember to enable drbd support in kernel."
-}
diff --git a/sys-cluster/drbd/drbd-8.4.3.ebuild b/sys-cluster/drbd/drbd-8.4.3.ebuild
deleted file mode 100644
index b192e831b583..000000000000
--- a/sys-cluster/drbd/drbd-8.4.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit bash-completion-r1 eutils multilib versionator udev
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	# respect LDFLAGS, #453442
-	sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
-		-e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
-		-i user{,/legacy}/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/{,legacy/}Makefile.in || die
-	# correct install paths (really correct this time)
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
-		scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-	sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		--with-bashcompletion \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
-
-	dodoc scripts/drbd.conf.example
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-}
diff --git a/sys-cluster/drbd/files/drbd-8.0.rc b/sys-cluster/drbd/files/drbd-8.0.rc
deleted file mode 100644
index 57f583bf94bf..000000000000
--- a/sys-cluster/drbd/files/drbd-8.0.rc
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-
-depend() {
-	use logger
-	need net
-	before heartbeat
-	after sshd
-}
-
-DEFAULTFILE="/etc/conf.d/drbd"
-DRBDADM="/sbin/drbdadm"
-PROC_DRBD="/proc/drbd"
-MODPROBE="/sbin/modprobe"
-RMMOD="/sbin/rmmod"
-UDEV_TIMEOUT=10
-ADD_MOD_PARAM=""
-
-if [ -f $DEFAULTFILE ]; then
-  . $DEFAULTFILE
-fi
-
-# Just in case drbdadm want to display any errors in the configuration
-# file, or we need to ask the user about registering this installation
-# at http://usage.drbd.org, we call drbdadm here without any IO
-# redirection.
-$DRBDADM sh-nop
-
-assure_module_is_loaded() {
-	[ -e "$PROC_DRBD" ] && return
-	ebegin "Loading drbd module"
-	ret=0
-
-	$MODPROBE -s drbd `$DRBDADM sh-mod-parms` $ADD_MOD_PARAM || ret=20
-	eend $ret
-	return $ret
-}
-
-adjust_with_progress() {
-	IFS_O=$IFS
-	NEWLINE='
-'
-	IFS=$NEWLINE
-	local D=0
-	local S=0
-	local N=0
-
-	einfon "Setting drbd parameters "
-	COMMANDS=`$DRBDADM -d adjust all` || { 
-		eend 20 "Error executing drbdadm"
-		return 20 
-	}
-	echo -n "[ "
-	
-	for CMD in $COMMANDS; do
-		if echo $CMD | grep -q disk; then echo -n "d$D "; D=$(( D+1 ));
-		elif echo $CMD | grep -q syncer; then echo -n "s$S "; S=$(( S+1 ));
-		elif echo $CMD | grep -q net; then echo -n "n$N "; N=$(( N+1 ));
-		else echo echo -n ".. ";
-		fi
-		IFS=$IFS_O
-		eval $CMD || {
-			echo 
-			eend 20 "cmd $CMD failed!"
-			return 20
-		}
-		IFS=$NEWLINE
-	done
-	echo "]"
-	eend 0
-	
-	IFS=$IFS_O
-}
-
-start() {
-	einfo "Starting DRBD resources:"
-	eindent
-	assure_module_is_loaded || return $?
-	adjust_with_progress || return $?
-
-	# make sure udev has time to create the device files
-	ebegin "Waiting for udev device creation ..."
-	for RESOURCE in `$DRBDADM sh-resources`; do
-		for DEVICE in `$DRBDADM sh-dev $RESOURCE`; do
-			UDEV_TIMEOUT_LOCAL=$UDEV_TIMEOUT
-			while [ ! -e $DEVICE ] && [ $UDEV_TIMEOUT_LOCAL -gt 0 ] ; do
-				sleep 1
-				UDEV_TIMEOUT_LOCAL=$(( $UDEV_TIMEOUT_LOCAL-1 ))
-			done
-		done
-	done
-	eend 0
-
-	einfon "Waiting for connection "
-	$DRBDADM wait-con-int
-	ret=$?
-	echo
-
-	sleep 5
-	
-	einfon "Become primary if configured "
-	$DRBDADM sh-b-pri all
-	echo
-
-	eend $ret
-	return $ret
-}
-
-stop() {
-	ebegin "Stopping all DRBD resources"
-	
-	# Check for mounted drbd devices
-	if ! grep -q '^/dev/drbd' /proc/mounts &>/dev/null; then
-		if [ -e ${PROC_DRBD} ]; then
-			${DRBDADM} down all
-			ret=$?
-			sleep 3
-			if [ -e /proc/modules ] && grep -q '^drbd' /proc/modules ; then
-		 	      ${RMMOD} drbd
-         	fi
-		fi
-		eend $ret
-		return $ret
-	else
-		einfo "drbd devices mounted, please umount them before trying to stop drbd!"
-		eend 1
-		return 1
-	fi
-}
-
-status() {
-	# NEEDS to be heartbeat friendly...
-	# so: put some "OK" in the output.
-	
-	if [ -e $PROC_DRBD ]; then
-		ret=0
-		ebegin "drbd driver loaded OK; device status:"
-		eend $ret
-		cat $PROC_DRBD
-	else
-		ebegin "drbd not loaded"
-		ret=3
-		eend $ret
-	fi
-	return $ret
-}
-
-reload() {
-	ebegin "Reloading DRBD"
-	${DRBDADM} adjust all
-	ret=$?
-	eend $ret
-	return $ret
-}
diff --git a/sys-cluster/drbd/files/drbd-8.3.11-kernel3.patch b/sys-cluster/drbd/files/drbd-8.3.11-kernel3.patch
deleted file mode 100644
index 1eeca1b1b0ff..000000000000
--- a/sys-cluster/drbd/files/drbd-8.3.11-kernel3.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/drbd/Makefile	2011-07-07 12:55:39.000000000 +0200
-+++ b/drbd/Makefile	2011-11-03 12:56:42.280603057 +0100
-@@ -77,9 +77,12 @@
-     endif
-   endif
- 
-+  KDIR_Makefile_VERSION = $(shell test -e $(KDIR)/Makefile && grep "^VERSION = " $(KDIR)/Makefile | cut -d " " -f 3)
-   KDIR_Makefile_PATCHLEVEL = $(shell test -e $(KDIR)/Makefile && grep "^PATCHLEVEL = " $(KDIR)/Makefile | cut -d " " -f 3)
--  ifneq ($(findstring $(KDIR_Makefile_PATCHLEVEL),12345),)
--    $(error "won't compile with this kernel version")
-+  ifneq ($(KDIR_Makefile_VERSION),3)
-+    ifneq ($(findstring $(KDIR_Makefile_PATCHLEVEL),12345),)
-+      $(error "ici won't compile with this kernel version")
-+    endif
-   endif
- 
-   .PHONY: drbd.o default all greeting clean kbuild install dep tags
diff --git a/sys-cluster/drbd/files/drbd-8.3.8.1-implicits.patch b/sys-cluster/drbd/files/drbd-8.3.8.1-implicits.patch
deleted file mode 100644
index 0fbbb92a2c3f..000000000000
--- a/sys-cluster/drbd/files/drbd-8.3.8.1-implicits.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-drbdadm_main.c:2525:2: warning: implicit declaration of function ‘stat’
-
---- a/user/drbdadm_main.c
-+++ b/user/drbdadm_main.c
-@@ -33,6 +33,7 @@
- #include <search.h>
- 
- #include <sys/types.h>
-+#include <sys/stat.h>
- #include <sys/wait.h>
- #include <sys/poll.h>
- #include <sys/socket.h>
diff --git a/sys-cluster/drbd/files/drbd-8.4.3-block-drbd.patch b/sys-cluster/drbd/files/drbd-8.4.3-block-drbd.patch
deleted file mode 100644
index 408b81362967..000000000000
--- a/sys-cluster/drbd/files/drbd-8.4.3-block-drbd.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/scripts/block-drbd	2014-07-30 17:19:59.000000000 -0700
-+++ b/scripts/block-drbd	2014-07-31 09:54:56.000000000 -0700
-@@ -248,7 +248,7 @@
-     fi
- 
-     case $t in 
--      drbd)
-+      drbd|phy)
-         drbd_resource=$p
-         drbd_role="$(/sbin/drbdadm role $drbd_resource)"
-         drbd_lrole="${drbd_role%%/*}"
-@@ -276,7 +276,7 @@
- 
-   remove)
-     case $t in 
--      drbd)
-+      drbd|phy)
-         p=$(xenstore_read "$XENBUS_PATH/params")
-         drbd_resource=$p
-         drbd_role="$(/sbin/drbdadm role $drbd_resource)"
diff --git a/sys-cluster/drbd/metadata.xml b/sys-cluster/drbd/metadata.xml
deleted file mode 100644
index 82f50565f990..000000000000
--- a/sys-cluster/drbd/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cluster@gentoo.org</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-	<use>
-		<flag name="xen">Enable Xen integration</flag>
-		<flag name="pacemaker">Enable Pacemaker integration</flag>
-		<flag name="heartbeat">Enable Heartbeat integration</flag>
-	</use>
-	<longdescription>
-		The user space tools to control, configure the DRBD driver, as well as integration programs and scripts
-		that glues the DRBD system to cluster management software and other system components.
-	</longdescription>
-</pkgmetadata>
diff --git a/sys-cluster/gearmand/Manifest b/sys-cluster/gearmand/Manifest
deleted file mode 100644
index a40425d6584e..000000000000
--- a/sys-cluster/gearmand/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gearmand-0.34-stdbool-h.patch 568 BLAKE2B 990e4421f26a17d284a725cb50bf1fddf683b2ac34c454bc489a01c99001896016369f2da7efbcb596a075e5f8b8f9f9796f8084635223d0f925f2b6b446f7f0 SHA512 bff5ae044cbf7bd08911ff29699a6f6065320c888f3f3f27ffc655dbbb283914c7aaa6474902f3644940a9698921d60622e4eeada653183c6fa90bb08e423930
-AUX gearmand.conf.d 1542 BLAKE2B b4f8f54f20bac3fd80bc990726656963b62d9f3bc71b74aae6ffd66bfd28d95ae9c8af0777c0b5d3159064b354a01a6a3ad425943659b01ae7ad5cbadef3d959 SHA512 850cf6bd13475d30879bd49c9650e1f01e52c1bd8ed580d6dda09c83f74e424a17c04e9d8203c2b3555a69cf5cf3f00ede3fbcc7d005f90844e4494041c9168f
-AUX gearmand.init.d.2 3206 BLAKE2B 40fcc652edf5c5694fa18957f3e9163fb43052108f1085dca76967b8aba1035b240994322cd34dcfa3feadcd5e743c0eb8791fc4047798a81dfd60d62a79822d SHA512 33d2208e668d060948715faa193b021603679ef6e870a80fbd666256a1d2a49ad709bf7efd94bd00fc8b96373feb34ea12c1212ac42b0d2f99fbbe369fa34175
-DIST gearmand-0.34.tar.gz 842579 BLAKE2B 439fcec297ae874cecbc355526b4681329fde2ac39ccc9f6e14413979e7cdbc6c88f2e8cc34e2af1f166f873415a1d5b353716a227894c36bbde66f30b900e56 SHA512 8263cd19337f56cb692209efb4867b54954081a907c109b4828c1a7dfd8e1dec803f9c06e0f09e1ec6cc4271299bf77bcd5069b765647b31559480b4e7e756ba
-EBUILD gearmand-0.34-r1.ebuild 2604 BLAKE2B 13a41ad6e77156d96b08ee07d20779883eee12a44fe0f7f399d19af3d60873f1489595c516a2f60d977c1ba7bd1aa8474f014723ae6fa7ca9a28f0ca84c6b8b0 SHA512 02ddf427124ca3ee407854c10e53555c0ad5347f5eb12a8f0d66e4da96028e387972d07e8aaa2b27499d8f29ec492186032e08f96193c55beb3b5bc3afa47d14
-MISC metadata.xml 513 BLAKE2B cd88a2f62fcc99a941b8b884b8d4179ce0a8ab73890ad387afcfbe2d0721c91f1a74c041e74fb182e76b2ad13bce51d12a84a0e71ca355c28a29f276c42e714e SHA512 ed6ea7bdac5ed5e46e2f620881681807d9096299a0fe702abe11093cbddb70e3660b29a5bac30b003dcf4003ad455d431ba4e88eb7d5e939273a8049d74705e6
diff --git a/sys-cluster/gearmand/files/gearmand-0.34-stdbool-h.patch b/sys-cluster/gearmand/files/gearmand-0.34-stdbool-h.patch
deleted file mode 100644
index 37d2db62741d..000000000000
--- a/sys-cluster/gearmand/files/gearmand-0.34-stdbool-h.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Ignore configure checks and include stdbool.h
-unconditionally, we're in 2016.
-
---- gearmand-0.34/libhostile/called.c
-+++ gearmand-0.34/libhostile/called.c
-@@ -41,6 +41,7 @@
- #include <assert.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdbool.h>
- 
- __thread bool is_called_= false;
- static __thread char** unique_ptr= NULL;
---- gearmand-0.34/libhostile/called.h
-+++ gearmand-0.34/libhostile/called.h
-@@ -36,9 +36,7 @@
- 
- #pragma once
- 
--#ifdef HAVE_STDBOOL_H
--# include <stdbool.h>
--#endif
-+#include <stdbool.h>
- 
- bool is_called(void);
- void set_called();
diff --git a/sys-cluster/gearmand/files/gearmand.conf.d b/sys-cluster/gearmand/files/gearmand.conf.d
deleted file mode 100644
index aeb49d5c6b9e..000000000000
--- a/sys-cluster/gearmand/files/gearmand.conf.d
+++ /dev/null
@@ -1,39 +0,0 @@
-# /etc/conf.d/gearmand: config file for /etc/init.d/gearmand
-
-# Persistent queue store
-# The following queue stores are available:
-# drizzle|memcache|mysql|postgre|sqlite|tokyocabinet|none
-# If you do not wish to use persistent queues, leave this option commented out.
-# Note that persistent queue mechanisms are mutally exclusive.
-#PERSISTENT=""
-
-# Persistent queue settings for drizzle, mysql and postgre
-#PERSISTENT_SOCKET=""
-#PERSISTENT_HOST=""
-#PERSISTENT_PORT=""
-#PERSISTENT_USER=""
-#PERSISTENT_PASS=""
-#PERSISTENT_DB=""
-#PERSISTENT_TABLE=""
-
-# Persistent queue settings for sqlite
-#PERSISTENT_FILE=""
-
-# Persistent queue settings for memcache
-#PERSISTENT_SERVERLIST=""
-
-# General settings
-#
-# -j, --job-retries=RETRIES   Number of attempts to run the job before the job
-#                             server removes it. Thisis helpful to ensure a bad
-#                             job does not crash all available workers. Default
-#                             is no limit.
-# -L, --listen=ADDRESS        Address the server should listen on. Default is
-#                             INADDR_ANY.
-# -p, --port=PORT             Port the server should listen on. Default=4730.
-# -r, --protocol=PROTOCOL     Load protocol module.
-# -t, --threads=THREADS       Number of I/O threads to use. Default=0.
-# -v, --verbose               Increase verbosity level by one.
-# -w, --worker-wakeup=WORKERS Number of workers to wakeup for each job received.
-#                             The default is to wakeup all available workers.
-GEARMAND_PARAMS=""
diff --git a/sys-cluster/gearmand/files/gearmand.init.d.2 b/sys-cluster/gearmand/files/gearmand.init.d.2
deleted file mode 100644
index 48d19bd1dc8b..000000000000
--- a/sys-cluster/gearmand/files/gearmand.init.d.2
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2009-2012 Pavel Stratil, senbonzakura.eu
-# Distributed under the terms of the MIT license
-
-pidfile=/var/run/gearmand/gearmand.pid
-command=/usr/sbin/gearmand
-
-depend() {
-	use localmount
-
-	case $PERSISTENT in
-	  drizzle)
-	    use drizzle
-	    ;;
-	  memcache)
-	    use memcache
-	    ;;
-	  mysql)
-	    use mysql
-	    ;;
-	  postgre)
-	    use postgresql
-	    ;;
-	  *)
-	    ;;
-	esac
-}
-
-start() {
-	case ${PERSISTENT:-none} in
-	  drizzle|mysql)
-	    GEARMAND_PARAMS="${GEARMAND_PARAMS} -q libdrizzle"
-            [ ${PERSISTENT_HOST}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-host=${PERSISTENT_HOST}"
-            [ ${PERSISTENT_USER}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-user=${PERSISTENT_USER}"
-            [ ${PERSISTENT_PASS}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-password=${PERSISTENT_PASS}"
-            [ ${PERSISTENT_DB}     ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-db=${PERSISTENT_DB}"
-            [ ${PERSISTENT_TABLE}  ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-table=${PERSISTENT_TABLE}"
-            [ ${PERSISTENT_PORT}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-port=${PERSISTENT_PORT}"
-            [ ${PERSISTENT_SOCKET} ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-uds=${PERSISTENT_SOCKET}"
-            [ ${PERSISTENT} == "mysql" ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-mysql"
-	    ;;
-	  memcache)
-	    [ ${PERSISTENT_SERVERLIST} ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} -q libmemcached --libmemcached-servers=${PERSISTENT_SERVERLIST}"
-	    ;;
-	  postgre)
-	    GEARMAND_PARAMS="${GEARMAND_PARAMS} -q libpq"
-            [ ${PERSISTENT_HOST}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libpq-host=${PERSISTENT_HOST}"
-            [ ${PERSISTENT_USER}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libpq-user=${PERSISTENT_USER}"
-            [ ${PERSISTENT_PASS}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libpq-password=${PERSISTENT_PASS}"
-            [ ${PERSISTENT_DB}     ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libpq-dbname=${PERSISTENT_DB}"
-            [ ${PERSISTENT_PORT}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libpq-port=${PERSISTENT_PORT}"
-            [ ${PERSISTENT_TABLE}  ] && ewarn "Libpq doesn't recognise 'table' parameter."
-            [ ${PERSISTENT_SOCKET} ] && ewarn "Libpq doesn't recognise 'socket' parameter. If no host is set, it automatically falls back to a socket."
-	    ;;
-	  tokyocabinet)
-	    GEARMAND_PARAMS="${GEARMAND_PARAMS} -q libtokyocabinet --libtokyocabinet-file=${PERSISTENT_FILE}"
-	    ;;
-	  sqlite)
-	    GEARMAND_PARAMS="${GEARMAND_PARAMS} -q libsqlite3 --libsqlite3-db=${PERSISTENT_FILE}"
-	    ;;
-          none)
-            ;;
-	  *)
-            eerror "Wrong persistent queue store setting in /etc/conf.d/gearmand."
-	    return 1
-	    ;;
-	esac
-
-
-	checkpath -d -m 0755 -o gearmand:nogroup /var/run/gearmand /var/log/gearmand
-
-	ebegin "Starting ${SVCNAME}"
-        start-stop-daemon --pidfile /var/run/gearmand/gearmand.pid --start \
-		--exec /usr/sbin/gearmand -- --pid-file=/var/run/gearmand/gearmand.pid \
-		--user=gearmand --daemon \
-		--log-file=/var/log/gearmand/gearmand.log ${GEARMAND_PARAMS}
-	eend $?
-}
diff --git a/sys-cluster/gearmand/gearmand-0.34-r1.ebuild b/sys-cluster/gearmand/gearmand-0.34-r1.ebuild
deleted file mode 100644
index 846d47261961..000000000000
--- a/sys-cluster/gearmand/gearmand-0.34-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils flag-o-matic libtool user
-
-DESCRIPTION="Generic framework to farm out work to other machines"
-HOMEPAGE="http://www.gearman.org/"
-SRC_URI="https://launchpad.net/gearmand/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug tcmalloc +memcache sqlite tokyocabinet postgres"
-
-RDEPEND="dev-libs/libevent
-	>=dev-libs/boost-1.39:=[threads(+)]
-	|| ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 )
-	tcmalloc? ( dev-util/google-perftools )
-	memcache? ( >=dev-libs/libmemcached-0.47 )
-	sqlite? ( dev-db/sqlite:3 )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	postgres? ( >=dev-db/postgresql-9.0:* )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/boost-m4-0.4_p20160328"
-
-pkg_setup() {
-	enewuser gearmand -1 -1 /dev/null nogroup
-}
-
-src_prepare() {
-	# fixes bug 574558, which is due to an outdated bundled boost.m4
-	rm m4/boost.m4 || die
-	sed -i -e 's/AM_INIT_AUTOMAKE.*//g' m4/pandora_canonical.m4 || die
-	epatch -p1 "${FILESDIR}/${P}-stdbool-h.patch"
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable memcache libmemcached)
-		$(use_enable tcmalloc)
-		$(use_enable tokyocabinet libtokyocabinet)
-		$(use_with postgres postgresql)
-		$(use_with sqlite sqlite3)
-		--disable-mtmalloc
-		--disable-static
-	)
-
-	# Don't ever use --enable-assert since configure.ac is broken, and
-	# only does --disable-assert correctly.
-	if use debug; then
-		# Since --with-debug would turn off optimisations as well as
-		# enabling debug, we just enable debug through the
-		# preprocessor then.
-		append-cppflags -DDEBUG
-	fi
-
-	# Explicitly enable c++11 mode
-	append-cxxflags -std=c++11
-
-	autotools-utils_src_configure
-}
-
-src_test() {
-	# Since libtool is stupid and doesn't discard /usr/lib64 from the
-	# load path, we'd end up testing against the installed copy of
-	# gearmand (bad).
-	#
-	# We thus cheat and "fix" the scripts by hand.
-	sed -i -e '/LD_LIBRARY_PATH=/s|/usr/lib64:||' "${BUILD_DIR}"/tests/*_test \
-		|| die "test fixing failed"
-
-	autotools-utils_src_test
-}
-
-DOCS=( README AUTHORS ChangeLog )
-
-src_install() {
-	autotools-utils_src_install
-
-	newinitd "${FILESDIR}"/gearmand.init.d.2 gearmand
-	newconfd "${FILESDIR}"/gearmand.conf.d gearmand
-}
-
-pkg_postinst() {
-	elog ""
-	elog "Unless you set the PERSISTENT_TABLE option in"
-	elog "/etc/conf.d/gearmand, Gearmand will use table 'queue'."
-	elog "If such table doesn't exist, Gearmand will create it for you"
-	elog ""
-}
diff --git a/sys-cluster/gearmand/metadata.xml b/sys-cluster/gearmand/metadata.xml
deleted file mode 100644
index d08fb72aef86..000000000000
--- a/sys-cluster/gearmand/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->  
-  <use>
-    <flag name="memcache">
-      Support memcache daemon (via <pkg>dev-libs/libmemcached</pkg>)
-      for the queue storage.
-    </flag>
-    <flag name="tokyocabinet">
-      Support <pkg>dev-db/tokyocabinet</pkg> for the queue storage.
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="launchpad">gearmand</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sys-cluster/libdlm/Manifest b/sys-cluster/libdlm/Manifest
index 38ba5d3a75d2..0565ab4aabe6 100644
--- a/sys-cluster/libdlm/Manifest
+++ b/sys-cluster/libdlm/Manifest
@@ -1,5 +1,6 @@
+AUX libdlm-3.2.0-sysmacros.patch 416 BLAKE2B 1c1e621e2321196d6ba769dc761170c3b7b146d24d133128d1318ecd28232d688f5b9193e34afb1172544c249039b64eef0b2f90d2fe2bb288af48238c8c5dfd SHA512 acc5f156651a7389b5bd6c64bb0df7bedf95c5a77e6e9bb2f669c25a1beadd924cff5004b784f51c45ad0a646ae0c476290fa6c89136f5c6c492ef70565ef9cf
 DIST cluster-3.1.5.tar.gz 651449 BLAKE2B 7abee8c9df113b884a9e168bdcce904100d46e8346accd202c9ca43e6861a79da6d8826776dba657a182d73b84ecc19520b516c29975554c7d149e2b109599a3 SHA512 692888ed55c6bb7ebf3b3e792ec071b5fcff4c35c181c5b0c9296e8222c62e10f8a6344af391fbae8186b39cb31e674632bde77ebcc1fcab758657ae4264634a
 DIST cluster-3.2.0.tar.gz 688411 BLAKE2B b1218e74bd0d9f1d25d8a01659d5a038f3a5380e6d6e04f02138d13ef3de1e3f96d6aac680c2858ac6bd0e830d227474af9ec82ea8bbefd3f33b88bbe2d5ffc6 SHA512 00620b89564c4f9b67b679695749cd7515f49af43ace6a565e32e020ee66db219f3db3f53420d6460ea8c1cab03258305735fe5db81aab3953777015119533e9
 EBUILD libdlm-3.1.5.ebuild 1435 BLAKE2B 3b068b281d94e72a57bad70b988d172fbd6ed42bc897af76936bb15721cbb796db48805772e4ae855c898b9bf2eac785236f61c621b6012cbac6034ee36de8b5 SHA512 ee6463c25df6bcd045bbe8cc2b3ea14fa2873fe8b209af6dccb5252c4ae82f0b3288f96699568ee5f7e7f33af5b1ac1ed8ad3dd93ca579a7d9707fc7f2953ad0
-EBUILD libdlm-3.2.0.ebuild 1599 BLAKE2B bbc6e48ee8cf7856ddaf3921381c5b7c9df7eeba13526e419e438473012e9d6b04f55979175c5436072ecb6b7882da135cfa5190bd26016e3dc6c5bf8739eabf SHA512 d5df4a9da2f018a4d6098d8977da2ff376226c55a2b5adf96549154944dcefa073c513f39065163aa788c90110064641dc19f1f7623f342e66670ea1314b24ad
+EBUILD libdlm-3.2.0.ebuild 1649 BLAKE2B 79aff4a167928626940cefcd66ae7d738ff5c7143466a762166ef1ab2c161a5301dffee3f590c9d7bb7812f0ad9b1b411e805ba140a85e4a5324996ceaf3118d SHA512 86efcb3ccd29f2c139ac639a815aeec1959faa4fb1f2946a80f368e8a849b40dd97fe606bf9f8fab7809c20c8c52f6d10e2fe6918e496781ad0953c06e4821ed
 MISC metadata.xml 342 BLAKE2B 4ee7c616a4c41808d0e5fbbb8171f31e3158fd22a76975b3a48d6710f1ef8986446f46c88c212ac4a4c80b4dfce91acf9c84bdc3779e7fc9ce03968c55c40c23 SHA512 2acce7a5bf8ca7cdc148b258f9a64c4ad1a3eb7e4385cf4394f0d55891d649c6d7ab1efe5e1235a39afe9a8782b9c7ab36dec4a87f78f1a81cb2df6662ffd6c9
diff --git a/sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch b/sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch
new file mode 100644
index 000000000000..3a8a8b11fa15
--- /dev/null
+++ b/sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch
@@ -0,0 +1,11 @@
+diff -ruN cluster-3.2.0.orig/dlm/libdlm/libdlm.c cluster-3.2.0/dlm/libdlm/libdlm.c
+--- cluster-3.2.0.orig/dlm/libdlm/libdlm.c	2012-11-26 05:13:22.000000000 +0100
++++ cluster-3.2.0/dlm/libdlm/libdlm.c	2018-04-29 23:46:57.591160008 +0200
+@@ -5,6 +5,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/param.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <inttypes.h>
diff --git a/sys-cluster/libdlm/libdlm-3.2.0.ebuild b/sys-cluster/libdlm/libdlm-3.2.0.ebuild
index 84928252827f..aebc2e1b0eab 100644
--- a/sys-cluster/libdlm/libdlm-3.2.0.ebuild
+++ b/sys-cluster/libdlm/libdlm-3.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit multilib toolchain-funcs versionator
+inherit multilib toolchain-funcs versionator epatch
 
 CLUSTER_RELEASE="${PV}"
 MY_P="cluster-${CLUSTER_RELEASE}"
@@ -33,6 +33,7 @@ src_prepare() {
 	sed -i \
 		-e "s|/lib|/$(get_libdir)|g" \
 		"${WORKDIR}/${MY_P}/make/install.mk" || die "sed failed"
+	epatch "${FILESDIR}/${P}-sysmacros.patch"
 }
 
 src_configure() {
diff --git a/sys-cluster/zookeeper-bin/Manifest b/sys-cluster/zookeeper-bin/Manifest
index d74a787adbbc..3a9e56027b1c 100644
--- a/sys-cluster/zookeeper-bin/Manifest
+++ b/sys-cluster/zookeeper-bin/Manifest
@@ -3,6 +3,8 @@ AUX zookeeper.confd 398 BLAKE2B d49c6c7358ce2f6911d359142e0f6abe2662c0e5c2bcf1ac
 AUX zookeeper.initd 373 BLAKE2B c60740f691d186861e3f101c84e5904774de6235a0423f4f639843b105d6ce9b4ebd9555db13f5ac1447c154881b3c95fbd4738d496f6008d9e52de1cc3e74eb SHA512 34a4011ecb5d8739e57dbc9222b528a0b323c6aa0aa45391621e724106571a632908782e3a4e14e953be72fa0e525b4c7cab0440af37bbef26a100fd1d92da81
 DIST zookeeper-3.4.10.tar.gz 35042811 BLAKE2B c17100d2179688665cfc9efededd378543492e2a839df9da7ab72097b954200c527375cadae1d7b30d83c511c21c1470d0b86a4a19df5abe0c82980920cad92f SHA512 4c54e40ac8d0b267db4a188a30e39ed0ac2c3e8a8fadaf244be45ff5adee956df28f6cb9f1eb56f175e924fa3629b64f98286a090c46764c91c017613c80a51b
 DIST zookeeper-3.4.11.tar.gz 36668066 BLAKE2B 4bf963d41280bd6227b4e81721576bf1f973a765c7049e78c5fae4d9dbc7e4d034304208af0f68b894bd4624e1945c9e4492b3217ff7f0e05d9b822c1843d96d SHA512 1ed2df11dbff2fbbb70d992d02427c4f694ccb4fe493db10a087b04d934b132b970956099edbdf1c2c636d5eb248bca1528846fcb449ae8bee4b9a82f7936f9e
+DIST zookeeper-3.4.12.tar.gz 36667596 BLAKE2B e4aac98f86fc4fcc576ecfb55381fd37efe3fa56cebc1632abda59b6ba71fecca17ace29124ef9f59ca0de627ff463f9d6fc7ff7fbbe77c2bbf30ae25a9f99f8 SHA512 026c7feb4a660bf8d99b1b719fec2b7e4603c3c46f2b77bac372df15ed0ceb4d971aa9c954082d61d73929ef8dc38c31693604ae75244f746cafb4eb6e67320c
 EBUILD zookeeper-bin-3.4.10.ebuild 1956 BLAKE2B 09d13cfe913fb3626e25ca677fa38bb7d23220424fc34745b04ae9a8e85d9c103ee6c82b856c732df89f70810eb17c3f01d9b7ad98fedf7b8a09534c58108ce6 SHA512 21b72660fbd7cfe4aa3b9a6af3d04641e2cee78b0eaf249ef678a93d1c1cb8aee1f12ff61152f9d33fed1a880956e54fbd5c7141916976eeec5679423675f437
 EBUILD zookeeper-bin-3.4.11.ebuild 1956 BLAKE2B 09d13cfe913fb3626e25ca677fa38bb7d23220424fc34745b04ae9a8e85d9c103ee6c82b856c732df89f70810eb17c3f01d9b7ad98fedf7b8a09534c58108ce6 SHA512 21b72660fbd7cfe4aa3b9a6af3d04641e2cee78b0eaf249ef678a93d1c1cb8aee1f12ff61152f9d33fed1a880956e54fbd5c7141916976eeec5679423675f437
+EBUILD zookeeper-bin-3.4.12.ebuild 1956 BLAKE2B 96cb31edbc31b9da04f51d1b94adb1e403a106e3d1fa8e50eed7a144f0c57c0769b17df4135a07ba218bb25aa5ae6784f143406cc56ff0bb1fa77463b07234ce SHA512 18e2c107a885f3dac119029738870615dbc4613f5cb707c8d689ab50f1c1c9b868e6d804e3f4aa7ccd3a578034df4cd03e9652f120fe0ea88a8000dd47a4b180
 MISC metadata.xml 377 BLAKE2B ab2582cf60510f072415cc1dd008bd744f66d76fe6b34b779eba8acf7c28a0d055d70d16c2712af7324b6b11193ed2526b6b8bb1b101084e8a5ca8d96993ef3d SHA512 2ad1600101d36b70c32cb76894e55f01717a544d689bd28ffb41a727d7d23b6f8e9565eea71f252a721bcd4e516692921796f24266485a216a6015a5a9e74f26
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.12.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.12.ebuild
new file mode 100644
index 000000000000..a35bfb4d98d4
--- /dev/null
+++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.12.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils java-utils-2 user
+
+MY_P="zookeeper"
+MY_PN=${MY_P}-${PV}
+
+DESCRIPTION="A high-performance coordination service for distributed applications."
+HOMEPAGE="http://zookeeper.apache.org/"
+SRC_URI="mirror://apache/${MY_P}/${MY_PN}/${MY_PN}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror binchecks"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=virtual/jre-1.7"
+
+S=${WORKDIR}/${MY_PN}
+
+INSTALL_DIR=/opt/${PN}
+export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
+
+pkg_setup() {
+	enewgroup zookeeper
+	enewuser zookeeper -1 /bin/sh /var/lib/zookeeper zookeeper
+}
+
+src_prepare() {
+	# python
+	sed -e "s|src/c/zookeeper.c|zookeeper.c|g" \
+		-e "s|../../../|${S}|g" \
+		-i contrib/zkpython/src/python/setup.py || die
+}
+
+src_configure() {
+	cd "${S}"/src/c || die
+	econf
+}
+
+src_compile() {
+	cd "${S}"/src/c || die
+	emake
+}
+
+src_install() {
+	local DATA_DIR=/var/lib/${MY_P}
+
+	# python
+	cd "${S}"/contrib/zkpython/ || die
+	mv src/python/setup.py .
+	mv src/c/* .
+	python_foreach_impl distutils-r1_src_install
+	cd "${S}" || die
+
+	# cleanup sources
+	rm -rf src/ || die
+	rm bin/*.cmd || die
+
+	keepdir "${DATA_DIR}"
+	sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed"
+	cp "${FILESDIR}"/log4j.properties conf/ || die "cp log4j conf failed"
+
+	dodir "${INSTALL_DIR}"
+	cp -a "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
+
+	# data dir perms
+	fowners zookeeper:zookeeper "${DATA_DIR}"
+
+	# log dir
+	keepdir /var/log/zookeeper
+	fowners zookeeper:zookeeper /var/log/zookeeper
+
+	# init script
+	newinitd "${FILESDIR}"/zookeeper.initd zookeeper
+	newconfd "${FILESDIR}"/zookeeper.confd zookeeper
+
+	# env file
+	cat > 99"${PN}" <<-EOF
+		PATH=${INSTALL_DIR}/bin
+		CONFIG_PROTECT=${INSTALL_DIR}/conf
+	EOF
+	doenvd 99"${PN}" || die "doenvd failed"
+}