gentoo resync : 25.08.2020

12 files changed, 129 insertions, 675 deletions

diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 2f2186c0106c..8da4291aa679 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,10 +1,12 @@
 AUX net-snmp-5.1.2-snmpconf-selinux.patch 189 BLAKE2B ca3ac3cc5786226ca5ed73997df2b9ec5c75405f098ed8eb29a52f5187399a1a6fd357613ca10c8dad3a4a5c8f03e25771e785ec9673ae0d3da3970827b90afc SHA512 5859742fa90c297af17b1b1a4718af8d03edbb3a78f723c2cbde54576c68a5f562ed573cc0f8cfdd0bdee9d5accb769e6183dbd16d5e5aa66f0d43f174658f75
 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-my_bool.patch 751 BLAKE2B d0caff5c2cebb50cc2fcf4375d222f1146e3908698565eb7201d3e009b4bcbbccf653c336c1af9a23a8dc1a5f468da12d77d940ea4a00eb3f7c14db7dd45463e SHA512 5fe9d44653e5c26d1d1d6041b48f0abf5c38d148b8dfe82d6fc83290e66becc25dda43962a895994989f7267d5914f69969b118c999c324b7fac0184c383bbce
 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-pkg-config.patch 621 BLAKE2B 013ae933eb2ec9edc0e454ea7d508eac9a49f92aa6fbcfd47a3b25c85852ce235a9dcb8b5aef1f16ea17976a56341bf484419fa84cb5e83a1e29481a409445aa SHA512 fb7a79514936962af175d068996a2420d70c11478a03f7437d3b471a695cbdc685d3d472c8145b4b400fb2511e591fd717e7c4e265c464696edfc091a747a6e9
+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
+AUX net-snmp-5.9-MakeMaker.patch 215 BLAKE2B 72b8b903d89bb7eff1dd69f9a212f6b1dcd13fcdc2a38650b3ffaadaae0ffe042bbb4ee3b2a8badb10c43f8179d405de45ff7dae42d83dc29f0929388bd0046d SHA512 2ade984435766624c2dcf3755644760d123745feaf9283f9f94230647df6fdc92cd27af7a8e144377ff17a6812b50c80d660d9a050e0a346b5260ec7963e0300
 AUX net-snmp-99999999-tinfo.patch 280 BLAKE2B 4a762bb037beb054d6afa1d3047e9bfa9df7746bdbcbf3ee4050377deee5d4107433e983f1e443a801adcabcd7f13c71f27e14ab49b729850beeb06a096d4c2b SHA512 19c65a7f80eea80fbe88bb5653dadb46f36b4921123aa7c7874c71ab82c6b14b5331b2d697a3d273d3bf93a961b80bf0a9252d833c21f81aa6f73d7e2a4a39d7
 AUX snmpd.conf 552 BLAKE2B 9d2801b0ddc2148a62e332a1d355a9ddc050ec95aea2dde31f25413096c4b91dbab794c1e71b75f5baba1234d89729a6e8c50287098c04991a3eec4d9f512b3c SHA512 e64f93631e5cb2160d3fb26abb84fc74f5632d8875227d5c8dfa24809b25e8202dcf23251ea8f296aedf16298c31ce49b8e64fb6325c18775d8899a50b853bbc
 AUX snmpd.init.2 680 BLAKE2B ce21b60980c2a0d74c810bb473c6b4c70eb11a2fc0636ec4af8a262ce412324ba80bc6c72b2544d359b4e2f536cf329df99e0be7d96035fa20c25f9ab7dc4a16 SHA512 10394f04dee23537a195f5aed63a3e758ca90227e269076ae9d13f883c7bd666c1c43823d1b869c43f232e97dc4138e52648cae995327f7a7f676ba416ee6fff
@@ -14,12 +16,8 @@ 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.8.1.pre1.tar.gz 6630615 BLAKE2B 32ae7177fc08a773928da7f19cd06617feb1358c0dd21d39e08db460fa4267b6353f4afede1f5a500a628235a6a94d95700c84df6e85bda18b7a7a6e7bf3781f SHA512 e1ad421970abb67490a08fa735bbe9ff77a6fc5a19b8bf6942bef80f5b328f8038373cd5995970085177bcfe939dfa309019512b2abce0e8cf779e693f7d6dbd
-DIST net-snmp-5.8.1.pre2.tar.gz 6642893 BLAKE2B 4b2a1e87738c3bde49354f0cca84628f2953ee14f6b08ca53cf0bc5c320052cb4fe0f6eeb46551eaf2d45ba9c17f86ce06b64c00c1629b2d17bc351c0ccb37a8 SHA512 78cd9a29cc89ff7fa170ee767db3ca2077fc1d877f207c018887c2ea0148ffaf01eb013efc21b47f14c893a6ca48b3b439210ccd27dfc77f8c8e56bf9546f23e
-DIST net-snmp-5.8.tar.gz 6591680 BLAKE2B ac1bff4152310da57818a00d752a08a7fc61d697b02479d9952ca12d024d3d68dc8bfa674571e93d6f3597605b2fe91513fb6839057a80f2c3dd8d0cce0077f2 SHA512 27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7
-EBUILD net-snmp-5.8-r3.ebuild 5307 BLAKE2B 0fd9232f549db78f18da4af6ac54b03259824e6e6a53e5c698be79c5119292dddc5399f5ce33f6942164e21daf2ad8df5b99a9387c05c48674e5bce498c959da SHA512 f09184badd9aef60566ba914652d1b0ac4c9394b6fed387f53fe721c6cc7fbb9e5a2fb8c9ab69ecb325ea78f3f0415405ef25660bda9a89b868847afeb3b143c
-EBUILD net-snmp-5.8-r4.ebuild 5362 BLAKE2B ea28ce42536d30a2ebd65aea7fe43373811c0c7bae824fa5e97738644f077e5fa20feff6e2bc4d2110a1c032d7fec889a74ce991b043dcd193e3d7a7a830ba70 SHA512 2d3cd08567007c19e68b19452474817da4929f33ea31f954da6b80f903834d1a9c0e1c9ac8d9d9303566133a78abd86a74df0f9ecebbd5939ed1d5d41b29b361
-EBUILD net-snmp-5.8-r5.ebuild 5558 BLAKE2B fcb029e7f92bdf90ac3578d5599177d9a5d2ea4479199ee438bf44e82ab54b17a411b1db8058d1071a00e147c769b8026ec0ee853ddebb98a5bd1ea48a769b22 SHA512 0597a38dee250bca1a42370abebba5c67febf707c5429e21fd489475b0cdf8e47cec0dff91290982ce15a12b31ba3ad7d1eceedd88801f2a82f60ff0213c237e
-EBUILD net-snmp-5.8.1_pre1-r1.ebuild 5570 BLAKE2B f75cd10ede99d60c0795bfd327bf256ad90a9c72821c14e6a4292315bd3ff3947eaa5f1ecfc45bbaa9796411f6c2cb31f04678eb2080868f84bbcb1a26aa948e SHA512 aacc4e3f80cb1b10e21cf069ad0c79c59a3262adb7399d4b8e33b00e05506b032c1b46a2434a0cab5d4351a55c45b76d20a9449398f5f3724eac4179c1e8075c
-EBUILD net-snmp-5.8.1_pre2.ebuild 5571 BLAKE2B 24e01221c74e249b692b68e666f92ccc31b06d27bc0a83a2513efd0f53d6823fc24ae652f1716791fd48f241bef8279713e954b7efe732f8e2ddd50322b3d679 SHA512 9de9231e3be9ba3aefaef68bc67b02ab1a55686d1f2b20c9af10cd31d4db1c6a06ea98fbc8936b6d37d872cc971ba53d7174671e5106da97eff6e26aab3c7ee2
-EBUILD net-snmp-99999999.ebuild 5520 BLAKE2B 4e720f3ce4c2769074e966301cbafd0269982b8e82614e04692660cb819e49ba6b6bea332ee278e56a9aaf590d4ab24f05289aff55641cb89523d093fd979849 SHA512 96ca977388d258f84e7027711875fb2e37bf9700bfcb49b9d844049859ecde0f30a6eb9a9d5cc5820bf1ac0b7969bcf230ee8e77326a3c116102ff8738a4f7b2
+DIST net-snmp-5.9.tar.xz 4082580 BLAKE2B 9dfd5a7dfe4ca18b16c71c9f5cb70c540d16aa36a0b2dacd3ddc465934f96ac473f77490af78d202bf6dad4eddea5d75665a770df74132aafda39f5f3a87d835 SHA512 3f1e27caa8e5306d451b61b08c2daf007929a850661962fcd29b528a80332a980184303a7e87c96d8d2774181758889dc825cb08e3c3b353c5e7ca1ebcc09173
+EBUILD net-snmp-5.8.1_pre1-r1.ebuild 5662 BLAKE2B 92cc1484aa8572cbb265682d451f699afcaa92858d5dac8fc7b22723dead6a4974b1dfa6f192d33e5432b4aa11e9793d606dffb4f4908a9dd8f2ebed7a5a258d SHA512 a395ce9e3e814cc1f1da2b14bd70cc49b2b39a096fc256bc8e59ffe3dcce0af3c7536c9481dd8f0eecdfd7969b859abf888c16602973ea17ae0ff8b70a8082cd
+EBUILD net-snmp-5.9-r2.ebuild 5675 BLAKE2B 24deee7e745cb2145385a737944ce0909f03beeb650f21d184a01f456cb3190c7f68ba1395805bef48ff606c8742a0912dc1388c242e92f8ae8d68c931466aaa SHA512 cf30fe0b3597a3d1ea41237951837782ac2f55afe1b49286628c7693c751be6530b8f229296d01aacfc262b7248f4b580bf535ff6e8591d7731938410ae028e0
+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-my_bool.patch b/net-analyzer/net-snmp/files/net-snmp-5.8-my_bool.patch
deleted file mode 100644
index 72127d053c0a..000000000000
--- a/net-analyzer/net-snmp/files/net-snmp-5.8-my_bool.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 9f4af8c42d515e6b214738cc97212dfbe7f749cf
-Author: Andreas Hasenack <ahasenack2@users.sourceforge.net>
-Date:   Tue Feb 5 18:21:40 2019 -0800
-
-    apps/snmptrapd_sql: Fix build against MySQL 8
-    
-    See also https://sourceforge.net/p/net-snmp/bugs/2922/.
-    
-    [bvanassche: changed 'int' into 'char']
-
-diff --git a/apps/snmptrapd_sql.c b/apps/snmptrapd_sql.c
-index 6126ca916..32a3b1799 100644
---- a/apps/snmptrapd_sql.c
-+++ b/apps/snmptrapd_sql.c
-@@ -199,7 +199,7 @@ typedef struct sql_buf_t {
-  * static bind structures, plus 2 static buffers to bind to.
-  */
- static MYSQL_BIND _tbind[TBIND_MAX], _vbind[VBIND_MAX];
--static my_bool    _no_v3;
-+static char       _no_v3;
- 
- static void _sql_process_queue(u_int dontcare, void *meeither);
- 
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8.1-mysqlclient.patch b/net-analyzer/net-snmp/files/net-snmp-5.8.1-mysqlclient.patch
new file mode 100644
index 000000000000..94811747d2b4
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.8.1-mysqlclient.patch
@@ -0,0 +1,30 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,6 +25,8 @@
+ 
+ AC_MSG_CACHE_INIT()
+ 
++PKG_PROG_PKG_CONFIG
++
+ #
+ # save the configure arguments
+ #
+--- a/configure.d/config_os_libs2
++++ b/configure.d/config_os_libs2
+@@ -516,6 +516,8 @@
+ #   mysql
+ ##
+ if test "x$with_mysql" = "xyes" ; then
++  PKG_CHECK_MODULES([MYSQL],[mysqlclient],[MYSQL_INCLUDES="$MYSQL_CFLAGS"],)
++  if test -x "$MYSQL_LIBS"; then
+   AC_PATH_PROGS(MYSQLCONFIG,mysql_config)
+   test -x "$MYSQLCONFIG" \
+ 	|| AC_MSG_ERROR([Could not find mysql_config and was specifically asked to use MySQL support])
+@@ -523,6 +525,7 @@
+   MYSQL_INCLUDES=`$MYSQLCONFIG --include`
+   _libs="${LIBS}"
+   _cppflags="${CPPFLAGS}"
++  fi
+   LIBS="${LIBS} ${MYSQL_LIBS}"
+   CPPFLAGS="${CPPFLAGS} ${MYSQL_INCLUDES}"
+   AC_CHECK_HEADER(mysql.h,,
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8.1-net-snmp-config-libdir.patch b/net-analyzer/net-snmp/files/net-snmp-5.8.1-net-snmp-config-libdir.patch
new file mode 100644
index 000000000000..73d420531bb3
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.8.1-net-snmp-config-libdir.patch
@@ -0,0 +1,37 @@
+--- a/net-snmp-config.in
++++ b/net-snmp-config.in
+@@ -193,10 +193,10 @@
+     #################################################### client lib
+     --libs)
+       # use this one == --netsnmp-libs + --external-libs
+-      echo $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS
++      echo $NSC_SNMPLIBS $NSC_LIBS
+       ;;
+     --netsnmp-libs)
+-      echo $NSC_LIBDIR $NSC_BASE_SNMP_LIBS
++      echo $NSC_BASE_SNMP_LIBS
+       ;;
+     --external-libs)
+       echo $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@
+@@ -210,10 +210,10 @@
+       ;;
+     --agent-libs)
+       # use this one == --netsnmp-agent-libs + --external-libs
+-      echo $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS
++      echo $NSC_AGENTLIBS $NSC_LIBS
+       ;;
+     --netsnmp-agent-libs)
+-      echo $NSC_LIBDIR $NSC_BASE_AGENT_LIBS
++      echo $NSC_BASE_AGENT_LIBS
+       ;;
+     --external-agent-libs)
+       echo $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS
+@@ -660,7 +660,7 @@
+         echo "Ack.  Can't create $tmpfile."
+ 	exit 1
+       fi
+-      cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $NSC_LDFLAGS $NSC_LIBDIR $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS $ldflags"
++      cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $ldflags $NSC_LDFLAGS $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS"
+       echo "running: $cmd"
+       echo `$cmd`
+       result=$?
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch b/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch
index fd53973c2bec..acda136a22cd 100644
--- a/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch
+++ b/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch
@@ -1,16 +1,20 @@
 --- a/netsnmp-agent.pc.in
 +++ b/netsnmp-agent.pc.in
-@@ -9,4 +9,4 @@
+@@ -8,5 +8,5 @@
+ URL: http://www.net-snmp.org
  Version: @PACKAGE_VERSION@
  Cflags: -I${includedir}
- Libs: -L${libdir} -lnetsnmpmibs -lnetsnmpagent -lnetsnmp
+-Libs: -L${libdir} -lnetsnmpmibs -lnetsnmpagent -lnetsnmp
 -Libs.private: @LDFLAGS@ @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@
++Libs: -lnetsnmpmibs -lnetsnmpagent -lnetsnmp
 +Libs.private: @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@
 --- a/netsnmp.pc.in
 +++ b/netsnmp.pc.in
-@@ -9,4 +9,4 @@
+@@ -8,5 +8,5 @@
+ URL: http://www.net-snmp.org
  Version: @PACKAGE_VERSION@
  Cflags: -I${includedir}
- Libs: -L${libdir} -lnetsnmp
+-Libs: -L${libdir} -lnetsnmp
 -Libs.private: @LDFLAGS@ @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@
++Libs: -lnetsnmp
 +Libs.private: @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9-MakeMaker.patch b/net-analyzer/net-snmp/files/net-snmp-5.9-MakeMaker.patch
new file mode 100644
index 000000000000..1c6a3fd1eaf3
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.9-MakeMaker.patch
@@ -0,0 +1,10 @@
+--- a/perl/Makefile.PL
++++ b/perl/Makefile.PL
+@@ -3,6 +3,7 @@
+ use ExtUtils::MakeMaker;
+ use Config;
+ require 5;
++use lib '.';
+ use MakefileSubs;
+ 
+ # Prevent that MakeMaker complains about unknown parameter names.
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild
deleted file mode 100644
index a1920941b96a..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=yesplz
-DISTUTILS_OPTIONAL=yesplz
-WANT_AUTOMAKE=none
-PATCHSET=3
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools distutils-r1 eutils ltprune perl-module systemd
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://www.net-snmp.org/"
-SRC_URI="
-	mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}/${P/_p*/}.tar.gz
-	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
-"
-
-S=${WORKDIR}/${P/_/.}
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0/35"
-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 pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
-
-COMMON_DEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-	)
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	elf? ( dev-libs/elfutils )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-	pci? ( sys-apps/pciutils )
-	lm-sensors? ( sys-apps/lm-sensors )
-	netlink? ( dev-libs/libnl:3 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	perl? ( dev-lang/perl:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		X? ( dev-perl/Tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmp )
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	rpm? ( bzip2 zlib )
-"
-S=${WORKDIR}/${P/_p*/}
-
-RESTRICT=test
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# snmpconf generates config files with proper selinux context
-	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch
-	eapply "${FILESDIR}"/${PN}-5.8-tinfo.patch
-
-	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
-	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
-	eapply "${WORKDIR}"/patches/*.patch
-
-	eapply_user
-
-	eautoconf
-}
-
-src_configure() {
-	# keep this in the same line, configure.ac arguments are passed down to config.h
-	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
-	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-	use smux && mibs="${mibs} smux"
-
-	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
-	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
-
-	econf \
-		$(use_enable !ssl internal-md5) \
-		$(use_enable ipv6) \
-		$(use_enable mfd-rewrites) \
-		$(use_enable perl embedded-perl) \
-		$(use_enable ucd-compat ucd-snmp-compatibility) \
-		$(use_with bzip2) \
-		$(use_with elf) \
-		$(use_with kmem kmem-usage) \
-		$(use_with mysql) \
-		$(use_with netlink nl) \
-		$(use_with pci) \
-		$(use_with perl perl-modules INSTALLDIRS=vendor) \
-		$(use_with python python-modules) \
-		$(use_with rpm) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with zlib) \
-		--enable-shared --disable-static \
-		--with-default-snmp-version="3" \
-		--with-install-prefix="${D}" \
-		--with-ldflags="${LDFLAGS}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-mib-modules="${mibs}" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--with-sys-contact="root@Unknown" \
-		--with-sys-location="Unknown"
-}
-
-src_compile() {
-	for target in snmplib agent sedscript all; do
-		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
-	done
-
-	use doc && emake docsdox
-}
-
-src_install() {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install
-
-	if use perl ; then
-		perl_delete_localpod
-		if ! use X; then
-			rm "${D}"/usr/bin/tkmib || die
-		fi
-	else
-		rm -f \
-			"${D}"/usr/bin/fixproc \
-			"${D}"/usr/bin/ipf-mod.pl \
-			"${D}"/usr/bin/mib2c \
-			"${D}"/usr/bin/net-snmp-cert \
-			"${D}"/usr/bin/snmp-bridge-mib \
-			"${D}"/usr/bin/snmpcheck \
-			"${D}"/usr/bin/snmpconf \
-			"${D}"/usr/bin/tkmib \
-			"${D}"/usr/bin/traptoemail \
-			"${D}"/usr/share/snmp/mib2c.perl.conf \
-			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
-			|| die
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/html/*
-	fi
-
-	keepdir /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
-	systemd_dounit "${FILESDIR}"/snmpd.service
-	systemd_dounit "${FILESDIR}"/snmptrapd.service
-
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-
-	# Remove everything not required for an agent.
-	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
-	if use minimal; then
-		rm -rf \
-			"${D}"/**/*.pl \
-			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
-			"${D}"/usr/share/snmp/*.conf \
-			"${D}"/usr/share/snmp/snmpconf-data \
-			|| die
-	fi
-
-	prune_libtool_files
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild
deleted file mode 100644
index a9de9b055493..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=yesplz
-DISTUTILS_OPTIONAL=yesplz
-WANT_AUTOMAKE=none
-PATCHSET=3
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools distutils-r1 eutils ltprune perl-module systemd
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://www.net-snmp.org/"
-SRC_URI="
-	mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}/${P/_p*/}.tar.gz
-	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
-"
-
-S=${WORKDIR}/${P/_/.}
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0/35"
-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 pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
-
-COMMON_DEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-	)
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	elf? ( dev-libs/elfutils )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-	pci? ( sys-apps/pciutils )
-	lm-sensors? ( sys-apps/lm-sensors )
-	netlink? ( dev-libs/libnl:3 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	perl? ( dev-lang/perl:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		X? ( dev-perl/Tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmp )
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	rpm? ( bzip2 zlib )
-"
-S=${WORKDIR}/${P/_p*/}
-
-RESTRICT=test
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# snmpconf generates config files with proper selinux context
-	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch
-	eapply "${FILESDIR}"/${PN}-5.8-my_bool.patch
-	eapply "${FILESDIR}"/${PN}-5.8-tinfo.patch
-
-	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
-	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
-	eapply "${WORKDIR}"/patches/*.patch
-
-	eapply_user
-
-	eautoconf
-}
-
-src_configure() {
-	# keep this in the same line, configure.ac arguments are passed down to config.h
-	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
-	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-	use smux && mibs="${mibs} smux"
-
-	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
-	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
-
-	econf \
-		$(use_enable !ssl internal-md5) \
-		$(use_enable ipv6) \
-		$(use_enable mfd-rewrites) \
-		$(use_enable perl embedded-perl) \
-		$(use_enable ucd-compat ucd-snmp-compatibility) \
-		$(use_with bzip2) \
-		$(use_with elf) \
-		$(use_with kmem kmem-usage) \
-		$(use_with mysql) \
-		$(use_with netlink nl) \
-		$(use_with pci) \
-		$(use_with perl perl-modules INSTALLDIRS=vendor) \
-		$(use_with python python-modules) \
-		$(use_with rpm) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with zlib) \
-		--enable-shared --disable-static \
-		--with-default-snmp-version="3" \
-		--with-install-prefix="${D}" \
-		--with-ldflags="${LDFLAGS}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-mib-modules="${mibs}" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--with-sys-contact="root@Unknown" \
-		--with-sys-location="Unknown"
-}
-
-src_compile() {
-	for target in snmplib agent sedscript all; do
-		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
-	done
-
-	use doc && emake docsdox
-}
-
-src_install() {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install
-
-	if use perl ; then
-		perl_delete_localpod
-		if ! use X; then
-			rm "${D}"/usr/bin/tkmib || die
-		fi
-	else
-		rm -f \
-			"${D}"/usr/bin/fixproc \
-			"${D}"/usr/bin/ipf-mod.pl \
-			"${D}"/usr/bin/mib2c \
-			"${D}"/usr/bin/net-snmp-cert \
-			"${D}"/usr/bin/snmp-bridge-mib \
-			"${D}"/usr/bin/snmpcheck \
-			"${D}"/usr/bin/snmpconf \
-			"${D}"/usr/bin/tkmib \
-			"${D}"/usr/bin/traptoemail \
-			"${D}"/usr/share/snmp/mib2c.perl.conf \
-			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
-			|| die
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/html/*
-	fi
-
-	keepdir /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
-	systemd_dounit "${FILESDIR}"/snmpd.service
-	systemd_dounit "${FILESDIR}"/snmptrapd.service
-
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-
-	# Remove everything not required for an agent.
-	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
-	if use minimal; then
-		rm -rf \
-			"${D}"/**/*.pl \
-			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
-			"${D}"/usr/share/snmp/*.conf \
-			"${D}"/usr/share/snmp/snmpconf-data \
-			|| die
-	fi
-
-	prune_libtool_files
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild
deleted file mode 100644
index d99fb7481f5e..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=yesplz
-DISTUTILS_OPTIONAL=yesplz
-WANT_AUTOMAKE=none
-PATCHSET=3
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools distutils-r1 eutils ltprune perl-module systemd
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://www.net-snmp.org/"
-SRC_URI="
-	mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}/${P/_p*/}.tar.gz
-	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
-"
-
-S=${WORKDIR}/${P/_/.}
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0/35"
-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
-"
-
-COMMON_DEPEND="
-	bzip2? ( app-arch/bzip2 )
-	elf? ( dev-libs/elfutils )
-	lm-sensors? ( sys-apps/lm-sensors )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	netlink? ( dev-libs/libnl:3 )
-	pcap? ( net-libs/libpcap )
-	pci? ( sys-apps/pciutils )
-	perl? ( dev-lang/perl:= )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-	)
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		X? ( dev-perl/Tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmp )
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	rpm? ( bzip2 zlib )
-"
-S=${WORKDIR}/${P/_p*/}
-
-RESTRICT=test
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# snmpconf generates config files with proper selinux context
-	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch
-	eapply "${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
-	eapply "${FILESDIR}"/${PN}-5.8-my_bool.patch
-	eapply "${FILESDIR}"/${PN}-5.8-pcap.patch
-	eapply "${FILESDIR}"/${PN}-5.8-tinfo.patch
-
-	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
-	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
-	eapply "${WORKDIR}"/patches/*.patch
-
-	eapply_user
-
-	eautoconf
-}
-
-src_configure() {
-	# keep this in the same line, configure.ac arguments are passed down to config.h
-	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
-	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-	use smux && mibs="${mibs} smux"
-
-	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
-	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
-
-	econf \
-		$(use_enable !ssl internal-md5) \
-		$(use_enable ipv6) \
-		$(use_enable mfd-rewrites) \
-		$(use_enable perl embedded-perl) \
-		$(use_enable ucd-compat ucd-snmp-compatibility) \
-		$(use_with bzip2) \
-		$(use_with elf) \
-		$(use_with kmem kmem-usage) \
-		$(use_with mysql) \
-		$(use_with netlink nl) \
-		$(use_with pcap) \
-		$(use_with pci) \
-		$(use_with perl perl-modules INSTALLDIRS=vendor) \
-		$(use_with python python-modules) \
-		$(use_with rpm) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with zlib) \
-		--enable-shared --disable-static \
-		--with-default-snmp-version="3" \
-		--with-install-prefix="${D}" \
-		--with-ldflags="${LDFLAGS}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-mib-modules="${mibs}" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--with-sys-contact="root@Unknown" \
-		--with-sys-location="Unknown"
-}
-
-src_compile() {
-	for target in snmplib agent sedscript all; do
-		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
-	done
-
-	use doc && emake docsdox
-}
-
-src_install() {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install
-
-	use python && python_optimize
-
-	if use perl ; then
-		perl_delete_localpod
-		if ! use X; then
-			rm "${D}"/usr/bin/tkmib || die
-		fi
-	else
-		rm -f \
-			"${D}"/usr/bin/fixproc \
-			"${D}"/usr/bin/ipf-mod.pl \
-			"${D}"/usr/bin/mib2c \
-			"${D}"/usr/bin/net-snmp-cert \
-			"${D}"/usr/bin/snmp-bridge-mib \
-			"${D}"/usr/bin/snmpcheck \
-			"${D}"/usr/bin/snmpconf \
-			"${D}"/usr/bin/tkmib \
-			"${D}"/usr/bin/traptoemail \
-			"${D}"/usr/share/snmp/mib2c.perl.conf \
-			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
-			|| die
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/html/*
-	fi
-
-	keepdir /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
-	systemd_dounit "${FILESDIR}"/snmpd.service
-	systemd_dounit "${FILESDIR}"/snmptrapd.service
-
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-
-	# Remove everything not required for an agent.
-	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
-	if use minimal; then
-		rm -rf \
-			"${D}"/**/*.pl \
-			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
-			"${D}"/usr/share/snmp/*.conf \
-			"${D}"/usr/share/snmp/snmpconf-data \
-			|| die
-	fi
-
-	prune_libtool_files
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild
index c40fd89123d1..48c7448ff414 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_/.}
 # GPL-2 for the init scripts
 LICENSE="HPND BSD GPL-2"
 SLOT="0/35"
-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
@@ -79,6 +79,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.8-pcap.patch
 	"${FILESDIR}"/${PN}-5.8-tinfo.patch
 	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
+	"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
+	"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
 )
 
 pkg_setup() {
diff --git a/net-analyzer/net-snmp/net-snmp-5.8.1_pre2.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
index 1418de67f9f9..1e5af8e04ff0 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8.1_pre2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
@@ -2,27 +2,24 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=yesplz
 DISTUTILS_OPTIONAL=yesplz
-WANT_AUTOMAKE=none
-PATCHSET=3
+DISTUTILS_SINGLE_IMPL=yesplz
 GENTOO_DEPEND_ON_PERL=no
-
+PATCHSET=3
+PYTHON_COMPAT=( python3_{6,7,8} )
+WANT_AUTOMAKE=none
 inherit autotools distutils-r1 perl-module systemd
 
 DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="http://www.net-snmp.org/"
 SRC_URI="
-	mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}-pre-releases/${P/_pre/.pre}.tar.gz
 	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
+	https://dev.gentoo.org/~jer/${P}.tar.xz
 "
 
-S=${WORKDIR}/${P/_/.}
-
 # GPL-2 for the init scripts
 LICENSE="HPND BSD GPL-2"
-SLOT="0/35"
+SLOT="0/40"
 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
@@ -71,14 +68,16 @@ RDEPEND="
 	)
 	selinux? ( sec-policy/selinux-snmp )
 "
-S=${WORKDIR}/${P/_pre/.pre}
 RESTRICT=test
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.7.3-include-limits.patch
 	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
 	"${FILESDIR}"/${PN}-5.8-pcap.patch
-	"${FILESDIR}"/${PN}-5.8-tinfo.patch
 	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
+	"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
+	"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
+	"${FILESDIR}"/${PN}-5.9-MakeMaker.patch
+	"${FILESDIR}"/${PN}-99999999-tinfo.patch
 )
 
 pkg_setup() {
@@ -126,7 +125,8 @@ src_configure() {
 		$(use_with ssl openssl) \
 		$(use_with tcpd libwrap) \
 		$(use_with zlib) \
-		--enable-shared --disable-static \
+		--disable-static \
+		--enable-shared \
 		--with-default-snmp-version="3" \
 		--with-install-prefix="${D}" \
 		--with-ldflags="${LDFLAGS}" \
@@ -138,14 +138,17 @@ src_configure() {
 }
 
 src_compile() {
-	for target in snmplib agent sedscript all; do
-		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
+	emake sedscript
+
+	local subdir
+	for subdir in snmplib agent/mibgroup agent apps .; do
+		emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all
 	done
 
 	use doc && emake docsdox
 }
 
-src_install () {
+src_install() {
 	# bug #317965
 	emake -j1 DESTDIR="${D}" install
 
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
index dd3818e50c1d..638e5357bb17 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
@@ -2,13 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_SINGLE_IMPL=yesplz
 DISTUTILS_OPTIONAL=yesplz
-WANT_AUTOMAKE=none
-PATCHSET=3
+DISTUTILS_SINGLE_IMPL=yesplz
 GENTOO_DEPEND_ON_PERL=no
-
+PATCHSET=3
+PYTHON_COMPAT=( python3_{6,7,8} )
+WANT_AUTOMAKE=none
 inherit autotools distutils-r1 git-r3 perl-module systemd
 
 DESCRIPTION="Software for generating and retrieving SNMP data"
@@ -20,7 +19,7 @@ SRC_URI="
 
 # GPL-2 for the init scripts
 LICENSE="HPND BSD GPL-2"
-SLOT="0/35"
+SLOT="0/40"
 KEYWORDS=""
 IUSE="
 	X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql
@@ -69,14 +68,15 @@ RDEPEND="
 	)
 	selinux? ( sec-policy/selinux-snmp )
 "
-S=${WORKDIR}/${P/_/.}
-S=${WORKDIR}/${P/_p*/}
 RESTRICT=test
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.7.3-include-limits.patch
 	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
 	"${FILESDIR}"/${PN}-5.8-pcap.patch
 	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
+	"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
+	"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
+	"${FILESDIR}"/${PN}-5.9-MakeMaker.patch
 	"${FILESDIR}"/${PN}-99999999-tinfo.patch
 )
 
@@ -130,7 +130,8 @@ src_configure() {
 		$(use_with ssl openssl) \
 		$(use_with tcpd libwrap) \
 		$(use_with zlib) \
-		--enable-shared --disable-static \
+		--disable-static \
+		--enable-shared \
 		--with-default-snmp-version="3" \
 		--with-install-prefix="${D}" \
 		--with-ldflags="${LDFLAGS}" \
@@ -142,8 +143,11 @@ src_configure() {
 }
 
 src_compile() {
-	for target in snmplib agent sedscript all; do
-		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
+	emake sedscript
+
+	local subdir
+	for subdir in snmplib agent/mibgroup agent apps .; do
+		emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all
 	done
 
 	use doc && emake docsdox