From 804fdd99eb85e39b9a97651f12f64102f074ab29 Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 2 Apr 2021 05:53:14 +0100 Subject: [PATCH] dev-libs/squareball: EAPI 7, eutils--, ltprune-- Signed-off-by: Sam James --- dev-libs/squareball/squareball-0.2.0.ebuild | 27 ++++++++------------- dev-libs/squareball/squareball-9999.ebuild | 27 ++++++++------------- 2 files changed, 20 insertions(+), 34 deletions(-) diff --git a/dev-libs/squareball/squareball-0.2.0.ebuild b/dev-libs/squareball/squareball-0.2.0.ebuild index aeb29384561f1..f66cb329826cb 100644 --- a/dev-libs/squareball/squareball-0.2.0.ebuild +++ b/dev-libs/squareball/squareball-0.2.0.ebuild @@ -1,22 +1,17 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git" - inherit git-r3 autotools + inherit autotools git-r3 fi -inherit eutils ltprune - DESCRIPTION="A general-purpose library for C99" HOMEPAGE="https://github.com/rafaelmartins/squareball" - -SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.xz" -if [[ ${PV} = *9999* ]]; then - SRC_URI="" -else +if ! [[ ${PV} = *9999* ]]; then + SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~x86" fi @@ -25,14 +20,11 @@ SLOT="0" IUSE="doc test static-libs" RESTRICT="!test? ( test )" -RDEPEND="" - -DEPEND=" +BDEPEND=" virtual/pkgconfig - test? ( - dev-util/cmocka ) - doc? ( - app-doc/doxygen )" + doc? ( app-doc/doxygen ) +" +DEPEND="test? ( dev-util/cmocka )" src_prepare() { [[ ${PV} = *9999* ]] && eautoreconf @@ -55,5 +47,6 @@ src_compile() { src_install() { use doc && HTML_DOCS=( doc/build/html/* ) default - prune_libtool_files --all + + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/squareball/squareball-9999.ebuild b/dev-libs/squareball/squareball-9999.ebuild index aeb29384561f1..28dcbab67e2f6 100644 --- a/dev-libs/squareball/squareball-9999.ebuild +++ b/dev-libs/squareball/squareball-9999.ebuild @@ -1,22 +1,17 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git" - inherit git-r3 autotools + inherit autotools git-r3 fi -inherit eutils ltprune - DESCRIPTION="A general-purpose library for C99" HOMEPAGE="https://github.com/rafaelmartins/squareball" - -SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.xz" -if [[ ${PV} = *9999* ]]; then - SRC_URI="" -else +if [[ ${PV} != *9999* ]]; then + SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~x86" fi @@ -25,14 +20,11 @@ SLOT="0" IUSE="doc test static-libs" RESTRICT="!test? ( test )" -RDEPEND="" - -DEPEND=" +BDEPEND=" virtual/pkgconfig - test? ( - dev-util/cmocka ) - doc? ( - app-doc/doxygen )" + doc? ( app-doc/doxygen ) +" +DEPEND="test? ( dev-util/cmocka )" src_prepare() { [[ ${PV} = *9999* ]] && eautoreconf @@ -55,5 +47,6 @@ src_compile() { src_install() { use doc && HTML_DOCS=( doc/build/html/* ) default - prune_libtool_files --all + + find "${ED}" -name '*.la' -delete || die }