[gentoo-commits] repo/gentoo:master commit in: net-analyzer/gnome-nettool/files/, net-analyzer/gnome-nettool/

[Matt Turner]

commit:     f5416db3f4a8682b6493d6f527d03d06f6972a94
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 04:02:44 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 04:03:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5416db3

net-analyzer/gnome-nettool: Version bump to 42.0

Bug: https://bugs.gentoo.org/835391
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-analyzer/gnome-nettool/Manifest                |  1 +
 ....0-meson-drop-unused-positional-arguments.patch | 38 +++++++++++++++++++++
 .../gnome-nettool/gnome-nettool-42.0.ebuild        | 39 ++++++++++++++++++++++
 3 files changed, 78 insertions(+)

diff --git a/net-analyzer/gnome-nettool/Manifest b/net-analyzer/gnome-nettool/Manifest
index d63b7d4fc227..af7a39e5ec79 100644
--- a/net-analyzer/gnome-nettool/Manifest
+++ b/net-analyzer/gnome-nettool/Manifest
@@ -1 +1,2 @@
 DIST gnome-nettool-3.8.1.tar.xz 589024 BLAKE2B f12c43b713ae81a2460b12c150e2c52baf98900b14ce0ff188b3fb1a55aa636391fb62d9c20b40d3a60ff322d4af9744d072c2727a77bced056ef0df042e21cf SHA512 c1c90fa727ebbf21442c4d0f5f4e98acf91fdd68a476f5f378167f92c3d7938ef33598525b62b838dc9b485abeb40171bdffb0fe3cb060fd3982db013a30bbed
+DIST gnome-nettool-42.0.tar.xz 422880 BLAKE2B 847f14781865eb936f0ded28a3f45ffa4ed02a20d335aea95a623795a2bb40bf57a49ecb28b26088c2818d028a401b3ef346806ea60305022bcafc9972094f4e SHA512 a640cd7f2008be870c4c457d3f793e6d31a10457b826641ef3cb9b831ea1d80756abc2a39aef7cb093905adafe41f27ee3c5648b1a6a3a01aa3d3ee7988330ce

diff --git a/net-analyzer/gnome-nettool/files/42.0-meson-drop-unused-positional-arguments.patch b/net-analyzer/gnome-nettool/files/42.0-meson-drop-unused-positional-arguments.patch
new file mode 100644
index 000000000000..e1da4288a742
--- /dev/null
+++ b/net-analyzer/gnome-nettool/files/42.0-meson-drop-unused-positional-arguments.patch
@@ -0,0 +1,38 @@
+https://gitlab.gnome.org/GNOME/gnome-nettool/-/merge_requests/3
+
+From 1124c3e1fdb8472d30b7636500229aa16cdc1244 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jeremy.bicha@×××××××××.com>
+Date: Wed, 6 Apr 2022 13:05:25 -0400
+Subject: [PATCH] meson: drop unused positional arguments
+
+This fixes a build error with newer meson
+---
+ data/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 585e6d3..ed1e8bb 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -20,16 +20,14 @@ desktop_in = configure_file(input: 'gnome-nettool.desktop.in.in',
+                             output: 'gnome-nettool.desktop.in',
+                             configuration: desktop_conf)
+ 
+-i18n.merge_file('desktop',
+-                type: 'desktop',
++i18n.merge_file(type: 'desktop',
+                 input: desktop_in,
+                 output: 'gnome-nettool.desktop',
+                 po_dir: po_dir,
+                 install: true,
+                 install_dir: join_paths(prefix, datadir, 'applications'))
+ 
+-i18n.merge_file('appdata',
+-                type: 'xml',
++i18n.merge_file(type: 'xml',
+                 input: 'gnome-nettool.appdata.xml.in',
+                 output: 'gnome-nettool.appdata.xml',
+                 po_dir: po_dir,
+-- 
+GitLab
+

diff --git a/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild
new file mode 100644
index 000000000000..947f77f258a6
--- /dev/null
+++ b/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson
+
+DESCRIPTION="Graphical front-ends to various networking command-line"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-nettool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=x11-libs/gtk+-3.0.0:3
+	>=dev-libs/glib-2.26:2
+	gnome-base/libgtop:2=
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		net-misc/iputils
+		net-analyzer/tcptraceroute
+		net-analyzer/traceroute
+	)
+	net-analyzer/nmap
+	net-dns/bind-tools
+	net-misc/netkit-fingerd
+	net-misc/whois
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-meson-drop-unused-positional-arguments.patch
+)