11 files changed, 181 insertions, 163 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 95e89c0aa29e..e3481133429b 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index c008431beb7c..9de2a486baf9 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,6 +1,10 @@
+AUX charliecloud-0.30-dash.patch 1669 BLAKE2B 4e68576d20800c0682b38f6fd5a1a391b860bb3e925ad0503b376f16e01b2fd341a94a03a3644e0dac475e4722547c2098ebc085c56b9f95f38c9ebe174376f2 SHA512 6312e62cbe2ee188a1c683cce4ecc904f529bd76cbf966aeaf175c2173a7f7a4c5f01a0d09ffde252800e6571d588c9ba91728c1b6049f496c701c34faa7c012
+AUX charliecloud-0.31-realpath_return.patch 972 BLAKE2B fa3db3892339f1476ef7e8e7d29cafee04bf02eb0f995196b80dbd4ecab8b0caa27fccec5a2b5f32cb28f37d09b5ec97337742987600ecda0b3be3a682c48dbc SHA512 d782863c4b1c76a5516431634b23ae8f1faed388f7585915a641b0c614fb29d42a12b1466d048804f3441fd7c5061537b81a10ddd0444b4d66da8e7b8d2171a7
+DIST charliecloud-0.30.tar.gz 524870 BLAKE2B 0eadb4abda47554117aa657c3335d0ad95c71a3ccae67af000beeb8e375058002821783824142208ab58dcf7a62141d1eee45ac4241fe53cd2b206bbbbbb10b4 SHA512 a7188594482b712521930b141e10a981f7536b979f14c3a206f02895f8404a9095b17fc6764f937bdb466624ca6074cc0cbc84f33d59b4453b55be5691f4fbd4
+DIST charliecloud-0.31.tar.gz 534662 BLAKE2B 08f95f4e37e4de3590344f14cf1ce6e502af414806cc625b8b4be454c1e1e9611d40e599828033a08dfba8ff6fa6fbcee107f19c38ce247addace6a91876dea8 SHA512 9fdcabbf533ab42556bcd8552c42dce3096dffd1f863e2a7a2e87a4596e1df601d55e56fde48cfd88fac62b31bad4257d1b1cdbb9a82df3e32ad4b5f1842307e
 DIST charliecloud-0.32.tar.gz 549184 BLAKE2B 5d574ccf2fb36b0acf4f436099ba8344b5d9058d5f79abb8d56082d86b2f9e7207052009b2d49ed50eaede7411796804944fbe11c0d7bcf21f2d62ba01b2c28f SHA512 c32362a219fbe7ec298ac314f58a17e0e6972a3436f66a0243a77c8c05007e6fea3ac8d4ddc15274737eacf3ba32601c0198fc5a39bccb4017d675a149366aee
-DIST charliecloud-0.33.tar.gz 559786 BLAKE2B 46e8a488af5a27e6b52ae41118cea663cd6c01f8a24566576dbdc7bac99bd94ac50c0559da07a204c2e68ed46edb8c5a5e0bd26986b5bc960901457af632e134 SHA512 d6854873bdfca5512c54ba28ff70721442241a00cbec6d67c9693e946c6925d030773382c8ba9fc3ebcdfd52da56580e6c4e3ad7080d51d9844ad6f216f15e70
+EBUILD charliecloud-0.30.ebuild 2317 BLAKE2B b50cd22bdff025153fa6e9ce7e53dc4928bdb397f0b6c928bac6406a8db3c0d88e2f4451c13de18a221f90757355a2b85057cf0c23fd7d4304911bd606a36d54 SHA512 d153dec41317fa65c85e348a6bd845f8db4e7eec5df882e7d0a97262e02cb920a577a5eab3c1eb5d65a60ba766683be70d81f81e07f1fbaf4c6b2b5d17d17587
+EBUILD charliecloud-0.31-r1.ebuild 2415 BLAKE2B 628ecf4468bb234a2cc025f8a399766c799c3b993aabd5849975a8a06576176d4f5929438a4206e45484818b961d1b110ddb3bd075ed861f793d78aab60105a7 SHA512 38c7fb1ac49eff6890c02f36245015401e73cc9f5be2fff1794451cab68d6b08a2c46f51ec65acaf6c1e29e54b606171e37dffecd9cc6f33d5706fb4aabdb24f
 EBUILD charliecloud-0.32.ebuild 2417 BLAKE2B eb92fbf5ded6f827c9748263fa6d921254f7c9a2bf196ef7c69814e74e33032976d7ee5de2531f544f1d37fabacab5319aa0ea13c72cf463207c3bcba49801eb SHA512 15518863a6618c0145a08d832a180af4edac26c1cac45ae4153d27b4c4e7312927077541689f083e88ef5efaa370bce2349ddcd6f0c0df3c09f2643214865ca5
-EBUILD charliecloud-0.33.ebuild 2417 BLAKE2B eb92fbf5ded6f827c9748263fa6d921254f7c9a2bf196ef7c69814e74e33032976d7ee5de2531f544f1d37fabacab5319aa0ea13c72cf463207c3bcba49801eb SHA512 15518863a6618c0145a08d832a180af4edac26c1cac45ae4153d27b4c4e7312927077541689f083e88ef5efaa370bce2349ddcd6f0c0df3c09f2643214865ca5
 EBUILD charliecloud-9999.ebuild 2417 BLAKE2B eb92fbf5ded6f827c9748263fa6d921254f7c9a2bf196ef7c69814e74e33032976d7ee5de2531f544f1d37fabacab5319aa0ea13c72cf463207c3bcba49801eb SHA512 15518863a6618c0145a08d832a180af4edac26c1cac45ae4153d27b4c4e7312927077541689f083e88ef5efaa370bce2349ddcd6f0c0df3c09f2643214865ca5
 MISC metadata.xml 618 BLAKE2B 5f7dbfdb8a940a534ed97b4bd47b05a271d6454b0584ac29db1c2fb533044a2c6d48b8425399866abd8d2ebea1f41199ea4cf23af1c6f2646d4c35b5b4c104a4 SHA512 df1b817bbabc6b227c9a779677d345b9df259444b943b1ab58d55c860cd79ad8f9d4b382dc6c4de0c5daa955fd694990217a559e897a3b11f7e954c7b54d4678
diff --git a/sys-cluster/charliecloud/charliecloud-0.30.ebuild b/sys-cluster/charliecloud/charliecloud-0.30.ebuild
new file mode 100644
index 000000000000..f57bb46d685e
--- /dev/null
+++ b/sys-cluster/charliecloud/charliecloud-0.30.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools optfeature python-single-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~x86-linux"
+fi
+
+DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
+HOMEPAGE="https://hpc.github.io/charliecloud/"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+IUSE="ch-image doc"
+
+# Extensive test suite exists, but downloads container images
+# directly and via Docker and installs packages inside using apt/yum.
+# Additionally, clashes with portage namespacing and sandbox.
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	elibc_musl? ( sys-libs/argp-standalone )
+"
+DEPEND="
+	ch-image? (
+		$(python_gen_cond_dep '
+			dev-python/lark[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+		')
+	)
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+		')
+		net-misc/rsync
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-dash.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local econf_args=()
+	econf_args+=(
+		$(use_enable doc html)
+		$(use_enable ch-image)
+		# Libdir is used as a libexec-style destination.
+		--libdir="${EPREFIX}"/usr/lib
+		# Attempts to call python-exec directly otherwise.
+		--with-sphinx-python="${EPYTHON}"
+		# This disables -Werror, see also: https://github.com/hpc/charliecloud/pull/808
+		--enable-buggy-build
+		# Do not use bundled version of dev-python/lark.
+		--disable-bundled-lark
+		# Use correct shebang.
+		--with-python="${PYTHON}"
+	)
+	econf "${econf_args[@]}"
+}
+
+pkg_postinst() {
+	elog "Various builders are supported, as alternative to the internal ch-image."
+	optfeature "Building with Buildah" app-containers/buildah
+	optfeature "Building with Docker" app-containers/docker
+	optfeature "Progress bars during long operations" sys-apps/pv
+	optfeature "Pack and unpack squashfs images" sys-fs/squashfs-tools
+	optfeature "Mount and umount squashfs images" sys-fs/squashfuse
+	optfeature "Build versioning with ch-image" dev-vcs/git
+}
diff --git a/sys-cluster/charliecloud/charliecloud-0.33.ebuild b/sys-cluster/charliecloud/charliecloud-0.31-r1.ebuild
index 7e84cbf18286..3478b9b51f7d 100644
--- a/sys-cluster/charliecloud/charliecloud-0.33.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.31-r1.ebuild
@@ -48,6 +48,10 @@ DEPEND="
 		net-misc/rsync
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-realpath_return.patch
+)
+
 src_prepare() {
 	default
 	eautoreconf
@@ -81,7 +85,6 @@ pkg_postinst() {
 	elog "Various builders are supported, as alternative to the internal ch-image."
 	optfeature "Building with Buildah" app-containers/buildah
 	optfeature "Building with Docker" app-containers/docker
-	optfeature "Building with Podman" app-containers/podman
 	optfeature "Progress bars during long operations" sys-apps/pv
 	optfeature "Pack and unpack squashfs images" sys-fs/squashfs-tools
 	optfeature "Mount and umount squashfs images" sys-fs/squashfuse
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.30-dash.patch b/sys-cluster/charliecloud/files/charliecloud-0.30-dash.patch
new file mode 100644
index 000000000000..ba76e3fee59f
--- /dev/null
+++ b/sys-cluster/charliecloud/files/charliecloud-0.30-dash.patch
@@ -0,0 +1,48 @@
+From 1fb019b26d54f777ea7a2781f96adec369a25cbc Mon Sep 17 00:00:00 2001
+From: Oliver Freyermuth <o.freyermuth@googlemail.com>
+Date: Tue, 17 Jan 2023 19:00:11 +0100
+Subject: [PATCH] PR #1538: configure: Remove bashisms, fix dash compatibility
+Bug: https://bugs.gentoo.org/890873
+Bug: https://github.com/hpc/charliecloud/pull/1538
+
++= and |& are not supported by systems using dash as shell.
+---
+ configure.ac | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 683a532..1c878d7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -216,15 +216,15 @@ AC_PROG_CC
+ # Set up CFLAGS.
+ ch_cflags='-std=c99 -Wall'
+ AS_IF([test -n "$lib_libsquashfuse"],
+-      [ch_cflags+=" -I$inc_libsquashfuse -L$lib_libsquashfuse"
++      [ch_cflags="$ch_cflags -I$inc_libsquashfuse -L$lib_libsquashfuse"
+        # Without this, clang fails with "error: argument unused during
+        # compilation" on the -L. GCC ignores it.
+-       ch_cflags+=' -Wno-unused-command-line-argument'])
++       ch_cflags="$ch_cflags -Wno-unused-command-line-argument"])
+ AS_IF([test $use_werror = yes],
+-      [ch_cflags+=' -Werror'])
++      [ch_cflags="$ch_cflags -Werror"])
+
+ AX_CHECK_COMPILE_FLAG([$ch_cflags], [
+-  CFLAGS+=" $ch_cflags"
++  CFLAGS="$CFLAGS $ch_cflags"
+ ], [
+   AC_MSG_ERROR([no suitable C99 compiler found])
+ ])
+@@ -434,7 +434,7 @@ CH_CHECK_VERSION([GIT], [$vmin_git], [--version | cut -d' ' -f3])
+ # DOT
+ vmin_dot=2.30.1
+ AC_CHECK_PROG([DOT], [dot], [dot])
+-CH_CHECK_VERSION([DOT], [$vmin_dot], [dot -V |& cut -d' ' -f5])
++CH_CHECK_VERSION([DOT], [$vmin_dot], [dot -V 2>&1 | cut -d' ' -f5])
+
+ # git2dot
+ vmin_git2dot=0.8.3
+--
+2.38.2
+
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.31-realpath_return.patch b/sys-cluster/charliecloud/files/charliecloud-0.31-realpath_return.patch
new file mode 100644
index 000000000000..7b320fa9dbab
--- /dev/null
+++ b/sys-cluster/charliecloud/files/charliecloud-0.31-realpath_return.patch
@@ -0,0 +1,32 @@
+From e6d25474fcd326ae657c08d7b49606aeabc98b51 Mon Sep 17 00:00:00 2001
+From: Oliver Freyermuth <o.freyermuth@googlemail.com>
+Date: Sat, 28 Jan 2023 21:25:09 +0100
+Subject: [PATCH] ch-misc: Do not check errno in realpath_ unless realpath
+ returns NULL
+Bug: https://github.com/hpc/charliecloud/pull/1550
+
+glibc's realpath may set errno also on success, as POSIX specifies
+errno should only be checked after realpath if the return value is not NULL.
+
+See for example:
+ https://bugzilla.redhat.com/show_bug.cgi?id=1916968
+---
+ bin/ch_misc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/ch_misc.c b/bin/ch_misc.c
+index 04ac52a..93a3339 100644
+--- a/bin/ch_misc.c
++++ b/bin/ch_misc.c
+@@ -589,7 +589,7 @@ char *realpath_(const char *path, bool fail_ok)
+    errno = 0;
+    pathc = realpath(path, NULL);
+ 
+-   if (errno != 0) {
++   if (pathc == NULL && errno != 0) {
+       if (fail_ok) {
+          T_ (pathc = strdup(path));
+       } else {
+-- 
+2.39.1
+
diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index e6c1dbaeebb3..8ac34e13c0e1 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -2,12 +2,9 @@ AUX drbd-utils-8.0.rc 3077 BLAKE2B 2f6820c0705d315a5d7b018d1aa77bd7bfb27281c8406
 AUX drbd-utils-9.15.1-run-lock.patch 564 BLAKE2B f09107b53ee522976c40a91a4d6e267f1effb2bf3afadf77b2138af2031c59a88debc40ed06e1fe0d6fafe6773f3bf5358c315081eca3182853bf132632c617f SHA512 62faedab4668d31d86cfb634bde68aaeb7d9329d0e6948d46e2c0a90cf1988b68438ef1b71f9d84a4dd2230f0cef5179be80cf4a5aef22c30f59a0ab2906523c
 AUX drbd-utils-9.15.1-sysmacros.patch 950 BLAKE2B d5a81c0e13715c595ec25ae8e78a8176b46b437e01efa8d3a44d3ad6b143ac6ae723fa7f563b5d930d6b9dd82107ed02b5d67406732e2ff2675e1fe180cba657 SHA512 471877458ac9f8fbfe6c223f35ec51e487dfe0e8448ccbc17aabcfec002e9eeb1a3ab6d3477cce7e9791cab9b9db506519c409eee91bf45069fd35bb8bc81d58
 AUX drbd-utils-9.19.1-configure-posix.diff 397 BLAKE2B 3e430311b1d901a143343415d6f9c5ff18ae7cc1e8167f2bfe5582d7165b89b9bc5047beb13f12573ba46adf2c01c21d5446de31b186547d3d57ef1cdde3c7b4 SHA512 555960c82800d166e09fa29975a860ecf8a26ee5d01402aa43cf9d441293b037d2d67c9eb7cfa5baf26ee1545ec27987ca4f1b3222cf784d5c6f2a0495135564
-AUX drbd-utils-9.23.1-respect-flags.patch 928 BLAKE2B 0f861e6426133053aeb16da1c2be7377d2f814de13d74e55c8ab7e80fec3337157aaf76ba6cc92d8461f9368a3a0cd957299f69499fcb0b64dd4bf46dd60e780 SHA512 99f67183cdffa40d38432b9d87e7daec92dd4f79eba9491b8dcaa565666146beb07eaee4201b63b2b7803bce165f13e9b9919b77da9d189b2d516e6d1811f5a7
 AUX run-lock.patch 564 BLAKE2B 53062442dcc45c71eedde79e9d09b543ca6b6b48f552a5de95c14e5abc89296f111a11ffe109723de1602aab39dfccdfb016734b4ffceecb0a7bf94aa6ed8cea SHA512 779ad53c9f019b9dcc748177d6017ca06f1b450bf0889307c9660c574c09414964e4c5e4d6f2f3e8fc540ba14a1d489d09991b813af1581b2f6cd4ba491455ab
 DIST drbd-utils-9.15.1.tar.gz 1229196 BLAKE2B c73cb624e4c35f2c5c001b4545c2ad806d3f13471aa25b0941d923020fe01a73405d1ed7c2ab2efe3afee0e59b8e9d401072edb788c57dc338fe3ddb4eebebf3 SHA512 bf9c46335500c0dd7afdc160221acaf8fd053afc453cb26cd76ef085c41580be5a62021ef1f1a57eac9df70d1158a008f489d1a8bb5c3329c5a187f79e4942de
 DIST drbd-utils-9.19.1.tar.gz 1265184 BLAKE2B b26fd9abd6408df4ccaa46c4713ece1743386bb4727ad8206498c30189d6c119ced57ec2d528c0575c5192cf366998b5f7db99aaecf1a2ba6af028b87c4ae082 SHA512 65d8f5802c541781895c59a5f631b222746b21615049e53f77d6c36a7255c51fe5d062984174ab8578d64af104fe9d66df5ae185ba50a8c38813c12a69fceb22
-DIST drbd-utils-9.23.1.tar.gz 1279916 BLAKE2B f631473d7ff2d569e2e5dc61940085f4d575baaa1e02eaba50f37b15e9b381afb9089d4e50fbd511dc7c73350a9e5552b16a1e80742151801e5068c12830a469 SHA512 8befaa20f4217fb83b127bad332a96be61ffd0cefca78b298dbede4c7f33424e8f27aeb251bb022bb4e1ade11307448cdf39d5750924fcf2711141a29e7a81f0
 EBUILD drbd-utils-9.15.1-r2.ebuild 2730 BLAKE2B 8dc9d7d8bf3bbd30aaa02552b0f3c8d5485b2f68f52f38eb2fe4daf5ddbc1ec020cb56ad5ff37bab5dbf889fa8eb32719536a293c74b39324f870474d4d5ead9 SHA512 9e1cf14d6f3e55f252a9fa7bb1bea5f184ee7ca435bc574cf0c28259dfb3a1da1d813db431df57725cf03b36c68c973d388d2beaef058f1ce154a1ca5076e494
-EBUILD drbd-utils-9.19.1.ebuild 3403 BLAKE2B 9b8415ff90e2aae6e6ba40b819fee2012cf50bcae22d1bf8183f337d8d02d10004646cdd48928b9f211adf2dfcff0c0ad27ef595687261592b284c0a5e245c63 SHA512 8d8f97c5a957ae25a3d4ab54b9f9d3388989a1cf2c83d3ed0ff0365139100b678b1d67bcc3774ad9cf8641e8e9d62eb213e8acc239c276b99f9ae2dbf49d4406
-EBUILD drbd-utils-9.23.1.ebuild 3400 BLAKE2B cdd67c2afa66dd4a2141751ce5e80b17f207c1dda774d801e15b053e5892ff1b919ce55783a5b0d01f1b6818874a00a173cc0995ae8b98fb849c94bcd9a67a1d SHA512 c54d87dc100b711d4c90a4fa4c56f3397d839ccfd5e08084e3907195d692183e9766a5df7cd147bc28e28631f7c90978c741b03b292e16150ac645658484257b
-MISC metadata.xml 699 BLAKE2B 29fb1a4285fd24b219d870c4217de139fe55d03e6aeef7c1c6dc9d1460cab067c2d6e45e4607eeca4e5d92ba00a94cc1e7d2e8c9807784484c16fd4ec8ae158d SHA512 0fa9b010ff2d3e127bc9971e710113825fa43a06db2d12eedf547dcc22361f9864ea43328e4dbc8a48d47b7110af5af16408b8e3f47ce896e031ed78bd0aba63
+EBUILD drbd-utils-9.19.1.ebuild 3405 BLAKE2B 5a580efa3ca46c9aee54c7211325da70d5a9f3f218907000fd6013159c64bd0cb5cec3b2964e6716f81d68ac5a8ea1fd1047d29e5eb2e108cd0dc5b3f9bfe5db SHA512 99bcb0525415a934674c70493fd8c347a699edfcc0cd7c01683ad96743c39f5ed68ca57a565a010494e7faf35cb60c814dd6e16c78f8a69aa0a024a0efe3e93a
+MISC metadata.xml 617 BLAKE2B f724b64a762ce8f00e3ae3c9d69c16b947abda948c6979b37139e7306718db3102cd2a7735b9107317f0ef2f98658e0507782effa708e81f1b65adb9c2751037 SHA512 aff2a5533955421f813308ec3d1e32d176f7f873e2d9a367084fbd63fa02dd776084cb43eba99fa39faf9c457b7e7d4fe05332cedd304ee06bb7e913cfa10d46
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild
index e68a3085c8a4..c54edf54fc3b 100644
--- a/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.linbit.com/drbd"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="pacemaker +udev xen"
 
 DEPEND="
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.23.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.23.1.ebuild
deleted file mode 100644
index 1ca0cd8e56f3..000000000000
--- a/sys-cluster/drbd-utils/drbd-utils-9.23.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools bash-completion-r1 linux-info tmpfiles udev
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-HOMEPAGE="https://www.linbit.com/drbd"
-SRC_URI="https://pkg.linbit.com/downloads/drbd/utils/${P}.tar.gz"
-S="${WORKDIR}/${P/_/}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pacemaker split-usr +udev xen"
-
-DEPEND="
-	pacemaker? ( sys-cluster/pacemaker )
-	udev? ( virtual/udev )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/flex"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.15.1-run-lock.patch
-	"${FILESDIR}"/${PN}-9.23.1-respect-flags.patch
-)
-
-pkg_setup() {
-	# verify that CONFIG_BLK_DEV_DRBD is enabled in the kernel or
-	# warn otherwise
-	linux-info_pkg_setup
-	elog "Checking for suitable kernel configuration options..."
-	if linux_config_exists; then
-		if ! linux_chkconfig_present BLK_DEV_DRBD; then
-			ewarn "CONFIG_BLK_DEV_DRBD: is not set when it should be."
-			elog "Please check to make sure these options are set correctly."
-		fi
-	else
-		ewarn "Could not check if CONFIG_BLK_DEV_DRBD is enabled in your kernel."
-		elog "Please check to make sure these options are set correctly."
-	fi
-}
-
-src_prepare() {
-	# Respect LDFLAGS, bug #453442
-	sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
-		-e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
-		-i user/*/Makefile.in || die
-
-	# Respect multilib, bug #698304
-	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
-	sed -i -e "s/lib/$(get_libdir)/" scripts/drbd.service || 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/global_common.conf || die
-	sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}"/var
-		--with-bashcompletion
-		--with-distro=gentoo
-		--with-prebuiltman
-		--without-rgmanager
-		$(use_with pacemaker)
-		$(use_with udev)
-		$(use_with xen)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Only compile the tools
-	emake CXXFLAGS="${CXXFLAGS}" OPTFLAGS="${CFLAGS}" tools doc
-}
-
-src_install() {
-	# Only install the tools
-	emake DESTDIR="${D}" install-tools install-doc
-
-	# Install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/}
-
-	dodoc scripts/drbd.conf.example
-
-	keepdir /var/lib/drbd
-	rm -r "${ED}"/var/run || die
-
-	newtmpfiles scripts/drbd.tmpfiles.conf drbd.conf
-
-	# bug #698304
-	dodir /lib/drbd
-	local i
-	for i in drbdadm-83 drbdadm-84 drbdsetup-83 drbdsetup-84; do
-		dosym -r /$(get_libdir)/drbd/"${i}" /lib/drbd/"${i}"
-	done
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	tmpfiles_process drbd.conf
-
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from ${EROOT}/usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to ${EROOT}/etc/${PN/-utils/}.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
-}
diff --git a/sys-cluster/drbd-utils/files/drbd-utils-9.23.1-respect-flags.patch b/sys-cluster/drbd-utils/files/drbd-utils-9.23.1-respect-flags.patch
deleted file mode 100644
index 259f6aa35632..000000000000
--- a/sys-cluster/drbd-utils/files/drbd-utils-9.23.1-respect-flags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/user/drbdmon/Makefile.in
-+++ b/user/drbdmon/Makefile.in
-@@ -1,6 +1,6 @@
--CXXFLAGS=-std=c++11 -I. -I../shared -Icppdsaext/src -Wall -Werror -pedantic-errors -fPIC -O2 \
---Wsign-compare -Wpointer-arith -Wswitch-default -Wswitch-enum -Wtype-limits \
---Wmissing-declarations -Wshadow
-+CPPFLAGS = -I. -I../shared -Icppdsaext/src
-+CXXFLAGS ?= -Wall -Werror -pedantic-errors -fPIC -O2 -Wsign-compare -Wpointer-arith -Wswitch-default -Wswitch-enum -Wtype-limits -Wmissing-declarations -Wshadow
-+CXXFLAGS += -std=c++11 -O2 -fPIC
- CXX = @CXX@
- LIBS = @LIBS@
- 
-@@ -51,7 +51,7 @@ $(dsaext-obj): $(basename $(dsaext-obj)).cpp $(basename $(dsaext-obj)).h
- $(integerparse-obj): $(basename $(integerparse-obj)).cpp $(basename $(integerparse-obj)).h
- 
- drbdmon: $(ls-obj)
--	$(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $^ $(LIBS)
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
- 
- # do not try to rebuild Makefile itself
- Makefile: ;
diff --git a/sys-cluster/drbd-utils/metadata.xml b/sys-cluster/drbd-utils/metadata.xml
index f2f60d7670e3..7379df5988dc 100644
--- a/sys-cluster/drbd-utils/metadata.xml
+++ b/sys-cluster/drbd-utils/metadata.xml
@@ -13,7 +13,4 @@
 		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>
-	<upstream>
-		<remote-id type="github">LINBIT/drbd-utils</remote-id>
-	</upstream>
 </pkgmetadata>