gentoo christmass resync : 25.12.2020

3 files changed, 2 insertions, 42 deletions

diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index 0db340b79cf3..a99e2b16532f 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -1,6 +1,4 @@
 AUX libsmi-0.4.8-CVE-2010-2891.patch 476 BLAKE2B d93f008527b01c2f9d1fed934c886328c5f0e167a68f38d68a170809a63b63439ca99b0e23e6f3b548cb99a518651e93236072de300001c453a5de6f23059709 SHA512 e4e1f8f0e598656785123241cc8aabc948058229cd955ecf651dcb49332e9e35fc4c9831a6336e949e557e18e2af58bd8aa8f31b25628f32b35ced3972fa184f
-DIST libsmi-0.4.8.tar.gz 4104111 BLAKE2B af7fe812d8dd6cbd538fbb9d5671f9478b6c3bf4b251eb0729142f56aacc87fd8aa38927f92ebb4f546069e81391e85be338fec92979cd462efe614e16220754 SHA512 c4f5f30c9fbf26c2e0d87e29783794014a518a7494c17112b1970b5434c698d06ffd529ea58eb7856a0f86a30f1059aaf49d4fbdf39db971d9114d427d8a1863
 DIST libsmi-0.5.0.tar.gz 4798883 BLAKE2B 37e9b0160f131db52fb68bd0b3eb0555b1cfb588aefb8e094fc50eec28b31f315907cd602f262d9f6c1ef887de148350da4747e0587b5518dac7376981fc12ae SHA512 be82e6b7054426e4634ac9d90467b89a51a9c836273c9d516f07ff3cec3a8dcc8b3bb0e0396d5facec3d9c952b17fb67f24ff2d3959e7e5cf9eced72023a0708
-EBUILD libsmi-0.4.8-r1.ebuild 989 BLAKE2B c0e313ce7f28a9f4bd7154a65ca5a595b8ecb22bd90e4c8e13661813acc257fee594fb737aabed99b1b3cf231e5172177ef4b3e6f487aa8413adcf54f2cadbc8 SHA512 dc7aa0631fb98736d7bc2e9931780584843d4739a1a45aa293ca8c9afddaa2619f46301e127133d48387b787d354fc947368d92e64f25c8d770a936beb60b66e
-EBUILD libsmi-0.5.0-r1.ebuild 899 BLAKE2B f66a0085abb97bf1f087d0ed1cd3a5253d707d2ec13393da363a6ebd82e5024afa6bc2cf8d36915228855670a028248e5a5c941467227584a33f6f36f53ab811 SHA512 8a07b75a6023c47651b16dc97dc7df80c39387e54e19052d8c608a087825f0b0ddf62edacb666c922c9f6e6714208cc48e8e68ad3649eac7c049ad4da9d85c59
+EBUILD libsmi-0.5.0-r1.ebuild 898 BLAKE2B 9432c628324fd5d57242339e0ce07fc6bfdfa2e8457053fab177a05c1edf8e357c15483d6d9686eedfe24c798c22ea31fd3abe08bae28b34a1dd5ec551b19b99 SHA512 3ce94933bf9f64ed12d1c740645cb2979386d86ef595a229062d196900d1e44effd30b7e16ef9f30e583f519afb67ec06d561e60b4486045ac2c9156854e31f2
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
deleted file mode 100644
index f5b1fb46e092..000000000000
--- a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic ltprune
-
-DESCRIPTION="A Library to Access SMI MIB Information"
-SRC_URI="ftp://ftp.ibr.cs.tu-bs.de/pub/local/${PN}/${P}.tar.gz"
-HOMEPAGE="https://www.ibr.cs.tu-bs.de/projects/libsmi/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86"
-IUSE="static-libs"
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-CVE-2010-2891.patch
-}
-
-src_configure() {
-	replace-flags -O? -O2
-	econf $(use_enable static-libs static)
-}
-
-src_test() {
-	# sming test is known to fail and some other fail if LC_ALL!=C:
-	# https://mail.ibr.cs.tu-bs.de/pipermail/libsmi/2008-March/001014.html
-	sed -i '/^[[:space:]]*smidump-sming.test \\$/d' test/Makefile
-	LC_ALL=C emake -j1 check
-}
-
-src_install() {
-	default
-	dodoc smi.conf-example ANNOUNCE ChangeLog README THANKS TODO \
-		doc/{*.txt,smi.dia,smi.dtd,smi.xsd}
-	prune_libtool_files
-}
diff --git a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
index 6b0294947d29..f36fbd9bb1e2 100644
--- a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 RESTRICT="test"