gentoo auto-resync : 24:10:2024 - 04:04:24

5 files changed, 53 insertions, 77 deletions

diff --git a/sys-cluster/resource-agents/Manifest b/sys-cluster/resource-agents/Manifest
index 7718ec7ea80e..7b86fe01744a 100644
--- a/sys-cluster/resource-agents/Manifest
+++ b/sys-cluster/resource-agents/Manifest
@@ -1,8 +1,7 @@
+AUX 4.6.1-autoconf-2.72.patch 566 BLAKE2B 0e7b5ca1308921b85444dbd3827232d349af3e5187ce059c0f36fcafa7558609d1a60fd1d66beb788b4f5ff7f8420d1fb9ec360f2e75c771f1b92ab83c5d5ad6 SHA512 26b1171c7857913e59fd9c6a313a6bce98739d3df9fbdef33c2046cd4ea90d0538b281a82c719fffde50e35f7a2429f9b317921a9c1c4b6619a768e3cb5fd97e
 AUX 4.6.1-configure.patch 1181 BLAKE2B 51290610cded3c58be968b140716047ca42cfff9e678ae4bdfc842e619c534d9b12ae62fe3ce5a5fbf491e89d0330b3946bd862ee6db99b62349e788beb32cd0 SHA512 e6269e8e4333a884ebd9f6ff1ecb1f1b23e4b6da57bf8921868e0bfaa6a072caa2306b9b76d119743d33544207dbcf6c0ec77638bbf23ac9e9098c3fa6bbc39e
-DIST resource-agents-4.11.0.tar.gz 860940 BLAKE2B 8009d6936c59bd014710db2478e3d001c59eca8c9e76f5847cc7568c08951f784696a65ff0cf62970a7d193ce7e205ddfc1116993dc0ea07496a647833d32829 SHA512 3baf66b39a26323787a5089dccd369a0e4fc8ac60a3061c8fbe461d5e60cdee6330eaa7840c32d536473688f1bdeea47b77e1ba9bb199012495a31d2d75662c2
 DIST resource-agents-4.12.0.tar.gz 865910 BLAKE2B fe10a86620e9b549b7634721697d04eb331bb87e50c28dadeb4590ae74febc3a793b9d7bce7fbb8de7d1b8a6ace2546882627e506020e1006cb9fb193b114d19 SHA512 1c1ec1ae4a96b6832eb8631f8e2aa064adac04093e1e98c444376e18d27db4b630c840c45bc3486160a2a8f5c510bb05c15362b8b65197387a31b7adc059e87b
-DIST resource-agents-4.6.1.tar.gz 799688 BLAKE2B a276dbd17d6b91926f2a040d847e2ca499fe36cf30a0413d2bdffccd3bd8cbe7022ab29244524d5f7f6b91c7513a56b40de5f4bb425e65d4f83710445da91231 SHA512 ccd4a86b5a4da636248badfb81808fa4c96f08dbce9dc8d9322b594cb6028f74b33fd9cacdbee65f49ca05f7dca04671e247f64b767df5cd0b7d19539f52ad5e
-EBUILD resource-agents-4.11.0.ebuild 1589 BLAKE2B 721c27815ee0ac081fc13e81971b94881e400d79739def71f3f49203e77ce7f352a4036552aefed536fc285a48bf6f0102122028e74535035a6e9c060130dfd4 SHA512 a3604e060702a47ae7571052fa1268e92926f7291703fa2bbf0f3f53fb456321b8398fe3e47184a21eca911aff0a9d939090373ffc892fc1132f99a567236763
-EBUILD resource-agents-4.12.0.ebuild 1819 BLAKE2B 37999bddaa6c2a08dddb69e2555c251fad77e5ba4681b981acb005d70d730c9f05ba82f70c12715984dd7ef76b56144c66fc7abdaa8aaab956f921843b94b5b4 SHA512 50320290c7e82d530bed94202d584629422760d9bfbad0a031af8139d6796b89c50186c0fc955d915e1fcdafc85a1008d6b01c6e24fb28154363bdef93e6f06f
-EBUILD resource-agents-4.6.1.ebuild 1502 BLAKE2B 08ca4d6e594f6cc91bf4e3cb3b395928183e709af2159eb8519ad0b8df20f3c44f31ab4f5e243dc1d0f1a0e8043240c210763a708e206767fcf959bd74da867b SHA512 df73d89def7f2acaf66476505718e32f9366059b51312a770ed9016817bf74bcbdb5687b4dcdf1a49ab7c427fb6b09160bcb344132cc578380876c07e9d8c03d
+DIST resource-agents-4.15.1.tar.gz 891596 BLAKE2B 17a8e8268508ae539f88a10e8d8b5cfab6449d4a8678b2aac4422a5e4fe33746f99b4b3964b6372eb2ad186a629b85927ba93543a47b1c5f2ca28cc4fb675cf5 SHA512 e5990fa28bef5795183dc198340f5cba1f379f73b89bd53cf1ecb2e7c8337e0ac8f47e85f7f2a66af45b9d7dd500e60f78d757f316168ed2592689d9d88fc0ea
+EBUILD resource-agents-4.12.0.ebuild 1860 BLAKE2B aee7f340bca81fc27247454e058d530727785740c6d33ab11db793596f54110eb9180cebe2d89894191a224dbcc4c3d7a1cee4e20dc1d0bf21041a5cfb555a96 SHA512 b1130496f6a25d773985e9a841fbffb215903a67467bb10dc7b3ad531ea862dceaaeb615c91c2df1725d2d22034a604bf9102f5343842392b9695e56f50422aa
+EBUILD resource-agents-4.15.1.ebuild 1925 BLAKE2B 7d2bc7ac403bbe4237c5a5c2a6098751760225d7e2f813959b916e0b144bce6b504efdeda303e54ab821ba33e0114614f80cfcd9af79dc52ccfc315a6f3b7a26 SHA512 a05d06365cd4a3ebd2ed705faee93849c3ff9a05e21afcf1f45f6a9dcd5dc483c1f266722879ac8a8036a3dcd7c44b1a7eae22d9a0675bb3089967012973e4c8
 MISC metadata.xml 866 BLAKE2B b366853b9f1cd186c3fffae556ec08006f82a415a64acddcd5700faec1bab16eb63046a479beb8115de011bee8566994d6846bf574aa7a9eb6953182766e1972 SHA512 55d7e7d1601196cefc59a741ec5e3036b32c4727c367db9ee1ef463e3ddd23cd7b96d7c5f2c97a2e6ca14a3ce406d4bd468df0914b53bbb3e30480a1e369d01d
diff --git a/sys-cluster/resource-agents/files/4.6.1-autoconf-2.72.patch b/sys-cluster/resource-agents/files/4.6.1-autoconf-2.72.patch
new file mode 100644
index 000000000000..0ac63a216ff6
--- /dev/null
+++ b/sys-cluster/resource-agents/files/4.6.1-autoconf-2.72.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/920743
+https://github.com/ClusterLabs/resource-agents/pull/1908
+
+From a97a00c37d8a15ee3a8d11ac00281626f55790b3 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Mon, 8 Jan 2024 15:07:19 +0100
+Subject: [PATCH] configure: fix "C preprocessor "gcc -E" fails sanity check"
+ error caused by autoconf 2.72
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -81,6 +81,7 @@ fi
+ AC_PROG_CC dnl Can force other with environment variable "CC".
+ AM_PROG_CC_C_O
+ AC_PROG_CC_STDC
++AC_PROG_CPP
+ AC_PROG_AWK
+ AC_PROG_LN_S
+ AC_PROG_INSTALL
+
diff --git a/sys-cluster/resource-agents/resource-agents-4.12.0.ebuild b/sys-cluster/resource-agents/resource-agents-4.12.0.ebuild
index 186c37a1b914..c7e69e2cf201 100644
--- a/sys-cluster/resource-agents/resource-agents-4.12.0.ebuild
+++ b/sys-cluster/resource-agents/resource-agents-4.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,6 +32,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/4.6.1-configure.patch"
+	"${FILESDIR}/4.6.1-autoconf-2.72.patch"
 )
 
 src_prepare() {
diff --git a/sys-cluster/resource-agents/resource-agents-4.11.0.ebuild b/sys-cluster/resource-agents/resource-agents-4.15.1.ebuild
index 5438b3b45f41..6bbb47044a5a 100644
--- a/sys-cluster/resource-agents/resource-agents-4.11.0.ebuild
+++ b/sys-cluster/resource-agents/resource-agents-4.15.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 MY_P="${P/resource-}"
-inherit autotools
+inherit autotools tmpfiles
 
 DESCRIPTION="Resources pack for Heartbeat / Pacemaker"
 HOMEPAGE="http://www.linux-ha.org/wiki/Resource_Agents"
@@ -12,18 +12,22 @@ SRC_URI="https://github.com/ClusterLabs/resource-agents/archive/v${PV}.tar.gz ->
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="doc libnet rgmanager systemd"
 
 RDEPEND="
 	sys-apps/iproute2
+	sys-apps/which
 	>=sys-cluster/cluster-glue-1.0.12-r1
+	sys-cluster/libqb:=
 	libnet? ( net-libs/libnet:1.1 )
 	systemd? ( sys-apps/systemd )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	sys-apps/which
 	doc? (
+		dev-libs/libxml2
 		dev-libs/libxslt
 		app-text/docbook-xsl-stylesheets
 	)
@@ -39,14 +43,19 @@ src_prepare() {
 }
 
 src_configure() {
-	# --with-ocf-root needs to be /usr/lib, see bug #720420
-	econf \
-		--disable-fatal-warnings \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/lib/ocf \
-		--with-rsctmpdir=/run/resource-agents \
-		$(use_enable doc) \
+	# TODO: fix systemd automagic
+	# TODO: python support
+	local myeconfargs=(
+		--disable-fatal-warnings
+		--localstatedir=/var
+		# --with-ocf-root needs to be /usr/lib, see bug #720420
+		--with-ocf-root=/usr/lib/ocf
+		--with-rsctmpdir=/run/resource-agents
+		$(use_enable doc)
 		$(use_enable libnet)
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -57,9 +66,17 @@ src_install() {
 	rm -rf "${ED}"{,/var}/run || die
 
 	use rgmanager || rm -rf "${ED}"/usr/share/cluster/ "${ED}"/var/
+
+	if ! use systemd ; then
+		newtmpfiles - resource-agents.conf <<-EOF
+		d /var/run/resource-agents 1755 root root
+		EOF
+	fi
 }
 
 pkg_postinst() {
+	tmpfiles_process resource-agents.conf
+
 	elog "To use Resource Agents installed in ${EROOT}/usr/lib/ocf/resource.d"
 	elog "you have to emerge required runtime dependencies manually."
 	elog ""
diff --git a/sys-cluster/resource-agents/resource-agents-4.6.1.ebuild b/sys-cluster/resource-agents/resource-agents-4.6.1.ebuild
deleted file mode 100644
index cf01dbf63693..000000000000
--- a/sys-cluster/resource-agents/resource-agents-4.6.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/resource-}"
-inherit autotools multilib
-
-DESCRIPTION="Resources pack for Heartbeat / Pacemaker"
-HOMEPAGE="http://www.linux-ha.org/wiki/Resource_Agents"
-SRC_URI="https://github.com/ClusterLabs/resource-agents/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="doc libnet rgmanager"
-
-RDEPEND="sys-apps/iproute2
-	>=sys-cluster/cluster-glue-1.0.12-r1
-	libnet? ( net-libs/libnet:1.1 )"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)"
-
-PATCHES=(
-	"${FILESDIR}/4.6.1-configure.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-fatal-warnings \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/$(get_libdir)/ocf \
-		--with-rsctmpdir=/run/resource-agents \
-		$(use_enable doc) \
-		$(use_enable libnet)
-}
-
-src_install() {
-	default
-	rm -rf "${D}/usr/$(get_libdir)/ocf/resource.d/redhat" || die
-	rm -rf "${D}"/etc/init.d/ || die
-	rm -rf "${D}"{,/var}/run || die
-	use rgmanager || rm -rf "${D}"/usr/share/cluster/ "${D}"/var/
-}
-
-pkg_postinst() {
-	elog "To use Resource Agents installed in /usr/$(get_libdir)/ocf/resource.d"
-	elog "you have to emerge required runtime dependencies manually."
-	elog ""
-	elog "Description and dependencies of all Agents can be found on"
-	elog "http://www.linux-ha.org/wiki/Resource_Agents"
-	elog "or in the documentation of this package."
-}