5 files changed, 10 insertions, 261 deletions
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index 1832233fe06d..5ab937888fe7 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -1,8 +1,5 @@
-AUX tin-2.6.2-c99.patch 2650 BLAKE2B 0afaeb921397abd451dd166947a15ccb493bff51872a9fbb10cfff15b6dac77b9c9c9f8343a63e0eaf419c50e0151376bc461aa233cbea9680e198c0f30bc699 SHA512 886fbb0d54690373f4abb7ac8bbdd417883db9d0f21b41c5aff0e1e52b787cf67f0603682679380a93d80f369d626db1ec7000c925fdf8ec1c9b5a092ae00687
-AUX tin-2.6.2-gnutls.patch 653 BLAKE2B fd5ad80b1f2e5c5307e28e513f2aaf9cbd17f12517aed07298aaa54dc85a26aa28f4a091841fd2efa154b9acc4fa7749d575ec3aba60e4008f9c1ef533a50120 SHA512 d372ce615a18ab5cc67ec69e71870e5073937e8a59f55cf7e5a43271cd9eb55ae379e875b8656b2140403e23792df1844b05ff234cbed18883f59a445d11d21f
-DIST tin-2.6.2.tar.xz 1598732 BLAKE2B 0e5bac9a711fb69e64d64b4f0c070d456f38f727e7b7aa794ad5ada8695c2174023964b8f07d2e7d6add51cf0c7c3102965bef653a7e873275747145cb70dbe2 SHA512 4c9e0edb3268d57fb89d9d53a90e8a5ba73da7c1da63c834224bed0f763502a7c3dd325351d3e57b1ddcb57494a84228cc38f227c49300b759fad8d112b1cac1
 DIST tin-2.6.3.tar.xz 1639192 BLAKE2B dba26c5e5fe0e331e069a22ce3241c00e7e01f582d00a38e55e2fe33c93f98d99c47e9d04e0660b40535a8b11e63789bc91df1b22dacd62405ee716a003c07dd SHA512 e8b474849e3330475e92b7c578ffe2f29f022303be266d39493e58b7227d9a5ee3915812c1806f52358c07f91d6119810498db906d2da7ffe035feba0e340a42
-EBUILD tin-2.6.2-r1.ebuild 2685 BLAKE2B 11a451371d2cee52e345132eec6e897434c7bf0e0a85532cbf0dd1cc3731e151e2a94e0e129dcf407ddb6a5b4fa8b598a0d39f7ecbb89177b5f0adc098d1ca25 SHA512 9d93ca00dda9c9580c1f8057097ffcd5af95163d8742c25f934c90e7befb31190c27e6cc2e4b63aa319204045292ccd230b251139ce561597e54c2aa50ae4c6f
-EBUILD tin-2.6.2-r2.ebuild 2787 BLAKE2B 4974ed2b15b1d2efee1d13e4c389eb7bc7f95821716a140488e0fc8e63f5d4df4b9dcd140e4c7cdd8b7e92ecd388230aab75db4760c1b3e9e4719cb1927f46e4 SHA512 0ff24f6d9a1a0e2e345f4baf38823d7e0881a264b7f18e8d34199a4ea69e9fd16cf397c312d89323d17fe0dd3e8519afa9e590fce4e86316bd8d22dfe273056d
+DIST tin-2.6.4.tar.xz 1640064 BLAKE2B 7a9ec66a55db282b2b3b7c977dfafd47cb72224873369ebbce05865a92719253f59a17d1b79fcee98c1c10a88e323eddcd88d40ea6719be96a407ed361aa4107 SHA512 63d7d8bf9d00644b05f128ab78960a1a1ccbeebbec9721517dc4971d07459d0a547adfd4eb8446a695d7303b43f45168a203c29f318b66fc79e4aba80cf8cc97
 EBUILD tin-2.6.3.ebuild 2700 BLAKE2B 4626920e056acfe560558dfaf7914100c4d4e6c169d531ef7f4eef9de222ea431a52ef0d2fa68f3093c1c0a5bf8fb3cb94be55e9ecf33db12b7ce269399367b6 SHA512 fd3de6c7cd2618251fb6e01776ca6be7561aac8343f294251cbe00e7d0f9093418c072780404eee78f9a7b34efb76b4861d31523f432f8bbd0af2d7a5e4c9aaa
+EBUILD tin-2.6.4.ebuild 2790 BLAKE2B 7997144d8f7f31f1fbf4fccf0442e1e77194d8b3c82e67d902584cc75fa4f72c4e7ac5bf2d27cd45f3f8b475a1a5d6d331301a290430745b432708c061a7fe78 SHA512 2322de14af93e258a750b03b2c50e1bfe3e8375beea4646f45af379b7281ec5cc023dd882f3ec4520c5c5f3d6e497d3ea627768eac2de30442dc1b2a8a2df8bd
 MISC metadata.xml 567 BLAKE2B 25916692a1170d644125e756c5165c39ae91c663bcb2cb6eee21e6aca3852acb4eedc7ac6b3efdd1506a474c3e3314496018e84c99e218d1e9a92d4bbe6c2b99 SHA512 eabaa6400110777a838ece4787f6978eb2c4dd1bdf4051e498190e0607550ad8bf18ac63fd946635d2ea19849ea015a383da9bed35cfc940a2cae9b7f1329c61
diff --git a/net-nntp/tin/files/tin-2.6.2-c99.patch b/net-nntp/tin/files/tin-2.6.2-c99.patch
deleted file mode 100644
index f9c9cff697f1..000000000000
--- a/net-nntp/tin/files/tin-2.6.2-c99.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-https://src.fedoraproject.org/rpms/tin/c/1f724cd60f641c3599f65e819dd2a878efa6b1a2?branch=rawhide
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 2891764c68c773c4..5620aad356b67762 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -3517,7 +3517,7 @@ RETSIGTYPE signal_handler (int sig)
- 	int system_status;
- 	wait (&wait_status);
- 	system_status = WEXITSTATUS(wait_status); /* should be nonzero */
--	${cf_cv_main_return:-return}(system_status != 23);
-+	exit(system_status != 23);
- }
- 
- int main(void)
-@@ -5173,7 +5173,7 @@ AC_CACHE_CHECK([for passwd.pw_gecos], cf_cv_pw_gecos,[
- #include <pwd.h>
- ],[
- 	struct passwd foo;
--	char bar = foo.pw_gecos],
-+	char *bar = foo.pw_gecos],
- 	[cf_cv_pw_gecos=yes],
- 	[cf_cv_pw_gecos=no])])
- test $cf_cv_pw_gecos = no && AC_DEFINE(DONT_HAVE_PW_GECOS,1,[Define this to 1 if passwd struct has .pw_gecos])
-diff --git a/configure b/configure
-index 9e2d9ab4b6c46581..a85eaf929db2c820 100755
---- a/configure
-+++ b/configure
-@@ -24209,7 +24209,8 @@ int
- main (void)
- {
- 
--			int32_t needed, ustr = NULL;
-+			int32_t needed;
-+			const UChar *ustr = NULL;
-  			UErrorCode status;
- 			needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status);
-   ;
-@@ -26820,8 +26821,8 @@ cat >"conftest.$ac_ext" <<_ACEOF
- int
- main (void)
- {
--struct timeval *tv;
--struct timezone *tz;
-+struct timeval tv;
-+struct timezone tz;
- gettimeofday(&tv, &tz);
-   ;
-   return 0;
-@@ -27669,7 +27670,7 @@ main (void)
- {
- 
- 	struct passwd foo;
--	char bar = foo.pw_gecos
-+	char *bar = foo.pw_gecos
-   ;
-   return 0;
- }
-@@ -28106,7 +28107,7 @@ RETSIGTYPE signal_handler (int sig)
- 	int system_status;
- 	wait (&wait_status);
- 	system_status = WEXITSTATUS(wait_status); /* should be nonzero */
--	${cf_cv_main_return:-return}(system_status != 23);
-+	exit(system_status != 23);
- }
- 
- int main(void)
-diff --git a/configure.in b/configure.in
-index 7d24b24176f7c3a6..810eaf6158dc9b48 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1013,7 +1013,8 @@ AC_CHECK_HEADER(unicode/unorm.h,[
- 		cf_try_icuuc="no"
- 		LIBS="$LIBS -licuuc"
- 		AC_TRY_LINK([#include <unicode/unorm.h>], [
--			int32_t needed, ustr = NULL;
-+			int32_t needed;
-+			const UChar *ustr = NULL;
-  			UErrorCode status;
- 			needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status);], [
- 			AC_DEFINE(HAVE_LIBICUUC,1,[Define this to 1 if we have libicuuc])
-@@ -1280,8 +1281,8 @@ AC_TRY_COMPILE([
- #if HAVE_SYS_TIME_H
- #include <sys/time.h>
- #endif],
--[struct timeval *tv;
--struct timezone *tz;
-+[struct timeval tv;
-+struct timezone tz;
- gettimeofday(&tv, &tz);],
- ac_cv_func_gettimeofday_2args=yes, ac_cv_func_gettimeofday_2args=no)
- AC_MSG_RESULT($ac_cv_func_gettimeofday_2args)
-
diff --git a/net-nntp/tin/files/tin-2.6.2-gnutls.patch b/net-nntp/tin/files/tin-2.6.2-gnutls.patch
deleted file mode 100644
index b7f7de0956a2..000000000000
--- a/net-nntp/tin/files/tin-2.6.2-gnutls.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Upstream patch to allow GnuTLS support without debug definitions.
-
---- a/src/nntps.c
-+++ b/src/nntps.c
-@@ -41,8 +41,8 @@
- #endif /* USE_LIBTLS */
-
- #ifdef USE_GNUTLS
--#	ifdef DEBUG
- static int verification_func(gnutls_session_t session);
-+#	ifdef DEBUG
- static void log_func(int level, const char *msg);
- #	endif /* DEBUG */
- #else
-@@ -933,8 +933,7 @@
- #endif /* USE_OPENSSL */
-
-
--#ifdef DEBUG
--#	ifdef USE_GNUTLS
-+#ifdef USE_GNUTLS
- static int
- verification_func(
- 	gnutls_session_t session)
-@@ -953,8 +952,11 @@
-
- 	return gnutls_verification_status;
- }
-+#endif /* USE_GNUTLS */
-
-
-+#ifdef DEBUG
-+#	ifdef USE_GNUTLS
- static void
- log_func(
- 	int level,
diff --git a/net-nntp/tin/tin-2.6.2-r1.ebuild b/net-nntp/tin/tin-2.6.2-r1.ebuild
deleted file mode 100644
index 631a6ec8091d..000000000000
--- a/net-nntp/tin/tin-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit optfeature toolchain-funcs
-
-DESCRIPTION="A threaded NNTP and spool based UseNet newsreader"
-HOMEPAGE="http://www.tin.org/"
-SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cancel-locks debug gnutls gpg libtls nls sasl socks5 ssl"
-
-RDEPEND="
-	dev-libs/icu:=
-	dev-libs/libpcre2:=
-	dev-libs/uulib
-	sys-libs/ncurses:=
-	virtual/libiconv
-	cancel-locks? ( >=net-libs/canlock-3.0:= )
-	gpg? ( app-crypt/gnupg )
-	nls? ( virtual/libintl )
-	sasl? ( virtual/gsasl )
-	socks5? ( net-proxy/dante )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			libtls? ( dev-libs/libretls:= )
-			!libtls? ( dev-libs/openssl:= )
-		)
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-alternatives/yacc
-	dev-libs/libpcre2
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-gnutls.patch )
-
-DOCS=(
-	README{,.MAC,.WIN}
-	doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW,filtering}
-)
-
-src_configure() {
-	tc-export AR CC RANLIB
-	tc-export_build_env
-
-	# The build incorrectly discards its local -I if $CPPFLAGS is set.
-	if [[ -n ${BUILD_CPPFLAGS} ]]; then
-		BUILD_CPPFLAGS+=' -I$(INCDIR)'
-	fi
-
-	local myeconfargs=(
-		$(use_enable cancel-locks)
-		$(use_with cancel-locks canlock)
-
-		$(use_enable debug)
-		$(use_enable gpg pgp-gpg)
-		$(use_enable nls)
-		$(use_with socks5 socks)
-		--disable-mime-strict-charset
-		--enable-nntp
-		--enable-prototypes
-		--without-pcre
-		--with-pcre2-config
-		--with-coffee # easter egg :)
-		--with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.io}}"
-		--with-screen=ncursesw
-	)
-
-	if use ssl; then
-		if use gnutls; then
-			myeconfargs+=( --with-nntps=gnutls )
-		elif use libtls; then
-			myeconfargs+=( --with-nntps=libtls )
-		else
-			myeconfargs+=( --with-nntps=openssl )
-		fi
-	fi
-
-	myeconfargs+=(
-		# set default paths for utilities
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-		--with-gpg="${EPREFIX}"/usr/bin/gpg
-		--with-ispell="${EPREFIX}"/usr/bin/aspell
-		--with-mailer="${EPREFIX}"/bin/mail
-		--with-sum="${EPREFIX}"/usr/bin/sum
-
-		# set default paths for directories
-		--with-libdir="${EPREFIX}"/var/lib/news
-		--with-spooldir="${EPREFIX}"/var/spool/news
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# To build from the root dir you have to call `make build`, not just `make`.
-	emake build
-}
-
-src_install() {
-	default
-
-	emake DESTDIR="${D}" install_sysdefs
-	emake -C src DESTDIR="${D}" install_nls_man
-
-	dodoc doc/{*.sample,*.txt}
-}
-
-pkg_postinst() {
-	optfeature "spell checker support" app-text/aspell
-}
diff --git a/net-nntp/tin/tin-2.6.2-r2.ebuild b/net-nntp/tin/tin-2.6.4.ebuild
index 9eb463615776..b881b9d141dd 100644
--- a/net-nntp/tin/tin-2.6.2-r2.ebuild
+++ b/net-nntp/tin/tin-2.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,8 +17,11 @@ IUSE="cancel-locks debug gnutls gpg libtls nls sasl socks5 ssl"
 RDEPEND="
 	dev-libs/icu:=
 	dev-libs/libpcre2:=
+	>=dev-libs/uriparser-0.9.8
 	dev-libs/uulib
+	net-dns/libidn2:=
 	sys-libs/ncurses:=
+	sys-libs/zlib:=
 	virtual/libiconv
 	cancel-locks? ( >=net-libs/canlock-3.0:= )
 	gpg? ( app-crypt/gnupg )
@@ -43,11 +46,10 @@ BDEPEND="
 QA_CONFIG_IMPL_DECL_SKIP=(
 	# Windows only (bug #900278)
 	memset_s
-)
 
-PATCHES=(
-	"${FILESDIR}"/${P}-gnutls.patch
-	"${FILESDIR}"/${PN}-2.6.2-c99.patch
+	# checking if the socks library uses socks4 prefix
+	Rinit
+	init
 )
 
 DOCS=(
@@ -71,7 +73,7 @@ src_configure() {
 		$(use_enable debug)
 		$(use_enable gpg pgp-gpg)
 		$(use_enable nls)
-		$(use_with socks5 socks)
+		$(use_with socks5)
 		--disable-mime-strict-charset
 		--enable-nntp
 		--enable-prototypes
@@ -98,7 +100,6 @@ src_configure() {
 		--with-gpg="${EPREFIX}"/usr/bin/gpg
 		--with-ispell="${EPREFIX}"/usr/bin/aspell
 		--with-mailer="${EPREFIX}"/bin/mail
-		--with-sum="${EPREFIX}"/usr/bin/sum
 
 		# set default paths for directories
 		--with-libdir="${EPREFIX}"/var/lib/news