gentoo resync : 30.09.2020

3 files changed, 2 insertions, 79 deletions

diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 9db367ca2e9c..4845a0d451a3 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,8 +1,6 @@
 AUX ettercap-0.8.3-fno-common.patch 741 BLAKE2B 907c78c720e2a55bc7325f8611ec0bd8a869b9b0a172445e45f064faa988c5e2863bd46d3f2a724613c9f6311e4d925472d701aee4963546a2b4e771b4a04255 SHA512 6c896bdbfac24bd698f49ed33617f2a9b43f4ec080b292e9d1b06e038b53b3dfaeadc3d6d0e08a968f8a1e9ccc71cff266412a1858bbf4bfbb9c294947c795cf
 AUX ettercap-0.8.3.1-libressl.patch 1147 BLAKE2B bb3cf4e73f9a03cb13a82e6569d05f52ffe2bf438fc834f5793057c9aab85a5edff7a2c5830a5aecddce8646e9a5d370be4654610516bdbbdcfaff63a2b8ea04 SHA512 57c8c6c04f4b49598fedc702d119963e7633ebec4008d4c3467749e7f5053572f9d8fe1254f7ed6554975791300ba2e96e481a86a656f6ec0d80d5a011254b92
 DIST ettercap-0.8.3.1.tar.gz 6678653 BLAKE2B 2680b97454626a6f1af3b21f689ba8eed7a023c3ef5cd84d5b2b5859382f398b3a6fc622270ca41941a8a18a7bdd260af64165344a33b2e195c86ee61567f2eb SHA512 9bd71dcc1730293ee83934aca3587dfde662cb3890c12fafa557b6359f12226e5cb6f59a0db1aa11245a132b275e355e3bcc8952db921171d27b792827f148b5
-DIST ettercap-0.8.3.tar.gz 8381943 BLAKE2B f49098d61f60877d3f979d7861f36dad6ec3fbfca7ed89d8f9826867145ea36daec65a1076c893f81391218688448515ef020a9cdf9a16ffddc830bacec8eb1c SHA512 1929c986d3a17ebc693ffe8531e01c66379c0ee6ea71305ea49b6a9eece84b6da1923135311db458bdb6035feb593e525786e6cf4c465ced5a7683384d4a4ae7
-EBUILD ettercap-0.8.3.1.ebuild 1851 BLAKE2B aebcd0be22f8fda3158d21d721874cb20672301af9993f96ae309f3cc5c24270071c87e2d80f031b785a2a039db0d08f1c1c6fcc8d73bc8ceaf3e1db8947d07b SHA512 01b1e02b01f6c38fec77595d65937aa910240a6964d8d889d8f6d4993884d1d5fc90bfdadda515faaa5c1bc4283e6c18c3e686b64e73d40c9a2696da41cc775c
-EBUILD ettercap-0.8.3.ebuild 1825 BLAKE2B 67ea7421490b802862350501d505722efcfce8779a0e65a6815980ca4e25f3be75f8a50d94f3c2478375a79d04721d2b0ac9718932cb569a3050b5c91e6b592b SHA512 ef4f1d1488fd92569f42e699494eef056ed0252b287ec6c94eb21f92ef071772158a07fec18a1387c7a77d9ef01b4c3e73fb426df4886fa8eb8eecdf92c291f6
+EBUILD ettercap-0.8.3.1.ebuild 1850 BLAKE2B 2bd65f9b1dee27731671f7b1f7e669a9be0968f45e8682833f2076cbd8319bc21f67f281932f3ab72c7a2a13845f36bc392df00576e56fbdd948e2dac47c2b24 SHA512 ab334f8a0e70726703d3d82562ccd160e6488e908c2fe415386484150116e600ff5079bee7fbf854bcbe5501531e399415e85f753d59f1972a3b7884660351d9
 EBUILD ettercap-9999.ebuild 1809 BLAKE2B 2dcdca206b6ec876b887c0d4b126f4f0800ca9ac9e3b4801d3d2e4475f07d66683396320fdd3be51106bbf1c0151734d1cc1c9f9ccece788327e13e5f0b5d531 SHA512 d709b14a46a70723f0f72a2615bc97f720babf5900e177ded948a9c00e627db9a66fe6aeb80fb406bfd9e7ca966e01b9bb20aa85154a162e56763a035785c394
 MISC metadata.xml 657 BLAKE2B e32e3fbc55029a9398399a2e2b69974f720826f8769379868ae80e32d2a9b2a69bfeb59b349dae91b7f27a759647091f58ea07a9b23a6dcf32d373966310bdde SHA512 0b682cb596f905882f2c0682c163d31410b94ca873a468db93e155103aeb1e943bff1c55bde1c9537478ce324d368f468bcb91c98f0aefb9dfa2a2239d7f73d5
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
index aa5cb4b852ff..7d5c3ac6c11e 100644
--- a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.3.1.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"
+	KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
 fi
 
 IUSE="doc geoip gtk ipv6 libressl ncurses +plugins test"
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.ebuild
deleted file mode 100644
index f49ef8cf2e4f..000000000000
--- a/net-analyzer/ettercap/ettercap-0.8.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="A suite for man in the middle attacks"
-HOMEPAGE="https://github.com/Ettercap/ettercap"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	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"
-fi
-
-IUSE="doc geoip gtk ipv6 libressl ncurses +plugins test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/libbsd
-	dev-libs/libpcre
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libnet:1.1
-	>=net-libs/libpcap-0.8.1
-	sys-libs/zlib
-	geoip? ( dev-libs/geoip )
-	gtk? (
-		>=dev-libs/atk-1.2.4
-		>=dev-libs/glib-2.2.2:2
-		media-libs/freetype
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.2.2:2
-		>=x11-libs/pango-1.2.3
-	)
-	ncurses? ( >=sys-libs/ncurses-5.3:= )
-	plugins? ( >=net-misc/curl-7.26.0 )"
-DEPEND="${RDEPEND}
-	doc? ( app-text/ghostscript-gpl
-		sys-apps/groff )
-	test? ( dev-libs/check )
-	sys-devel/flex
-	virtual/yacc"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
-)
-
-src_prepare() {
-	sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CURSES="$(usex ncurses)"
-		-DENABLE_GTK="$(usex gtk)"
-		-DENABLE_PLUGINS="$(usex plugins)"
-		-DENABLE_IPV6="$(usex ipv6)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_PDF_DOCS="$(usex doc)"
-		-DENABLE_GEOIP="$(usex geoip)"
-		-DBUNDLED_LIBS=OFF
-		-DSYSTEM_LIBS=ON
-		-DINSTALL_SYSCONFDIR="${EPREFIX}"/etc
-	)
-		#right now we only support gtk2, but ettercap also supports gtk3
-		#do we care? do we want to support both?
-	cmake-utils_src_configure
-}