gentoo resync : 13.10.2019

4 files changed, 3 insertions, 86 deletions

diff --git a/net-analyzer/snmptt/Manifest b/net-analyzer/snmptt/Manifest
index 45bfae918899..78680d7d665c 100644
--- a/net-analyzer/snmptt/Manifest
+++ b/net-analyzer/snmptt/Manifest
@@ -1,7 +1,4 @@
-AUX snmptt.initd 393 BLAKE2B 79f8f0cdbb5302d59af5d4ecbfe0ce43a489b13d414e814cf8231ac884400d3da52cce5c9c60ba84d04cfbce1deba7c2239a1c9b27623543b9eaf011cf96b387 SHA512 07dac48c0bd4f09d8fb1d705e933693b507ab06f908921e5033c863c65597832c509372c6270f56535176b0484f02be66383dd9efdf20303a36bec6e1f0065da
 AUX snmptt.initd-r1 374 BLAKE2B fa18e20e2fd206aacb782da948e6b2a6dcfa5f33f3f9f9f1e682a3ec1d6c058b94e0e9046f0a5a274fbf933fb47a80e00a4247a53368a18f3faa872dac2d6e04 SHA512 ccf4441135f4a8f3fb323efd68c75b099977c1855ac5ae41adf6ef2974e0c2c1fd57c132e9877da12c34683b2bf19d4774e7aad4527e530ce48ec3fb59c2b7aa
-DIST snmptt_1.2.tgz 135132 BLAKE2B adb58a04b8d0f4f0367c7ad789ac249b57e9acbbc7458cbea38c0ad9931a83ce991b8d4297a485bb5ccb0193286418980ab3bbe008d65dd1a4f849d177b30bf1 SHA512 6a6fc291a11ebc42b8c2e4bc040cd2833acc2e8e5dc9dbcd1aa48a073125b342a2333f7caba4fe789dba876e5a3879161707a23b52ba751007fcf9bcfa408a67
 DIST snmptt_1.4.tgz 148504 BLAKE2B b49e51d0ec207f1250536010e6475649eeca1a89f85bf31e1a7545cae2fa6ac66951916932863543336bb63a8519f35e9c54e7c67bcd14a43ed7ce6d8d63876b SHA512 200ebe565766c15f85b9b9cbc178baeef740663efc951af4c790c4b28d27398c14a95c4b38306ec3503cefe9b86634d5f24ec5f2482694f07789e9025ea39a80
-EBUILD snmptt-1.2.ebuild 1452 BLAKE2B 81c2a9a060d895f777102f498756af54d71a6a844d0d41e1629c561793adae3172f5eddfda5e44d5449510670b10000ea2bb4b722d865cdef5d7e0726104f526 SHA512 3de10e31c9c9fb46106137d4d49f0481cd05c54d77685813356bf2477f45a54e346cfb72045f757d9c77d2e6d5ac3dd6afe7775df70cb006b5f8af836b5bb135
-EBUILD snmptt-1.4.ebuild 1219 BLAKE2B fe0081357bdb6d9ea2adb0092eaeae7af38d1a562faa1a2bb5b2217fd21d9599409e72ed5aaf8c61ea57ebb2181c8daf7315c40f9ae4a0aea1dad930a82102b0 SHA512 1810d0882d35993f2280ff6800bfe3b8c3b3b6efcf50c463c57ea1355daa3747a2949cf1e677736e3aeeab493156a11146311e5c49e87cfe31ae9555144c1749
+EBUILD snmptt-1.4.ebuild 1215 BLAKE2B edf2cd62de24976f6d4391f0c5fde21d3627651c4fa1cce0361900c526512fc50b3e97023915184e575e636b8733db931725f0a026a315226fa74c110d3155ef SHA512 e1f60bccd817decdf4ce2aed6be0aa3ff06ec983f3c5bb6046636f70231054eaab0642b9194232a4da830bd2d3020d8e29a565ef3feba812b035494aa9b53190
 MISC metadata.xml 413 BLAKE2B c84c68487407401218116505b51d3e61edfbdfdd9008a83c51c2685b1ebd513fe94beedf8c02330bf465f979b5f7d88f1e3b896c8d0dea74c1a2db3795024b5a SHA512 facfbb9f61e391c7c80e3dc62300049a3fee43c2de84805474662e4c7fa7fce78ecbf86bbb691f13ddf39b0759ba5daec5feef91bedda39731d6fb389e4df1a3
diff --git a/net-analyzer/snmptt/files/snmptt.initd b/net-analyzer/snmptt/files/snmptt.initd
deleted file mode 100644
index 76b67a2b1304..000000000000
--- a/net-analyzer/snmptt/files/snmptt.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net snmptrapd
-}
-				
-start() {
-	ebegin "Starting snmptt"
-	start-stop-daemon --start --pidfile /var/run/snmptt.pid --exec /usr/sbin/snmptt
-	eend
-}
-
-stop() {
-	ebegin "Stopping snmptt"
-	start-stop-daemon  --stop --pidfile /var/run/snmptt.pid
-	eend
-}		
diff --git a/net-analyzer/snmptt/snmptt-1.2.ebuild b/net-analyzer/snmptt/snmptt-1.2.ebuild
deleted file mode 100644
index 207d3658b9d8..000000000000
--- a/net-analyzer/snmptt/snmptt-1.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P="${P/-/_}"
-
-DESCRIPTION="SNMP Trap Translator"
-SRC_URI="mirror://sourceforge/snmptt/${MY_P}.tgz"
-HOMEPAGE="http://www.snmptt.org/"
-
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~ppc x86"
-SLOT="0"
-IUSE="mysql postgres"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND=">=dev-lang/perl-5.6.1
-	dev-perl/Config-IniFiles
-	>=net-analyzer/net-snmp-5.1
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# bug 105354, daemonize this thing
-	sed -i -e "s:mode = standalone:mode = daemon:g" snmptt.ini || die
-
-	echo "traphandle default /usr/sbin/snmptt" >examples/snmptrapd.conf.sample
-}
-
-src_install() {
-	into /usr
-	dosbin snmptt
-	dosbin snmptthandler
-	dosbin snmptt-net-snmp-test
-	dosbin snmpttconvert
-	dosbin snmpttconvertmib
-
-	insinto /etc/snmp
-	doins snmptt.ini
-	doins examples/snmptt.conf.generic
-	cp -pPR ${D}/etc/snmp/snmptt.conf.generic ${D}/etc/snmp/snmptt.conf
-	doins examples/snmptrapd.conf.sample
-
-	dodoc BUGS ChangeLog README sample-trap
-	dohtml docs/faqs.html docs/index.html docs/layout1.css docs/snmptt.html docs/snmpttconvert.html docs/snmpttconvertmib.html
-
-	newinitd "${FILESDIR}"/snmptt.initd snmptt
-}
-
-pkg_postinst() {
-	if ( use mysql || use postgres ); then
-		elog "Read the html documentation to configure your database."
-	fi
-	elog "Please configure /etc/snmp/snmptt.conf before running."
-}
diff --git a/net-analyzer/snmptt/snmptt-1.4.ebuild b/net-analyzer/snmptt/snmptt-1.4.ebuild
index bae24f294755..ed70054e6dc9 100644
--- a/net-analyzer/snmptt/snmptt-1.4.ebuild
+++ b/net-analyzer/snmptt/snmptt-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/snmptt/${MY_P}.tgz"
 HOMEPAGE="http://www.snmptt.org/"
 LICENSE="GPL-2"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 SLOT="0"
 IUSE="mysql postgres"