commit: c5ea3c2cc75ac22165cd80e75298a75b30031294 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Sep 19 02:15:23 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Sep 19 02:24:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ea3c2c
sys-devel/sparse: add 0.6.4 Closes: https://bugs.gentoo.org/812551 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-devel/sparse/Manifest | 1 + .../sparse/{sparse-9999.ebuild => sparse-0.6.4.ebuild} | 18 ++++++++++-------- sys-devel/sparse/sparse-9999.ebuild | 18 ++++++++++-------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/sys-devel/sparse/Manifest b/sys-devel/sparse/Manifest index a706e2ac3fc..7c1cf179d14 100644 --- a/sys-devel/sparse/Manifest +++ b/sys-devel/sparse/Manifest @@ -1 +1,2 @@ DIST sparse-0.6.3.tar.xz 350676 BLAKE2B 5c8f54f3b7d2095df30b9a59a151e307ebedac5dbb6910ab5684b298c2b427e55dd43697e698fd289fb0d8e824ba4d72c2761772babb9f438e622f439ab3448d SHA512 33170065ea5967d7c640a7551acc78d7efee9f7aa6a9edf6afe2cdd8a04ea5cebe7b5dcdeebf791d384542b8bcdd4e818c75e7ae2e7aa4e1edbd56b68367b28f +DIST sparse-0.6.4.tar.xz 370840 BLAKE2B 4b21d26c87df65f08928438c311582a45f4cbbb5ed2bb399c3521d1e40630006d794b4f1e545693e82225f086968cf686c5bfb29059644a31812120f07caebe2 SHA512 4ada31e588469d15862579dd7eb926ce1ad717bf96d38d425b9153f2efe73949fdda5bc59d05d926614a08d70e656e4ff531a5f0a1cf8e7725c596dcdba169f9 diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-0.6.4.ebuild similarity index 80% copy from sys-devel/sparse/sparse-9999.ebuild copy to sys-devel/sparse/sparse-0.6.4.ebuild index 0fcda784733..3304272807e 100644 --- a/sys-devel/sparse/sparse-9999.ebuild +++ b/sys-devel/sparse/sparse-0.6.4.ebuild @@ -3,6 +3,7 @@ EAPI=7 +LLVM_MAX_SLOT=12 inherit llvm multilib toolchain-funcs DESCRIPTION="C semantic parser" @@ -21,16 +22,20 @@ SLOT="0" IUSE="gtk llvm sqlite test xml" RESTRICT="!test? ( test )" -LLVM_MAX_SLOT=10 - RDEPEND="gtk? ( x11-libs/gtk+:2 ) - llvm? ( sys-devel/llvm:${LLVM_MAX_SLOT}= ) + llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= ) sqlite? ( dev-db/sqlite:= ) xml? ( dev-libs/libxml2 )" -DEPEND="${RDEPEND} - gtk? ( virtual/pkgconfig ) +DEPEND="${RDEPEND}" +BDEPEND="gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig )" +llvm_check_deps() { + has_version "sys-devel/llvm:${LLVM_MAX_SLOT}" || \ + has_version "sys-devel/llvm:$((${LLVM_MAX_SLOT} - 1))" \ + has_version "sys-devel/llvm:$((${LLVM_MAX_SLOT} - 2))" +} + pkg_setup() { use llvm && llvm_pkg_setup } @@ -44,15 +49,12 @@ _emake() { AR="$(tc-getAR)" \ CFLAGS="${CFLAGS}" \ PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - \ HAVE_GTK=$(usex gtk) \ HAVE_LLVM=$(usex llvm) \ HAVE_SQLITE=$(usex sqlite) \ HAVE_LIBXML=$(usex xml) \ - \ V=1 \ PREFIX="${EPREFIX}/usr" \ - \ "$@" } diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-9999.ebuild index 0fcda784733..3304272807e 100644 --- a/sys-devel/sparse/sparse-9999.ebuild +++ b/sys-devel/sparse/sparse-9999.ebuild @@ -3,6 +3,7 @@ EAPI=7 +LLVM_MAX_SLOT=12 inherit llvm multilib toolchain-funcs DESCRIPTION="C semantic parser" @@ -21,16 +22,20 @@ SLOT="0" IUSE="gtk llvm sqlite test xml" RESTRICT="!test? ( test )" -LLVM_MAX_SLOT=10 - RDEPEND="gtk? ( x11-libs/gtk+:2 ) - llvm? ( sys-devel/llvm:${LLVM_MAX_SLOT}= ) + llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= ) sqlite? ( dev-db/sqlite:= ) xml? ( dev-libs/libxml2 )" -DEPEND="${RDEPEND} - gtk? ( virtual/pkgconfig ) +DEPEND="${RDEPEND}" +BDEPEND="gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig )" +llvm_check_deps() { + has_version "sys-devel/llvm:${LLVM_MAX_SLOT}" || \ + has_version "sys-devel/llvm:$((${LLVM_MAX_SLOT} - 1))" \ + has_version "sys-devel/llvm:$((${LLVM_MAX_SLOT} - 2))" +} + pkg_setup() { use llvm && llvm_pkg_setup } @@ -44,15 +49,12 @@ _emake() { AR="$(tc-getAR)" \ CFLAGS="${CFLAGS}" \ PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - \ HAVE_GTK=$(usex gtk) \ HAVE_LLVM=$(usex llvm) \ HAVE_SQLITE=$(usex sqlite) \ HAVE_LIBXML=$(usex xml) \ - \ V=1 \ PREFIX="${EPREFIX}/usr" \ - \ "$@" }
