gentoo resync : 29.12.2022

3 files changed, 2 insertions, 48 deletions

diff --git a/net-analyzer/gnome-nettool/Manifest b/net-analyzer/gnome-nettool/Manifest
index 0f26372a8171..3ab3ae507b28 100644
--- a/net-analyzer/gnome-nettool/Manifest
+++ b/net-analyzer/gnome-nettool/Manifest
@@ -1,6 +1,4 @@
 AUX 42.0-meson-drop-unused-positional-arguments.patch 1307 BLAKE2B 59c086c1dbec1853be1272ec20542516f4a3c730db2ee70aa392377b9506d1a0936923dc41cf7eb282d0d3454a60da9974b9f3aa9c51c604d6161213b0403f18 SHA512 8ead1d57f68415eb323896fc5a9bb3e0f67f7a976c12f8ceaafd81cbc45cd259df7cd835e3ae9b2311a42ebd9c0c3b66982b7398a99711b71e308fab662a9ba7
-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
-EBUILD gnome-nettool-3.8.1.ebuild 887 BLAKE2B 1d477c82c829ecb536140f52cd9f792dc39f50c62c95b66adc558bde9ffcfee17a3e1011006774787f89b23cc917b1fa00841a3643cef75f8e8ea80f497e6021 SHA512 3819612df6c5bfc0995f3968049dbc44b8233a5e7b152edf651f98f6168b97a76c92b93943042b06b2fb97378dc15d9ba5b8784081f9358b63106a3e28a80095
-EBUILD gnome-nettool-42.0.ebuild 967 BLAKE2B 2e23d5692ba153d9c6196e4c0b05b460527487bd1a3d0c1060929e900180bfae3c8256b6f7f902520c65504f900eb42eea8cb7e33b4c86368f44c08d62461eb6 SHA512 9c9b97bbd0930dbed8ad5596aacb661041d519ac22f7ad3c24b4a71edeced0c72712d8cc0fc852f4a5973b8b68528fe934804e45b66fe887998766613cef0618
+EBUILD gnome-nettool-42.0.ebuild 965 BLAKE2B ee12f83b352b8c6d1753098f37c1539df017c7040c6bd2acb1dabca073de2e968f0178cc2c9d1282d49720b5aae88331046c93265c5dd12c38535bdc3c02f0c1 SHA512 60a71e7ccc7238c6270f90cca1187814af9353620834e2dde2554b5dc7019dba63cc84f5e8706bd14881b945ccaf16b095dab68bb543a44d0113e7c2f31d5253
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild
deleted file mode 100644
index d2180ca2b6aa..000000000000
--- a/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="Graphical front-ends to various networking command-line"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-nettool"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.25.10:2
-	gnome-base/libgtop:2=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.90.4:3
-	x11-libs/pango
-"
-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
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_configure() {
-	gnome2_src_configure $(use_enable debug)
-}
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild
index 0237bc3c236d..cd1094cb845c 100644
--- a/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild
+++ b/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-nettool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="
 	>=x11-libs/gtk+-3.0.0:3