gentoo auto-resync : 29:09:2022 - 15:22:54

6 files changed, 30 insertions, 200 deletions

diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index f50e8538f50e..10b943257e89 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,8 +1,6 @@
-DIST putty-0.76.tar.gz 2735687 BLAKE2B 7994a8ea4eb735091e92438fd9558b1047b2ddffe53e3cd2ae7c182e333d21482de7c1a549b738d00af1e592e078648b153fa095a9e5310ee4a884c0cc9fb896 SHA512 4576b359593928c6eba923f2d7b66ac0f2cf00e0c217cdbbb124471c3b35feb090e623847bfc507a4ef106cb3067aac47419e241b11dd8bf4ae554061fa93c25
+AUX putty-0.77-nogssapi.patch 567 BLAKE2B 2fe0a8633ae122f9c9220f898d3bdeaacedc844f50a510e6822138843da1b6d9477ad2bb414d1df2ef3ca94be69e83ff9391c69eeeedb0b9793582403f4fd0dc SHA512 a0704a360180114ef1b4d8cf2882cb1e5e7cfbc286f3abe2deae80fea0703b8fcf1dc816b117ca445355b97064e7446b8b1af6a1f7bc8375f7d89651f3505e39
 DIST putty-0.77.tar.gz 2619481 BLAKE2B 83b0838a3923c93f95020297d6402872605609da81d33f864d72074d1e5cae2fcf2710a038aef1de56077de2e296f4c5e573af077f4b55e433563f680cd9cc4b SHA512 35eb1e3f98a07611365bedc492c69a5475ce9b3d920ecebc78c76813505684c16cfcbfbb2306c1106fb5a9b72ca3dd52cbd39b9e9805c6689c9a9464910c0e7d
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
-EBUILD putty-0.76.ebuild 1707 BLAKE2B 5da5dbaf196d105ffcdeac1fba6b49f0be19d69d851bfbb0e79812aabc3573d717a440c693ffd96df62d8290c43581b08130c794f0000ed66c7018bbcc10e038 SHA512 93f499eb5fe6fbf3844cbc8a3c970d5329660d85da134b2811de6f9be0c930951057445cc7e663c91467e4e4646cf4f8e1c11d7f3f4de1ebce5a1ea5295d7161
-EBUILD putty-0.77-r1.ebuild 1851 BLAKE2B 81beaf794457204d0e8cd5c54d11b61a47cc2541abf8722677727859ac2977d145645a317eb01254d248ee4e7dde5162edb131f435a0102b7a1a853fbe0cbd2d SHA512 e08e2470968a83cef9a8f225dcf316e00db231a4ce2f43dec93894735dbef3e8571d08b5c569bfb5888017e1d9b3ae91f56b8f69b7542f6503d53120c58b105d
-EBUILD putty-0.77-r2.ebuild 1831 BLAKE2B 1d829824482af8079cb7a80227d00553b980c722ffa76ba84973d2f885f58fe3251476bc2de8848f8bbd0d95753ff813905012eeeceaea7560a978ea0c4ffd7f SHA512 9c5e0711759336b3b3642b18f819b575efb9778695cad0874f061b8b52f3853fec1b1c4da1ea6fed86cad94b7e5f6a820ef0532bfa16e7b57e74851e198a2e63
-EBUILD putty-9999.ebuild 1851 BLAKE2B 81beaf794457204d0e8cd5c54d11b61a47cc2541abf8722677727859ac2977d145645a317eb01254d248ee4e7dde5162edb131f435a0102b7a1a853fbe0cbd2d SHA512 e08e2470968a83cef9a8f225dcf316e00db231a4ce2f43dec93894735dbef3e8571d08b5c569bfb5888017e1d9b3ae91f56b8f69b7542f6503d53120c58b105d
+EBUILD putty-0.77-r3.ebuild 1899 BLAKE2B 8924c081a3d250bf5bd3e86097dfe4ea697aaf663b1173cf567a86327f35f780f821051af656bb58bbf30002d9410dbe179088d61d8f0cde8056298d38185649 SHA512 24b4ce38c7c5eb014f80260875d3db63f0566b5d480d955d7113a9e454991a72cee5840e177824c8be85af727d8bdc8909a160dc30f9c309be6edd1479adfc9b
+EBUILD putty-9999.ebuild 1830 BLAKE2B ae8ac481031ed674d52aa70031c0eaa8f769b23534ef63a3b59b9a420a67b53e472cb7b7bf35ccd5d36243defdc9be5e9d55b0c606e7ce620b8629408096b166 SHA512 c373accbd85ab6ae24c243ef11bffc3f6afc0ff7d18430a9715be3c7ff8c898714f68f3963f500f82fb38c338ef3513a64241c3fc91bb8f151659a4801738535
 MISC metadata.xml 1007 BLAKE2B 358ab09685c2020a9d0bd49a7c4845cf3b0f31776d7ad9d11c99b70b325b9d902bad73690e68aa991b0123a3a720eb55f50d07f6df35e7142ddddb5146b92ed8 SHA512 45ed3f5781db722328f6101496538c2d920c6cfe5f9422ba838e4d723b9ca53ad2fa783a6c0dd36557e7d0008071d7886bd7e5f1ca76e1b83465a6312c01d772
diff --git a/net-misc/putty/files/putty-0.77-nogssapi.patch b/net-misc/putty/files/putty-0.77-nogssapi.patch
new file mode 100644
index 000000000000..84d36e1849e0
--- /dev/null
+++ b/net-misc/putty/files/putty-0.77-nogssapi.patch
@@ -0,0 +1,18 @@
+Define NO_GSSAPI when -DPUTTY_GSSAPI=OFF
+
+Previously it would only be defined if -DPUTTY_GSSAPI=DYNAMIC and libdl is
+not found on the system. Setting -DPUTTY_GSSAPI=OFF on systems with glibc
+2.33 and earlier causes a build failure, because libdl is not linked in.
+
+Bug: https://bugs.gentoo.org/873355
+--- a/cmake/platforms/unix.cmake
++++ b/cmake/platforms/unix.cmake
+@@ -105,6 +105,8 @@
+       "Could not find libdl -- cannot provide dynamic GSSAPI support")
+     set(NO_GSSAPI ON)
+   endif()
++else()
++  set(NO_GSSAPI ON)
+ endif()
+ 
+ if(PUTTY_GSSAPI STREQUAL STATIC)
diff --git a/net-misc/putty/putty-0.76.ebuild b/net-misc/putty/putty-0.76.ebuild
deleted file mode 100644
index 49c3ca73ee4d..000000000000
--- a/net-misc/putty/putty-0.76.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop toolchain-funcs xdg-utils
-
-DESCRIPTION="A Free Telnet/SSH Client"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
-SRC_URI="
-	https://dev.gentoo.org/~matthew/distfiles/${PN}-icons.tar.bz2
-	https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz
-"
-IUSE="doc +gtk gtk2 ipv6 gssapi"
-RDEPEND="
-	!net-misc/pssh
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf
-		x11-libs/libX11
-		x11-libs/pango
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3[X] )
-	)
-	gssapi? ( virtual/krb5 )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-"
-REQUIRED_USE="
-	gtk2? ( gtk )
-"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|-Werror||g' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	cd "${S}"/unix || die
-	econf \
-		$(use_with gssapi) \
-		$(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) )
-}
-
-src_compile() {
-	emake -C "${S}"/doc
-	emake -C "${S}"/unix AR="$(tc-getAR)" $(usex ipv6 '' COMPAT=-DNO_IPV6)
-}
-
-src_test() {
-	emake -C unix cgtest
-	unix/cgtest || die
-}
-
-src_install() {
-	dodoc doc/puttydoc.txt
-
-	if use doc; then
-		docinto html
-		dodoc doc/*.html
-	fi
-
-	cd "${S}"/unix || die
-	default
-
-	if use gtk ; then
-		for i in 16 22 24 32 48 64 128 256; do
-			newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
-		done
-
-		# install desktop file provided by Gustav Schaffter in #49577
-		make_desktop_entry ${PN} PuTTY ${PN} Network
-	fi
-}
-
-pkg_postinst() {
-	use gtk && xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	use gtk && xdg_icon_cache_update
-}
diff --git a/net-misc/putty/putty-0.77-r1.ebuild b/net-misc/putty/putty-0.77-r1.ebuild
deleted file mode 100644
index be3a4064accf..000000000000
--- a/net-misc/putty/putty-0.77-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake desktop xdg-utils
-
-DESCRIPTION="A Free Telnet/SSH Client"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${PN}-icons.tar.bz2"
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	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"
-fi
-LICENSE="MIT"
-
-SLOT="0"
-IUSE="debug doc +gtk gtk2 ipv6 gssapi"
-
-RDEPEND="
-	!net-misc/pssh
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf
-		x11-libs/libX11
-		x11-libs/pango
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3[X] )
-	)
-	gssapi? ( virtual/krb5 )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	doc? ( app-doc/halibut )
-"
-
-REQUIRED_USE="
-	gtk2? ( gtk )
-"
-
-src_unpack() {
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-	default
-}
-
-src_configure() {
-	cd "${S}"/unix || die
-	local mycmakeargs=(
-		-DPUTTY_DEBUG="$(usex debug)"
-		-DPUTTY_GSSAPI="$(usex gssapi DYNAMIC OFF)"
-		-DPUTTY_GTK_VERSION=$(usex gtk $(usex gtk2 2 3 ) '')
-		-DPUTTY_IPV6="$(usex ipv6)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile all doc
-}
-
-src_install() {
-	cmake_src_install
-
-	doman "${BUILD_DIR}"/doc/*.1
-
-	if use doc ; then
-		docinto html
-		dodoc "${BUILD_DIR}"/doc/html/*.html
-	fi
-
-	if use gtk ; then
-		local i
-		for i in 16 22 24 32 48 64 128 256; do
-			newicon -s ${i} \
-				"${WORKDIR}"/${PN}-icons/${PN}-${i}.png \
-				${PN}.png
-		done
-
-		# install desktop file provided by Gustav Schaffter in #49577
-		make_desktop_entry ${PN} PuTTY ${PN} Network
-	fi
-}
-
-pkg_postinst() {
-	use gtk && xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	use gtk && xdg_icon_cache_update
-}
diff --git a/net-misc/putty/putty-0.77-r2.ebuild b/net-misc/putty/putty-0.77-r3.ebuild
index f064771f6cea..737dcfe68966 100644
--- a/net-misc/putty/putty-0.77-r2.ebuild
+++ b/net-misc/putty/putty-0.77-r3.ebuild
@@ -12,7 +12,7 @@ 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"
 
@@ -44,6 +44,11 @@ REQUIRED_USE="
 	gtk2? ( gtk )
 "
 
+PATCHES=(
+	# Bug #873355
+	"${FILESDIR}"/putty-0.77-nogssapi.patch
+)
+
 src_unpack() {
 	[[ ${PV} == *9999 ]] && git-r3_src_unpack
 	default
diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild
index be3a4064accf..f3873e1fcf7f 100644
--- a/net-misc/putty/putty-9999.ebuild
+++ b/net-misc/putty/putty-9999.ebuild
@@ -12,12 +12,12 @@ 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 ipv6 gssapi"
+IUSE="debug doc +gtk gtk2 gssapi"
 
 RDEPEND="
 	!net-misc/pssh
@@ -55,7 +55,7 @@ src_configure() {
 		-DPUTTY_DEBUG="$(usex debug)"
 		-DPUTTY_GSSAPI="$(usex gssapi DYNAMIC OFF)"
 		-DPUTTY_GTK_VERSION=$(usex gtk $(usex gtk2 2 3 ) '')
-		-DPUTTY_IPV6="$(usex ipv6)"
+		-DPUTTY_IPV6=yes
 	)
 	cmake_src_configure
 }