8 files changed, 12 insertions, 43 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 031406b4b2d6..c8517d0acbb9 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/kio-zeroconf/Manifest b/net-misc/kio-zeroconf/Manifest
index e551e54da898..7b6afcac9425 100644
--- a/net-misc/kio-zeroconf/Manifest
+++ b/net-misc/kio-zeroconf/Manifest
@@ -1,7 +1,5 @@
-DIST kio-zeroconf-23.04.3.tar.xz 44116 BLAKE2B 9cd9bdac2dda044485c1e665c875e85181ce540a251f28c3f7011c658523298072a96042ea30632422619054228aa9aa3ea4142a59fdddb918d64fd20cb10432 SHA512 83c401b0d5cc32088990635e805c9881bd234b5919eab973f26021841df0d3e06595c68d2b9a37dcbaa4158349a2540650b7897ef5209d7de54fa5913627df8a
 DIST kio-zeroconf-23.08.3.tar.xz 44372 BLAKE2B fb1d1657e864ce197f80d70e2112593a44d0a7503a1d5294117c31def0d9fbcbb24c51f7aa40bda10474d5f757365588052d47bb29ec1b477752d01bec46c422 SHA512 6e0393384565ff538c7f53ca4d537829d82b372f0a23d97d89ea78ffdcbb1e099ee278bb1f0234e5690f97dcc4b365b0369df909cb88479c9216051b609479e5
 DIST kio-zeroconf-23.08.4.tar.xz 44372 BLAKE2B 65aa26ecd0bfe558b46c651a83097a8d54c3f522cd979eadc6c9bee7bb6eec42d93f68e7025d3efc2033231ec8ddad4f38da0b1d69eaee205b550a1c5b9af11a SHA512 f7abb47080ddf1ea645971030e8e52e2c917b38bb3483bd998d8bb1cb5cbfa405a098da911ae852c65d5bd5afc1889fdef6e3caf6b8c493f441f0ac77d0c57c0
-EBUILD kio-zeroconf-23.04.3.ebuild 565 BLAKE2B c44d9b27a066ecf39836494b0fec84db9bda857042cc224840c84460fb7c7b7b194cd0fce80d9cfb9276ea3a002f3dd3b36a0c4b6fee806f970090cf9ad021d9 SHA512 db5d2bcb35c0d412cac6c601677461f05c6632926af9e1e86cf3b0eb965e9a92b51ef4b3dad85f30f1413f75c9e1e2c937bd9c4f8f419621576ca7dcd2ceec64
 EBUILD kio-zeroconf-23.08.3.ebuild 565 BLAKE2B c44d9b27a066ecf39836494b0fec84db9bda857042cc224840c84460fb7c7b7b194cd0fce80d9cfb9276ea3a002f3dd3b36a0c4b6fee806f970090cf9ad021d9 SHA512 db5d2bcb35c0d412cac6c601677461f05c6632926af9e1e86cf3b0eb965e9a92b51ef4b3dad85f30f1413f75c9e1e2c937bd9c4f8f419621576ca7dcd2ceec64
 EBUILD kio-zeroconf-23.08.4.ebuild 568 BLAKE2B 368319b220eb6f4dee152fa0d3661fc6b052a41c36d81ef60531b525b37d48e87298d0ec28722d38ed88784832f6db16796673ff4e5522ce1d0a37d6a3cc0607 SHA512 52ef155c1f3cccce18bfc9b0e2cc6f67f748c0c24c045508656e3e476015085a0f4e9eb1b1b8c0f21e79d2eb3d4f7f5df59743af3fd6e200c7a1f87794b06dba
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-23.04.3.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-23.04.3.ebuild
deleted file mode 100644
index b5993cb40e3e..000000000000
--- a/net-misc/kio-zeroconf/kio-zeroconf-23.04.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discovery)"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/net-misc/proxytunnel/Manifest b/net-misc/proxytunnel/Manifest
index eb2e342525ad..9af76f51f311 100644
--- a/net-misc/proxytunnel/Manifest
+++ b/net-misc/proxytunnel/Manifest
@@ -1,4 +1,4 @@
-DIST proxytunnel-1.11.1.tar.gz 55935 BLAKE2B fb24dcf5351eb252d7ba661c667cab25066592f6b7356360225d1492fcb621a39954062ebeb63c5cc1b9b66499538d69b8412ee6a770c88257f4ef0397f627c0 SHA512 2cc59285ca63beb063f3408655f31b2e9748f11cfff70e39b07dc3381348dd92c71a66974e83d360565ea107e53d830a57bc375e940a51388ced406ec5907006
-EBUILD proxytunnel-1.11.1.ebuild 1099 BLAKE2B 306c862080aac63a7bfe19382d3b02b32e619f7acd35e7fe8f535e26ecc377eff3584a6fc5461712281ac816dd1d367a21efe52386c569ad24ab2faf1de4362e SHA512 1a2018ff18e4d69aa58b72d562841427bcb19010a2dd5d0543c0bd0efabe6eb89b6aaf73b5a945f9e73bc88436cd27ca8c8060b587bf63d1f56a6b5b03d3fecc
+DIST proxytunnel-1.12.0.tar.gz 57664 BLAKE2B 3d5090a7f8f38fc928d68222e703913fcaade652c4d3cbf28b68682923c3558a7b3e17f00893a60b0cea4e27af185b50cf1ab52064e5125922c50716d5d9c0b7 SHA512 1a448728f49b34a3c6de2a876bfbd57b0f328f9f901db70cf8e6570eef81d2c26a0e0dbdfd566f683cea2d1b4816c01abc7049e5688b0335078034ec3f102b83
+EBUILD proxytunnel-1.12.0.ebuild 1099 BLAKE2B 306c862080aac63a7bfe19382d3b02b32e619f7acd35e7fe8f535e26ecc377eff3584a6fc5461712281ac816dd1d367a21efe52386c569ad24ab2faf1de4362e SHA512 1a2018ff18e4d69aa58b72d562841427bcb19010a2dd5d0543c0bd0efabe6eb89b6aaf73b5a945f9e73bc88436cd27ca8c8060b587bf63d1f56a6b5b03d3fecc
 EBUILD proxytunnel-9999.ebuild 1099 BLAKE2B f0583623d03bd83e41af0154343767de36dcc426789cff6272422c19d703f045ca38608dd4123454517d4253f56c3116940f3a3fd52bcf254d3f28dfab6a2f5a SHA512 44d288b26633cde054f04560c0123e158acc23a76957e1b208e3333b828c15cf801f3a9108f29919c6250aab8a90968d2a23a1b1e5d0b5987d5906d4cceb4acd
 MISC metadata.xml 718 BLAKE2B 886c8e0a950db2f3ba3d643089ebc02861ff82ae4011ada4bbb61ea5b926bf258d6332f95b13b12885a9a88effb1283c69df7c955d56b5e58742aad92e6a1ab7 SHA512 59d08a8785e6bbe0e2e8bdd48ef78c91e697159da4761d418ba265ab3886796ffdea605595689eb75ead2f96d11ccfd1004051bbcfdef6a94250c5c3db7d1cae
diff --git a/net-misc/proxytunnel/proxytunnel-1.11.1.ebuild b/net-misc/proxytunnel/proxytunnel-1.12.0.ebuild
index abdb6f3ed56f..abdb6f3ed56f 100644
--- a/net-misc/proxytunnel/proxytunnel-1.11.1.ebuild
+++ b/net-misc/proxytunnel/proxytunnel-1.12.0.ebuild
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 01965fe6fb54..eb6a47842b2c 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,5 +1,6 @@
 DIST putty-0.78.tar.gz 2811628 BLAKE2B 544fa7d3f7acfeb76cdb19e5ff3b60c81e4a1101ba16fab107d1f403745f792ab562d438d64a8a0a429b31ec426806c296a7b4e03916f8f32d2c227a54c32c71 SHA512 d7a3e2eabd5f1f65fc0f3f1ee0789c30fbe891b57f63ddeac0b92befcb6aecd4a748f04a21c76ee42d992deb77c2e1a0454a71cc620ef26fbf23af660bd84bb5
+DIST putty-0.80.tar.gz 2831433 BLAKE2B 95769ed372ee57f1cd0b9c9b26aab47c710b3eac2dd2f40b511179f1e06dae6c59ef5fd270eddc6b0531d8ed135897490ea029e0ca8c1febefe64743ddada341 SHA512 c8a6b6fa54ecd8bcf4ec274fef51343dd9996e6458b250b5555c4dc88ded25e87f97277da482c29858510e65635112d541f559ab683635bd950572d850129f90
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.78.ebuild 1737 BLAKE2B dba8b3d1142ab6b2eba92d78ca33a2c0a4cd0fbda6f50f60c47c2324011d3b428c4b56d6272d5fc7dd3b2b8a11a443b1a620012ddd2a01544792c368f4f9c400 SHA512 fc6a7e0bf203e35516f00e288b5d8c7f8e4858914b94e68d598c74733cf7e16d5d496d9c3e3d142a3e14da166a5d5a138d10d0f980ed687505ab483e16727e49
-EBUILD putty-9999.ebuild 1830 BLAKE2B ae8ac481031ed674d52aa70031c0eaa8f769b23534ef63a3b59b9a420a67b53e472cb7b7bf35ccd5d36243defdc9be5e9d55b0c606e7ce620b8629408096b166 SHA512 c373accbd85ab6ae24c243ef11bffc3f6afc0ff7d18430a9715be3c7ff8c898714f68f3963f500f82fb38c338ef3513a64241c3fc91bb8f151659a4801738535
-MISC metadata.xml 1007 BLAKE2B 358ab09685c2020a9d0bd49a7c4845cf3b0f31776d7ad9d11c99b70b325b9d902bad73690e68aa991b0123a3a720eb55f50d07f6df35e7142ddddb5146b92ed8 SHA512 45ed3f5781db722328f6101496538c2d920c6cfe5f9422ba838e4d723b9ca53ad2fa783a6c0dd36557e7d0008071d7886bd7e5f1ca76e1b83465a6312c01d772
+EBUILD putty-0.80.ebuild 1761 BLAKE2B 0a8cdff39a7c9783d239adbf25e19706c1b1ed08d9a66e500c11defddd90203ba0533cf674baca84beba23d78f1d7d269cd9cc0526d7fbe9fb33f8faa9d052c7 SHA512 ff6870abaaccd745c0a5d4f00cc2a315352e4a5fcdc02f1287c6c6a919556381873278509ec787f1a8f1d9c4df16ec74c249461155b6aaaf09f75786f049fa4c
+MISC metadata.xml 887 BLAKE2B c51675758674360519d21f8722a4ea0815bfc56591a28e9026e4aa02b0046006ab87bfcd68f945184f1d82710d912a0f3557c34f4d43fc5fadd7ad7c38b5c3d3 SHA512 be79490eb1313d5f9d4b80dacc6e7727d44c1106da668869e58f106235ff6b074d17ad3fe41aa09c176bf713e17dddda6a73df728bfdfe752db6ccbf9690befa
diff --git a/net-misc/putty/metadata.xml b/net-misc/putty/metadata.xml
index ba7ec402bc1d..6d9cc6eb57e8 100644
--- a/net-misc/putty/metadata.xml
+++ b/net-misc/putty/metadata.xml
@@ -15,6 +15,5 @@
 	<use>
 		<flag name="gssapi">Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)</flag>
 		<flag name="gtk">Build the PuTTY client which requires <pkg>x11-libs/gtk+</pkg>. If disabled only the CLI tools puttygen, plink, pscp and psftp will be built</flag>
-		<flag name="gtk2">Build the PuTTY client with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-0.80.ebuild
index f3873e1fcf7f..39a91c351eff 100644
--- a/net-misc/putty/putty-9999.ebuild
+++ b/net-misc/putty/putty-0.80.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,22 +12,22 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
 else
 	SRC_URI+=" https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 LICENSE="MIT"
 
 SLOT="0"
-IUSE="debug doc +gtk gtk2 gssapi"
+IUSE="debug doc +gtk gssapi"
 
 RDEPEND="
 	!net-misc/pssh
 	gtk? (
 		dev-libs/glib:2
-		x11-libs/gdk-pixbuf
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3[X]
 		x11-libs/libX11
 		x11-libs/pango
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3[X] )
 	)
 	gssapi? ( virtual/krb5 )
 "
@@ -40,10 +40,6 @@ BDEPEND="
 	doc? ( app-doc/halibut )
 "
 
-REQUIRED_USE="
-	gtk2? ( gtk )
-"
-
 src_unpack() {
 	[[ ${PV} == *9999 ]] && git-r3_src_unpack
 	default
@@ -54,7 +50,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DPUTTY_DEBUG="$(usex debug)"
 		-DPUTTY_GSSAPI="$(usex gssapi DYNAMIC OFF)"
-		-DPUTTY_GTK_VERSION=$(usex gtk $(usex gtk2 2 3 ) '')
+		-DPUTTY_GTK_VERSION=$(usex gtk 3 '')
 		-DPUTTY_IPV6=yes
 	)
 	cmake_src_configure