gentoo auto-resync : 16:06:2023 - 01:40:03

5 files changed, 134 insertions, 5 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 64470ac79c33..1cdd3eb8bd8c 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index e6c1dbaeebb3..fae028da9e51 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -7,7 +7,9 @@ AUX run-lock.patch 564 BLAKE2B 53062442dcc45c71eedde79e9d09b543ca6b6b48f552a5de9
 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
 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
 MISC metadata.xml 699 BLAKE2B 29fb1a4285fd24b219d870c4217de139fe55d03e6aeef7c1c6dc9d1460cab067c2d6e45e4607eeca4e5d92ba00a94cc1e7d2e8c9807784484c16fd4ec8ae158d SHA512 0fa9b010ff2d3e127bc9971e710113825fa43a06db2d12eedf547dcc22361f9864ea43328e4dbc8a48d47b7110af5af16408b8e3f47ce896e031ed78bd0aba63
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.24.0.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.24.0.ebuild
new file mode 100644
index 000000000000..1ca0cd8e56f3
--- /dev/null
+++ b/sys-cluster/drbd-utils/drbd-utils-9.24.0.ebuild
@@ -0,0 +1,129 @@
+# 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/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 5dc224046e6f..d0c84e5df7c5 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -5,7 +5,7 @@ AUX keepalived.service 293 BLAKE2B e80be18a91569d73e64d12ff74622c866efc03522640f
 AUX keepalived.service-r1 349 BLAKE2B 8ad78799046d586a5f98ebd53b9f449918bea5947a818b88d92135f7269ec583e6c52c90f2e8ed365b8c96b66d019753a7f139b63d0cfd361d924372672a3d50 SHA512 4850d785ff6761c75a7f1a5cbf2d8ad0f96ab46287992123a3a8ae4085d7102fd8bbbbb6104ad35747beb8f04c9e0e3a0aceb95a900bb03f3b5575a9d8814d2e
 AUX keepalived.service.conf 47 BLAKE2B b6e32bf8c8a602186af776d85c6c457aad2408becfd24af4db6db6123946fba2443f51fae3df0d220a4ebf9ae81a02f4bc1ee0d1d1a7a4b050802336c029c87e SHA512 ecf081bd59c57d6be3627ab42183bdebe58f65355c9cfa3e753a9b1fbf64e7731a7b26ec3ef2bf0422c1a6de4eb1d8d84787ca4d3def2d1f12caed9b64b5063a
 DIST keepalived-2.2.7.tar.gz 1180180 BLAKE2B 62c4534eb1eebeac596b628a1fa5fb4069498d532fdeff0dc51afbc71e90125bff7fcffb897da3fd34765c64f43d7b04dcf184169b1bc2cf33413e109f9f5cdc SHA512 9869437fe6f0c10590b13088002b53474a51102da9838a6575d835d006c4871b61324ab80e0e81e0a23d0124e6f033cfc7114749e87b8f736408f3f0bedb3968
-DIST keepalived-2.2.7_p20221209.tar.gz 959087 BLAKE2B 2c8a46874ddac414a6d6f7bc1646d90dd9afc813ffcdd5990d1a220171e77c1e17a97c0549c2223eb2401b60870b7d98139106345079033c2f2875d158024b2a SHA512 519837fd463e69bc2eb8415fa8d5e5bd92cda1d0e3e80a0725a38285901b59fa8ba9e0d6852dbbdddf4bb72398286b4fa2779a6c341245b6322c4bef8dce37d6
+DIST keepalived-2.2.8.tar.gz 1202602 BLAKE2B 3d8d738a0c4e6f00ea8dc3603813d21e52e259d301872f2db16c3373c3a034bedcf3f02e19d1b50855d90bbfece863e710d75a67e2d6dd057dfe451608a73fcb SHA512 dc0ab5b0ef8911a7859422eccc2771a40e942236c855a628158ed748eb5f7dc4b6f4850e9c3057e81fd9d2daa640ab51fb1d7af12748a613280a217b333eb06b
 EBUILD keepalived-2.2.7.ebuild 1977 BLAKE2B 869038839c7ca6cece0a5dc6f8daf8b775759bc13ff227fee834a1f899d5d3fc4c85b3f66100c58d4f9276bff1f2d2dc8f4f5a6b9d59027b8d3d07b394bc111c SHA512 868d65f06e41b21663b8a401d01262a9b78180d16c037da9b9aaebf27e47b43541bf9c1a084a121331d64c17b7012948e117245a264d81c9273f05f16185a9d8
-EBUILD keepalived-2.2.7_p20221209.ebuild 2052 BLAKE2B 26d0a887369204207c4ea86b76e270d0c11a633358e73de49c28653af179cb957dd3007460ccff53c214c609e5430d115bf5e90809bc9f6324d746d0ed22b3d6 SHA512 74e55c78ad337690effd0dd139720e3cd37d5a1bac44eceb4741afbf26c0adf518af4cc80ccc2a3c18a4773c9c2f691ddecbb67cb39993c84f79b7e1be2b8386
+EBUILD keepalived-2.2.8.ebuild 1924 BLAKE2B b3d124b9f6025a21affb6ea3a5c57dca1e2034588e1f83d46f05064ba17ce689da196a8dcd21e3831a93bab5d7f87ef2776a5a24ea127c55385361c76f7a9191 SHA512 2298906bbc56458b6361903a23620d99295f8481edb2b4f5ee2f341fd511a9a80d5364d8c706947fc5490b494efe71ecee3e09fd6ed07d0c8ad6f58c22a13b1b
 MISC metadata.xml 613 BLAKE2B e9c0ffc59326021d01ca9003ed5e249d1d11672bcc27de65be9889bd8d20ed5818f15d327d9bfd53d9406da2a67a1be9df40da60f6584f969c4c3ce62b35a065 SHA512 b5681eda044f3a4c6fe91894c27d474e6a1109a4594d0955aac024906a687ef83613ac29b58cad04d70ffa9efc1305ccb9620bbea9acc89159e97b667e7c073f
diff --git a/sys-cluster/keepalived/keepalived-2.2.7_p20221209.ebuild b/sys-cluster/keepalived/keepalived-2.2.8.ebuild
index 8a0b7135a533..ca5547748e72 100644
--- a/sys-cluster/keepalived/keepalived-2.2.7_p20221209.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.2.8.ebuild
@@ -4,12 +4,10 @@
 EAPI=8
 
 inherit autotools systemd
-GIT_COMMIT="fbd699fac85d768c3ddab048a8f9d3dfaec7eaad"
 
 DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
 HOMEPAGE="https://www.keepalived.org/"
-SRC_URI="https://github.com/acassen/keepalived/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/keepalived-${GIT_COMMIT}"
+SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"