6 files changed, 126 insertions, 181 deletions
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index d718d0fb2726..a393428c21c8 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index c33c96c0ba19..de24ba23dc7c 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -2,8 +2,6 @@ AUX sabnzbd-r1.ini 322 BLAKE2B a0afea7621d0385f2d5d01f7b9bff2afaa87efdf8b8cbea19
 AUX sabnzbd-r1.initd 1391 BLAKE2B 1ff6d3dc4f5ece413cf1c0ab104b23c3a4ab451d5cda283327ca781acee88dcbbe22cffc15a725f6f6825a123f0db94fbad017fb7343c05f47ad02a02b68a235 SHA512 c5be8bf0a0053e1a5a6458b7a86c994e636845be2721dc0b14e76ed425ed077274ecbc800724502fa9fa543714470bbede219ec06e7b5dbd310e07c9a14f644c
 AUX sabnzbd.confd 156 BLAKE2B 8cd006eedf4f6614fa00ad9bfee6411dbfb99e1e487c19c4b314b3a7a12742ae4da5de93d771f3fb11a8c2ff5a7eef8fc1b879c1d85757ce218d9357037a70d6 SHA512 91915b54b6e2c2dc7839c23726aba7982b158b20a813ad0f66fa879d2454db14e24472e57e076b41866b28c7cd3991f9961c114b17dfc7e37322b23aa1e6c468
 AUX sabnzbd_at.service 185 BLAKE2B bedc84a8dec50c230bd2d4041d3e56dd33fdd7814488e3a6b53fbb8e0c7df2100ac13ee746e4b6cd45b384acfe6a9478df3a3d1f75bfc70dc41f51ac8f018916 SHA512 e5e6882c8520d26c21583fd2b9895248a777fa7519dc3588726dcccf689f81d604f2ef883681e54f6b212a51a8d8e690570ab60742d8b0232af73e98d61d6d34
-DIST SABnzbd-4.3.2-src.tar.gz 5106752 BLAKE2B 0f8c934b862354158e8aa081adc9beec285e2f3b01899b6ae4e51e7b236aacf1a5dfff21a4e847add1412c620cd6da2e7c2e38173c3450443b37142332ab5659 SHA512 3b119ac4f3de55191e9ed4668b5423e680a11e12f98f0d3d82cc7e2195af316c30711372771a6ab863bcc3fdf39e79f121781341872b42cfbdec332f63ffc29a
 DIST SABnzbd-4.3.3-src.tar.gz 5108172 BLAKE2B 668c2c13da3039f2ca34a2d67a1b06a6cb831a27b3bf997bdba674e1830a01837561b67a97d802a4ae2018085e7491489c87398801e0413e3006911620c4e324 SHA512 9b4bd35b1c44c9dc03a83319450b71043f4ffcf7c680e5d206ed51157d0fc69376065d0a5cec7dd144bfca9eaa1932bb7d2fc984dea5cacd8361c91ad701e8f2
-EBUILD sabnzbd-4.3.2.ebuild 6036 BLAKE2B 43044c2d60a65faa77800838d37643bc20dbd9636e148726050a0a63f4b15c6d04ee343d1e2e0d59eef4185212f1494912bb0848e5747b4d449a9e5e5402f015 SHA512 007818a41a2d90faacec1ee2986d031383fd6e386afd3538b5f98fb2c8a1b31a9a231bfb4030a47eceefb3c3b922150e00bddd6628ec771e96f7abb997845222
-EBUILD sabnzbd-4.3.3.ebuild 6098 BLAKE2B 59ce567e70392f38d2132d44966d9b8b7ed7ce7656fe1a4ed98d54c55306f8e005085eabab0c4a647fa0f9f6d45b88d2bb5518a75149d7dafc9bb20b0c3ea901 SHA512 c6c9b153b5fae82fd5a0fac00ec551bf51e652305191bd2a95bf53fffeed6e50f98d8bb02be0a36f561a4514ca9a72ac3e2975700d3e02450d2a38b717c785c0
+EBUILD sabnzbd-4.3.3.ebuild 6097 BLAKE2B 6d7bfd7830bcf01c60cf416ba027f6159774f6f36763b3febb7a2f8fbbaf4da49d9a5efdf74b288c11f0e4165b12eea355af5d2396faab7d76c275a8e36fd9cf SHA512 7b1097426aad0967ebfb1b49605dc54676aabc54df8c37cfe4c7b6273a09a61749f0f1f8f5702509e9597747c67b9c260857811df5958fea0bb84fa37fd0824e
 MISC metadata.xml 463 BLAKE2B 90b3702d7d29524a2f0c450d757fa35178211816fbf04661251a257d681d0af7ca7020f920e51fb1ae380fa24c5dd473588ae8ea42f1eb4982246c903872becd SHA512 ea4d26003fa929bc21a5678633a8df6cf76a6ce4dc4a6c33c15207e41fd147e94e2632dfcf3c1bfd46467920d8c46a667ec83fe71caa1347a5da2b798dffc329
diff --git a/net-nntp/sabnzbd/sabnzbd-4.3.2.ebuild b/net-nntp/sabnzbd/sabnzbd-4.3.2.ebuild
deleted file mode 100644
index 8170087d60e0..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-4.3.2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="sqlite"
-
-inherit optfeature python-single-r1 systemd
-
-MY_PV="${PV/_alpha/Alpha}"
-MY_PV="${MY_PV/_beta/Beta}"
-MY_PV="${MY_PV/_rc/RC}"
-
-MY_P="SABnzbd-${MY_PV}"
-
-DESCRIPTION="Binary newsgrabber with web-interface"
-HOMEPAGE="https://sabnzbd.org/"
-SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-# Sabnzbd is GPL-2 but bundles software with the following licenses.
-LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	acct-user/sabnzbd
-	acct-group/sabnzbd
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/apprise-1.8.0[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cheetah3[${PYTHON_USEDEP}]
-		dev-python/cherrypy[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/feedparser-6.0.11[${PYTHON_USEDEP}]
-		>=dev-python/guessit-3.8.0[${PYTHON_USEDEP}]
-		dev-python/notify2[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/puremagic[${PYTHON_USEDEP}]
-		~dev-python/sabctools-8.2.3[${PYTHON_USEDEP}]
-	')
-"
-RDEPEND="
-	${DEPEND}
-	|| (
-		>=app-arch/par2cmdline-0.8
-		>=app-arch/par2cmdline-turbo-1.1.0
-	)
-	net-misc/wget
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/flaky[${PYTHON_USEDEP}]
-			>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-			<dev-python/pyfakefs-5.4.0[${PYTHON_USEDEP}]
-			dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-			dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-			dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-			dev-python/pytest-mock[${PYTHON_USEDEP}]
-			~dev-python/pytest-7.4.4[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/selenium[${PYTHON_USEDEP}]
-			dev-python/tavalidate[${PYTHON_USEDEP}]
-			>=dev-python/tavern-2[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/xmltodict[${PYTHON_USEDEP}]
-		')
-		app-arch/p7zip
-		app-arch/unrar
-		app-arch/unzip
-		www-apps/chromedriver-bin
-	)
-"
-
-src_test() {
-	local EPYTEST_IGNORE=(
-		# network sandbox
-		tests/test_getipaddress.py
-		tests/test_rss.py
-		tests/test_urlgrabber.py
-		tests/test_utils/test_happyeyeballs.py
-		tests/test_utils/test_internetspeed.py
-	)
-	local EPYTEST_DESELECT=(
-		# network sandbox
-		'tests/test_cfg.py::TestValidators::test_validate_host'
-		'tests/test_consistency.py::TestWiki'
-		'tests/test_newswrapper.py::TestNewsWrapper'
-		'tests/test_happyeyeballs.py::TestHappyEyeballs'
-		'tests/test_internetspeed.py::TestInternetSpeed'
-		# Just plain fails
-		'tests/test_newsunpack.py::TestPar2Repair::test_basic'
-		# Chromedriver tests don't want to behave in portage
-		'tests/test_functional_config.py::TestBasicPages::test_base_pages'
-		'tests/test_functional_config.py::TestBasicPages::test_base_submit_pages'
-		'tests/test_functional_config.py::TestConfigLogin::test_login'
-		'tests/test_functional_config.py::TestConfigCategories::test_page'
-		'tests/test_functional_config.py::TestConfigRSS::test_rss_basic_flow'
-		'tests/test_functional_config.py::TestConfigServers::test_add_and_remove_server'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_basic_rar5'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_zip'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_7zip'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_passworded'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_fully_obfuscated'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_unicode_rar'
-		'tests/test_functional_misc.py::TestShowLogging::test_showlog'
-		'tests/test_functional_misc.py::TestQueueRepair::test_queue_repair'
-		'tests/test_functional_misc.py::TestDaemonizing::test_daemonizing'
-		'tests/test_functional_sorting.py::TestDownloadSorting'
-		# Bug https://bugs.gentoo.org/934331 fixed in 4.3.3.
-		'tests/test_sorting.py::TestSortingSorter'
-		# cryptography-43, https://bugs.gentoo.org/938453
-		'tests/test_utils/test_cert_gen.py::TestCertGen::test_generate_key_custom[512-test_key.pem]'
-	)
-
-	# The test suite is prone to being broken by random plugins that happen
-	# to be installed, so disable autoloading.
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# Use PYTEST_PLUGINS instead of args to 'epytest' because the test suite
-	# calls pytest itself and the args would get lost. To get the list of plugins,
-	# if stuck, comment out the AUTOLOAD line above, look at the list of loaded
-	# plugins at the top of the pytest output, then translate those into module names
-	# by e.g. checking equery f.
-	local -x PYTEST_PLUGINS=pytest_mock,tavern,tavern._core.pytest,pyfakefs.pytest_plugin,pytest_asyncio.plugin
-
-	epytest -s
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r email icons interfaces locale po sabnzbd scripts tools
-
-	exeinto /usr/share/${PN}
-	doexe SABnzbd.py
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-	python_optimize "${ED}"/usr/share/${PN}
-
-	newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	diropts -o ${PN} -g ${PN}
-	dodir /etc/${PN}
-	keepdir /var/log/${PN}
-
-	insinto "/etc/${PN}"
-	insopts -m 0600 -o "${PN}" -g "${PN}"
-	newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
-
-	dodoc ISSUES.txt README.mkd
-
-	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		einfo "Default directory: /var/lib/${PN}"
-		einfo
-		einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
-		einfo
-		einfo "    usermod -a -G sabnzbd <user>"
-		einfo
-		einfo "By default, SABnzbd will listen on TCP port 8080."
-	fi
-
-	optfeature "7z archive support" app-arch/p7zip
-	optfeature "rar archive support" app-arch/unrar app-arch/rar
-	optfeature "zip archive support" app-arch/unzip
-}
diff --git a/net-nntp/sabnzbd/sabnzbd-4.3.3.ebuild b/net-nntp/sabnzbd/sabnzbd-4.3.3.ebuild
index ece533e3a260..d1a47f998e84 100644
--- a/net-nntp/sabnzbd/sabnzbd-4.3.3.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-4.3.3.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 # Sabnzbd is GPL-2 but bundles software with the following licenses.
 LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index f858fa1f0622..2ec126f35beb 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -1,6 +1,8 @@
 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
+EBUILD tin-2.6.3.ebuild 2704 BLAKE2B 71a9810bcd17a3a9486bf4bdd56ca209d3715d576270d2218ad98748b87f652387752414f4b7fc2a6531278702f1f99cdbb04293c9fe32cadb2f96d66a813430 SHA512 e557e73142d9d5ad0efcaeb2801fe3d83d2038b7b93fd7e23d3f2759d6246bb916f497ea0e446f542bbfc3ab17a3afe18cbe2b0c30f13f2e655b2c106d80d0c3
 MISC metadata.xml 567 BLAKE2B 25916692a1170d644125e756c5165c39ae91c663bcb2cb6eee21e6aca3852acb4eedc7ac6b3efdd1506a474c3e3314496018e84c99e218d1e9a92d4bbe6c2b99 SHA512 eabaa6400110777a838ece4787f6978eb2c4dd1bdf4051e498190e0607550ad8bf18ac63fd946635d2ea19849ea015a383da9bed35cfc940a2cae9b7f1329c61
diff --git a/net-nntp/tin/tin-2.6.3.ebuild b/net-nntp/tin/tin-2.6.3.ebuild
new file mode 100644
index 000000000000..0b301a45df40
--- /dev/null
+++ b/net-nntp/tin/tin-2.6.3.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2024 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? ( 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="
+	app-alternatives/yacc
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# Windows only (bug #900278)
+	memset_s
+)
+
+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
+}