gentoo resync : 29.12.2022

4 files changed, 127 insertions, 46 deletions

diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index ed97830d7f5b..c99bbe87d180 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,5 +1,7 @@
 DIST putty-0.76.tar.gz 2735687 BLAKE2B 7994a8ea4eb735091e92438fd9558b1047b2ddffe53e3cd2ae7c182e333d21482de7c1a549b738d00af1e592e078648b153fa095a9e5310ee4a884c0cc9fb896 SHA512 4576b359593928c6eba923f2d7b66ac0f2cf00e0c217cdbbb124471c3b35feb090e623847bfc507a4ef106cb3067aac47419e241b11dd8bf4ae554061fa93c25
+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 1702 BLAKE2B bf252a9a45fd62cd5c791c99ecfd055e2343ccdb75ab5dc3a21f7738aa2ad2014b7a8e203dbd4030aae05311ad87394af83eb9efe8c0bb65d563383e9bb59beb SHA512 0e5d4e5507610e9d905e5e9c0304747d07002618c698c6b73413e82302c3b12c4ce8b66dd1aa9101c36e39d1bcc63185d124a7e81657f9900193574d19b93883
-EBUILD putty-9999.ebuild 1748 BLAKE2B c19463b704de38bc5226c6f37b58aeabeb888a85f5cfcdbed00d32f525241daca1b7382a7f7f0a7c86fbbd1c2ccda92481a209e353afd6760c9b9dcc14441af1 SHA512 f18023f6866e116aae2b6cc9aa92cd3421942d6396768321bc44da8f88292ea50a38999053bb015914cc23af37d52b275cb0d7dad7c7a5ec15412ffe7f70ed23
-MISC metadata.xml 1011 BLAKE2B a759a93b5f4affdefc2ad81edd6a9c15fa31feb5b549d23a56114e7a9937bef6e60aa6b630fba223043cd0909e8052dcb3f1e848199399aa1f249b9d4dd59715 SHA512 3c48cbb3dff26aee751960ceccb5214c97adb60c68eb67fe69a2c6ffa059b2defeb66623e85da970c4fa0668fafa5c4b61404685fcc3e6d5b803944d11ea9bf9
+EBUILD putty-0.77.ebuild 1836 BLAKE2B 371707bb25ee6363fe7a2744762fa5d3b53201845d77c6f4df977e56b547ae54ac7639d2489f46931f42660e31773a3463a6f4508ca018ddb4c9821526e26f80 SHA512 3d1c3b6e2112d31c4c872eb1dec125dc3643e662729702d8d355687809224c29edb3da90c65fdb5e9e536f5f27b4c554af14bcf521383c79f9315d501d2abe0f
+EBUILD putty-9999.ebuild 1836 BLAKE2B 371707bb25ee6363fe7a2744762fa5d3b53201845d77c6f4df977e56b547ae54ac7639d2489f46931f42660e31773a3463a6f4508ca018ddb4c9821526e26f80 SHA512 3d1c3b6e2112d31c4c872eb1dec125dc3643e662729702d8d355687809224c29edb3da90c65fdb5e9e536f5f27b4c554af14bcf521383c79f9315d501d2abe0f
+MISC metadata.xml 927 BLAKE2B b16050f046b27ee7798fe2a59f80cb5d0b6e76e0facef049d17b67c955986af99fa16d705ee22bba3282ee968e3b1986fdfead3ba51664e9eacbbb8c0e4dba62 SHA512 6241b2e460a8b7bb195712f3cdd2200984e7e2e185c73e9630badca12ff2e01d345467d97c93d8ba79a801d14eb906fc9dfdbc0ef9c7f411fa2cd33abff752fe
diff --git a/net-misc/putty/metadata.xml b/net-misc/putty/metadata.xml
index 56d8ef2b4271..d1187ee7285b 100644
--- a/net-misc/putty/metadata.xml
+++ b/net-misc/putty/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		PuTTY is a free implementation of Telnet and SSH for Windows and Unix
 		platforms, along with an xterm terminal emulator. It supports flexible terminal
diff --git a/net-misc/putty/putty-0.77.ebuild b/net-misc/putty/putty-0.77.ebuild
new file mode 100644
index 000000000000..a09ae7ae4600
--- /dev/null
+++ b/net-misc/putty/putty-0.77.ebuild
@@ -0,0 +1,92 @@
+# 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/~polynomial-c/${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 +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
+"
+#[[ ${PV} == *9999 ]] && BDEPEND+=" 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_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-9999.ebuild b/net-misc/putty/putty-9999.ebuild
index 97dbfaea150f..a09ae7ae4600 100644
--- a/net-misc/putty/putty-9999.ebuild
+++ b/net-misc/putty/putty-9999.ebuild
@@ -1,18 +1,23 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit autotools desktop git-r3 toolchain-funcs xdg-utils
+EAPI=8
+inherit cmake desktop xdg-utils
 
 DESCRIPTION="A Free Telnet/SSH Client"
 HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
 SRC_URI="https://dev.gentoo.org/~polynomial-c/${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"
-KEYWORDS=""
-IUSE="doc +gtk gtk2 ipv6 gssapi"
+IUSE="debug +gtk gtk2 ipv6 gssapi"
 
 RDEPEND="
 	!net-misc/pssh
@@ -30,62 +35,47 @@ DEPEND="
 	${RDEPEND}
 "
 BDEPEND="
-	app-doc/halibut
 	dev-lang/perl
 	virtual/pkgconfig
 "
+#[[ ${PV} == *9999 ]] && BDEPEND+=" doc? ( app-doc/halibut )"
+
 REQUIRED_USE="
 	gtk2? ( gtk )
 "
 
 src_unpack() {
-	git-r3_src_unpack
-	default
-}
-
-src_prepare() {
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
 	default
-
-	sed -i \
-		-e 's|-Werror||g' \
-		configure.ac || die
-
-	./mkfiles.pl || 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
+	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_install() {
-	dodoc doc/puttydoc.txt
+	cmake_src_install
 
-	if use doc; then
-		docinto html
-		dodoc doc/*.html
-	fi
+	doman "${BUILD_DIR}"/doc/*.1
 
-	cd "${S}"/unix || die
-	default
+	#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
+			newicon -s ${i} \
+				"${WORKDIR}"/${PN}-icons/${PN}-${i}.png \
+				${PN}.png
 		done
 
 		# install desktop file provided by Gustav Schaffter in #49577