gentoo auto-resync : 16:12:2023 - 14:53:46

4 files changed, 152 insertions, 20 deletions

diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index dc3d4163f2b6..b0395ac524ac 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index 21328742e7dd..02eb78092339 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -1,7 +1,7 @@
 AUX tin-2.6.1-configure-clang16.patch 2473 BLAKE2B af55c171def1e2756bdb305069aeb81b79198397afb38738c4298a1268dc813f7a9c11b941da503d11d5b2d4bac48cb5fa987486dc42a833b1d8241e05779542 SHA512 56ff3b3e71f79145feeaa6e6ce20bf2ebdc3f4b02681423dcabf27ccaa69ffeecb85430b2aed6c07bb9c90fffcaba35801dd44f4e8a81d0fd6fd698cea010af1
+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.1.tar.xz 1570500 BLAKE2B ec9c54b8b89ecd33a42ede37c8db50828de2dce56ddff01900121903a18d73bde8a06733ca2dfb72c676eb373b5ea874cecb9a1ee7890ada4ad6539d9ff1a435 SHA512 dc9ace5e24cac1efcaac25df1747dd435573130cff4e9c846c89e8faaed8e8120d66a2021332c01f350744155bcb7be608657285560a1a2457b4635cc8fa22b3
 DIST tin-2.6.2.tar.xz 1598732 BLAKE2B 0e5bac9a711fb69e64d64b4f0c070d456f38f727e7b7aa794ad5ada8695c2174023964b8f07d2e7d6add51cf0c7c3102965bef653a7e873275747145cb70dbe2 SHA512 4c9e0edb3268d57fb89d9d53a90e8a5ba73da7c1da63c834224bed0f763502a7c3dd325351d3e57b1ddcb57494a84228cc38f227c49300b759fad8d112b1cac1
-EBUILD tin-2.6.1-r1.ebuild 2025 BLAKE2B 11841532f22a5b6c56c0e5261d24c501ec46f76edc062155d2385e63cc2052e369bae4c3d697e4c0811a63d84b693a112b5ce038e40520398a741c388421a388 SHA512 5cf5e4b1249df5eed6f124499aa3cb56623a5ec2b00e971fff58f4c44fcf91c737718618c56df5eef5923cf552c3fc8f5330af21792698aa526be9f1a2623fde
 EBUILD tin-2.6.2-r1.ebuild 2685 BLAKE2B 11a451371d2cee52e345132eec6e897434c7bf0e0a85532cbf0dd1cc3731e151e2a94e0e129dcf407ddb6a5b4fa8b598a0d39f7ecbb89177b5f0adc098d1ca25 SHA512 9d93ca00dda9c9580c1f8057097ffcd5af95163d8742c25f934c90e7befb31190c27e6cc2e4b63aa319204045292ccd230b251139ce561597e54c2aa50ae4c6f
+EBUILD tin-2.6.2-r2.ebuild 2787 BLAKE2B 4974ed2b15b1d2efee1d13e4c389eb7bc7f95821716a140488e0fc8e63f5d4df4b9dcd140e4c7cdd8b7e92ecd388230aab75db4760c1b3e9e4719cb1927f46e4 SHA512 0ff24f6d9a1a0e2e345f4baf38823d7e0881a264b7f18e8d34199a4ea69e9fd16cf397c312d89323d17fe0dd3e8519afa9e590fce4e86316bd8d22dfe273056d
 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
new file mode 100644
index 000000000000..f9c9cff697f1
--- /dev/null
+++ b/net-nntp/tin/files/tin-2.6.2-c99.patch
@@ -0,0 +1,93 @@
+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/tin-2.6.1-r1.ebuild b/net-nntp/tin/tin-2.6.2-r2.ebuild
index cc1eac16cc3e..9eb463615776 100644
--- a/net-nntp/tin/tin-2.6.1-r1.ebuild
+++ b/net-nntp/tin/tin-2.6.2-r2.ebuild
@@ -11,72 +11,111 @@ 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 gpg nls sasl socks5"
+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/libpcre:3
+	dev-libs/libpcre2:=
 	dev-libs/uulib
-	sys-libs/ncurses:=[unicode(+)]
+	sys-libs/ncurses:=
+	virtual/libiconv
 	cancel-locks? ( >=net-libs/canlock-3.0:= )
 	gpg? ( app-crypt/gnupg )
 	nls? ( virtual/libintl )
-	sasl? ( virtual/gsasl )
+	sasl? ( net-misc/gsasl[client] )
 	socks5? ( net-proxy/dante )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			libtls? ( dev-libs/libretls:= )
+			!libtls? ( dev-libs/openssl:= )
+		)
+	)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	virtual/pkgconfig
 	app-alternatives/yacc
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
 "
 
-DOCS=(
-	README{,.MAC,.WIN}
-	doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW,filtering}
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# Windows only (bug #900278)
+	memset_s
 )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.1-configure-clang16.patch
+	"${FILESDIR}"/${P}-gnutls.patch
+	"${FILESDIR}"/${PN}-2.6.2-c99.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 cancel-locks)
+		$(use_with cancel-locks canlock)
+
 		$(use_enable debug)
 		$(use_enable gpg pgp-gpg)
 		$(use_enable nls)
-		$(use_with socks5 socks) $(use_with socks5)
+		$(use_with socks5 socks)
 		--disable-mime-strict-charset
-		--enable-nntp-only
+		--enable-nntp
 		--enable-prototypes
-		--with-coffee
+		--without-pcre
+		--with-pcre2-config
+		--with-coffee # easter egg :)
 		--with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.io}}"
-		--with-pcre=/usr
 		--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-metamail="${EPREFIX}"/usr/bin/metamail
 		--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`.
+	# 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