gentoo auto-resync : 21:03:2024 - 07:00:13

4 files changed, 16 insertions, 34 deletions

diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 3930afc7ebb8..f657681e9d33 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/suck/Manifest b/net-nntp/suck/Manifest
index a4689f428466..be35adc930ef 100644
--- a/net-nntp/suck/Manifest
+++ b/net-nntp/suck/Manifest
@@ -1,6 +1,5 @@
-AUX 4.3.3-fputs.patch 639 BLAKE2B acbb1344a34b8176abcc10d61ed08d506cd80ad331aba78c97c5c0de97192ec2708d5c21f34a9b329303ab6c5066b0b248128977eb5d9e2c44633acb56a9919e SHA512 70e7e117692b27e9bcc646eca4e41cf432aca180358922f900e02b0ffa4c98e0a4814f05aa6b318cb38c50075bedf560a74f1a3e9dadf3e88c855d4a43bcc24d
-DIST suck-4.3.3.tar.gz 153624 BLAKE2B 434bdb21ba37deefcba4c0fa9ec3cdf14bc49e1295533ae3c7fb298f49819113ad05e26b3ca72e20ebdd498b0514155f8d79e7c82e95f423521586de889c2371 SHA512 629ecbd7e8d070fc9c1175be6dd10d49fe71b59b8694f32a81cc2dd5ec46e32d64463d221052922a7e21fcac1c9a330f56399bad7c64fa653d68127cd16dbfdc
 DIST suck-4.3.4.tar.gz 153774 BLAKE2B dc7943af43a305386872995a27b6e2faf34949813960314cbf85c4f2ad1658107480cdf77241394aa031270afc3faab5fbd30ec19559fb3d4d261fd8fa5e3416 SHA512 79892cfce1b569bbd5fb6468a919d77bce82a533c1b70369ab88a2066dc3d4396480b9a56b25e960d6e49cd0f9abad605d841693f086c9d07913798d7ac99730
-EBUILD suck-4.3.3-r1.ebuild 1329 BLAKE2B 6f34ff3cf4f838877b981b6afa99a87e9b393ddc1cde51ac5dd17fabd1e68b316fe64b5346b67a8aacf4c14eb2a3b17372cbde77b163e3afb0f379b4c5ab51f1 SHA512 afe4b0bf7cc4102623565af5a1a02d448a0c59519d48e4333ff6a702dfdffb5a837ca4d8f313c56576896f2d5ac1887d0cdece05a8d014e8e461a735fdf9c6a7
+DIST suck-4.3.5.tar.gz 153874 BLAKE2B ecc7d20f8844890acae94bb154583ace66b02c594514e925500cb9337aa1678622622286aaefedda066e73236d136e2383a846f0013f7e65f657757ae6cee818 SHA512 7bf7196db62416800c040ff9afd545c8a62e50a7f8dcb914aef1105d4bdc57ec4c198b1a42d5ad4e3c9455ddca3d516a55ca9cc62c88e010e8ba8eb4fcbeb275
 EBUILD suck-4.3.4.ebuild 1313 BLAKE2B 6c6cfbb373ca4e88e508d5ca0f4266c25a0b0d1212b7e8b2c4c28735e3facfed32bb9b43f09e27966108d6d1f1cc7bfbfb07484327cd79377e85674705ede69e SHA512 5443bf03291235f8b2d7ec5a67b9e2f5c1909f166aba75f489c521609ff54e33327dfc32359c514c481c96791af278394939ef70f7d959417687228b8430bad9
+EBUILD suck-4.3.5.ebuild 1338 BLAKE2B d71c0b741a2e5f721d9f4a52de0d6ecf0c93c3910c04143b08bb90daa94982cd4d6ec0f4d1babaf04713a9fd11251b259f40c59da373348d1a712e1f01b0cbd3 SHA512 97bd764e802554d5039e85854d914107e366b938c91e21b32d4fcad55e4bf558bfb6b89d29e024d80fd5ee2fecdf68d93718782296405e0d682f9ad4cb643857
 MISC metadata.xml 492 BLAKE2B 745197873726143bea117cde640030f6bbc4adf880de74e0faf2fc2a63ed4c47c4b5822d4e36e559ead54489158cd8bd83f781cd6b1cdfd7bc6b47c983771fef SHA512 c8601419f0ce76b471f2b022482f1d6f2eff9be1611ac30b490074d5ed43fcd1c3f810a9ee8c16eb001d157785dc5955e8f69e9a57a24bacb4b5ab51c5e8edda
diff --git a/net-nntp/suck/files/4.3.3-fputs.patch b/net-nntp/suck/files/4.3.3-fputs.patch
deleted file mode 100644
index df38f1d4316a..000000000000
--- a/net-nntp/suck/files/4.3.3-fputs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 440c3c39c51c89c0a5bc53850e9b75b142a39bd2 Mon Sep 17 00:00:00 2001
-From: Michael Vetter <jubalh@iodoru.org>
-Date: Wed, 14 Feb 2018 15:02:22 +0100
-Subject: [PATCH] Use fputs instead of fput
-
-fput() seems to be non-standard.
-See commit cb0aadd0a2f16a09bc972d648b864a1fd541e75f
-Now we have the original patch.
----
- lpost.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lpost.c b/lpost.c
-index a2c0d29..39bb17e 100644
---- a/lpost.c
-+++ b/lpost.c
-@@ -42,7 +42,7 @@ int main(int argc,char *argv[]) {
- 			}
- 		}
- 		else {
--			(void) fput(line, pfp);
-+			(void) fputs(line, pfp);
- 		}
- 	} /* end while */
- 	exit(retval);
diff --git a/net-nntp/suck/suck-4.3.3-r1.ebuild b/net-nntp/suck/suck-4.3.5.ebuild
index 264c898d7d64..37cd11cf40b4 100644
--- a/net-nntp/suck/suck-4.3.3-r1.ebuild
+++ b/net-nntp/suck/suck-4.3.5.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="Grab news from a remote NNTP server and feed them to another"
@@ -14,18 +15,20 @@ IUSE="perl ssl"
 
 RDEPEND="
 	sys-libs/gdbm:=
-	ssl? ( dev-libs/openssl:0= )
+	ssl? (
+		dev-libs/openssl:0=
+	)
 "
 DEPEND="${RDEPEND}
 	sys-libs/db
 	perl? ( dev-lang/perl )
 "
 
-PATCHES=( "${FILESDIR}/${PV}-fputs.patch" )
-
 src_prepare() {
 	default
 
+	rm java/*.class || die
+
 	# Fix paths to the locations in Gentoo
 	sed -i \
 		-e 's:/usr/bin/rnews:/usr/$(get_libdir)/news/bin/rnews:' \
@@ -36,8 +39,13 @@ src_prepare() {
 }
 
 src_configure() {
-	use ssl || sed -i -e 's/^SSL_/#SSL_/' Makefile.in || die "ssl sed failed"
-	use perl || sed -i -e 's/^PERL_/#PERL_/' Makefile.in || die "perl sed failed"
+	if use ssl; then
+		sed -i -e 's/^SSL_/#SSL_/' Makefile.in || die "ssl sed failed"
+	fi
+
+	if use perl; then
+		sed -i -e 's/^PERL_/#PERL_/' Makefile.in || die "perl sed failed"
+	fi
 
 	econf --without-inn-lib --without-inn-include
 }