gentoo resync : 15.12.2019

6 files changed, 64 insertions, 61 deletions

diff --git a/sys-cluster/libqb/Manifest b/sys-cluster/libqb/Manifest
index b77c650ce084..c76e5c1fbd05 100644
--- a/sys-cluster/libqb/Manifest
+++ b/sys-cluster/libqb/Manifest
@@ -1,7 +1,7 @@
-DIST libqb-0.17.1.tar.xz 386304 BLAKE2B 41356198a6f97d71bd2fdfca34c539c81c2d439410fad9f934d10fa411dafbdb490ef800d8a8e88bd4db966dd09bc4b6dd67c17508d15a7e05906982ebc3cd20 SHA512 9705b291a61ca278fd0c9ab631af2cb844cdfc73b19501dd2e12eb162b37f0eded800860127a8a5c5c7c2a0e8db53e4780d3ab9697b099f4560a9a87aa8ec9ca
 DIST libqb-0.17.2.tar.xz 373540 BLAKE2B b9d751fca21cc25798a24207740b14722502cbb918cc652cd33b0159a9bd1254a8a64bc73684ae3274a2cf346db5b19924cf010ba487f4c6a9a5f9deade792c4 SHA512 9c6dce7d18aa4da31594faecd0ea2737c2beefa749290094f733fe89ac40f094ec6409f310c534b8144d500e8c204c328386eaf1029995698d7019c014433443
 DIST libqb-1.0.1.tar.xz 438204 BLAKE2B be4d4dbe624721a6434f7e3023bcaef017e1358f67fa308e4107bd96469675eca51b5787f498857d22104e3ffa55ded9c44fe320c37fec639a84648c1f517223 SHA512 9afdf5b7064f4e79f70e3c21d1ae954d1444d202d5903bd84866e502b2afc218d4a84fd21fab637a198357e1dad5da94814a6c0bdaa0ba6ac4a24ff40422c185
-EBUILD libqb-0.17.1.ebuild 1105 BLAKE2B baf81629892d2a5be45791b407f046e66467a167b79e8f658662a189278430d66db064d52acaa3560c7ace57a66658c5c1b4a4e394c44e135e6e1a393696fa2e SHA512 929ab8e277508eaba06516e7b4424bba5e81c4a22e7fd5b8b962fcaa1402cad78df56546b56ed14f39b81efe2e9a19f32e0fd921209b2bcd71070ceaf6a11b94
-EBUILD libqb-0.17.2.ebuild 1115 BLAKE2B 285b572383450885ac4529b0510e7737d73b6ac7836d453dfc9748a0b1405c10842089f82c83acd8d15f3855be3759c54f207dcb7d95c88b6c2aece47075f706 SHA512 e9aa9dd53e4a75ac67e45778ce537987d93244ac769888b2ce4cb2d442dac0ad6637a51c658c4e3909b2d7f4d3061efa8e6f18d46876e4729f45eb8469c3b7ea
-EBUILD libqb-1.0.1.ebuild 1143 BLAKE2B a074ade79bdeaaf12b0bd6f1a7adaab5eda0856f5725441548e24b1a214e57042e8cc68b8dd13741356bd948186c0b3c81bdacc181229999a03ba687fa43064b SHA512 59ab3d4399c91a42c943c851dd857ad3cac4e6c70acef525b2a3a22d13867fb24fafa4e12bf55f263a7b633f49dbc153321518f2f858870bc50ac60479fdff5f
-MISC metadata.xml 336 BLAKE2B bfb9a7bc9f1619b2605c7e6ca503e06cd0ccbcdef1dcea10f6f8e8fa524ccb3df4a230b000f6b7eb869d2eab92cec6a385e7d2c482bc612289a0b0b9e72875c4 SHA512 7138793800d1d53f31019dcd56eb8d44a0442dc25733a777931af10846f0a61488d3e30f2ba7b5540380e1ddb4d7fdc44eaa39c126ed005b8bde7ef75b2b495e
+DIST libqb-1.0.5.tar.xz 488516 BLAKE2B 96f61ce681d0c259e8df38f35c04349ab3b1199f62c2311d60c6f229bf15e8f62825c965a4847cbda4701119fc7ae3c68cc3a7187f927f8ddf7496cf1931c7c2 SHA512 a695bc4c913a32d47535cb2d8812f14a39732cae32651521a8f7b6d05c4202bfc28a477c88875bbfbe1a0238cd33f1fe64f2d2217b0c27cf11acf7233fc2cbdf
+EBUILD libqb-0.17.2.ebuild 1155 BLAKE2B 3028a41671305e4202f7535905fb0d9636659456c254a7817d26ed8f1c77210d0bf551bd86a748e5ef114055a0ca2964155bb26f119a8af5c10b1cd71addf2f1 SHA512 89420a61581c365561d5cb25601efd84c0ef331e4b8666a80e64fc4d83b106e6518ae11d98079b5a37a8e63303e11186522fa45448c4751da7f4e7e95826270c
+EBUILD libqb-1.0.1.ebuild 1167 BLAKE2B cb36195482930926022160f4fcc37636f83726daee2a56f382370341e2b9a4729e875929a1f0a014b6d46511d920727b9c72b4ca838c4bca3bb70cb70d9f0ad0 SHA512 f6fa8cd1e1d2513827bacb46898596072bc3b5c2b9369b3ed29164585a83e4051aaa82e5d691f346d7c39ba3c63bac23c36dccbcd171d725c656b6bbd55a8dc1
+EBUILD libqb-1.0.5.ebuild 1004 BLAKE2B 8aeaecd43035bd49dc1ba587aa435fc295aa5bf59826bbb72d9c922f9b822f89c8dc046add84fd92639aa11ee88543eb6c4bdbd274def5e0461943c6fed141a7 SHA512 6101d690fd176d773a21e7b357ca9be5100a028b46736db385c22f5342a0a8f4f0b250cc9182f2b31460dd0f4cbfc211fd4cee6f181edcac0ec1b57e5ef18399
+MISC metadata.xml 339 BLAKE2B c62f10b2ef4d7efe87b20e68a511c136192cdf33cddb9dee961099a44c26179f78ccd2804dacc21f6e72c2a5266f2274b332f656c3e5a1ad4f0fdad7ad33a0ab SHA512 39cccac769c39f6b8f90500c1b8f21e6ab65429ec1d992e7aa0025bc161d1ceffa28796accba321af01b75671c11ae6cacb4c8b4ab5ef14dbc8ef103dfc9f0b3
diff --git a/sys-cluster/libqb/libqb-0.17.1.ebuild b/sys-cluster/libqb/libqb-0.17.1.ebuild
deleted file mode 100644
index b79bf5d082a9..000000000000
--- a/sys-cluster/libqb/libqb-0.17.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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/asalkeld/libqb"
-SRC_URI="http://fedorahosted.org/releases/q/u/quarterback/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE="debug doc examples static-libs 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-0.17.2.ebuild b/sys-cluster/libqb/libqb-0.17.2.ebuild
index 8b80054d7eab..b9af51a50ad1 100644
--- a/sys-cluster/libqb/libqb-0.17.2.ebuild
+++ b/sys-cluster/libqb/libqb-0.17.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,13 +8,14 @@ AUTOTOOLS_AUTORECONF=1
 inherit autotools-utils
 
 DESCRIPTION="Library providing high performance logging, tracing, ipc, and poll"
-HOMEPAGE="https://github.com/asalkeld/libqb"
-SRC_URI="http://fedorahosted.org/releases/q/u/quarterback/${P}.tar.xz"
+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}
diff --git a/sys-cluster/libqb/libqb-1.0.1.ebuild b/sys-cluster/libqb/libqb-1.0.1.ebuild
index 748d05368bf3..55a12354c876 100644
--- a/sys-cluster/libqb/libqb-1.0.1.ebuild
+++ b/sys-cluster/libqb/libqb-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="debug doc examples static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/glib:2"
 DEPEND="${RDEPEND}
diff --git a/sys-cluster/libqb/libqb-1.0.5.ebuild b/sys-cluster/libqb/libqb-1.0.5.ebuild
new file mode 100644
index 000000000000..1b65743a9677
--- /dev/null
+++ b/sys-cluster/libqb/libqb-1.0.5.ebuild
@@ -0,0 +1,52 @@
+# 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/metadata.xml b/sys-cluster/libqb/metadata.xml
index 3b2c851443a0..492068d9c1f4 100644
--- a/sys-cluster/libqb/metadata.xml
+++ b/sys-cluster/libqb/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Cluster Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">asalkeld/libqb</remote-id>
+		<remote-id type="github">ClusterLabs/libqb</remote-id>
 	</upstream>
 </pkgmetadata>