gentoo auto-resync : 01:01:2024 - 05:52:14

9 files changed, 31 insertions, 341 deletions

diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index 2624a85a0512..6610e7405522 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -1,18 +1,9 @@
 AUX drbd-utils-8.0.rc 3077 BLAKE2B 2f6820c0705d315a5d7b018d1aa77bd7bfb27281c8406682cc19f82af023aab2b0a62d29e43c25204ffb52464c6a2306252c7f532730f10e12ab074eceed02c7 SHA512 efc3ff5566e8eebe033f1d76a183d84d242eaf63d0322579af4cd005eeed0e12f5d4660d778a4fcc83c6a5e457908322853bdd3d9f02573dd415844551662f21
-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 drbd-utils-9.25.0-missing-stdint.patch 889 BLAKE2B c1e04a7334175c29a1fe6bfce9a419d0a7ee4d227909630f843f8e0a6e0fb2f4abcffc51856ba47aa3e946d4c1903e0b6991b2a9ae25711ab914e1cb71d16b3f SHA512 1b0bb70cdbfed0765a963ce8e352b67528dcf7735db6a149e5804ea64e73d0b037fd3a237c5b7593379d96f49dd5bfb3eb107bd982172653096e0f969a94b793
-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
-DIST drbd-utils-9.24.0.tar.gz 1296591 BLAKE2B ece4773bc2e63739ae656987166423303ad32a50e27983d4e8b173d997221e5c45389aa6306b3219d5a648d2d3401720b73e9a67880225c46b9e2f28d5605b62 SHA512 20f85f3dcdb0a1a1dcf5029e4737799081bcb0c69a60e8fe077016899ef37efb5ee585a92cf30a0475970a12c1da90aaebc0fd9e33452690838a56bc75b49ec4
 DIST drbd-utils-9.25.0.tar.gz 1406804 BLAKE2B 6617d2a2a947926d894c184c0c6f79262c32010b7982c85b30f1e02fec66d611f9389c1de0e8435f6ea4999626cf2763bc332f8c619b9201bb29308338f1d355 SHA512 43ed52c59ab0272a389c647240ad4e8e04cdca4c4530da9645d9fc22fda45d7c6d9bea6781a433f3993f9f717e1c1a9ea10af12b18a49ad2d22f78f458ef46f3
-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
-EBUILD drbd-utils-9.24.0.ebuild 3400 BLAKE2B cdd67c2afa66dd4a2141751ce5e80b17f207c1dda774d801e15b053e5892ff1b919ce55783a5b0d01f1b6818874a00a173cc0995ae8b98fb849c94bcd9a67a1d SHA512 c54d87dc100b711d4c90a4fa4c56f3397d839ccfd5e08084e3907195d692183e9766a5df7cd147bc28e28631f7c90978c741b03b292e16150ac645658484257b
+DIST drbd-utils-9.27.0.tar.gz 1418879 BLAKE2B a4f505768aacf03c14c7b52815293f1ee62385e98d6fed9d83b18899a4f424ed263388076abba5692885441310a5730d1d5ae175bae4307d5ab268e9129eb31d SHA512 066849e77bac04515682f497398e3840eecdf16c866a0d67df4e8978e9278dee120d9a216ba7dcf16e1dc2cfdd7271ff775e5bee9ccd0cead8360b7e33e08f5d
+EBUILD drbd-utils-9.25.0-r1.ebuild 3788 BLAKE2B ff0018693892235f40c514ce2729233a801f317fa0286663239506da8b999f81e7f334053c3ce5137b9034009b6493406b363bfc875b8dff56404f324a76f1aa SHA512 2071ef9d74beb6371b01c138b381293025a2bad6a3f59977e82db151f8223f1725b3963f3306b897cd01c74fefde76a6234fc1207dce996a1270df1f3e626b42
 EBUILD drbd-utils-9.25.0.ebuild 3448 BLAKE2B 4b1014cac1c07ee5c089a620936244302e96bb5acb6fec37e143337e75cfd4696faf3e1fd50962d8409525b79698eeb1b38f4fcf1696f4cc88976507e692181c SHA512 94ca9240fd9beac2bf18636aebbbae4e3b6fa06157db867e01d212f37a1d488d56421e8b9aecc934b849ec0c70c860d4802833bb69677334da602b038ca661d1
+EBUILD drbd-utils-9.27.0.ebuild 3714 BLAKE2B caa03c97e415264ba86745bd6a67c3f819772ee403e6fb65842a2d0954d23399b09bad5ac204b234469b4d7455eb3c57e7c162bf516405d6bade803b70a49f50 SHA512 d9cd24bae4edc4b512c2216d1025a39504003ead0c512b8d118282d341ea33dbcca12067d4846b3d8c591f14d1edb3f5ea54fae30d94c6d01f0efd46e852b6ed
 MISC metadata.xml 699 BLAKE2B 29fb1a4285fd24b219d870c4217de139fe55d03e6aeef7c1c6dc9d1460cab067c2d6e45e4607eeca4e5d92ba00a94cc1e7d2e8c9807784484c16fd4ec8ae158d SHA512 0fa9b010ff2d3e127bc9971e710113825fa43a06db2d12eedf547dcc22361f9864ea43328e4dbc8a48d47b7110af5af16408b8e3f47ce896e031ed78bd0aba63
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.15.1-r2.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.15.1-r2.ebuild
deleted file mode 100644
index d080591f8106..000000000000
--- a/sys-cluster/drbd-utils/drbd-utils-9.15.1-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 tmpfiles udev
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="https://www.linbit.com/downloads/drbd/utils/${P}.tar.gz"
-HOMEPAGE="https://www.linbit.com/drbd"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pacemaker +udev xen"
-
-DEPEND="
-	pacemaker? ( sys-cluster/pacemaker )
-	udev? ( virtual/udev )"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/flex"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-run-lock.patch
-	"${FILESDIR}"/${P}-sysmacros.patch
-)
-
-S="${WORKDIR}/${P/_/}"
-
-src_prepare() {
-	# respect LDFLAGS, #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() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-bashcompletion \
-		--with-distro=gentoo \
-		--with-prebuiltman \
-		--without-rgmanager \
-		$(use_with pacemaker) \
-		$(use_with udev) \
-		$(use_with xen)
-}
-
-src_compile() {
-	# only compile the tools
-	emake 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
-
-	# https://bugs.gentoo.org/698304
-	dodir lib/drbd
-	local i
-	for i in drbdadm-83 drbdadm-84 drbdsetup-83 drbdsetup-84; do
-		dosym ../../lib64/drbd/"${i}" lib/drbd/"${i}"
-	done
-}
-
-pkg_postinst() {
-	tmpfiles_process drbd.conf
-
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to /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
-	elog "Remember to enable drbd support in kernel."
-}
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild
deleted file mode 100644
index e68a3085c8a4..000000000000
--- a/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info tmpfiles udev
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="https://pkg.linbit.com/downloads/drbd/utils/${P}.tar.gz"
-HOMEPAGE="https://www.linbit.com/drbd"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pacemaker +udev xen"
-
-DEPEND="
-	pacemaker? ( sys-cluster/pacemaker )
-	udev? ( virtual/udev )"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/flex"
-
-DOCS=( ChangeLog README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.15.1-run-lock.patch
-	"${FILESDIR}"/${PN}-9.15.1-sysmacros.patch
-	"${FILESDIR}"/${PN}-9.19.1-configure-posix.diff
-)
-
-S="${WORKDIR}/${P/_/}"
-
-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, #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() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-bashcompletion \
-		--with-distro=gentoo \
-		--with-prebuiltman \
-		--without-rgmanager \
-		$(use_with pacemaker) \
-		$(use_with udev) \
-		$(use_with xen)
-}
-
-src_compile() {
-	# only compile the tools
-	emake 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
-
-	# https://bugs.gentoo.org/698304
-	dodir lib/drbd
-	local i
-	for i in drbdadm-83 drbdadm-84 drbdsetup-83 drbdsetup-84; do
-		dosym ../../lib64/drbd/"${i}" lib/drbd/"${i}"
-	done
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	tmpfiles_process drbd.conf
-
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to /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/drbd-utils-9.24.0.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.25.0-r1.ebuild
index 1ca0cd8e56f3..1dde213b413e 100644
--- a/sys-cluster/drbd-utils/drbd-utils-9.24.0.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-9.25.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools bash-completion-r1 linux-info tmpfiles udev
+inherit autotools bash-completion-r1 flag-o-matic linux-info tmpfiles udev
 
 DESCRIPTION="mirror/replicate block-devices across a network-connection"
 HOMEPAGE="https://www.linbit.com/drbd"
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_/}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="pacemaker split-usr +udev xen"
+IUSE="pacemaker +udev xen"
 
 DEPEND="
 	pacemaker? ( sys-cluster/pacemaker )
@@ -23,8 +23,9 @@ RDEPEND="${DEPEND}"
 BDEPEND="sys-devel/flex"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-9.15.1-run-lock.patch
+	#"${FILESDIR}"/${PN}-9.15.1-run-lock.patch
 	"${FILESDIR}"/${PN}-9.23.1-respect-flags.patch
+	"${FILESDIR}"/${PN}-9.25.0-missing-stdint.patch
 )
 
 pkg_setup() {
@@ -70,8 +71,18 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=lto-type-mismatch, bug #863728
+	# https://github.com/LINBIT/drbd-utils/issues/40
+	filter-lto
+
 	local myeconfargs=(
 		--localstatedir="${EPREFIX}"/var
+		# don't autodetect systemd/sysv; install systemd and use our own openrc
+		--with-initscripttype=systemd
+		# only used for systemdunitdir and for udevdir; the latter breaks
+		# merged-usr interop
+		PKG_CONFIG=/bin/false
+		--with-systemdunitdir="${EPREFIX}"/usr/lib/systemd/system
 		--with-bashcompletion
 		--with-distro=gentoo
 		--with-prebuiltman
@@ -101,8 +112,6 @@ src_install() {
 	keepdir /var/lib/drbd
 	rm -r "${ED}"/var/run || die
 
-	newtmpfiles scripts/drbd.tmpfiles.conf drbd.conf
-
 	# bug #698304
 	dodir /lib/drbd
 	local i
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.23.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.27.0.ebuild
index 1ca0cd8e56f3..3d8b35c868a0 100644
--- a/sys-cluster/drbd-utils/drbd-utils-9.23.1.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-9.27.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools bash-completion-r1 linux-info tmpfiles udev
+inherit autotools bash-completion-r1 flag-o-matic linux-info tmpfiles udev
 
 DESCRIPTION="mirror/replicate block-devices across a network-connection"
 HOMEPAGE="https://www.linbit.com/drbd"
@@ -13,9 +13,10 @@ S="${WORKDIR}/${P/_/}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="pacemaker split-usr +udev xen"
+IUSE="pacemaker +udev xen"
 
 DEPEND="
+	sys-apps/keyutils
 	pacemaker? ( sys-cluster/pacemaker )
 	udev? ( virtual/udev )
 "
@@ -23,7 +24,6 @@ RDEPEND="${DEPEND}"
 BDEPEND="sys-devel/flex"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-9.15.1-run-lock.patch
 	"${FILESDIR}"/${PN}-9.23.1-respect-flags.patch
 )
 
@@ -70,8 +70,18 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=lto-type-mismatch, bug #863728
+	# https://github.com/LINBIT/drbd-utils/issues/40
+	filter-lto
+
 	local myeconfargs=(
 		--localstatedir="${EPREFIX}"/var
+		# don't autodetect systemd/sysv; install systemd and use our own openrc
+		--with-initscripttype=systemd
+		# only used for systemdunitdir and for udevdir; the latter breaks
+		# merged-usr interop
+		PKG_CONFIG=/bin/false
+		--with-systemdunitdir="${EPREFIX}"/usr/lib/systemd/system
 		--with-bashcompletion
 		--with-distro=gentoo
 		--with-prebuiltman
@@ -101,8 +111,6 @@ src_install() {
 	keepdir /var/lib/drbd
 	rm -r "${ED}"/var/run || die
 
-	newtmpfiles scripts/drbd.tmpfiles.conf drbd.conf
-
 	# bug #698304
 	dodir /lib/drbd
 	local i
diff --git a/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-run-lock.patch b/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-run-lock.patch
deleted file mode 100644
index fa31a9b0cb11..000000000000
--- a/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-run-lock.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -457,8 +457,8 @@ AH_TEMPLATE(DRBD_LEGACY_84, [Include support for drbd-8.4 kernel code])
- AH_TEMPLATE(WINDRBD, [Include support for windrbd (do not use this under Linux)])
- 
- AC_SUBST(DRBD_LIB_DIR, [$localstatedir/lib/$PACKAGE_TARNAME])
--AC_SUBST(DRBD_RUN_DIR, [$localstatedir/run/$PACKAGE_TARNAME])
--AC_SUBST(DRBD_LOCK_DIR, [$localstatedir/lock])
-+AC_SUBST(DRBD_RUN_DIR, [/run/$PACKAGE_TARNAME])
-+AC_SUBST(DRBD_LOCK_DIR, [/run/lock])
- AC_SUBST(DRBD_CONFIG_DIR, [$sysconfdir])
- AC_SUBST(DRBD_BIN_DIR, [$exec_prefix/bin])
- 
diff --git a/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-sysmacros.patch b/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-sysmacros.patch
deleted file mode 100644
index 961105f2b3ff..000000000000
--- a/sys-cluster/drbd-utils/files/drbd-utils-9.15.1-sysmacros.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/616758
---- a/user/shared/shared_tool.c
-+++ b/user/shared/shared_tool.c
-@@ -8,6 +8,7 @@
- #define _FILE_OFFSET_BITS 64
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
- #include <fcntl.h>
---- a/user/v83/drbdadm_adjust.c
-+++ b/user/v83/drbdadm_adjust.c
-@@ -25,6 +25,7 @@
- #define _GNU_SOURCE
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
- #include <unistd.h>
---- a/user/v84/drbdadm_adjust.c
-+++ b/user/v84/drbdadm_adjust.c
-@@ -27,6 +27,7 @@
- #define _FILE_OFFSET_BITS 64
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
- #include <unistd.h>
---- a/user/v9/drbdadm_adjust.c
-+++ b/user/v9/drbdadm_adjust.c
-@@ -27,6 +27,7 @@
- #define _FILE_OFFSET_BITS 64
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
- #include <unistd.h>
diff --git a/sys-cluster/drbd-utils/files/drbd-utils-9.19.1-configure-posix.diff b/sys-cluster/drbd-utils/files/drbd-utils-9.19.1-configure-posix.diff
deleted file mode 100644
index bea7fd08f9d2..000000000000
--- a/sys-cluster/drbd-utils/files/drbd-utils-9.19.1-configure-posix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac      2021-12-02 12:37:16.175586192 +0000
-+++ b/configure.ac      2021-12-02 12:39:37.346871340 +0000
-@@ -248,7 +248,7 @@ if test -z $FLEX; then
-    AC_MSG_ERROR([Cannot build utils without flex.])
- fi
-
--if [[ $WITH_DRBDMON == "yes" ]] ; then
-+if test x"$WITH_DRBDMON" = x"yes"; then
-    AC_PROG_CXX
-    AX_CXX_COMPILE_STDCXX_11(, optional)
-    if test "$HAVE_CXX11" = "0"; then
diff --git a/sys-cluster/drbd-utils/files/run-lock.patch b/sys-cluster/drbd-utils/files/run-lock.patch
deleted file mode 100644
index 5ff7ab21f7c3..000000000000
--- a/sys-cluster/drbd-utils/files/run-lock.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.ac.orig	2015-01-31 23:19:18.745021931 +0000
-+++ configure.ac	2015-01-31 23:19:38.988027506 +0000
-@@ -353,8 +353,8 @@
- AH_TEMPLATE(DRBD_LEGACY_84, [Include support for drbd-8.4 kernel code])
- 
- AC_SUBST(DRBD_LIB_DIR, [$localstatedir/lib/$PACKAGE_TARNAME])
--AC_SUBST(DRBD_RUN_DIR, [$localstatedir/run/$PACKAGE_TARNAME])
--AC_SUBST(DRBD_LOCK_DIR, [$localstatedir/lock])
-+AC_SUBST(DRBD_RUN_DIR, [/run/$PACKAGE_TARNAME])
-+AC_SUBST(DRBD_LOCK_DIR, [/run/lock])
- AC_SUBST(DRBD_CONFIG_DIR, [$sysconfdir])
- 
- AC_DEFINE_UNQUOTED(DRBD_LIB_DIR, ["$DRBD_LIB_DIR"])