gentoo resync : 20.03.2021

6 files changed, 25 insertions, 176 deletions

diff --git a/sys-cluster/libqb/Manifest b/sys-cluster/libqb/Manifest
index 7998e784dcfe..37e33c494234 100644
--- a/sys-cluster/libqb/Manifest
+++ b/sys-cluster/libqb/Manifest
@@ -1,9 +1,4 @@
-DIST libqb-0.17.2.tar.xz 373540 BLAKE2B b9d751fca21cc25798a24207740b14722502cbb918cc652cd33b0159a9bd1254a8a64bc73684ae3274a2cf346db5b19924cf010ba487f4c6a9a5f9deade792c4 SHA512 9c6dce7d18aa4da31594faecd0ea2737c2beefa749290094f733fe89ac40f094ec6409f310c534b8144d500e8c204c328386eaf1029995698d7019c014433443
-DIST libqb-1.0.5.tar.xz 488516 BLAKE2B 96f61ce681d0c259e8df38f35c04349ab3b1199f62c2311d60c6f229bf15e8f62825c965a4847cbda4701119fc7ae3c68cc3a7187f927f8ddf7496cf1931c7c2 SHA512 a695bc4c913a32d47535cb2d8812f14a39732cae32651521a8f7b6d05c4202bfc28a477c88875bbfbe1a0238cd33f1fe64f2d2217b0c27cf11acf7233fc2cbdf
-DIST libqb-1.9.0.tar.gz 225147 BLAKE2B d8200d5eec8c05a18675de585e2f85694d3d062d82afca38c421859e3e0287d1691fe9726a75d3726afc58a94765f6a201f8fb51bf1ed25c1cfeaeb326e6f6d0 SHA512 9bdf2087f610a7a02b976312d60391e1c53ebd3f36a897cdc3fcf818f666f772d63386b52bd11ed4e5ea52fa4775231ab7125359a270451f925b3821d9b8e3ee
+AUX libqb-2.0.1-slibtool.patch 620 BLAKE2B 5c5e3c699eb8b9d1d7e9e41a36e9be28e60cc1e0a978ec06cd018a3441f0bf3680991178466ea0ffea99d51c334404bae8f6b9397c49fa97ab5ade378b564e30 SHA512 9cb82b24a18282cf7364f1f413585f70e912ec46f94a2d37c45f643aa8046186cead8805f04b1e5d5daff393e35f99240a51d5a7873996d86b51480c5925b4f6
 DIST libqb-2.0.1.tar.xz 480516 BLAKE2B 402ca20f16a232497c9a363c557556bbdcfffff5d0f075898bf4008bb51b30771f284c29b64421be1dae8215e153b8978ac06c9bd10f3e5e23632b597549d2c7 SHA512 6d989d30b381253c7d7c4ff1e6400ad3445b92184906c859f10d6352dd604a309d7e2d9c8298d8b8d59a0e884e2d821608a39f043db7e96db2118a867ef57672
-EBUILD libqb-0.17.2.ebuild 1156 BLAKE2B ed266360fd089792e9b498bf0afd1f0cd57a82fefcf817f65cf019524d418380481f1281a8ee31bf7f857e9138f53380bbf76d9b9b097776e2ec6f872c7d3766 SHA512 6918bd4feeec474dcd88fb585f7a0a96e795297b6a44d622c56a8f9c883bcdc15f8a2dc457205138d91413690dc6327ff1438193ea68d70207ba49ee785c4353
-EBUILD libqb-1.0.5.ebuild 1004 BLAKE2B 8aeaecd43035bd49dc1ba587aa435fc295aa5bf59826bbb72d9c922f9b822f89c8dc046add84fd92639aa11ee88543eb6c4bdbd274def5e0461943c6fed141a7 SHA512 6101d690fd176d773a21e7b357ca9be5100a028b46736db385c22f5342a0a8f4f0b250cc9182f2b31460dd0f4cbfc211fd4cee6f181edcac0ec1b57e5ef18399
-EBUILD libqb-1.9.0.ebuild 1391 BLAKE2B 968c70eed5573536df473711c0878a71fe678dabcf5d9e1f49a24b82f18d8651694a65312da285e3d108505301ef6bc3312db6a3031f9f0901d21373ddf990f6 SHA512 8a6f04badb2746224f2cca41a74b898ac517bf048d8b7f2004976f21268b9dc830d2ca91c95ba913dcadf925f65907e2077bf25d595f557394bde9fd8ae30d74
-EBUILD libqb-2.0.1-r1.ebuild 1319 BLAKE2B 34c48eaaccc73a812736d84a3cbeaf1de5aba6a799042b852c28c2a4424dddeef3f70f774f7a3d548a185ea4bbf8888827d10cdead76a2dcbe26f84064f889f3 SHA512 f051492bf59671c5a7ac9840d990f2b680df081b4990ad8a330713155b035ddd4d11c84d0a706db58e5727f62ae2433736467f45b1c78c52583b56bbebbfb7c6
+EBUILD libqb-2.0.1-r1.ebuild 1374 BLAKE2B 76e9b4348a1330437661c2d2020fb40774e2084a1dbb06f990c2242a8c00d427101989576d1dba6d1bca5faf530a9e2305cd6d12c385fe517f23c835ce2f95b0 SHA512 89829b4ec8fdc17947d18416bb6f71d1372d3dd04f81e19ff8b5671615422c86ccc276df354ca0210527312c4462a6c955bf7bc8ed22a175cbe666346e2fe0df
 MISC metadata.xml 339 BLAKE2B c62f10b2ef4d7efe87b20e68a511c136192cdf33cddb9dee961099a44c26179f78ccd2804dacc21f6e72c2a5266f2274b332f656c3e5a1ad4f0fdad7ad33a0ab SHA512 39cccac769c39f6b8f90500c1b8f21e6ab65429ec1d992e7aa0025bc161d1ceffa28796accba321af01b75671c11ae6cacb4c8b4ab5ef14dbc8ef103dfc9f0b3
diff --git a/sys-cluster/libqb/files/libqb-2.0.1-slibtool.patch b/sys-cluster/libqb/files/libqb-2.0.1-slibtool.patch
new file mode 100644
index 000000000000..f96652c30660
--- /dev/null
+++ b/sys-cluster/libqb/files/libqb-2.0.1-slibtool.patch
@@ -0,0 +1,19 @@
+https://github.com/ClusterLabs/libqb/pull/440
+https://bugs.gentoo.org/775605
+
+From 84c09815fee4d1c2571ed1ef772812cac470a8f3 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 16 Mar 2021 11:13:45 -0700
+Subject: [PATCH] build: Fix undefined pthread reference.
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -38,7 +38,8 @@ bmc_SOURCES = bmc.c
+ bmc_LDADD = $(top_builddir)/lib/libqb.la
+ 
+ bmcpt_SOURCES = bmcpt.c
+-bmcpt_LDADD = $(top_builddir)/lib/libqb.la
++bmcpt_CFLAGS = $(PTHREAD_CFLAGS)
++bmcpt_LDADD = $(PTHREAD_LIBS) $(top_builddir)/lib/libqb.la
+ 
+ bms_SOURCES = bms.c
+ bms_CFLAGS = $(GLIB_CFLAGS)
diff --git a/sys-cluster/libqb/libqb-0.17.2.ebuild b/sys-cluster/libqb/libqb-0.17.2.ebuild
deleted file mode 100644
index 37428196e8bb..000000000000
--- a/sys-cluster/libqb/libqb-0.17.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="Library providing high performance logging, tracing, ipc, and poll"
-HOMEPAGE="https://github.com/ClusterLabs/libqb"
-SRC_URI="https://github.com/ClusterLabs/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="debug doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	test? ( dev-libs/check )
-	doc? ( app-doc/doxygen[dot] )"
-
-DOCS=(README.markdown ChangeLog)
-
-src_prepare() {
-	sed -e '/dist_doc_DATA/d' -i Makefile.am || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile doxygen
-}
-
-src_install() {
-	use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/docs/html/")
-	autotools-utils_src_install
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-}
diff --git a/sys-cluster/libqb/libqb-1.0.5.ebuild b/sys-cluster/libqb/libqb-1.0.5.ebuild
deleted file mode 100644
index 1b65743a9677..000000000000
--- a/sys-cluster/libqb/libqb-1.0.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Library providing high performance logging, tracing, ipc, and poll"
-HOMEPAGE="https://github.com/ClusterLabs/libqb"
-SRC_URI="https://github.com/ClusterLabs/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="debug doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	test? ( dev-libs/check )
-	doc? ( app-doc/doxygen[dot] )"
-
-DOCS=(README.markdown ChangeLog)
-
-src_prepare() {
-	default
-	sed -e '/dist_doc_DATA/d' -i Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug)
-}
-
-src_compile() {
-	default
-	use doc && emake doxygen
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-
-	use doc && HTML_DOCS=("docs/html/.")
-	einstalldocs
-}
diff --git a/sys-cluster/libqb/libqb-1.9.0.ebuild b/sys-cluster/libqb/libqb-1.9.0.ebuild
deleted file mode 100644
index 9166158e3bac..000000000000
--- a/sys-cluster/libqb/libqb-1.9.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Library providing high performance logging, tracing, ipc, and poll"
-HOMEPAGE="https://github.com/ClusterLabs/libqb"
-
-# Avoiding release tarball due to https://github.com/ClusterLabs/libqb/issues/375
-# Please re-add ChangeLog to DOCS when switching back
-SRC_URI="https://github.com/ClusterLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/20"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
-IUSE="debug doc examples systemd test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	test? ( dev-libs/check )
-	doc? ( app-doc/doxygen[dot] )"
-
-DOCS=( README.markdown )
-
-src_prepare() {
-	default
-
-	# Skip installation of text documents without value
-	sed -e '/dist_doc_DATA/d' -i Makefile.am || die
-
-	# Do not append version suffix "-yank"
-	sed 's|1-yank|1|' -i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable systemd systemd-journal) \
-		$(use_enable debug)
-}
-
-src_compile() {
-	default
-	use doc && emake doxygen
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-
-	use doc && HTML_DOCS=("docs/html/.")
-	einstalldocs
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-cluster/libqb/libqb-2.0.1-r1.ebuild b/sys-cluster/libqb/libqb-2.0.1-r1.ebuild
index 0d08cf0e61ad..acda01cfb901 100644
--- a/sys-cluster/libqb/libqb-2.0.1-r1.ebuild
+++ b/sys-cluster/libqb/libqb-2.0.1-r1.ebuild
@@ -26,6 +26,10 @@ BDEPEND="app-arch/xz-utils
 
 DOCS=( ChangeLog README.markdown )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.1-slibtool.patch
+)
+
 src_prepare() {
 	default