gentoo (leap year) resync : 29.02.2020

3 files changed, 74 insertions, 4 deletions

diff --git a/sys-devel/sparse/Manifest b/sys-devel/sparse/Manifest
index 49c517b3f822..762d6a2320a8 100644
--- a/sys-devel/sparse/Manifest
+++ b/sys-devel/sparse/Manifest
@@ -2,8 +2,10 @@ AUX sparse-0.5.1-cmdline-include.patch 1886 BLAKE2B 328a414d8c24f02e682978b7b6fe
 DIST sparse-0.5.1.tar.xz 215144 BLAKE2B 209aa7cf34a9135dae38466a0ba41ff4fb888c363ed59a68a5820d4b6ef1636d717b8172a6d638d9dbc61197efb7a3e06ef85830b6f1c359737520b4b3aa0fbe SHA512 f7fc516ef8343a4153b9bda1b50b326dcd55a77fce5acccd9aa4c5636d6510573c7e26b0a7ca1df847082faf2be2d292336ad1cec855e395703a6b1e04d3a8a1
 DIST sparse-0.5.2-rc1.tar.gz 282810 BLAKE2B 74d06230ceb06dac427984c365223633ef795b2f6329c69da5183b9f3444457ee05d74b04b18cf400b4d813026a746218edbf9bc0b2aa371c8a3681ac10ce19b SHA512 b58458b97e91b7d02d032a946d9870a3fd227959608fb7847864ad1a92258aeb0461da513f4d6d3b37791ed8d5fc41ac01cfef0fcaf34b229090ff078672ef40
 DIST sparse-0.6.0.tar.xz 284668 BLAKE2B 9bb568fe23ac96d6e179e5c5927ff34e9fc88909d367f6ab49c8862a8e599df83602ba72bc42ba3bf63823b024340f101128c528ebf767f4e29da7f5324a1f40 SHA512 5c6c88f203c941bf0efd28802ef91641c96e7d4b4688a5176d091ff0fd6a650d9147e590b631602a8bd08994a35261977569367861a6d605ccdd25e4a07debf9
+DIST sparse-0.6.1.tar.xz 287880 BLAKE2B 026e7770460ab576b91e8c401c642e95269ddd7c90c0f855b0246448ca653b95a899b4bf647134c090c06c802757b6415dcc89bc214fb7ff124c2ce3888fccb0 SHA512 2faad9b3263f19f941cd6a5891960d2c7d1066c664d3ef68e722d461785aeed2d4a9539df3556bbd98c022e7ee965b8030c49272ab6003113ba3b36f73c00187
 EBUILD sparse-0.5.1.ebuild 1327 BLAKE2B c44384e5b672e5e83bee23d70c2b3b0fe31c6f399c3f40959416f38db7462876f3f969c80d21242dc5d795fc8f183f09b5fec500adb5b2e56b8d121accc69c35 SHA512 d47842a5115e1b92c16b69ff12e42e1b9373610a04aacf6fec6d41c4062fbd3d4f72e351f5265e82e25e14f665174fd98e0f082649a64566e15e084f432f4c84
 EBUILD sparse-0.5.2_rc1.ebuild 1403 BLAKE2B d2831df966b03a8fe9d1c2fa76a13e8157fa5c6450e55620d6076a9ea9babd7a5dd20ea1d27ee124c4a7aaefa0d255f0ba8e8de2442a0e549e65e84ac804380f SHA512 63463d63f25beb72ce5629c2edff0cfe06f910cdefcd49f5b28a6afc7c9d1ca5f2b0977d07a048071eea9ae5462da68eef6e3412dcafa334800d9e0ad84fb126
 EBUILD sparse-0.6.0.ebuild 1296 BLAKE2B 5ba61e5e9e8a1bcad1b11df3f8707555c4cb15bfea192c7b4192a0bd78e0ae3b38fdadb3aa96958b795e57bcbd4feb74c5fc467c01f7fa638d608cf33b8ce23c SHA512 35eb90b9d6316a7d19a64be1043658dcbcdebee0127aa3e82bb7a8ad46544b69700688eaf4a20a6082ac2be3ad77a67cf20034e023bd24d0a9a58aa3d62e5aab
-EBUILD sparse-9999.ebuild 1296 BLAKE2B 5ba61e5e9e8a1bcad1b11df3f8707555c4cb15bfea192c7b4192a0bd78e0ae3b38fdadb3aa96958b795e57bcbd4feb74c5fc467c01f7fa638d608cf33b8ce23c SHA512 35eb90b9d6316a7d19a64be1043658dcbcdebee0127aa3e82bb7a8ad46544b69700688eaf4a20a6082ac2be3ad77a67cf20034e023bd24d0a9a58aa3d62e5aab
+EBUILD sparse-0.6.1.ebuild 1330 BLAKE2B 3a12192b45f930ee4dd2a5f0c9dd3fe6aa506e2eb646cd1a5f543f7bdc805093be2567b43f79df3df713d75f00fe2bdc7157b308880aff5c472dabfc676f36cd SHA512 678d576cbe52849aa76e399837d8b9be37bfccbbd037a4282bcb3fdd7b182161780cd2f61d186d954d617b7d4d0dd505f29209073662c2d9fec6d0869d003ac8
+EBUILD sparse-9999.ebuild 1330 BLAKE2B 3a12192b45f930ee4dd2a5f0c9dd3fe6aa506e2eb646cd1a5f543f7bdc805093be2567b43f79df3df713d75f00fe2bdc7157b308880aff5c472dabfc676f36cd SHA512 678d576cbe52849aa76e399837d8b9be37bfccbbd037a4282bcb3fdd7b182161780cd2f61d186d954d617b7d4d0dd505f29209073662c2d9fec6d0869d003ac8
 MISC metadata.xml 636 BLAKE2B 48bac3e5bb329089c8923cfbdd0bd32efa8202c5f43a8179b044c70fdc1fcb73090b0765fe3d2b6e33fd0364f5ca25eec07aabd152dff21948074a2099c5367e SHA512 b46ed66da3644ecf4e2cdb6a0ecd9fd18e99cfb6aea1967acf1119d1f75c4907889a3fbcda76ef2d3c4b1617d718a946e5fb01e75db105d740a98c49430da859
diff --git a/sys-devel/sparse/sparse-0.6.1.ebuild b/sys-devel/sparse/sparse-0.6.1.ebuild
new file mode 100644
index 000000000000..8df52ef8a1e5
--- /dev/null
+++ b/sys-devel/sparse/sparse-0.6.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils llvm multilib 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"
+	KEYWORDS=""
+else
+	SRC_URI="https://www.kernel.org/pub/software/devel/${PN}/dist/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="gtk llvm test xml"
+RESTRICT="!test? ( test )"
+
+LLVM_MAX_SLOT=9
+
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
+	llvm? ( sys-devel/llvm:${LLVM_MAX_SLOT}= )
+	xml? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}
+	gtk? ( virtual/pkgconfig )
+	xml? ( virtual/pkgconfig )"
+
+_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_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 fa4c7a97fab9..8df52ef8a1e5 100644
--- a/sys-devel/sparse/sparse-9999.ebuild
+++ b/sys-devel/sparse/sparse-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils multilib toolchain-funcs
+inherit eutils llvm multilib toolchain-funcs
 
 DESCRIPTION="C semantic parser"
 HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
@@ -22,8 +22,10 @@ SLOT="0"
 IUSE="gtk llvm test xml"
 RESTRICT="!test? ( test )"
 
+LLVM_MAX_SLOT=9
+
 RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	llvm? ( >=sys-devel/llvm-3.0 )
+	llvm? ( sys-devel/llvm:${LLVM_MAX_SLOT}= )
 	xml? ( dev-libs/libxml2 )"
 DEPEND="${RDEPEND}
 	gtk? ( virtual/pkgconfig )