gentoo resync : 17.02.2020

4 files changed, 53 insertions, 5 deletions

diff --git a/net-analyzer/mbrowse/Manifest b/net-analyzer/mbrowse/Manifest
index b21ba25269e3..8fb6a01ea408 100644
--- a/net-analyzer/mbrowse/Manifest
+++ b/net-analyzer/mbrowse/Manifest
@@ -1,4 +1,6 @@
+AUX mbrowse-0.4.3-flags.patch 344 BLAKE2B 84e36e46bf28cbda61458c9b43df300c691b9e175035175bc751799ac6feca151ab3aa5deae15b1809c1a96da6442093aafac6ee5dccb928cbf7e04ec98949c9 SHA512 46b27bc97436a714f6c36a3690c1c935c76d74ba32bbaa4904a6522654ec61981df58ed48c6255357404a3af904c322fea01658abb1bddec61cf6071dbdc74d5
+AUX mbrowse-0.4.3-fno-common.patch 611 BLAKE2B 6c01824e75927a0d49c831cb6e2e668a25c2da539ec6ed7b9e1dd14acfc9e82ec2297e8bdb5b4baaa2ded7276022f55dbbca471fdec15ed920ccf5c8bd5d153a SHA512 2d6ef84299eeea297926f4366863ae53b1ccca89b4fca8b7d3fefe6a7113000360e5a44be65356d4028f0501ad2fcc4699974b0d65f6d56979d31aa93ee24f2c
 DIST mbrowse-0.4.3.tar.gz 146028 BLAKE2B 32b33dc4ec10a7b7ece07c47280b703c871e83a41f3cd8d60f7a177925da9c269020d927b193e8550fe15356c55bb4faa47c195354bb7784553601fc39ef00b7 SHA512 adccf8de707611034db0cbb6a37117f6a4741eb92656eab0e9e5c6a8268b17cc66080ed9663fe59a3fea9b110d83bcff9094b5fec133ca7ceb2650fd532a6cb4
-EBUILD mbrowse-0.4.3-r1.ebuild 660 BLAKE2B 68a3c11dae8232b10e567f88885c510797da914703e628141aa353b6efcdf81e341a1ef4ca7c4a6b8606910d077c08f54fb61dfba12ba7c9d050970b0942395c SHA512 2cfcf6a8d5bd66e7e204bd2aecb50650362e513c4bcd142729a69f2ef93e11ed4ee2cda2d8bb04c7f2ece49d18c6f7a4909a97eb54b49f30b536a81c99f24e08
+EBUILD mbrowse-0.4.3-r1.ebuild 702 BLAKE2B 48616bede69a6fa7eba0c46c66ff5515b6d1c3168f10c8de27e44ad93f779ced3dfbe2388cce3d6c9d8adee27442b65f20bd50b8471fb97969544b23a4f5d11b SHA512 2c4041248c1155c3157f7c007c38a41082f2c8ccba84ad7238da989aeed9f41cf44c8abf8d7ec453ac75920f052468730ff11a7a05c16f4f6d8066c75424b148
 EBUILD mbrowse-0.4.3.ebuild 572 BLAKE2B 88cbf9cc7a4e4dbcf17264eee44137d23e0f3069296fc05700d47158a2263a1b6a8474a83859c31418e2f485fbfbbe7a12b8e2424a5652e2f359985a2334b052 SHA512 c9984d298f30a081068ec8de858c1d7c3a195af2a74c3fc82f4c85f7e801d8aaa1aa27c057fcb8577e95526c98c5b7c1f15786ea556aacfb4c41b80b369e367d
 MISC metadata.xml 357 BLAKE2B 725053ef04034d1a1c6272ed485156e4e2a933ef149a5df00d6a6b8b03bd48d6a1b49564c25d7d91ab78673d49e23f8587b7af091ffe20848b21a0bc157b2ac5 SHA512 5199c9147351e6dc733c1b8f2edaf598d9ae32d0a72de149a2b1550a4aaa1081d80ee5ae175fd9dc4de7e65d177055ee9dad006a81a268f8af6f8497e202261f
diff --git a/net-analyzer/mbrowse/files/mbrowse-0.4.3-flags.patch b/net-analyzer/mbrowse/files/mbrowse-0.4.3-flags.patch
new file mode 100644
index 000000000000..f17904b66901
--- /dev/null
+++ b/net-analyzer/mbrowse/files/mbrowse-0.4.3-flags.patch
@@ -0,0 +1,16 @@
+--- acinclude.m4
++++ b/acinclude.m4
+@@ -277,13 +277,11 @@
+     echo "***   --with-snmp-lib=DIR"
+     echo "***"
+     CFLAGS="$ac_save_CFLAGS"
+-    LDFLAGS="$ac_save_LDFLAGS"
+     LIBS="$ac_save_LIBS"
+     ifelse([$3], ,:,[$3])
+   fi
+ 
+   CFLAGS="$ac_save_CFLAGS"
+-  LDFLAGS="$ac_save_LDFLAGS"
+   LIBS="$ac_save_LIBS"
+ 
+   AC_SUBST(SNMP_CFLAGS)
diff --git a/net-analyzer/mbrowse/files/mbrowse-0.4.3-fno-common.patch b/net-analyzer/mbrowse/files/mbrowse-0.4.3-fno-common.patch
new file mode 100644
index 000000000000..72a4c785a13c
--- /dev/null
+++ b/net-analyzer/mbrowse/files/mbrowse-0.4.3-fno-common.patch
@@ -0,0 +1,29 @@
+--- a/src/interface.h
++++ b/src/interface.h
+@@ -9,12 +9,14 @@
+   GtkAccelGroup *accels;
+ } main_widgets_t;
+ 
+-struct menu_items {
++typedef struct menu_items {
+   char *item;
+   GtkSignalFunc func;
+   gpointer data;
+   GtkWidget *mi;
+-};
++} menu_items;
++
++extern struct menu_items bookmark_items[128];
+ 
+ void set_hostname(const char *host);
+ void set_oid(const char *oid);
+--- a/src/bookmarks.c
++++ b/src/bookmarks.c
+@@ -27,7 +27,6 @@
+ static GtkWidget *bkdial;
+ int delete = 0;
+ 
+-struct menu_items bookmark_items[128];
+ static GtkWidget* create_bookmark_dialogue(void);
+ 
+ static void mark_for_delete(void) {
diff --git a/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild b/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild
index 703e99ef3ccb..ab930a39ba20 100644
--- a/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild
+++ b/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,12 +21,13 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS README ChangeLog )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.3-flags.patch
+	"${FILESDIR}"/${PN}-0.4.3-fno-common.patch
+)
 
 src_prepare() {
 	default
-	sed -i \
-		-e '/LDFLAGS=/d' \
-		acinclude.m4 || die
 	eautoreconf
 }