gentoo resync : 05.02.2020

4 files changed, 93 insertions, 3 deletions

diff --git a/net-analyzer/yersinia/Manifest b/net-analyzer/yersinia/Manifest
index 0035ce2df986..282d14232bca 100644
--- a/net-analyzer/yersinia/Manifest
+++ b/net-analyzer/yersinia/Manifest
@@ -1,7 +1,9 @@
 AUX yersinia-0.7.1-no-ncurses.patch 330 BLAKE2B 86c2cb84542012c6424fdcae398e07769647bcdda300d6efdbb263451c8765e23cd272f76e4e0e84751272df3de46a77b32fd2321a0ab3bc70cc8199b457adf6 SHA512 c0a0ef6456727eaa0ae9ea50667e04a72afb01c5b75d13965836657e4d1946df550840afd091ec58e8875b1a551df5966feb98b655183cec6dadaf4f5de23e4f
 AUX yersinia-0.7.3-tinfo.patch 563 BLAKE2B 6203584c6ff7b8e5438f57ad74b5b1ee7ee61d08b2bee21234fd4cfbb6aa37b9b1cb69b4a7af11e57434b215e346f6384a195ffdd47b9504fe6eb93b3d2109e9 SHA512 9a53505e050a9658f49809ad989d534e542fb0cf21ae70a9271b536a9a478a4306e49c9b0493ab522d5ffb82849eed043b212e399505c916792372a64d96c319
+AUX yersinia-9999-tinfo.patch 563 BLAKE2B ef2b554f82037dde165373fd6db71503ee124062cef4689062e7e1799f5ae26afd5758468f3c860690046aa4cb6e12dafd7ed3189a765a52565b5530a322d11a SHA512 a0edb5a47281bc66f0296914597fc4a9901f0e50640b43b6b31a30ddc4b6a5202220207039c3936f32769161f2c61d78afc5a3d7725d04ea41afd301312efa24
 DIST yersinia-0.7.3.tar.gz 378124 BLAKE2B 032015045cd5683c8853504bd821ebb3decbeaeea933a14983eec6498de33db79771ddeb08934c6ddf82db620aba89c84ac8c369af25e7bc19d820395ba68b57 SHA512 60a1b58e6d76448e9332656645b468a6aa66afa0f45ea4b70a929651194a294b9b559bbe5fbacaeb475126e7ac248cd97c29f3177e5080286b2f551f1400d339
 DIST yersinia-0.8.2.tar.gz 387889 BLAKE2B 67fe92b9cd1253874c61fa38c8e89e023f7d0ec3b83fe3001b5bc203d4033e36cb94b453ed56426b34d942036a143bd135f247466425337478f292797a433652 SHA512 2c7c89f19b6791150c472a6066b6ffaf9ac5b3d1a3d2e6a27f91293bba9a0f72d147266731e5e2670e4bf7e67ccf04b6e353071ca42d3d281b25126c9bfcb1dd
 EBUILD yersinia-0.7.3.ebuild 980 BLAKE2B 09c0454f6e0cafef056d9fee8e9ca72f18b220939fd90130fcc4ab2320a063742af2ea9e1536af37cb753c29c7b9dc2006f84e04cd2e804de1a1431c05144e35 SHA512 df6a775cc7761a450f408439dda555f1864384516ee88b7406512b9eef3f6f3beda7cbb75ba4b070e98d4eeefdda152b3206fa04a5855b36e38bf1e874c706e3
-EBUILD yersinia-0.8.2.ebuild 1038 BLAKE2B 2be39326cbdbbad9900a22c612c699eac71818225e62f7ccd9de3045f9467be7646e2523531343819e8853cb06081059f965ae16899ff92bf48d700552b2dbcb SHA512 4385b3fe96879188680c992ed430e71d267cc892e222582962b1539c76c806bf0924c6eaa6314bd0ead7c2b1bdeb200870cfaac771b7d6cf235b7b840254743c
+EBUILD yersinia-0.8.2.ebuild 1073 BLAKE2B 4a3e9b457adbc9b58858581562ce2a8e9b82f1ac268b85e4f8bac8c9c495a2b8dd226851d82e6c4f9adbed3818fdada84ef520a4d5215607392632737e3ec56c SHA512 b9bc63584bd24feff8a6344b44b68dbb099e43c60e2c2a6512a7c815c560adc7a8625455615db92c3a0d874341d7ce4ec332e52450f1a5e49460ddd577b4d552
+EBUILD yersinia-9999.ebuild 1049 BLAKE2B d39ae8cc02fc3c7196e09d2924278f06eaf7dc229dfd0209a6b60df39f4fd3316638471f608c6ddce08cfb3e1bfc40f6251a9b0ff95dfc395007884f4fd40a84 SHA512 73641e8b11c20b57f5d500da14d9943b39e93b70d8e2551181976c155a60f481c64da39dd250e86c8afc4cd552a291e0c76e7106c422bbbb04b6b6b969f7d8c5
 MISC metadata.xml 513 BLAKE2B bf48a4589a561ec123290ebac68b7c500d17447c10b5c3fe67f39eca9566db84a968598071e84dab84cd159ee927c5e421070ef391a13ea43fe63927454b21ce SHA512 47b3fd2bc0c3c09d142113fcf3ac23256364a5737692f4c5a30f4980325c6a706d95c55d26365ac878e8a34c2a2471984c4c608ac4ecad2606836ea990bd468b
diff --git a/net-analyzer/yersinia/files/yersinia-9999-tinfo.patch b/net-analyzer/yersinia/files/yersinia-9999-tinfo.patch
new file mode 100644
index 000000000000..b5bf566c107d
--- /dev/null
+++ b/net-analyzer/yersinia/files/yersinia-9999-tinfo.patch
@@ -0,0 +1,27 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -467,6 +467,7 @@
+      AC_DEFINE(HAVE_REMOTE_ADMIN)
+ fi
+ 
++PKG_CHECK_MODULES(ncurses,ncurses)
+ 
+ dnl Curses detection: Munged from Midnight Commander's configure.in
+ dnl
+@@ -616,6 +617,16 @@
+ 		AC_DEFINE(USE_NCURSES)
+ 		AC_DEFINE(HAS_CURSES)
+ 		has_curses=true
++	  else
++		if test "$ncurses_LIBS" ; then
++			CURSES_LIBS="$ncurses_LIBS"
++			CURSES_INCLUDEDIR="$ncurses_CFLAGS"
++			search_ncurses=false
++			screen_manager="ncurses"
++			AC_DEFINE(USE_NCURSES)
++			AC_DEFINE(HAS_CURSES)
++			has_curses=true
++		fi
+ 	  fi
+ 	)
+ 
diff --git a/net-analyzer/yersinia/yersinia-0.8.2.ebuild b/net-analyzer/yersinia/yersinia-0.8.2.ebuild
index 4ec918539c0f..669aa0df2290 100644
--- a/net-analyzer/yersinia/yersinia-0.8.2.ebuild
+++ b/net-analyzer/yersinia/yersinia-0.8.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="A framework for layer 2 attacks"
 HOMEPAGE="http://www.yersinia.net/"
@@ -45,6 +45,8 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cflags -fcommon
+
 	econf \
 		--enable-admin \
 		--with-pcap-includes=/usr/include \
diff --git a/net-analyzer/yersinia/yersinia-9999.ebuild b/net-analyzer/yersinia/yersinia-9999.ebuild
new file mode 100644
index 000000000000..f2825d6f6f13
--- /dev/null
+++ b/net-analyzer/yersinia/yersinia-9999.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic git-r3
+
+DESCRIPTION="A framework for layer 2 attacks"
+HOMEPAGE="https://github.com/tomac/yersinia"
+EGIT_REPO_URI="https://github.com/tomac/yersinia"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="gtk ncurses"
+
+RDEPEND="
+	ncurses? ( >=sys-libs/ncurses-5.5:= )
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		=x11-libs/gtk+-2*
+	)
+	>=net-libs/libnet-1.1.2
+	>=net-libs/libpcap-0.9.4
+"
+DEPEND="
+	virtual/pkgconfig
+	${RDEPEND}
+"
+DOCS=( AUTHORS ChangeLog FAQ README THANKS TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.1-no-ncurses.patch
+	"${FILESDIR}"/${PN}-9999-tinfo.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use gtk; then
+		#bug #514802
+		sed -i -e '/AM_GLIB_GNU_GETTEXT/d' configure.in || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cflags -fcommon
+
+	econf \
+		--enable-admin \
+		--with-pcap-includes=/usr/include \
+		$(use_with ncurses) \
+		$(use_enable gtk)
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}