gentoo resync : 31.10.2017

9 files changed, 25 insertions, 115 deletions

diff --git a/net-analyzer/barnyard2/Manifest b/net-analyzer/barnyard2/Manifest
index 3e28fed41afd..cd8142367d02 100644
--- a/net-analyzer/barnyard2/Manifest
+++ b/net-analyzer/barnyard2/Manifest
@@ -4,4 +4,4 @@ DIST barnyard2-1.9.tar.gz 652879 SHA256 6bce0d5bd4a6fa2be2e5b1daaed1d6d0ec8e7f50
 EBUILD barnyard2-1.9.ebuild 1698 SHA256 31a937c3f53d7e9e161f51096ed7376abf9c8beaa69a3802e8f031ed760cd4f5 SHA512 0470caca3b6f1e2ee1013fcff6412907d854de6855c6f06df411cfea1fe8a864a50149274d4f47c826b5ef081e9d14440c01109be1acbf2e2bf8f4e317aa236a WHIRLPOOL 1341f226d3999b21f88085f670bb5fb18a22a3cd4bd151ebfb956e18153dfcf5cf0ba3bc3a34705a9c7594eb974a98ea8a4df72259dda4a252502543d3723e99
 MISC ChangeLog 3006 SHA256 aa4391e6b1a6aa44aa8e4c19ec70f55b9b85c4175bcacb9a53d7cf0b1c4f5aad SHA512 a4b8ea6ce60d50a69910df5f23d800c6cf76afef549197717ca753f9ffeb096d7b4d6f34317f3b67ccdfe93d707a16d6a878ce01352bcb0be81ad7ae09423d58 WHIRLPOOL 7edafd9b50a261a3fafe96a4373432eb0387361bfafaa40723055574c03616864ef30e39e76794f0a0da7fcfc4bd2ab6d59e52e66c1c5b75f5a5ae4fb5d6a71a
 MISC ChangeLog-2015 1721 SHA256 32ed17a9fde806b820c86354764abe907702402d46d3cd9f054e5157ccee080c SHA512 93c51bc99f9dcd8cb86108e93e86d85f1893899c27eb8eeff8a8f27ede12517456db4001152bf68ac1c41cf994b2645f5a1124bb7e6b9c531adad3ddb14d0dff WHIRLPOOL 18b74a382af265aa07085bb7f5d667b0962b1d4a4882f3b7ec7e4c45bafcbabffa49ef4ccb72cfb04e355af243eb9b68a64a34a928c84ad85a405011d1a348ce
-MISC metadata.xml 1738 SHA256 6383d379d028b444e84b6b6c6aa4e3bcfaba3af75bfc28f5e11abb192d3ed931 SHA512 830bdfa0acaa1a0d112e9b70b0a645a4e43256000bf83f9b851f5bcf7124eb27ca1322ee65e52ba2b60c69a17d0074047d1258c3fe4ccb504e95eb1df4036255 WHIRLPOOL efe25a53a3bc05e33298f95476bc95eac083ebe3053fbddcdf83c5f279ae4f32baf74887cdcb4b86d9943a689d85d33db16b24498ff5b48a12da3ad4b8127f1f
+MISC metadata.xml 1306 SHA256 99267bbd7163db2a84807ed7c5e9bc45c6fb2b157f9e8fef66b2381151dfb2a5 SHA512 270e811a9222fcc873b34aa5c19d40470cf8bd622c79efeb6d5f1268eb905d921d08d632c86b8ae658b58fdda151cef3873f1c8f3a278002909c0533a75bdc74 WHIRLPOOL 5dff4326770e8c6559668596b1adc875371269d6d5c2b1f35b8813909764badc2923e9b52fcc9097ef1ae87cf329645fdda1de02cc0f5f4b0cceedca607afaa7
diff --git a/net-analyzer/barnyard2/metadata.xml b/net-analyzer/barnyard2/metadata.xml
index 7bd3352141b2..be80ad6bbcbf 100644
--- a/net-analyzer/barnyard2/metadata.xml
+++ b/net-analyzer/barnyard2/metadata.xml
@@ -1,40 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>patrick@gentoo.org</email>
-        <name>Patrick Lauer</name>
-        <description>Maintainer</description>
-    </maintainer>
-    <maintainer type="person">
-        <email>jason.r.wallace@gmail.com</email>
-        <name>Jason Wallace</name>
-        <description>Proxy maintainer. CC him on bugs</description>
-    </maintainer>
-    <maintainer type="project">
-        <email>netmon@gentoo.org</email>
-        <name>Gentoo network monitoring and analysis project</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
-    <longdescription>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+		<description>Maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>
 		Barnyard2 is a fork of the original barnyard project (which is no longer under development).
 		Barnyard2 is an open source interpreter for Snort unified2 binary output files. Its primary
 		use is allowing Snort to write to disk in an efficient manner and leaving the task of 
 		parsing binary data into various formats to a separate process that will not cause Snort to
 		miss network traffic. Barnyard2 is under active development and continues to adapt based on 
 		user feedback.
-    </longdescription>
-    <upstream>
-        <maintainer>
-            <email>dev@securixlive.com</email>
-            <name>Securixlive</name>
-        </maintainer>
-        <doc>http://www.securixlive.com/barnyard2/docs/index.php</doc>
-        <bugs-to>mailto:dev@securixlive.com</bugs-to>
-    </upstream>
+	</longdescription>
+	<upstream>
+		<maintainer>
+			<email>dev@securixlive.com</email>
+			<name>Securixlive</name>
+		</maintainer>
+		<doc>http://www.securixlive.com/barnyard2/docs/index.php</doc>
+		<bugs-to>mailto:dev@securixlive.com</bugs-to>
+	</upstream>
 	<use>
 		<flag name="gre">Enable GRE support</flag>
 		<flag name="mpls">Enable support for mpls networks</flag>
diff --git a/net-analyzer/nagios-check_ipmi_sensor/Manifest b/net-analyzer/nagios-check_ipmi_sensor/Manifest
index e170b46e2c03..38d032b0be76 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/Manifest
+++ b/net-analyzer/nagios-check_ipmi_sensor/Manifest
@@ -6,4 +6,4 @@ EBUILD nagios-check_ipmi_sensor-3.2.ebuild 727 SHA256 9227b1475c7f13154238df0176
 EBUILD nagios-check_ipmi_sensor-3.6.ebuild 730 SHA256 7c7d6f3c6c184793a1157e5dd02b24eb7478010ba9540851acf1c45ee0a69ad0 SHA512 5df875927e39743c7f9de056aec8a6b45d18bd95651fdfeecf7169c5e9a43ce91b579996114ed62d24b6755e524a526190138def79091ee43cefee6803479f92 WHIRLPOOL 435815f1ba46efcb7343087c82c55834bef9c747f975f1e21cafb7a236e6767dfba6c6556837df5ed5c0a254a5bdbbe1e07da7d8fe896e916fca252e3e7c3c09
 MISC ChangeLog 2644 SHA256 edff24a78ba1db7a52c71c6d9babf5e1f057bd8ac4e6dd5c727ae00f8219cb84 SHA512 66abdf7cc5e4715d82f528143b46182008ef144157f72e658aeb346c123646d7bda71078d0e344893cd4088bf5d1a05d43c7bdb8c278a077003db81276ee96a0 WHIRLPOOL 8b2b70aae19e3e78a98a37f10e72f15daf04f61758dd3f9b27e5cbfb0702528f66a00748a07e1260f8806024ef5e8894a38a55badec33aa97953b1b8466ba8ab
 MISC ChangeLog-2015 1207 SHA256 64c27fdda0015956508789154b5c5afcaffb35cdabca17facf5c531ce76c6698 SHA512 d3587bdbbfbe7c5f3d71803bb0ad748b7b9d42120953f439e29afb794813c74263e0d8e3118cae4c78aefde3e07a1dd8c1fc6c9a561aff3c851d1966f90fc99c WHIRLPOOL 04247e5cc48a40fd68350389bb9edf5864a091dc79d9746137e7fdbd6f4af23b500ab72897997d18dd8465331e6e5954c2ffa16684fb3b9874df7f518cc3b500
-MISC metadata.xml 672 SHA256 2b55b078cc25c3bb788b82672eaa2382ea6019b03a83a65b871492e857575591 SHA512 ecb95b93ec10a2146b20b558e26009d5bc1ecbe06513811a1e38426466e1117cef75d5b8957957d1ddf594b37fd4d94d07cdf7c75217a0e26189294a0d07b208 WHIRLPOOL f62f364c65052e5f131b3da73e548992fae58b5dc4701062ff84fa832ca6c7d91e9733c7a28aeb755121f62111d030061a9f2d8a38283b20e8fb94be69aa3db9
+MISC metadata.xml 369 SHA256 20d6c86a32a47c63e51682100c6a2a20d573dfabc63c8ccd88c142da6b0c0f06 SHA512 d6f073707c4a9acd674e378c42d2c4662429dc8c666428823c4f1e8d9bf7529370e384fa79b5c9a081cd82f8a7c01b0ca8f8d781ccf56411124fb26c8583b9dd WHIRLPOOL c198cc75a87b5936efd06a9aacee44f125c6c11e708e6be39b0f1e422a0a99ed743b8dbffff6d86b0225bc2399733d1a4a2aaa3aad42741cdb497ced34221c75
diff --git a/net-analyzer/nagios-check_ipmi_sensor/metadata.xml b/net-analyzer/nagios-check_ipmi_sensor/metadata.xml
index ce7012f3276a..465282765dab 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/metadata.xml
+++ b/net-analyzer/nagios-check_ipmi_sensor/metadata.xml
@@ -5,17 +5,8 @@
 		<email>idl0r@gentoo.org</email>
 		<name>Christian Ruppert</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>wfischer@thomas-krenn.com</email>
-		<name>Werner Fischer</name>
-		<description>Upstream Maintainer (please CC on bugs)</description>
-	</maintainer>
 	<maintainer type="project">
 		<email>sysadmin@gentoo.org</email>
 		<name>Gentoo Sysadmin Project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	</pkgmetadata>
+</pkgmetadata>
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 3d875fcc81ae..b5eaae398a7c 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -22,4 +22,4 @@ EBUILD snort-2.9.8.3-r2.ebuild 8522 SHA256 e1d083c77a8238d1a8e5d66b9f13690ea58f5
 EBUILD snort-2.9.8.3.ebuild 8546 SHA256 3f31b2696ed17f3984c1e39c729a2167aa73261ccdc332376715331a642ade3b SHA512 e2b0a6e303ef3cb0d906a6c809d3d12ff9c3540fe9cdafdea24579ca88c3adf53e1895b60035db42e2a7058e39e16b83798cd2818f42d7b64d89eb25471816f3 WHIRLPOOL 4a7f15a8fc0c734c545bd145fb460e2c62f5a0deef306569f3cac987b41e3f2d27cb3eba0a4ae952a37b141b492ead404fd00b9ed441e7e8518c9447bdf280c3
 MISC ChangeLog 4623 SHA256 c7311eeb028b9f8b2ad38bd55b74a04289a5a165cb71c9521e1bae8d9528a33d SHA512 db43e349b79046b727cd6f5ec4b7ea972353fe9f05b76495a2b3fc4719c16a12750f382aa2c7bc731a03a7586021da52e1e1cdfacfcb3868ffc1426603b2f851 WHIRLPOOL 13512ea19848d1024c4a671c6ec204c040166b57bd601e042223fd08cc011ff561b4686b81626fc0510fb1c0777d0cd4060f8ce1c4c6fc256a7309142ff06eb8
 MISC ChangeLog-2015 36554 SHA256 2ec7c84ae8da30cc4c2e1b6dea4a05910ce8dcc4b7a3b43bc10420b2396aa82f SHA512 cc24cde8374d0ad8ab31f403928e8cf313f9a0b4173b3de94bc4620b591821f0166531d932fdc64d2a71c64bf18d903472a7330714a4a6e96ac2231a2f0150d0 WHIRLPOOL ad5d457d0a2cb6a01ca18cd769106358ba1035af4cce893b6b67c26355481cc234b1c460b560dd04d6ea112243e9d8b0ed7941fde83b20b2d65c009249ad43bd
-MISC metadata.xml 5357 SHA256 2682c328b03647effb7501b3eaa5be5574e3cda39693de121d114cc9c6b86c6b SHA512 56374a2fca28e4a0593c2fbeca7b2b1bcd643e72cb80318fad0a2cc1f682b6c38178d606b2a95d8677a14460db32d4b7e39c06f456d190e1fd008679480c379a WHIRLPOOL 59d14da50ed0d7fab65652e319063ac3196bedc11f07e6c06f4fc079fe2f5260a4f04e1af143129b0a83871dc3eec941fc5d7cbc46eb5a0292c4bc8e4ab8c927
+MISC metadata.xml 5063 SHA256 150a52d738da43dbd66fecf82e92bb7d4926b08a3a8bdcce7bfabdbc6753eb07 SHA512 9519263bb296703af5f24459c66ba70f84edbeeb36983bbacc9d674794505edee507bf181049d23f2c59a18f49975ba6788d0404f476292b0c7f4af86dccdb27 WHIRLPOOL 66805b560a63aac6b937d0f1fe06f4bb362b48dd8403e29607f03e49778e9f74ab9422fb370f225dd342c74d4bcfffed20e334422086af446d70f1f685dc9726
diff --git a/net-analyzer/snort/metadata.xml b/net-analyzer/snort/metadata.xml
index bfe81882b559..1c031275ed33 100644
--- a/net-analyzer/snort/metadata.xml
+++ b/net-analyzer/snort/metadata.xml
@@ -6,19 +6,10 @@
 		<name>Patrick Lauer</name>
 		<description>Maintainer</description>
 	</maintainer>
-	<maintainer type="person">
-		<email>jason.r.wallace@gmail.com</email>
-		<name>Jason Wallace</name>
-		<description>Proxy maintainer. CC him on bugs</description>
-	</maintainer>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Snort is an open source network intrusion prevention and detection
 		system (IDS/IPS) developed by Sourcefire. Combining the benefits of
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index 9c70ce453038..2afd2c801306 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,6 +1,4 @@
-DIST testssl-2.8.tar.gz 8529038 SHA256 2e4588bfcd5f4e6b30b2e250d51b39e4209131a5366f1e75354aaa4a5ee6a22d SHA512 9c30a0640c4c516bb6fd776d6d7d76af4f86be51ec2c282fad01b8ac14161d29732caf08ed64a0a93ad53c3afabe6641f423bc73f0323bd9526a4283fccad584 WHIRLPOOL 04564912e3e0ed3afac283da994edc032bc3b23c2c003ea02f531da25555dbb758f76e8ab04be38c6af8df340f7400545072f33dbb074586144bc2258d0de5e0
 DIST testssl-2.9.5.tar.gz 8955393 SHA256 3cd2d14b9b324545ff91d63e4261113f6ff0c6e32232cf49438b9fd2f3c8de3e SHA512 9b9cc9f4e5d85cb2bd3767f10d0342b65cd9662df2df4d21b838c8f6a904e8e91f0242e7be1a9e0d9532d13d210beacd1b9f189ba6f955f9c4d3a6bde675677c WHIRLPOOL faa158a05c8523df1e4142bf1838f4049d7ed9c9a2afbe2a97e190f19c5ab2efce878fb92e50665657e8cbf6a1abdfb2958b0ad142e2bc86e30a8bb672146968
-EBUILD testssl-2.8.ebuild 1396 SHA256 567ab64b38a034acd0bdb5c026e23f92f12fd5f1b96f04190c190866265be982 SHA512 51b485f25fb9448a510455b4aa8172b7f046fd3f15c9494d019d3f1e14816a9c9a996d7c9c7de3a7464288fabb532a642f1c8c846d380eb2b6e7f27c2906c8e0 WHIRLPOOL 97cadbbf78c63151e6014011784e4969199e527d17c5a20390ee0343f72b1bfe2a11144caf041680ba911567fde99b6aeadbbbcf609026a8950ef0e137a940f3
-EBUILD testssl-2.9.5.ebuild 1427 SHA256 53ea4c0958e7eb2730f7bcea9ee0d7af44ec617c31923bd56f322c7099c22b9c SHA512 5f41a1393afa10fafb1960006ed963953dbe90697d3044dd1e3a1e072f8df42b318820782b12fa720b1e6e00d4f0b0977194e17451ac88f7fcc1656a4ed3a49a WHIRLPOOL 6148fb2224537f215a24bb528f4612cd71f9cca15ba582a32e03165954a0476e99d2db860306362733f4725bfd283f22ddccac72238adc4c08b23d47cc37df24
+EBUILD testssl-2.9.5.ebuild 1426 SHA256 891c4820a9dc5525fd0d53b0fc38b900948338b4f8e746c779f7f43e2088fb89 SHA512 b1ecb8479877f7b92c6b008c5b0bfda6a554a0f22c5806b9b3c1022f058d4ff584570a9dfebe78f790820543ae8d659efa2ad679ae7671d14d62ea7b72c5b22a WHIRLPOOL 6cbd8c154a15afc892b487863c57f52279c2635ef9d787e9118810b8bb45ce1d20e95b60cbe48576af7fcb90273b980a2a7e7525338b7a795973716b018c3cae
 MISC ChangeLog 1148 SHA256 7387784a88de13fdaa0b09fff1f8d255729ccf8f1ddb121cca07067456366794 SHA512 ed6bdfab18a0d4898c7e6afde0842f3b635695dba2f6f0846534f64427fc52418b8b6d27e8fb0b5ed2f448e77e7cd4e4c21a2bd50a2c43319a011800df7a715b WHIRLPOOL 862e19b7e63c9976375077622e2bedaa06937dd7c66504ad6c7b19ebb2a438eb7d0da2c213ebd3a3cb7109943e2dff7ac0f46f19387fd5856ca59c2a04c0a7d6
 MISC metadata.xml 427 SHA256 f9e642a1c5ece37509373afb6e8152c0d516d8fa0802872dcd50a9cdf1870aa9 SHA512 83dacfa2293a8f14bce97a01f732376e76f84c4eb4fffbed1049b08210850cc5b54381d83df15bec2ecc1c1a592148d538ac37053b36fa1022542e023a97d9ab WHIRLPOOL fdff73ccb431fb2fabad3186df41206a875de7d98c518bcee26bb16a141e4f4f9dec343dfef484d2f1649542755defc40096ef632116826642d06d90c388f743
diff --git a/net-analyzer/testssl/testssl-2.8.ebuild b/net-analyzer/testssl/testssl-2.8.ebuild
deleted file mode 100644
index 20712e46f347..000000000000
--- a/net-analyzer/testssl/testssl-2.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN}.sh"
-
-DESCRIPTION="Tool to check TLS/SSL cipher support"
-HOMEPAGE="https://testssl.sh/"
-SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 bundled-openssl? ( openssl )"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="bundled-openssl"
-
-RDEPEND="
-	dev-libs/openssl:0
-	net-dns/bind-tools
-	sys-apps/util-linux
-	sys-libs/ncurses:0
-	sys-process/procps
-"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-QA_PREBUILT="opt/${PN}/*"
-
-pkg_setup() {
-	use amd64 && BUNDLED_OPENSSL="openssl.Linux.x86_64"
-}
-
-src_prepare() {
-	default
-	sed -i -e "s|MAPPING_FILE_RFC=\"\"|MAPPING_FILE_RFC=\"/usr/share/${PN}/mapping-rfc.txt\"|" ${PN}.sh || die
-}
-
-src_install() {
-	dodoc CHANGELOG.stable-releases.txt CREDITS.md Readme.md
-	dodoc openssl-rfc.mappping.html
-
-	dobin ${PN}.sh
-
-	insinto /usr/share/${PN}
-	doins etc/mapping-rfc.txt
-
-	if use bundled-openssl; then
-		exeinto /opt/${PN}
-		use amd64 && doexe bin/${BUNDLED_OPENSSL}
-	fi
-}
-
-pkg_postinst() {
-	if use bundled-openssl; then
-		einfo "A precompiled version of OpenSSL has been installed into /opt/${PN},"
-		einfo "configured to enable a wider range of features to allow better testing."
-		einfo ""
-		einfo "To use it, call ${PN} appropriately:"
-		einfo "${MY_PN} --openssl /opt/${PN}/${BUNDLED_OPENSSL} example.com"
-	fi
-}
diff --git a/net-analyzer/testssl/testssl-2.9.5.ebuild b/net-analyzer/testssl/testssl-2.9.5.ebuild
index c6ac1f8ddd28..e5a5559d687f 100644
--- a/net-analyzer/testssl/testssl-2.9.5.ebuild
+++ b/net-analyzer/testssl/testssl-2.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2 bundled-openssl? ( openssl )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="bundled-openssl"
 
 RDEPEND="