gentoo resync : 24.07.2021

4 files changed, 24 insertions, 202 deletions

diff --git a/sys-cluster/cluster-glue/Manifest b/sys-cluster/cluster-glue/Manifest
index 7f18cbec974c..dc82e7b5a5aa 100644
--- a/sys-cluster/cluster-glue/Manifest
+++ b/sys-cluster/cluster-glue/Manifest
@@ -1,7 +1,4 @@
 AUX heartbeat-logd.init 954 BLAKE2B b00280f93cb0a3f3f8f19d3170472e87d705f91113fc7d3fe1d0ecf45cb079673c5777acdc8ed3de63fb64848ce0e33e536f86e7dc74c86eb08e7a32da6e12fa SHA512 ef59ad02a608810750cc0241f4d0eb7584624e419f735e0e69b61c2865b68241e9b90a1d817bb838d744d955d9c67708fb89c36df35b17a0f8ef6243904b32c5
-DIST glue-1.0.11.tar.bz2 466057 BLAKE2B 929c9f803814fb1162d4058e0fb78deb96b6be9b4064dae96ea5653521f5dfb862850ab2c9010530ac652264c5e8e379cb397fc173f720d126540405b264ca5b SHA512 35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413
 DIST glue-1.0.12.tar.bz2 451569 BLAKE2B c074507563e797f105318bfcfab3e73eb1b62eb3037689c2b68f1b98f02b4a2c1da2e0b2931cd28ccc194d9f3b486733f642c6ff071c4f7629062d40c8d39427 SHA512 d5d2f6c426d2bed0d39269338fedfffe840a90ff56b05dff395243d0d8b803593bf35bbce5f7dce376120cd7ddef78400914cb7515b5451c287a1e9e74233122
-EBUILD cluster-glue-1.0.11.ebuild 2078 BLAKE2B 36377e5f84e8003c8e69a84756a51173de97e73c4a4d88b23db30d3fa9b986327514fa49e1ec5be35755fa9cb5c0c29e9a3879d04e24663859d417fdbe128abd SHA512 9e238976bb00e4a7b729b759725bef282dae2014bd55e424d8a03b889ac9112ca842dbf5704b8fe2eeadb329af410fc17e83aa5741a11569d91ee8321639b4b0
-EBUILD cluster-glue-1.0.12-r1.ebuild 2240 BLAKE2B de1e40f565e52e90b6842b35dd6ac49327073529aeeb31cec7e99ea172f652ef125b06e8d79ad02917d1ca49d8548965653261d8c123a8f2c0a643feadd63fd9 SHA512 6e9058ff4f8523196ec8d2a5282357c4c94d21eb9e790924ebb94754c6a4786b2143fccacbeb219830447bf84d9e62abee287af22692279b3ffb039d06cdce27
-EBUILD cluster-glue-1.0.12.ebuild 2096 BLAKE2B 3a99470b4c90567f6d3732b76b7b72204d0beee5fedd331e98f7b076765304abe7e20e756bfd4e629f0e8dfed549106516e3a9c43926ed62878fb697eaa3405d SHA512 bff597a019175f6d31e973130256a3543c69900e9874f26287305b2885aa13fa8ec693113e276cbe68dfff4b929deef98de0ababf1604ab3cc4ba9b155a1c85f
+EBUILD cluster-glue-1.0.12-r2.ebuild 2183 BLAKE2B dfbb68a8981c6ac1aa4b8d06dd4f5fa6877c8676e942c68dfabdade6ae495dfce68de7d0d018fd2edbf6fe2be7f8f94675685a872b38578a3f93738cb55e0901 SHA512 6ae8641950c8948fb1e633690904ef713fd1599bc83288290230b8a2b468767ebde3992ac6cef24b1d38b4e1d7f8f2e0c8c82f2b1d2b19d51a4ad4d441f2ba96
 MISC metadata.xml 582 BLAKE2B 5792be1499f85328ff85ec074189187e014c2eadf29b4ddaf4a64c71977ccf5ce91d86f251fe90f3540a7cfab8d52145cd5c085199c6e1099df5dbe801fc4291 SHA512 a2312279ff8e3e47db3d1a560699d76233dae3963cc094aefbbe965af053fe4299e95133d5f40aa69a565c91c21ce9d358020726d3c8c590255dcac72901d7e3
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
deleted file mode 100644
index b61d99db6fbe..000000000000
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/cluster-}"
-inherit autotools multilib user
-
-DESCRIPTION="Library pack for Heartbeat / Pacemaker"
-HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
-SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="doc libnet static-libs"
-
-RDEPEND="app-arch/bzip2
-	app-text/docbook-xml-dtd:4.4
-	dev-libs/glib:2
-	dev-libs/libaio
-	libnet? ( net-libs/libnet:1.1 )
-	net-misc/curl
-	net-misc/iputils
-	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		)"
-
-S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
-
-pkg_setup() {
-	enewgroup haclient
-	enewuser  hacluster -1 /dev/null /var/lib/heartbeat haclient
-}
-
-src_prepare() {
-	default
-	sed -e '/ -ggdb3/d' -i configure.ac || die
-	sed -e "s@http://docbook.sourceforge.net/release/xsl/current@/usr/share/sgml/docbook/xsl-stylesheets/@g" \
-		-i doc/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myopts
-
-	use doc && myopts=" --enable-doc"
-	econf \
-		$(use_enable libnet) \
-		$(use_enable static-libs static) \
-		--disable-fatal-warnings \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/$(get_libdir)/ocf \
-		${myopts} \
-		--with-group-id=$(id -g hacluster) \
-		--with-ccmuser-id=$(id -u hacluster) \
-		--with-daemon-user=hacluster --with-daemon-group=haclient
-}
-
-src_install() {
-	default
-
-	dodir /var/lib/heartbeat/cores
-	dodir /var/lib/heartbeat/lrm
-
-	keepdir /var/lib/heartbeat/cores
-	keepdir /var/lib/heartbeat/lrm
-
-	# init.d file
-	cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die
-	sed -i \
-		-e "s:%libdir%:$(get_libdir):" \
-		"${T}/heartbeat-logd.init" || die
-# 	newinitd "${T}/heartbeat-logd.init" heartbeat-logd
-	rm "${D}"/etc/init.d/logd
-
-	use static-libs || find "${D}" -type f -name "*.la" -delete
-}
-
-pkg_postinst() {
-	chown -R hacluster:haclient /var/lib/heartbeat/cores
-	chown -R hacluster:haclient /var/lib/heartbeat/lrm
-}
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r2.ebuild
index e37323b4c22c..c3100b232fb4 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r2.ebuild
@@ -4,11 +4,13 @@
 EAPI=7
 
 MY_P="${P/cluster-}"
-inherit autotools flag-o-matic multilib user
+
+inherit autotools flag-o-matic multilib
 
 DESCRIPTION="Library pack for Heartbeat / Pacemaker"
 HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
 SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
+S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,6 +18,8 @@ KEYWORDS="amd64 ~hppa x86"
 IUSE="doc ipmilan libnet static-libs"
 
 RDEPEND="
+	acct-group/haclient
+	acct-user/hacluster
 	app-arch/bzip2
 	app-text/asciidoc
 	app-text/docbook-xml-dtd:4.4
@@ -29,18 +33,13 @@ RDEPEND="
 	net-misc/iputils
 	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	doc? (
 		dev-libs/libxslt
 		app-text/docbook-xsl-stylesheets
-		)"
-
-S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
-
-pkg_setup() {
-	enewgroup haclient
-	enewuser  hacluster -1 -1 /var/lib/heartbeat haclient
-}
+	)
+"
 
 src_prepare() {
 	default
@@ -52,20 +51,21 @@ src_prepare() {
 
 src_configure() {
 	append-cppflags -DOPENIPMI_DEFINE_SELECTOR_T
-	local myopts
 
-	use doc && myopts=" --enable-doc"
-	econf \
-		$(use_enable ipmilan) \
-		$(use_enable libnet) \
-		$(use_enable static-libs static) \
-		--disable-fatal-warnings \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/$(get_libdir)/ocf \
-		${myopts} \
-		--with-group-id=$(id -g hacluster) \
-		--with-ccmuser-id=$(id -u hacluster) \
+	local myeconfargs=(
+		$(use_enable ipmilan)
+		$(use_enable libnet)
+		$(use_enable static-libs static)
+		$(usex doc '--enable-doc' '')
+		--disable-fatal-warnings
+		--localstatedir=/var
+		--with-ocf-root=/usr/$(get_libdir)/ocf
+		--with-group-id=$(id -g hacluster)
+		--with-ccmuser-id=$(id -u hacluster)
 		--with-daemon-user=hacluster --with-daemon-group=haclient
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -79,7 +79,7 @@ src_install() {
 	sed -i \
 		-e "s:%libdir%:$(get_libdir):" \
 		"${T}/heartbeat-logd.init" || die
-# 	newinitd "${T}/heartbeat-logd.init" heartbeat-logd
+	# newinitd "${T}/heartbeat-logd.init" heartbeat-logd
 	rm "${D}"/etc/init.d/logd
 
 	use static-libs || find "${D}" -type f -name "*.la" -delete
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
deleted file mode 100644
index ea054ce70395..000000000000
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/cluster-}"
-inherit autotools multilib user
-
-DESCRIPTION="Library pack for Heartbeat / Pacemaker"
-HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
-SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="doc libnet static-libs"
-
-RDEPEND="app-text/asciidoc
-	app-arch/bzip2
-	app-text/docbook-xml-dtd:4.4
-	dev-libs/glib:2
-	dev-libs/libaio
-	libnet? ( net-libs/libnet:1.1 )
-	net-misc/curl
-	net-misc/iputils
-	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		)"
-
-S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
-
-pkg_setup() {
-	enewgroup haclient
-	enewuser  hacluster -1 /dev/null /var/lib/heartbeat haclient
-}
-
-src_prepare() {
-	default
-	sed -e '/ -ggdb/d' -i configure.ac || die
-	sed -e "s@http://docbook.sourceforge.net/release/xsl/current@/usr/share/sgml/docbook/xsl-stylesheets/@g" \
-		-i doc/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myopts
-
-	use doc && myopts=" --enable-doc"
-	econf \
-		$(use_enable libnet) \
-		$(use_enable static-libs static) \
-		--disable-fatal-warnings \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/$(get_libdir)/ocf \
-		${myopts} \
-		--with-group-id=$(id -g hacluster) \
-		--with-ccmuser-id=$(id -u hacluster) \
-		--with-daemon-user=hacluster --with-daemon-group=haclient
-}
-
-src_install() {
-	default
-
-	dodir /var/lib/heartbeat/cores
-	dodir /var/lib/heartbeat/lrm
-
-	keepdir /var/lib/heartbeat/cores
-	keepdir /var/lib/heartbeat/lrm
-
-	# init.d file
-	cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die
-	sed -i \
-		-e "s:%libdir%:$(get_libdir):" \
-		"${T}/heartbeat-logd.init" || die
-# 	newinitd "${T}/heartbeat-logd.init" heartbeat-logd
-	rm "${D}"/etc/init.d/logd
-
-	use static-libs || find "${D}" -type f -name "*.la" -delete
-}
-
-pkg_postinst() {
-	chown -R hacluster:haclient /var/lib/heartbeat/cores
-	chown -R hacluster:haclient /var/lib/heartbeat/lrm
-}