gentoo resync : 04.01.2022

3 files changed, 80 insertions, 3 deletions

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 0c25b325c8de..cedb0d224ea0 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,5 +1,7 @@
 AUX pacemaker-2.0.4-qa-warnings.patch 819 BLAKE2B 5de3717c80c6aa0d81b66c2b16e0b15a272f2a67549ef22288f4feddd34ca498dd797744a94ebe5a7b05cf515a3f42f78e0281dfc805724a7aed957d966f58f8 SHA512 fad606290261b996dc5ed9c29388c245e1247d9816ef843360e36fac4360de0c95eda17ec3e254e7cb67921ab60263ae2acda46874c6d722f13b2e025a98ac94
-AUX pacemaker.initd 862 BLAKE2B 4da4af65887be567aa77fff2b3647b64fa86a9862a2269db1c27ab429759ac597f6eb5fcbadefc22ec64d0eb5983b3d7301c1867d056ef8332f241d967aae3c0 SHA512 9578a47ea9271a5b8b5939dc32ff49736504c2e6318f3e9f906b554b1b11a334c01cae8900e946318cdffd3cf9611d748013bdcc63b3ae68919709ebb12e7e7c
+AUX pacemaker.initd 858 BLAKE2B a1b4d9efd14f03620f03733a0a4d33f97ed056f041b970376c17fe2b54a52a172ef208b70bcb6914d211c3157a206ce57aed13898396bd78532e69e697a55a7f SHA512 d644b18cf45c74c21c845dbab16b63fd23944d7d1f9616a866b6b07ea6108ca52a1bb445b698dc87d36d0131abad8fa96a8de85aef843df4669699de289cf587
 DIST Pacemaker-2.0.5.tar.gz 5434850 BLAKE2B 4e3d24746978fe0785dd9c415cc3779a2bd06f78d8bcd3353cdab8c93b192db8a017d404f6d5e27852369e8db2dc1ee4a2c4c7806ebb1aad5381d1c5b5a681dc SHA512 5fd3614f0284297babb66ea2dc567583315052fcf77f49107c52161e8e8c164ae3169d98528fdc1316d8eabaacc98ed24e9c6e6c90b3286f2f012a4ee874bbba
+DIST Pacemaker-2.1.2.tar.gz 5092063 BLAKE2B 04689762cd3767fec35fc577b79007e7004411d4bb8676a0410c75619c35d1f158811555ea7d156accbb3e75a427128ab735ca21ad177934634b27fe2837175f SHA512 5c30ac5c371bb1f37215a9cf3e2eec701f7e4133252401dd2793b0908f2192de1d0b625cc37d84dfc9fd0885039c4d88e617110135c5e1a16c40cd3218603c26
 EBUILD pacemaker-2.0.5.ebuild 1576 BLAKE2B 014f0d09c3c664a90e1ed6656fbf62aedee5b840a8ca092aba647f0e251cbb941a4cba778e2cf209a5555c60f4fb81ebd4ebb7ae0ed211eb76cb5e3a30c0751d SHA512 865d8da908694c7c799395f8d706cfc89508ce766854bfdcd2fa572c58818afc707fe8b4ee36e3a54c1a064b0c9d46d5fd00cbbf876505fa6a5270afe5190f6a
+EBUILD pacemaker-2.1.2.ebuild 1615 BLAKE2B 233947ff4b1e4db17924572ab4229ba4abc7c677f2f1dd76c0d9805e387bc15cd4a348ec3580bb971042a4da0b61eb20586dfc6de8616a9b314706f4abbb6e94 SHA512 ec66857c2dff00b87862f7e627ec969b9e94ec39bc6a690c30a770884052e15a4a9a6f33129ac287fc014350692a37aeaae05d2124bc67fbd2c47b3688ad221f
 MISC metadata.xml 809 BLAKE2B fa4cdce64387006f97d32578157d82bfe8b82f7f049accc11731e1f4e0d502aa01e7099045bd8d775757de92229428d7dd386019b6b02f85f00222e7e6d60fbb SHA512 48fc7614e31ed83c5de217cf737931f1d9257827e60c2a7eceb9c936041e82b3477822b9c31e320468b3634af1651502bb5ce5cb162319921d3d03197196fcad
diff --git a/sys-cluster/pacemaker/files/pacemaker.initd b/sys-cluster/pacemaker/files/pacemaker.initd
index 8dbcea6ce37d..0264d34c25d3 100644
--- a/sys-cluster/pacemaker/files/pacemaker.initd
+++ b/sys-cluster/pacemaker/files/pacemaker.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 PIDFILE=/var/run/pacemaker.pid
@@ -21,7 +21,7 @@ start() {
 		nc=$(expr $nc + 1)
 		if [ $nc -gt 30 ]; then
 			echo
-			eend 1 "Failed to detect Corosync startup, is it really running ?"
+			eend 1 "Failed to detect Corosync startup, is it really running?"
 			exit 1
 		fi
 		sleep 1
diff --git a/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild b/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild
new file mode 100644
index 000000000000..7afdf78f7d25
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-2.1.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools python-single-r1
+
+MY_P="${PN^}-${PV/_/-}"
+
+DESCRIPTION="Pacemaker CRM"
+HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
+SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+ BSD CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="acl smtp snmp"
+
+DEPEND="
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-cluster/cluster-glue-1.0.12-r1
+	>=sys-cluster/libqb-2.0.0:=
+	sys-cluster/resource-agents
+	sys-cluster/corosync
+	smtp? ( net-libs/libesmtp )
+	snmp? ( net-analyzer/net-snmp )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+src_prepare() {
+	default
+	sed -i -e "s/ -ggdb//g" configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# appends lib to localstatedir automatically
+	local myconf=(
+		--with-ocfdir=/usr/$(get_libdir)/ocf
+		--localstatedir=/var
+		--disable-fatal-warnings
+		--disable-static
+		--without-cs-quorum
+		--without-cman
+		--without-heartbeat
+		--with-corosync
+		--with-ais
+		$(use_with acl)
+		$(use_with smtp esmtp)
+		$(use_with snmp)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# remove provided initd file as we need support for OpenRC
+	rm -r "${ED}/etc/init.d" || die "Failed to remove old initd"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+
+	keepdir /var/lib/pacemaker/{blackbox,cib,cores,pengine}
+	keepdir /var/log/pacemaker/bundles
+
+	find "${ED}" -name '*.la' -delete || die
+}