gentoo resync : 15.09.2019

7 files changed, 4 insertions, 196 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 574defe5a632..567d4157c7e1 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 4e86ccca4ea2..cfa1bda6c02c 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -3,6 +3,6 @@ AUX ettercap-0.8.2-openssl-1.1.patch 8769 BLAKE2B 6c9d7e8c60264b6ac0724891f9cbc9
 DIST ettercap-0.8.2.tar.gz 8082561 BLAKE2B 851df0a8700de45ce0e3427f7fdbdcd13feb2f75c0d1136563449db634b1f02276bade0d82a1a51bf8de726d6faddf05ff537e397c2e56cfc3e3181d25566fe9 SHA512 18137b1cc518c9db3c9650157a5cbf09dbb665b79876a24875d6c5125e8923ebde543464adb61cf1d1244101242f4d66b80d94ef3b36aa265cefca7646aa6415
 DIST ettercap-0.8.3.tar.gz 8381943 BLAKE2B f49098d61f60877d3f979d7861f36dad6ec3fbfca7ed89d8f9826867145ea36daec65a1076c893f81391218688448515ef020a9cdf9a16ffddc830bacec8eb1c SHA512 1929c986d3a17ebc693ffe8531e01c66379c0ee6ea71305ea49b6a9eece84b6da1923135311db458bdb6035feb593e525786e6cf4c465ced5a7683384d4a4ae7
 EBUILD ettercap-0.8.2-r2.ebuild 1789 BLAKE2B a23ee25a8d7c4b95a072183c1cbc6f1465b013ba5cb9cd894481b9063af043f7802ffd2b4311b030973b9acc04bf956e49922b2ed6105c67073f50b62b798946 SHA512 29bb82ce78874bf7b0b512b4a6033a80d1eafa125e4bbae14d6df3d89d92e55158ed6dea064fee50d04d82472b07082e177ffde512274c9e037f7a62299eb7ba
-EBUILD ettercap-0.8.3.ebuild 1753 BLAKE2B 80c74dc437c36eaa73bdbe0d6347a426127f31508f5e6d252d44036c4941b5adb1be2e46af95c321051fefb02d5fd3612af349f1649fe59b802ff2b73ad75a44 SHA512 64f94012b5830d582cba3aab5305092a6d12982ed2a526a56704b661cead583235ba34b43d765fbf638829b005042199cf62030401a6acb840050caa0a1a0397
+EBUILD ettercap-0.8.3.ebuild 1752 BLAKE2B 62ac3dc2e06f95db8d919181ee0ba2965e244dfab81bc79b7c12a162c78f9801f8b9db9834a80b511845d02984983be4ed0bcfaceaa9712683bddc92eb4465c2 SHA512 0a436c5e9d229ade9562b1d81de9249690ce1ff2d608dc86643785cb9da4a7c52c6611776bf2ecc5975a19af265649a3f836e0173023f3cf559361b4fb0f306c
 EBUILD ettercap-9999.ebuild 1711 BLAKE2B 0ed80f63f24c4c595f2b1caf410259fbe974d0833bf8bdaa14f964009a9bd5c75540fcd6beff17622a355bce45408ea2ca52d2378196c7b37a515c6222d96441 SHA512 9d4fd99f08e11126ba68519404490c7000997aa349805a8d4a6d271e52fcda764dc3c8164a3f5ddfe63e819343d24c7f792d229da9d44ec56f039c87854e37ec
 MISC metadata.xml 657 BLAKE2B e32e3fbc55029a9398399a2e2b69974f720826f8769379868ae80e32d2a9b2a69bfeb59b349dae91b7f27a759647091f58ea07a9b23a6dcf32d373966310bdde SHA512 0b682cb596f905882f2c0682c163d31410b94ca873a468db93e155103aeb1e943bff1c55bde1c9537478ce324d368f468bcb91c98f0aefb9dfa2a2239d7f73d5
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.ebuild
index c1487e4a8cde..46454702f6d1 100644
--- a/net-analyzer/ettercap/ettercap-0.8.3.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git"
 else
 	SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
 fi
 
 IUSE="doc geoip gtk ipv6 libressl ncurses +plugins test"
diff --git a/net-analyzer/iftop/Manifest b/net-analyzer/iftop/Manifest
index 58be045f9381..ad8ebb7fdef6 100644
--- a/net-analyzer/iftop/Manifest
+++ b/net-analyzer/iftop/Manifest
@@ -8,6 +8,6 @@ AUX iftoprc 1391 BLAKE2B b2558509d0f8e9dfade1bcb1a1b50569510cada2629fb3b0cb772d2
 DIST iftop-1.0pre4.tar.gz 204665 BLAKE2B 181385c3fbf43abd4ead975aac11b5ff196de94d9a8d6f195b3f0068aba6ae953067995d19f0175b49ab15c447c99d531542ae786603ee390e080e79bdcd7ae3 SHA512 abd74e8025bb82fef9ebab4997b1d018201a523d47c0128128ca37797490046538d74758dc4471735c22b890e5bd238ad6b2a30776d465138ede367cdd263d22
 EBUILD iftop-1.0_pre4-r2.ebuild 942 BLAKE2B 15e691dc44693bba16bf4a326419f69bb0fef3698262f017e4becb3828e3fec88f5818997da86dd39fd021d316087a4b32fe0c8c6120ab0902f665b43312a8de SHA512 99a36fad0f615711d836ee6e8aa8c4c370c609944cd8fd0d66e40cb3b0b4f8bd0605a5c193a33f1a557ec13a74d63288c4e93a76669f45398183f02bbdfe7898
 EBUILD iftop-1.0_pre4-r3.ebuild 977 BLAKE2B 942285e9896f3cd1b4431a41ce75ac55131dfe2ae7b0978596327a9df4d238d9088e2952f958a5eca725e99f4f0c8b7a06533020c7531b6e5ef3393cbd74084e SHA512 9d3e84519fcd745d055dc8c1fea5525f25d08ddf30bb8894cef7d2af3631d2d5fa5aa5368026c5092f5bce2a60f663db7245de2d82ede451eb57ff06d4f78ac1
-EBUILD iftop-1.0_pre4-r4.ebuild 1062 BLAKE2B af113810eddadf035ddf897b69aff409c1dad81be125ba3e868a41cced3e4aeb4803cc408a4902693da214c90e08a3460c17a4f8b8baad6d4bdc3d93c15c2fb3 SHA512 c16aaf87923a3d02689a072aa7f8e1c511d45ec18e7825fc6f131355a1729773fab377cfd0e5f64491ca080932fb92217f367e7331d4d893dc1c11f9b45815d9
+EBUILD iftop-1.0_pre4-r4.ebuild 1069 BLAKE2B 76fd9b231a91031734ad64877865fb8a59375bdab56c6b017828ae45e57fc8d8771334ceca236e4183f899c5bd8b1961359e23e49047dcc33739bf5bf776f4ae SHA512 71bb82ed24362c82baecc2a060324f22d2c98ed3ce03f78393d903f494aab0ded51f7db207cbe40d989a12bc167567347079da11175894b6d5abdc1c24e67616
 EBUILD iftop-9999999.ebuild 832 BLAKE2B feb1cc2f49365a06098ec2d90cbe02edb4edd0a598f390431473b829edc88ddcd415fbc902ab3f392481bda43085641e4fdd7ed875219209285b4d2abd64b199 SHA512 ce61354496ce1eb4e5e6073b61ac5eccd39b836c981a44f81e63b455d0206e0b4096642627554b01a0b6c5cb758f5a12e1a2859d3d66b078423d8b6a21ff3337
 MISC metadata.xml 286 BLAKE2B a278f67a760b977849da10dfbc6f2da19da66b553e51f6a7f32403dbb8eca85432dcec745815bc9b55596bf5eece7916ddd7657360d110d91a83b6077eec2619 SHA512 cfd1ca7999686b831b0b459f5b06ea80fd28b4f24d3404a8ad90bb4d6461a011f6a2b338ebbf45c2eac621ec828dcc397b26c2ae82068e5b703271a85c76e760
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
index ba3c20d34201..94b1fb3743b2 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 RDEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index e358f8b64036..6c7e420895a9 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -10,11 +10,9 @@ AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35
 AUX rrdtool-1.7.1-configure.ac.patch 257 BLAKE2B 9aa11b7b0392cb2427d686b888c29b09d8e50b1b0fbedfe0e144eeb27ab6da5a7526633eb8655f1edb129e6a256b102ba095cd9c1aa501aed5e9492073c93b2b SHA512 7c3d175ce94bce24ab244ca899d62d2537392c360ed3ec211b5be2e41fcb6638343f7357db1d3c00fac15104398f83b236ead713e940385b04d61851a3275683
 AUX rrdtool-1.7.1-rrdcached.socket.patch 733 BLAKE2B a9ca7691e1589061e65ed4acd3d404519da6fc984362ae1e37fde523d77ad2d1a1d9c78c5e8d873a40ff701fd9a4b62ce03202ece018f628c98ef59b462c7aef SHA512 7fc84ca7120b4a1e83fefff8c289c6eb78ba5127a80cc6304bec7c7118c6fcd08814fe66ea24267171fa7460effe871b371d2c2d9ae25af1218b73cd761ef6df
 DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
-DIST rrdtool-1.7.0.tar.gz 2849994 BLAKE2B f7a91fa661728850af55356a69b61ea1d4343c79579823e025e0a0757d1dab0d2cda6387197ece20e07f33a657743350cadfaf6504500f13be472d18e8826a3f SHA512 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f
 DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3066bb32e981b3254e41c53e29529698da5ef73f8365391180c76d15808d1d727a0834b8025893b01c3b9af8f46 SHA512 ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
 EBUILD rrdtool-1.6.0-r1.ebuild 4248 BLAKE2B 2e072f4503032b3f103ffb8ba21e60d9376608e763142b450b66a8dc6418cb130623f8d3eb8eaab68d884c9d80c561d318c9b2bae6fa17f0e9621815bdc710c7 SHA512 7ebb70f03615b612174bc9a66262c5eb2e658b8d7b6ddfce41bcff7e0ed589f31af4fd101dfedbd2b7578bdd88d060adba5f78028894a2d9a428c4b04a040e8e
-EBUILD rrdtool-1.7.0.ebuild 4301 BLAKE2B e5f7164f2dd661e6b56692812a7d09a42f2edf5402d8729e6114ff35ef66c4744e461c699376a10cfeadac2883f2c68a97de712eeb1e2b555732bddaeac2b1dc SHA512 2526dbb47c58bc067dd85f3923be6e22db815a2d6b71322452744eee5f440aace60178e6daddfda04635f2175277f4d28cffa3ab6d63f1660ae7c7b13b199e00
 EBUILD rrdtool-1.7.1.ebuild 4255 BLAKE2B 03afebd8aec6e29074c4def30106dd9b0c46383d3e1e62ca5c3b71cd938aecc53a9fdb6844ef20168e9e35b4ab17d1f201c20f7fce3a9c2f8080572693f97838 SHA512 92e9bdcbbaaa93b7e8c19caa111a1c7b8657ff03882bfef34165805dbaae8c4cd4753d0793fac1f96c7f0b560c0ba618d26177e6bd82ab2c59f85353815db216
 EBUILD rrdtool-1.7.2.ebuild 4203 BLAKE2B fcb474aef1bb6fe12b7c23515116f7e4cc214fc5ee2801aa1e3165e7d4cf5234fc48d01ca8ff156861f0c442800fbdfe06cb3011715de84ced266408f423ebfd SHA512 ee4702bc851fbdc723e1bcffb0c00c7f79c0337360f7558b07b5075c87729e0f618ecd80aecc077fec00bbf1dbc6f237698cfcebbe1d5779d867b382e98b52df
 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild
deleted file mode 100644
index 9f3cdf8e4bdf..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=true
-DISTUTILS_SINGLE_IMPL=true
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit autotools perl-module distutils-r1 flag-o-matic multilib
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
-SRC_URI="${HOMEPAGE}pub/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/8.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
-	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
-	dbi? ( dev-db/libdbi[static-libs(+)?] )
-	graph? (
-		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
-		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
-		>=x11-libs/pango-1.28
-	)
-	lua? ( dev-lang/lua:*[deprecated] )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	rados? ( sys-cluster/ceph )
-	tcl? ( dev-lang/tcl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-
-DEPEND="
-	${CDEPEND}
-	sys-apps/groff
-	virtual/pkgconfig
-	virtual/awk
-"
-RDEPEND="
-	${CDEPEND}
-"
-PDEPEND="
-	ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
-	"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-lua.patch
-	"${FILESDIR}"/${PN}-1.6.0-configure.ac.patch
-	"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
-
-)
-S=${WORKDIR}/${MY_P}
-
-python_compile() {
-	cd bindings/python || die
-	distutils-r1_python_compile
-}
-
-python_install() {
-	cd bindings/python || die
-	distutils-r1_python_install
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# At the next version bump, please see if you actually still need this
-	# before adding versions
-	if ! [ -f doc/rrdrados.pod ]; then
-		cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
-	else
-		die "File already exists: doc/rrdrados.pod. Remove this code!"
-	fi
-
-	# bug 456810
-	# no time to sleep
-	sed -i \
-		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
-		-e 's|^sleep 1$||g' \
-		-e '/^dnl.*png/s|^dnl||g' \
-		configure.ac || die
-
-	# Python bindings are built/installed manually
-	sed -i \
-		-e '/^all-local:/s| @COMP_PYTHON@||' \
-		bindings/Makefile.am || die
-
-	if ! use graph; then
-		sed -i \
-			-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
-			-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
-			tests/Makefile.am || die
-	fi
-
-	echo ${PV/_rc*/} >> VERSION || die
-
-	export rd_cv_gcc_flag__Werror=no
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
-
-	# to solve bug #260380
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
-	# Stub configure.ac
-	local myconf=()
-	if ! use tcpd; then
-		myconf+=( "--disable-libwrap" )
-	fi
-	if ! use dbi; then
-		myconf+=( "--disable-libdbi" )
-	fi
-	if ! use rados; then
-		myconf+=( "--disable-librados" )
-	fi
-
-	econf \
-		$(use_enable graph rrd_graph) \
-		$(use_enable lua lua-site-install) \
-		$(use_enable lua) \
-		$(use_enable perl perl-site-install) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable rrdcgi) \
-		$(use_enable static-libs static) \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
-		--with-perl-options=INSTALLDIRS=vendor \
-		--disable-ruby-site-install \
-		--disable-ruby \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	use python && distutils-r1_src_compile
-}
-
-src_test() {
-	export LC_ALL=C
-	default
-}
-
-src_install() {
-	default
-
-	if ! use doc ; then
-		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
-	fi
-
-	if use !rrdcgi ; then
-		# uses rrdcgi, causes invalid shebang error in Prefix, useless
-		# without rrdcgi installed
-		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
-	fi
-
-	if use perl ; then
-		perl_delete_localpod
-		perl_delete_packlist
-	fi
-
-	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
-
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
-
-	keepdir /var/lib/rrdcached/journal/
-	keepdir /var/lib/rrdcached/db/
-
-	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
-	newinitd "${FILESDIR}"/rrdcached.init rrdcached
-
-	use python && distutils-r1_src_install
-}