gentoo resync : 14.12.2020

3 files changed, 2 insertions, 13 deletions

diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 6a96c83b6e1a..b512dd4070f1 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -2,7 +2,6 @@ AUX net-snmp-5.1.2-snmpconf-selinux.patch 189 BLAKE2B ca3ac3cc5786226ca5ed73997d
 AUX net-snmp-5.7.3-include-limits.patch 578 BLAKE2B ae19f67f0e06a5010d8399e51f716cf7f2148ed9ed0737c00f195892346c2ec56985e2de9a12dbc111c98a012f591e69f6bac3d74ff8d83e36c56a9d0a21036e SHA512 47c27ac62c97a0b3ecfcfe05adeedd55436cc9cfc094a71f00df06cb5dece5f297c40fc255ad73e72a0c468a3c5f62afc98b79c0adc7d31a67813f25f1ec9415
 AUX net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch 1257 BLAKE2B 2cdb98653d617e7c00a0ec2810d529e1b3e80668fdbbe771dd14a2dee3cf39dac069981bb2b8f8b9ae9fdaaef943a75662fc42cc8dd15000cdbf56ad6be6dc6c SHA512 3b5b48c1c1cad6953fe4687cca9a54161b6686bd887aa068f1ce61219d4772c839459eeecde8fde0863a75e65a9cfc0a8ec1a607e7e7aa47e2cfa19ef0dbcfab
 AUX net-snmp-5.8-pcap.patch 1030 BLAKE2B e082b3a9e889ee2f9abd3229ba09a7ac35ca61b5ef65b5fd3460b89ace7753d6bef55560b5c066705bbb1965625e9739f6ebfb78c3e5b5edee2607e3df0728ac SHA512 af60ee67f1407f846f2590008a7ee1d24777f1004547d6281d7bf21d79020e5ceb4b2d0502f08c7d9e25f0fd10b8c5a8e6309963f30f2e43167d1590194ce32e
-AUX net-snmp-5.8-tinfo.patch 340 BLAKE2B 59b75cc89e83d59249921f92ca3b54e3a6fb943a956bb603c891a253f2d015b23ef00029d42bb799625bfd3af2eab5803474fad2dace5d2013f7004221c71e8d SHA512 94598dd39c0067a161beba68bfa09ef4c0dc09376c94a4b0b7346a718e75da173a8c9cb37349c79ec6909fb82a39552ca84b170c3f7f07927386991771b4568e
 AUX net-snmp-5.8.1-mysqlclient.patch 785 BLAKE2B 932b635c9a86f5637be849713f18636c0fa01730141bcb6ec71c540053e0d5a50e7e3fd410b730e78b0bb3f8b1a856dcb7dc24eaece972fe00afa5f43ff3711f SHA512 40a61a4bebfd289f3474da483177c0031096aced23bbf69e1bf7b5d7b383710b1df05b074baf1ccb87035b4cdde3b8b70773455e457ad53f347781d7c5368a8a
 AUX net-snmp-5.8.1-net-snmp-config-libdir.patch 1395 BLAKE2B d22fa136b32cab28ffff0f9ba47f7f16823313309504bdc3d36979648d2cb697dd061c8c048e03241d897f39652b35d27db6080eab1f003dbdd9e72499bd2b83 SHA512 082b0befa290c917271acca3bfa5a6258a0712c9f1fb42990db3e4858af6be500317bc12efbd51ca3da76d53d0924e034f8d77d1be79dc1cf90f7196a7830bb8
 AUX net-snmp-5.8.1-pkg-config.patch 744 BLAKE2B bdcd74073b174fdf208f44bbe17546ab5e61420927e34cb1c9ecad5a208d00b52d3577cf686baf2ffb515c28ae6caa1d88696a3ddd6fde8eeabed17170d057c0 SHA512 10a1fcc115fdf19e03ba04651cd90063b9c05a6d075a5c79bcea5074145b22c65ab5a6974aade3072349b1f3b2543fff5000467d30526d02e22762ea9af5ff86
@@ -16,6 +15,6 @@ AUX snmptrapd.init.2 338 BLAKE2B 893a510af4cb7f4115c5995ecd40c6ac3c5d2fd4cf92524
 AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c5976394c04bfd8da30917395b1a752f8e66502259d271ccf264c3e99f99e95df62b80447d4099d1dd7 SHA512 763682e3926fd1e7f28a013be2ad56cc53eed26a0415770906968e07a183128c9d5fb70d76513244ba0cc95fc2526b68c32207b5fda83b8f53c256549cfa1b1d
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
 DIST net-snmp-5.9.tar.xz 4082580 BLAKE2B 9dfd5a7dfe4ca18b16c71c9f5cb70c540d16aa36a0b2dacd3ddc465934f96ac473f77490af78d202bf6dad4eddea5d75665a770df74132aafda39f5f3a87d835 SHA512 3f1e27caa8e5306d451b61b08c2daf007929a850661962fcd29b528a80332a980184303a7e87c96d8d2774181758889dc825cb08e3c3b353c5e7ca1ebcc09173
-EBUILD net-snmp-5.9-r2.ebuild 5667 BLAKE2B 56d363f8e669ed84b134d6808188a66d121490d2bd21ead5ad2621314c5df9ec6722bc361f18603de05691149584b99a2279a5c7a6709f4f513741e34d90a047 SHA512 c568a2142e2c40e8b7662f1a248800c416b83f5d4db02250d0b2a84ed42c174b474f38746c1b82f8ba03dda8cdb6cc721b4712cd90702d63aa070c4fdb075ff4
+EBUILD net-snmp-5.9-r2.ebuild 5666 BLAKE2B 8b7ab8cdd193ac45fa4b062c8b431e58e68726f6a3d25bf0ca93e8e9c57a34c0a27c8f6754821dfdb352d6ef3de0825ec6290bccf98faacc1f3b65af60afbffc SHA512 ca456df45a171fa900255773dac673997d50dc5061f84a3652fb4952d9fd8fb9b4fbb82c1834a4a6f7885d0faebead5033c7be99dabc7cfe1ccec63462caaea3
 EBUILD net-snmp-99999999.ebuild 5667 BLAKE2B 96a45e763d4cd9e418288be6b86fb6884c3c05f99c8f01fac296b48af35cba79199eee4e5bb3984402c5847b9a8f91d7cdcfcb2164f6d6564dc06d93914ad751 SHA512 c08359fed122095229bea052ecad54a07228a862d532aae62315a5d7c563f7e02556d814cb5c97900656ee2736becc92e7b7fb3248f4e78bc3470b1586a9f91d
 MISC metadata.xml 1296 BLAKE2B 76a0264baf629293eac4127e3dbaf167b5af236e53e0de9cb1c65869242d13e6d5f3c90d47856d5f8c63eba34661698637dd7da56b307d9e6e07403bf91df320 SHA512 ff45396992b1804f3774bd532438b8e64327dfa71c109cde9073f6a5a17f6c3dcc2ba1278359fa10d5eb00c3ead0368706d29178466e9b8586b66e0219d7e4b0
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8-tinfo.patch b/net-analyzer/net-snmp/files/net-snmp-5.8-tinfo.patch
deleted file mode 100644
index 746575a9b7fb..000000000000
--- a/net-analyzer/net-snmp/files/net-snmp-5.8-tinfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.d/config_os_libs2
-+++ b/configure.d/config_os_libs2
-@@ -611,6 +611,7 @@
- AC_CHECK_HEADERS([curses.h])
- AC_CHECK_HEADERS([ncurses/curses.h])
- NETSNMP_SEARCH_LIBS([endwin], [curses ncurses],,,,[LIBCURSES])
-+NETSNMP_SEARCH_LIBS([cbreak], [tinfo],[LIBCURSES="$LIBCURSES -ltinfo"],,,)
- AC_SUBST([LIBCURSES])
- 
- #   libm for ceil
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
index 389a8f5e207f..bca96ebda9fe 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 # GPL-2 for the init scripts
 LICENSE="HPND BSD GPL-2"
 SLOT="0/40"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="
 	X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql
 	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib