From 85b450067aacc1e3906d4b3c7dc63dfc6c474e77 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Wed, 5 May 2021 04:29:24 -0500 Subject: [PATCH] sys-cluster/libqb-1.0.1: eapi 7 Bug: https://bugs.gentoo.org/786369 --- sys-cluster/libqb/Manifest | 6 +-- sys-cluster/libqb/libqb-0.17.1.ebuild | 51 ------------------- sys-cluster/libqb/libqb-0.17.2.ebuild | 51 ------------------- ...bqb-1.0.1.ebuild => libqb-1.0.1-r1.ebuild} | 34 ++++++++----- 4 files changed, 23 insertions(+), 119 deletions(-) delete mode 100644 sys-cluster/libqb/libqb-0.17.1.ebuild delete mode 100644 sys-cluster/libqb/libqb-0.17.2.ebuild rename sys-cluster/libqb/{libqb-1.0.1.ebuild => libqb-1.0.1-r1.ebuild} (66%) diff --git a/sys-cluster/libqb/Manifest b/sys-cluster/libqb/Manifest index b77c650..553c6b7 100644 --- a/sys-cluster/libqb/Manifest +++ b/sys-cluster/libqb/Manifest @@ -1,7 +1,3 @@ -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 +EBUILD libqb-1.0.1-r1.ebuild 1196 BLAKE2B 180dd96a7f094491a13f6b53bf9b7cf17f5b5e014f346fafcfeb25bf2e75fa57e6927b9486c2656092f2643a4f5d62243df90e00dd54b0e672a8d650810e3375 SHA512 4a4879c9c667178d9df9f34529082b4daf569f9c72293fc52a02f3730c85f895b1c0f45572dd3140b568b072c5a6781813f64cfa6a87bc975ebbe7b286ed1293 MISC metadata.xml 336 BLAKE2B bfb9a7bc9f1619b2605c7e6ca503e06cd0ccbcdef1dcea10f6f8e8fa524ccb3df4a230b000f6b7eb869d2eab92cec6a385e7d2c482bc612289a0b0b9e72875c4 SHA512 7138793800d1d53f31019dcd56eb8d44a0442dc25733a777931af10846f0a61488d3e30f2ba7b5540380e1ddb4d7fdc44eaa39c126ed005b8bde7ef75b2b495e 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 b79bf5d..0000000 --- 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 deleted file mode 100644 index 8b80054..0000000 --- a/sys-cluster/libqb/libqb-0.17.2.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 ppc ppc64 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-1.0.1.ebuild b/sys-cluster/libqb/libqb-1.0.1-r1.ebuild similarity index 66% rename from sys-cluster/libqb/libqb-1.0.1.ebuild rename to sys-cluster/libqb/libqb-1.0.1-r1.ebuild index 748d053..d244b29 100644 --- a/sys-cluster/libqb/libqb-1.0.1.ebuild +++ b/sys-cluster/libqb/libqb-1.0.1-r1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 AUTOTOOLS_AUTORECONF=1 -inherit autotools-utils +inherit autotools DESCRIPTION="Library providing high performance logging, tracing, ipc, and poll" HOMEPAGE="https://github.com/ClusterLabs/libqb" @@ -25,27 +25,37 @@ DEPEND="${RDEPEND} DOCS=(README.markdown ChangeLog) src_prepare() { + default + + # Skip installation of text documents without value sed -e '/dist_doc_DATA/d' -i Makefile.am || die - autotools-utils_src_prepare + + # Do not append version suffix "-yank" + sed 's|1-yank|1|' -i configure.ac || die + + eautoreconf } src_configure() { - local myeconfargs=( + econf \ $(use_enable debug) - ) - autotools-utils_src_configure } src_compile() { - autotools-utils_src_compile - use doc && autotools-utils_src_compile doxygen + default + use doc && emake doxygen } src_install() { - use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/docs/html/") - autotools-utils_src_install + emake install DESTDIR="${D}" + if use examples ; then - insinto /usr/share/doc/${PF}/examples - doins examples/*.c + docinto examples + dodoc examples/*.c fi + + use doc && HTML_DOCS=("docs/html/.") + einstalldocs + + find "${D}" -name '*.la' -delete || die }