gentoo resync : 25.09.2021

4 files changed, 81 insertions, 9 deletions

diff --git a/sys-devel/smatch/Manifest b/sys-devel/smatch/Manifest
index 3b32718845b2..82cef4b41546 100644
--- a/sys-devel/smatch/Manifest
+++ b/sys-devel/smatch/Manifest
@@ -1,4 +1,6 @@
 DIST smatch-1.60.tar.gz 558479 BLAKE2B d5e564c32e33dc38847f9a258b4b47285f190652181db9b8850c832c0cf4d8a3302d989a7b42592e73a713927a29565565e83a9be1b0a5c9d10869fce278a0be SHA512 2920c9d4c500db36cfa60db5be70d157ed16abd729279462faef6f79e0756bd017ec91b8f857d19fdebd8a9d709b0555635700a2864cf0a84daa61cf2ca3eecd
-EBUILD smatch-1.60.ebuild 1348 BLAKE2B f0e1768ab5130967d8c75237f92f84a1ff7268e100bd74717c6ef16ece2bf9851bfd9a2a6526d33ba84109326e023595deb2673ff7c53b534c7398f4695ffc91 SHA512 3678290ac0da569f9bcc208b8b9fc951bafa680718e9099f2bb4df7e180d52f031b82d1a93952fe9454438af9547157c60afee942296435c174ac6b2cad4ec3f
-EBUILD smatch-9999.ebuild 1293 BLAKE2B 6627304cd071518654a9cddc1fa8784143941141218762c317dbb762e330d5892f6c219a4b3ad04037c081eee7cef44588ae736552b68637388110ec3d20c138 SHA512 78a7b402bbb94e8f57617e05e31b4416c2aa2c0c773fbd7daa86a7377d1a99404d60d6c3175504fe70e04f457cce71a92a1b6296dc45a80c457ecc4bd3842018
+DIST smatch-1.72.tar.gz 1431923 BLAKE2B ec4119fce985876afc9a46a74a0a56e8e8cb271a964c16496972c59ade95aa3d2df3a839a819e31cb081ca8a3b1f6bf6934ec97d73209091cfd86c87c1433557 SHA512 6d12e9ba85f332fcc56657296596e811cf3b75d4ad37007e07feb31baa4b315732361915972a2139ae13f75b8a73f953488ceb9de41529db9e84c81fb6fde77e
+EBUILD smatch-1.60.ebuild 1348 BLAKE2B f0269b8ecea230ac142052d84f73f026109e68c80a24ccb361a5f9623ab8fca396f74aa293fa93853093aa259b30239e8c15e3bc78a2c1bb34a46cad634062dd SHA512 12f44adb87283108a36f7803cd113e5def9aa5f878fe3367c2ba89dcfa418a4573cf8acf55fa59c5c7d00c22ac6b7566c0f964fbc3c8398417dd8c496af88288
+EBUILD smatch-1.72.ebuild 1342 BLAKE2B bb0e6d6d68b3d8a2d0cac1e6391378ed0e9d9bdb0e4e97269ca91078995d85a64e2bf405ce50ec525d8e23a87ff53e1278f4b1831183d983a35b2713b8850524 SHA512 5b98e177e11f7088d517561a6b39b331cf2967a6a93a74300918e07fe9ac9c81d8064c2fdebf672276999b84bf8aef163e0a12e0a4afe37180e3c09fe901c639
+EBUILD smatch-9999.ebuild 1342 BLAKE2B bb0e6d6d68b3d8a2d0cac1e6391378ed0e9d9bdb0e4e97269ca91078995d85a64e2bf405ce50ec525d8e23a87ff53e1278f4b1831183d983a35b2713b8850524 SHA512 5b98e177e11f7088d517561a6b39b331cf2967a6a93a74300918e07fe9ac9c81d8064c2fdebf672276999b84bf8aef163e0a12e0a4afe37180e3c09fe901c639
 MISC metadata.xml 338 BLAKE2B c4bb073c88d842934dd0574360a70707c86b4a484b6b7f57464919a6e53389c5090ed4fcf757c0ade3c3030e9f91505181f0ee2020d9956090fc075e22674593 SHA512 1b0c36ac40b06b6f5cd562925f29fbcbaff1b2cb2691345146705da186932dc5908aab29c2cd773d624cd29e51fd75c2729dfbcfd26762c30a6879af7e3fe488
diff --git a/sys-devel/smatch/smatch-1.60.ebuild b/sys-devel/smatch/smatch-1.60.ebuild
index 9423f1d108f6..4a6c5f79460c 100644
--- a/sys-devel/smatch/smatch-1.60.ebuild
+++ b/sys-devel/smatch/smatch-1.60.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ else
 	S=${WORKDIR}/${PN}
 fi
 
-DESCRIPTION="static analysis tool for C"
+DESCRIPTION="Static analysis tool for C"
 HOMEPAGE="http://smatch.sourceforge.net/"
 
 LICENSE="OSL-1.1"
diff --git a/sys-devel/smatch/smatch-1.72.ebuild b/sys-devel/smatch/smatch-1.72.ebuild
new file mode 100644
index 000000000000..cb53b5afd462
--- /dev/null
+++ b/sys-devel/smatch/smatch-1.72.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
+		http://repo.or.cz/r/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz
+		mirror://gentoo/${P}.tar.gz"
+	# Update on bumps
+	S="${WORKDIR}"/${P}-7f4b936
+
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Static analysis tool for C"
+HOMEPAGE="http://smatch.sourceforge.net/"
+
+LICENSE="OSL-1.1"
+SLOT="0"
+
+RDEPEND="dev-db/sqlite"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \
+		-e 's:pkg-config:$(PKG_CONFIG):' \
+		Makefile || die
+}
+
+_emake() {
+	# gtk/llvm/xml is used by sparse which we don't install
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		V=1 \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		LD='$(CC)' \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		HAVE_GTK2=no \
+		HAVE_LLVM=no \
+		HAVE_LIBXML=no \
+		"$@"
+}
+
+src_compile() {
+	_emake smatch
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	# default install target installs a lot of sparse cruft
+	dobin smatch
+	insinto /usr/share/smatch/smatch_data
+	doins smatch_data/*
+	dodoc FAQ README
+}
diff --git a/sys-devel/smatch/smatch-9999.ebuild b/sys-devel/smatch/smatch-9999.ebuild
index 8ba49a55ed46..cb53b5afd462 100644
--- a/sys-devel/smatch/smatch-9999.ebuild
+++ b/sys-devel/smatch/smatch-9999.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
+		http://repo.or.cz/r/${PN}.git"
 	inherit git-r3
-	EGIT_REPO_URI="https://repo.or.cz/r/${PN}.git"
 else
 	SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz
 		mirror://gentoo/${P}.tar.gz"
+	# Update on bumps
+	S="${WORKDIR}"/${P}-7f4b936
+
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-	S=${WORKDIR}/${PN}
 fi
 
-DESCRIPTION="static analysis tool for C"
+DESCRIPTION="Static analysis tool for C"
 HOMEPAGE="http://smatch.sourceforge.net/"
 
 LICENSE="OSL-1.1"
 SLOT="0"
-IUSE=""
 
 RDEPEND="dev-db/sqlite"
 DEPEND="${RDEPEND}"