3 files changed, 97 insertions, 14 deletions
diff --git a/sys-devel/sparse/Manifest b/sys-devel/sparse/Manifest
index a8cfcdaa8193..46f34bcc25bc 100644
--- a/sys-devel/sparse/Manifest
+++ b/sys-devel/sparse/Manifest
@@ -1,7 +1,9 @@
 AUX sparse-0.5.1-cmdline-include.patch 1886 BLAKE2B 328a414d8c24f02e682978b7b6fef225519f5c5036ebb6f052dc930536ceb7232dfd45ccd158eaa712d2c4c1c622261969c24703bf4b69d6b625c0be4d397204 SHA512 d4267e94d7603b421a1df09869706114b5f81867ddd1d758b1dd251232f645e4a0c14df1d2bb993c78d14afaa699f84f7754b62fae19d1ccabe28571550d92f7
 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
 EBUILD sparse-0.5.1.ebuild 1292 BLAKE2B 548dd51d1c572e6a0aa775dbd30dbc70586d7c06d8dceb197f0d466a7c003ba091d0b9a9e6b777059fbcacec9ba40531d8b6e150dafbb434b0e99fef59e11cbd SHA512 fde8ddf89ffcb83d9827d133f9f6efedb4126ef8a8e77227d5e0e94710d238b5b64a078ded0e386219d5a4e2c7b90ba9edab856b3bef762ad35d5a36bb488d99
 EBUILD sparse-0.5.2_rc1.ebuild 1379 BLAKE2B ed99626abd55719915eb0dcc471840e201718b1b93c0f3f814a2d89dfa23a5149e060a14ed3670ab8877c36b368395e88e6ca1f3d648782b722399c77fe38009 SHA512 89ab151c9b25373b9ffda84092365f164467400a69c4defdad7829dfbc57996be67054f719728925fd5fe0f6d31038b38d625f34d937de3df8579d2e676c195f
-EBUILD sparse-9999.ebuild 1231 BLAKE2B 8a50ea0a7b11a2cdd9932098a70ca0c802764e1c1e42218ce1a856d17f7bba377baaf28cd948635bf3d11e573cfbea7443abecc2156144f5f6d98ed5f2b97e78 SHA512 069b2dc6db6225958ed3e7022244e2f242e00359b5538e2cbf02698016ba1f6df105649350462e30681fc0b78432e07a6f2a0d827e3307e69f26069073e489dd
+EBUILD sparse-0.6.0.ebuild 1258 BLAKE2B 1eab291902974025d40c19f9ec40ccc12c79520c6303c7e521266412fb609b875483b0154c15db21e6e5b57e73549a746af27112931b22eb1693fed3f5268caa SHA512 3c503fc1bb2da1f297e92cc17dc2373fd72fdffdc0be284a04c33669817f34b0123e28a47f908550d670ce8c8c7b2cac7ba32de74ba5c98c95e1daad29857533
+EBUILD sparse-9999.ebuild 1258 BLAKE2B 1eab291902974025d40c19f9ec40ccc12c79520c6303c7e521266412fb609b875483b0154c15db21e6e5b57e73549a746af27112931b22eb1693fed3f5268caa SHA512 3c503fc1bb2da1f297e92cc17dc2373fd72fdffdc0be284a04c33669817f34b0123e28a47f908550d670ce8c8c7b2cac7ba32de74ba5c98c95e1daad29857533
 MISC metadata.xml 636 BLAKE2B 48bac3e5bb329089c8923cfbdd0bd32efa8202c5f43a8179b044c70fdc1fcb73090b0765fe3d2b6e33fd0364f5ca25eec07aabd152dff21948074a2099c5367e SHA512 b46ed66da3644ecf4e2cdb6a0ecd9fd18e99cfb6aea1967acf1119d1f75c4907889a3fbcda76ef2d3c4b1617d718a946e5fb01e75db105d740a98c49430da859
diff --git a/sys-devel/sparse/sparse-0.6.0.ebuild b/sys-devel/sparse/sparse-0.6.0.ebuild
new file mode 100644
index 000000000000..41c95d2e55fe
--- /dev/null
+++ b/sys-devel/sparse/sparse-0.6.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils 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="mirror://kernel/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"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
+	llvm? ( >=sys-devel/llvm-3.0 )
+	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 43d03a624df2..41c95d2e55fe 100644
--- a/sys-devel/sparse/sparse-9999.ebuild
+++ b/sys-devel/sparse/sparse-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils multilib toolchain-funcs
 
@@ -28,18 +28,36 @@ DEPEND="${RDEPEND}
 	gtk? ( virtual/pkgconfig )
 	xml? ( virtual/pkgconfig )"
 
-src_prepare() {
-	tc-export AR CC PKG_CONFIG
-	sed -i \
-		-e '/^PREFIX=/s:=.*:=/usr:' \
-		-e "/^LIBDIR=/s:/lib:/$(get_libdir):" \
-		-e '/^COMMON_CFLAGS =/{s:=:= $(CPPFLAGS):;s:-O2 -finline-functions -fno-strict-aliasing -g:-fno-strict-aliasing:}' \
-		-e "s:pkg-config:${PKG_CONFIG}:" \
-		Makefile || die
-	export MAKEOPTS+=" V=1 AR=${AR} CC=${CC} HAVE_GTK2=$(usex gtk) HAVE_LLVM=$(usex llvm) HAVE_LIBXML=$(usex xml)"
-	default
+_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 $(usex test all all-installable)
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	_emake DESTDIR="${D}" install
+
+	dodoc FAQ README
 }