gentoo resync : 28.04.2019

4 files changed, 2 insertions, 127 deletions

diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 5a5e648381f0..2c97cf556038 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,8 +1,6 @@
 AUX cve-2017-6430.patch 2437 BLAKE2B 4267c1028467734e45f0a2b730498b6b1de86d9aca95377d7afe76d872ae05c0c9c5e600e8c35f7e0f74d00a125cbffce7f372d543e1728a83121c234ef65366 SHA512 fd3477e7ab087d2b0fdfff6ef331ca8ae4aa838ece54a84d4e597d57cf45425a4dc4be60b9caadf0af25ebe8072eea542092e400e6fe219696b0dc13ca4e205b
 AUX ettercap-0.8.2-openssl-1.1.patch 8769 BLAKE2B 6c9d7e8c60264b6ac0724891f9cbc9b2436bb943680d3e8612aee152bd360ea9f38a778175906787039041e654b49f91353f4cdc678f36753e289270c4b148b3 SHA512 0ba60719cde9648aae37499c1caa6f3e0630e31f1e819945648d778aa6359f0b3771d7673f16a81c4e7ea8efdcf84bf3fb55979d952cb767cb5334f5d154ca9d
 DIST ettercap-0.8.2.tar.gz 8082561 BLAKE2B 851df0a8700de45ce0e3427f7fdbdcd13feb2f75c0d1136563449db634b1f02276bade0d82a1a51bf8de726d6faddf05ff537e397c2e56cfc3e3181d25566fe9 SHA512 18137b1cc518c9db3c9650157a5cbf09dbb665b79876a24875d6c5125e8923ebde543464adb61cf1d1244101242f4d66b80d94ef3b36aa265cefca7646aa6415
-EBUILD ettercap-0.8.2-r1.ebuild 1714 BLAKE2B 2ffce7cce8e652e21470b00f70ef35d90ef768a9344abbebcbd92bed23ba008794932e622a3c31002651ff64e27336819943c14c92621fdb79b2d30d63da8852 SHA512 dda9381deb9b088fb39b7c1de4f7421b43c231d0c7535428ea148533787ece0a8bf31a93e580cfe108cfebd73da2b0ed1668274fa93d47042b1342447753be56
-EBUILD ettercap-0.8.2-r2.ebuild 1790 BLAKE2B e9facbe27ca2a72c28667fcc25c0ac959d2d1b8988f9e0824d351ba3049654391cd27603b350a0bef5752d61b4dce9f52563d2e0f35d1ac788e36015623a862e SHA512 8726c9a5e42ffd27f68974814d01be13c4912a680e001e810827d8edf4478797c6f63df79efa8208309fc92266dad3254f6a890dd15c877646552d7d3bdb64b3
-EBUILD ettercap-0.8.2.ebuild 1660 BLAKE2B 6cf57f82a93894c9bff14d56e823494fd7fd5fcce0285bd19e6316b5db7292e4a19874eccadfaa40ced9e2e3736007e94c30eb96f92f9b3bf714e75dd87f512e SHA512 d8a2b9dc5f6952cbffb15fe18689a7e3587a8d40e52159e65aaea9199f0de43da48bfc6b9c5ee6ab008f24f424d8350b0095246689d7ce36c4cd0a8c9f4f1015
+EBUILD ettercap-0.8.2-r2.ebuild 1789 BLAKE2B a23ee25a8d7c4b95a072183c1cbc6f1465b013ba5cb9cd894481b9063af043f7802ffd2b4311b030973b9acc04bf956e49922b2ed6105c67073f50b62b798946 SHA512 29bb82ce78874bf7b0b512b4a6033a80d1eafa125e4bbae14d6df3d89d92e55158ed6dea064fee50d04d82472b07082e177ffde512274c9e037f7a62299eb7ba
 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.2-r1.ebuild b/net-analyzer/ettercap/ettercap-0.8.2-r1.ebuild
deleted file mode 100644
index 71fe6afb63cf..000000000000
--- a/net-analyzer/ettercap/ettercap-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A suite for man in the middle attacks"
-HOMEPAGE="https://github.com/Ettercap/ettercap"
-SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" #mirror does not work
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="gtk ipv6 ncurses +plugins"
-
-RDEPEND="dev-libs/libbsd
-	dev-libs/libpcre
-	dev-libs/openssl:0=
-	net-libs/libnet:1.1
-	>=net-libs/libpcap-0.8.1
-	sys-libs/zlib
-	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}
-	sys-devel/flex
-	virtual/yacc"
-
-src_prepare() {
-	sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
-	epatch "${FILESDIR}"/cve-2017-6430.patch
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable ncurses CURSES)
-		$(cmake-utils_use_enable gtk)
-		$(cmake-utils_use_enable plugins)
-		$(cmake-utils_use_enable ipv6)
-		-DBUNDLED_LIBS=OFF
-		-DSYSTEM_LIBS=ON
-		-DINSTALL_SYSCONFDIR="${EROOT}"etc
-	)
-		#right now we only support gtk2, but ettercap also supports gtk3
-		#do we care? do we want to support both?
-
-		#we want to enable testing but it fails right now
-		#we want to disable the bundled crap, but we are missing at least "libcheck"
-		#if we want to enable tests, we need to fix it, and either package libcheck or allow bundled version
-		#$(cmake-utils_use_enable test TESTS)
-	cmake-utils_src_configure
-}
diff --git a/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild b/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild
index 318cbc6ec486..e8904593dbd3 100644
--- a/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.2-r2.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" #mirror does not work
-	KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
 fi
 
 IUSE="doc gtk ipv6 libressl ncurses +plugins test"
diff --git a/net-analyzer/ettercap/ettercap-0.8.2.ebuild b/net-analyzer/ettercap/ettercap-0.8.2.ebuild
deleted file mode 100644
index 7cb81f8684c1..000000000000
--- a/net-analyzer/ettercap/ettercap-0.8.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A suite for man in the middle attacks"
-HOMEPAGE="https://github.com/Ettercap/ettercap"
-SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" #mirror does not work
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="gtk ipv6 ncurses +plugins"
-
-RDEPEND="dev-libs/libbsd
-	dev-libs/libpcre
-	dev-libs/openssl
-	net-libs/libnet:1.1
-	>=net-libs/libpcap-0.8.1
-	sys-libs/zlib
-	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}
-	sys-devel/flex
-	virtual/yacc"
-
-src_prepare() {
-	sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable ncurses CURSES)
-		$(cmake-utils_use_enable gtk)
-		$(cmake-utils_use_enable plugins)
-		$(cmake-utils_use_enable ipv6)
-		-DBUNDLED_LIBS=OFF
-		-DSYSTEM_LIBS=ON
-		-DINSTALL_SYSCONFDIR="${EROOT}"etc
-	)
-		#right now we only support gtk2, but ettercap also supports gtk3
-		#do we care? do we want to support both?
-
-		#we want to enable testing but it fails right now
-		#we want to disable the bundled crap, but we are missing at least "libcheck"
-		#if we want to enable tests, we need to fix it, and either package libcheck or allow bundled version
-		#$(cmake-utils_use_enable test TESTS)
-	cmake-utils_src_configure
-}