gentoo resync : 05.02.2020

4 files changed, 115 insertions, 8 deletions

diff --git a/net-misc/packETH/Manifest b/net-misc/packETH/Manifest
index b05c91361bce..1f23bc7753b2 100644
--- a/net-misc/packETH/Manifest
+++ b/net-misc/packETH/Manifest
@@ -1,9 +1,12 @@
 AUX packETH-1.7.3-libs-and-flags.patch 241 BLAKE2B a3818b1a8d59b17356ad1bb5efa6ed8655e6bc9dd88002dda83a02034db61afc2e054a0c6fe0cd623abc7ea3b478e97e379e0afc1013c63e417757f3dd6a51b9 SHA512 ec4daf8f0b13fe65273ccfa92237f9578fba332516ffba5b55e60b4c2888f8f620b93de28449dbca02da9fe0b106023d5ba2623cd2f73c142680d3e4894443b1
 AUX packETH-1.8.1-libs-and-flags.patch 249 BLAKE2B 039c2c8329ad4ba7dde845c34c1de353a5e6e3ac82629675d8f183295946572eabc13da376775c4759e5b00d026efd4ee2b415f61c2da96acda67f44e857630f SHA512 2db5774cf4a3747a2f06cda925269929fdf6895557206c5bd02356de57d85b8868b850494a544089c3b1334f150e729070f652206ec0bd690cecd7adbc68c570
+AUX packETH-2.1-fno-common.patch 1050 BLAKE2B 37b96926309c9ee1fa9654941f0f18b9edebea98397128e32550601f7e0a75068c5eca6ae7c5498c99601703519016967e5aeb6614b0237251097fad256ee9bd SHA512 1f51f5746e2fb9405b11e6b64e0e30ba426459d892f3f60e62c879f8ff0276167ab37f630e828b3648e04774aeca9e716962bc936ca5b6d497a6b87d0dad4fd9
 DIST packETH-1.7.3.tar.gz 395666 BLAKE2B e3ca7e727900a85cf3a8fa1e88b2763cecb6d284342e123932f5d19ae1c324d93045372386026940e4b1eeefa71ee52b380a5aab5eeab1aab70cf749a8626bf4 SHA512 349fd579bbbbbbbe2ca96374c8083ecf047a1c5f51626341bd7f98b4c8a29b74342311e45950a3f2628ba53dba250135c3802556b6aa5c49181e72313a7256d5
 DIST packETH-1.8.1.tar.bz2 321624 BLAKE2B 3360240cde8c3dea41ea0e226cd648dc4599b5e838281a3d6b731c6d095a1d0db32373fd20096a16fd04390cc5bed11e94d05789b9ad7c97a79d2df6c0e3fcc2 SHA512 caca26d3a0e9a175cdcaccc21f8d0038fd4c3dc0939b52ae6e16109d0e42b882b4de95524d35bfe7bafc131203ba23aac5f3baf825b2c55ab18022edadb04a4d
 DIST packETH-1.9.tar.bz2 450837 BLAKE2B 38eee3092be49ffffe7af23c30059d723e566d572c6a8dda6af5b44e8bc5b3c17d76cdccbdb4b4664ac245e1e7a41eb43e49eafc09a7e56b3f9d1ded93ba9239 SHA512 f322130a5981412f109555c52f9ae0b1c92e4f2a4c9a0ec2a62abeef368ade1ef08d5152724a6351fd626ef1dee4b5b98a61b250efd2391e4d61976d4ae4c50d
+DIST packETH-2.1.tar.gz 458750 BLAKE2B c08096e0781fc0174922d2eece31fa5e789ccfd7745eac0f16fbd515c6b5f72c7b9f7575fd215a3a1d0b69d6ae1f08427e5d145abbc83b9cbfeb6c6657d28b35 SHA512 55be4a2eb517c1d040664ea1a16d59dab20b06edbbd073cbf709deb4dfcec8d8eb12b88dfbd578f9bdb0ca614036ac4bbb00be6f865b774da2aa62ce8d3d767e
 EBUILD packETH-1.7.3.ebuild 560 BLAKE2B 27a2ace9442a787bd95f72e6714ad49a92c73d630ff3920b1052fac4689a51bcc90ea51511e672688174b24fe36fc2a1bf682a99085905cec06c5718e45a011d SHA512 c07a137b43016c4b8f7ba290e1e639324bf3e637212ec6a58f2e9c883998eec0a90f92c1532763a0445c90aba79182bef1669cf3d87ea9c97f4651d70e85440e
 EBUILD packETH-1.8.1.ebuild 581 BLAKE2B 1186c54a0b83364459e874f3c719cfd9fab902243b86de9efc6a23489446b25b59c5f13e072837dba81f0d5d19e687c800d77506abe1dd2c5d1791165101385f SHA512 729ced9c9c86d7136ff99d2bf3c0f323fc4b16e149dedd35114c52c55036a3a34791e3d6f2ae6be9c51f77f178f86c862d292a279f997038b3d7a51c2e38139f
 EBUILD packETH-1.9.ebuild 581 BLAKE2B 1186c54a0b83364459e874f3c719cfd9fab902243b86de9efc6a23489446b25b59c5f13e072837dba81f0d5d19e687c800d77506abe1dd2c5d1791165101385f SHA512 729ced9c9c86d7136ff99d2bf3c0f323fc4b16e149dedd35114c52c55036a3a34791e3d6f2ae6be9c51f77f178f86c862d292a279f997038b3d7a51c2e38139f
-MISC metadata.xml 357 BLAKE2B ec95c94191c3c330d41b0154e6426072c76244759ddff4d159d042d865e7ccf3a582a0d47b53fb1e1a10887290a6aaff6904d41cc398601e567b8064d6dd88b8 SHA512 ba34ba4c24562a688b3de68e5109666e75436aeac2148113794562ad632ff5a55712f67de8c8f6ace526c66764af2fb130c556692040b8a05088a4c7bf6d77a4
+EBUILD packETH-2.1.ebuild 1058 BLAKE2B 0cb8897039e981419d2890a892b7eb3a8295cb8f52fb17574e638b67756866c1a784f636cef6e05f1e738aa3565923b8bbd18cbef49e12fcfaf65e3179a61f3f SHA512 e491dd967dc85fe8c86a8df0919d1d7438f444bca00e7ed3e9b8f2e0c145018ffce609cf54554b99c09b7f74a930cbeecf8e608978331ef0a98e17f322cdbc2b
+MISC metadata.xml 413 BLAKE2B 8d0f984cc4740f606b9dd7633dc126f2dc57a7f07930a8a6f554e254df9f54eee1405179f61b14dec8ecf02bcd13019575c55abeccf404011b97b9aacdd4d7e3 SHA512 5dd67301ca215d9f3d0695d530e137cadec338c90996c0119deea631ac1d3a2219320229556b265fda561e02aba43d9cdf2169725559f95dc40de15951fa6adb
diff --git a/net-misc/packETH/files/packETH-2.1-fno-common.patch b/net-misc/packETH/files/packETH-2.1-fno-common.patch
new file mode 100644
index 000000000000..1f34c53d6b28
--- /dev/null
+++ b/net-misc/packETH/files/packETH-2.1-fno-common.patch
@@ -0,0 +1,42 @@
+--- a/src/function.c
++++ b/src/function.c
+@@ -66,7 +66,7 @@
+ int ipv6_start = 0;
+ int eth_start = 0;
+ gboolean stop_flag = 0;
+-extern char iftext[20];
++char iftext[20];
+ static unsigned long crc32_table[256];
+ int crc32_table_init = 0;
+ int ip_proto_used = 0; // 0 - none, 4 - ipv4, 6- IPv6, 806 - ARP
+--- a/src/function.h
++++ b/src/function.h
+@@ -22,6 +22,8 @@
+ 

+ #include <gtk/gtk.h>

+ 

++extern char iftext[20];

++

+ signed int char2x(char *p);

+ char c4(int value);

+ guint32 get_checksum32(int start, int stop);	

+--- a/src/function_send.c
++++ b/src/function_send.c
+@@ -55,7 +55,6 @@
+ extern long li_packets_sent_lastsec;
+ extern long sentstream[10];
+ extern long sendtime;
+-char iftext[20];
+ 
+ struct params  {
+ 	long long del;
+--- a/src/callbacks.c
++++ b/src/callbacks.c
+@@ -65,7 +65,6 @@
+ extern int stop_flag;
+ extern long desired_bw;
+ gint row_number;/* this is because i cant get the selected row number*/
+-gchar iftext[20];
+ gchar address_filename[100] = "addresslist";
+ static GtkWidget *entry_field;
+ static GtkWidget *entry_field_ip;
diff --git a/net-misc/packETH/metadata.xml b/net-misc/packETH/metadata.xml
index 25820382f571..1dacf90ddd48 100644
--- a/net-misc/packETH/metadata.xml
+++ b/net-misc/packETH/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>netmon@gentoo.org</email>
-		<name>Gentoo network monitoring and analysis project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">packeth</remote-id>
-	</upstream>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<use>
+<flag name='cli'>Build and install packETHcli</flag>
+</use>
+<upstream>
+<remote-id type="sourceforge">packeth</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-misc/packETH/packETH-2.1.ebuild b/net-misc/packETH/packETH-2.1.ebuild
new file mode 100644
index 000000000000..75ec8e7348eb
--- /dev/null
+++ b/net-misc/packETH/packETH-2.1.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 toolchain-funcs
+
+DESCRIPTION="Packet generator tool for ethernet"
+HOMEPAGE="http://packeth.sourceforge.net/"
+SRC_URI="https://github.com/jemcek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli +gtk"
+REQUIRED_USE="
+	|| ( cli gtk )
+"
+
+RDEPEND="
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+	)
+"
+DEPEND="
+	${RDEPEND}
+	gtk? ( virtual/pkgconfig )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.1-libs-and-flags.patch
+	"${FILESDIR}"/${PN}-2.1-fno-common.patch
+)
+DOCS=( AUTHORS CHANGELOG README )
+
+src_prepare() {
+	default
+	use gtk && eautoreconf
+}
+
+src_configure() {
+	use gtk && default
+}
+
+src_compile() {
+	use gtk && default
+	use cli && emake \
+		CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -C cli
+}
+
+src_install() {
+	use gtk && default
+
+	if use cli; then
+		dobin cli/${PN}cli
+		local i
+		for i in NEWS README TODO; do newdoc cli/${i} ${i}.cli; done
+	fi
+}