gentoo resync : 29.12.2022

4 files changed, 10 insertions, 79 deletions

diff --git a/sys-devel/smatch/Manifest b/sys-devel/smatch/Manifest
index 45b63bdb8baa..6bdc2fabe20f 100644
--- a/sys-devel/smatch/Manifest
+++ b/sys-devel/smatch/Manifest
@@ -1,6 +1,4 @@
-DIST smatch-1.60.tar.gz 558479 BLAKE2B d5e564c32e33dc38847f9a258b4b47285f190652181db9b8850c832c0cf4d8a3302d989a7b42592e73a713927a29565565e83a9be1b0a5c9d10869fce278a0be SHA512 2920c9d4c500db36cfa60db5be70d157ed16abd729279462faef6f79e0756bd017ec91b8f857d19fdebd8a9d709b0555635700a2864cf0a84daa61cf2ca3eecd
 DIST smatch-1.72.tar.gz 1431923 BLAKE2B ec4119fce985876afc9a46a74a0a56e8e8cb271a964c16496972c59ade95aa3d2df3a839a819e31cb081ca8a3b1f6bf6934ec97d73209091cfd86c87c1433557 SHA512 6d12e9ba85f332fcc56657296596e811cf3b75d4ad37007e07feb31baa4b315732361915972a2139ae13f75b8a73f953488ceb9de41529db9e84c81fb6fde77e
-EBUILD smatch-1.60.ebuild 1351 BLAKE2B 9bddaa32f49c3f592f50d113e894fcffa09ff844c304faf08940dbf7fbbb8b98b91de596c0be8c08eb7a7409ba4e2624d7f546315d58923885303b8b16130d96 SHA512 166f6443cf3444521dbf1d69317dff217007dd8a16babda249be67a1cf14435dffe875a67e1d6ec6dc3ca85ce60d9e955291503d786f3626c18ed024008c8956
-EBUILD smatch-1.72.ebuild 1345 BLAKE2B 133ac9c1bd10316c312f2c5bdde43760401d4832e7faca97e57e0e941565f2a5bdf2d44265092e87b35876b8ce02c0842bd39226ec0be232e3944d8dca735f9c SHA512 334864ae52edbe07d6dc87b14a58ff32ed8545d2e11f97cbcddb553e9b5d091a3ecfea0bcf91ce64afade6b265f0c4a9df632fb0c71aa4e512fb56e8b4eb977a
-EBUILD smatch-9999.ebuild 1345 BLAKE2B 133ac9c1bd10316c312f2c5bdde43760401d4832e7faca97e57e0e941565f2a5bdf2d44265092e87b35876b8ce02c0842bd39226ec0be232e3944d8dca735f9c SHA512 334864ae52edbe07d6dc87b14a58ff32ed8545d2e11f97cbcddb553e9b5d091a3ecfea0bcf91ce64afade6b265f0c4a9df632fb0c71aa4e512fb56e8b4eb977a
+EBUILD smatch-1.72.ebuild 1368 BLAKE2B af9b479197ff846613fd9aba64047ee623d268aabb9740a1ff1de58c059efbbd966132bdbee5c741aa4139ba5cc7b0d05a352ed3ae97e3c5c773632ca610d515 SHA512 45c845be7593383cf4d1592acda05f075299f6763be87d5d398417203afde2e7f0cd330ca77ce279631cdbe7f62e91679f5ad21ed19f57b6ef8e39b671569744
+EBUILD smatch-9999.ebuild 1368 BLAKE2B af9b479197ff846613fd9aba64047ee623d268aabb9740a1ff1de58c059efbbd966132bdbee5c741aa4139ba5cc7b0d05a352ed3ae97e3c5c773632ca610d515 SHA512 45c845be7593383cf4d1592acda05f075299f6763be87d5d398417203afde2e7f0cd330ca77ce279631cdbe7f62e91679f5ad21ed19f57b6ef8e39b671569744
 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
deleted file mode 100644
index 04dfbb1b49ac..000000000000
--- a/sys-devel/smatch/smatch-1.60.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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="https://repo.or.cz/${PN}.git
-		https://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"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-	S=${WORKDIR}/${PN}
-fi
-
-DESCRIPTION="Static analysis tool for C"
-HOMEPAGE="http://smatch.sourceforge.net/"
-
-LICENSE="OSL-1.1"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-db/sqlite"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/${P}-7a4fdad
-
-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-1.72.ebuild b/sys-devel/smatch/smatch-1.72.ebuild
index 9006835c81bb..adff98d916f1 100644
--- a/sys-devel/smatch/smatch-1.72.ebuild
+++ b/sys-devel/smatch/smatch-1.72.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://repo.or.cz/${PN}.git
 		https://repo.or.cz/r/${PN}.git"
 	inherit git-r3
@@ -20,7 +20,8 @@ fi
 DESCRIPTION="Static analysis tool for C"
 HOMEPAGE="http://smatch.sourceforge.net/"
 
-LICENSE="OSL-1.1"
+# bug #853733
+LICENSE="GPL-2+ MIT OSL-1.1"
 SLOT="0"
 
 RDEPEND="dev-db/sqlite"
diff --git a/sys-devel/smatch/smatch-9999.ebuild b/sys-devel/smatch/smatch-9999.ebuild
index 9006835c81bb..adff98d916f1 100644
--- a/sys-devel/smatch/smatch-9999.ebuild
+++ b/sys-devel/smatch/smatch-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://repo.or.cz/${PN}.git
 		https://repo.or.cz/r/${PN}.git"
 	inherit git-r3
@@ -20,7 +20,8 @@ fi
 DESCRIPTION="Static analysis tool for C"
 HOMEPAGE="http://smatch.sourceforge.net/"
 
-LICENSE="OSL-1.1"
+# bug #853733
+LICENSE="GPL-2+ MIT OSL-1.1"
 SLOT="0"
 
 RDEPEND="dev-db/sqlite"