gentoo resync : 22.01.2021

3 files changed, 2 insertions, 49 deletions

diff --git a/dev-util/splint/Manifest b/dev-util/splint/Manifest
index b4c42def730b..f0909e36b25d 100644
--- a/dev-util/splint/Manifest
+++ b/dev-util/splint/Manifest
@@ -1,5 +1,4 @@
 AUX splint-3.1.2-musl.patch 232 BLAKE2B 1d802cba805a993ccec83b2beeefba3f7971fe31d4c20f03082538aa47ff3614fa8c270a6011c21745c85ad9325884d7447446dcc415995909bcedf1fcf10f9d SHA512 4e74cd5181848c3babf3a6d6687eb6d274be1549f26b7817b2c3fa4c0cee048c841d71a28931ae4db21c0c67154cff536218e7ace6d6e5ba4c7eccb7a800790f
 DIST splint-3.1.2.src.tgz 2284033 BLAKE2B b071092ddb82be76734e00cdc8f96b697c20d0beaeba921b74464ac0b1f727c396f8f15845cf8c6c20011186e4da00199411545e0e167fcb9ce4ef2b27efa975 SHA512 9bbf3f6575763c022940efde947f845f52095a1bcf645f7f4a98feb335b62d2bd50d78420e7fe95f81eb139b110d8fe48112b025deace45f7994360b20d47e0b
-EBUILD splint-3.1.2-r1.ebuild 1002 BLAKE2B 1245ae2889260c419c4438d5ae4782b46eee20b9955a9674b18b95e299ec050cee320aabf0b9c5edfea80ae5c9e0ce95122a7fdbd02e2e8c92da360ac20e9db7 SHA512 630a9f75a98652afee95b89ad820a02dd43808594fb90a011247e14d0ca4f53fc3555b84dcf4577c3384688a76682997b7122c613fed182577c84b0b5e1e3502
-EBUILD splint-3.1.2-r2.ebuild 1090 BLAKE2B 54cc2a4d65857d67e661409cbe20633d9e2b16b5fa8e278bec6bf1c6c828bb5d16f5cf9b51da43c3b4639ed762513cb984a1184aa5621da56bbc1bd4f9c3e5cc SHA512 e7e65c12b63698a63a10ab1e3ae3edf9fdd38af54319e5b8b023be307b9c6889c13e42cda6fed6f133686fc002b5de9c043fb511416f18fc6c3681499e407943
+EBUILD splint-3.1.2-r2.ebuild 1087 BLAKE2B 189e6a4cd1a1ffc4d9fe2d70e5c46448d292d0e25f5875f4b50b27b9921945bf0953b56b60aa81364015f0e23ad7f7bc1dfc8c08027d41b4e9b1c8f916aa9af3 SHA512 c433e0b8157232f023afd3e914f38adcb905d662538c52279fb96e486cbaee061ec4c94631e3ad57390f5dae26160695444a0d239ab1dd774af55db377b08309
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/splint/splint-3.1.2-r1.ebuild b/dev-util/splint/splint-3.1.2-r1.ebuild
deleted file mode 100644
index 8607d4e30a59..000000000000
--- a/dev-util/splint/splint-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools
-
-DESCRIPTION="Check C programs for vulnerabilities and programming mistakes"
-HOMEPAGE="http://lclint.cs.virginia.edu/"
-SRC_URI="http://www.splint.org/downloads/${P}.src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
-
-DEPEND="
-	sys-devel/flex
-"
-
-src_prepare() {
-	# verbose compiler calls
-	sed -i -e '/Compiling/d' src/Makefile.am || die
-	# automake complains about trailing \
-	sed -i -e '1600d' test/Makefile.am || die
-	# do not install these header files twice
-	sed -i -e '/\$(UnixHeaders)/s|stdio.h stdlib.h||g' lib/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# We do not need bison/yacc at all here
-	# We definitely need libfl
-	BISON=no LEXLIB=-lfl econf
-}
-
-src_compile() {
-	local subdir
-	# skip test/ subdir
-	for subdir in src lib imports doc; do
-		emake -j1 -C ${subdir}
-	done
-}
-
-src_test() {
-	emake -C test
-}
diff --git a/dev-util/splint/splint-3.1.2-r2.ebuild b/dev-util/splint/splint-3.1.2-r2.ebuild
index 3ce9e0034e4a..b47c46e8e141 100644
--- a/dev-util/splint/splint-3.1.2-r2.ebuild
+++ b/dev-util/splint/splint-3.1.2-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.splint.org/downloads/${P}.src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~x64-macos"
 
 DEPEND="
 	sys-devel/flex