gentoo resync : 25.09.2021

4 files changed, 87 insertions, 12 deletions

diff --git a/sys-devel/sparse/Manifest b/sys-devel/sparse/Manifest
index 6aeb6472936d..395a4c2aa386 100644
--- a/sys-devel/sparse/Manifest
+++ b/sys-devel/sparse/Manifest
@@ -1,4 +1,6 @@
 DIST sparse-0.6.3.tar.xz 350676 BLAKE2B 5c8f54f3b7d2095df30b9a59a151e307ebedac5dbb6910ab5684b298c2b427e55dd43697e698fd289fb0d8e824ba4d72c2761772babb9f438e622f439ab3448d SHA512 33170065ea5967d7c640a7551acc78d7efee9f7aa6a9edf6afe2cdd8a04ea5cebe7b5dcdeebf791d384542b8bcdd4e818c75e7ae2e7aa4e1edbd56b68367b28f
-EBUILD sparse-0.6.3.ebuild 1419 BLAKE2B c9a7686c96484117a74f796a989f53842b3e6ca29b499606f691f95b212c699b80b8ef98ba0d6e50dae4d1f232b7667b86ad068025cff883817a689482c96837 SHA512 c0af873bb50d3637fdcd2d424bed611c3e4da8bd97bbc0c3e79419e76ae97626844cb607387d255e49c390e939d7de7095032c98863556468285248ac58a6b22
-EBUILD sparse-9999.ebuild 1419 BLAKE2B c9a7686c96484117a74f796a989f53842b3e6ca29b499606f691f95b212c699b80b8ef98ba0d6e50dae4d1f232b7667b86ad068025cff883817a689482c96837 SHA512 c0af873bb50d3637fdcd2d424bed611c3e4da8bd97bbc0c3e79419e76ae97626844cb607387d255e49c390e939d7de7095032c98863556468285248ac58a6b22
+DIST sparse-0.6.4.tar.xz 370840 BLAKE2B 4b21d26c87df65f08928438c311582a45f4cbbb5ed2bb399c3521d1e40630006d794b4f1e545693e82225f086968cf686c5bfb29059644a31812120f07caebe2 SHA512 4ada31e588469d15862579dd7eb926ce1ad717bf96d38d425b9153f2efe73949fdda5bc59d05d926614a08d70e656e4ff531a5f0a1cf8e7725c596dcdba169f9
+EBUILD sparse-0.6.3.ebuild 1410 BLAKE2B a5e87d572c849d53c00667753e2d0b291ca10a2f8a258e4bcaf5d42b110826b37ff2445e5d4fdff331b03c6d69dc4b99fc47f48d4836c4252e139ad815746c15 SHA512 33bc791fb336bb58a7a09046674d82983f2907e0b70d560ba1c58e376fbc869c8fcc7e81e6afda81da47b1d6d066f34356e4275b0deafcdc1c93f1d8723c2bf8
+EBUILD sparse-0.6.4.ebuild 1535 BLAKE2B d5bd38f9f55cbde8516198b94f636bb3e2d1122a93de3629fca5f5a65980a33e64d48938c4ac392516c7711c0c72051cf1363a09ad50b661f1bb884e8d6a3d29 SHA512 9059e3219f0489887335e4045974118962a737d487a930a8e2dec6c6fab382854cd37241649056fd0acd6712650519e0786e340aa9e7c20c36701266fd9d608f
+EBUILD sparse-9999.ebuild 1535 BLAKE2B d5bd38f9f55cbde8516198b94f636bb3e2d1122a93de3629fca5f5a65980a33e64d48938c4ac392516c7711c0c72051cf1363a09ad50b661f1bb884e8d6a3d29 SHA512 9059e3219f0489887335e4045974118962a737d487a930a8e2dec6c6fab382854cd37241649056fd0acd6712650519e0786e340aa9e7c20c36701266fd9d608f
 MISC metadata.xml 637 BLAKE2B e33b84c487b6ca16c65c0df9419fcc884df2eb8093af0996cc2d3973a3408a37cdea26a76b9c0217c52798fd0fb8a11d4b8158fe4f7e3c8303af8abc4fb92680 SHA512 a2ee75927fab2cdbf79389bc1790683120a6c419ff529f806a747ad99a7ce1481c2434dafc39b3fef57a6e0d964580d113817dbe656ba1307a42de24ea4228d2
diff --git a/sys-devel/sparse/sparse-0.6.3.ebuild b/sys-devel/sparse/sparse-0.6.3.ebuild
index 0fcda7847330..0c2099d4c278 100644
--- a/sys-devel/sparse/sparse-0.6.3.ebuild
+++ b/sys-devel/sparse/sparse-0.6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit llvm multilib toolchain-funcs
+inherit llvm toolchain-funcs
 
 DESCRIPTION="C semantic parser"
 HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
diff --git a/sys-devel/sparse/sparse-0.6.4.ebuild b/sys-devel/sparse/sparse-0.6.4.ebuild
new file mode 100644
index 000000000000..6fbcc28e1552
--- /dev/null
+++ b/sys-devel/sparse/sparse-0.6.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LLVM_MAX_SLOT=12
+inherit llvm toolchain-funcs
+
+DESCRIPTION="C semantic parser"
+HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git"
+else
+	SRC_URI="https://www.kernel.org/pub/software/devel/${PN}/dist/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="gtk llvm sqlite test xml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
+	llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
+	sqlite? ( dev-db/sqlite:= )
+	xml? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="gtk? ( virtual/pkgconfig )
+	xml? ( virtual/pkgconfig )"
+
+llvm_check_deps() {
+	has_version "sys-devel/llvm:${LLVM_SLOT}" && \
+		has_version -r "sys-devel/llvm:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	use llvm && llvm_pkg_setup
+}
+
+_emake() {
+	# Makefile does not allow for an easy override of flags.
+	# Collect them here and override default phases.
+	emake \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC)" \
+		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" \
+		"$@"
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	_emake DESTDIR="${D}" install
+
+	dodoc FAQ README
+}
diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-9999.ebuild
index 0fcda7847330..6fbcc28e1552 100644
--- a/sys-devel/sparse/sparse-9999.ebuild
+++ b/sys-devel/sparse/sparse-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-inherit llvm multilib toolchain-funcs
+LLVM_MAX_SLOT=12
+inherit llvm toolchain-funcs
 
 DESCRIPTION="C semantic parser"
 HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
@@ -21,16 +22,19 @@ 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_SLOT}" && \
+		has_version -r "sys-devel/llvm:${LLVM_SLOT}"
+}
+
 pkg_setup() {
 	use llvm && llvm_pkg_setup
 }
@@ -44,15 +48,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" \
-		\
 		"$@"
 }