7 files changed, 99 insertions, 10 deletions
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 8784856daf2e..db285a6dacef 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/slrn/Manifest b/net-nntp/slrn/Manifest
index efb634667575..fd7143f9c8ab 100644
--- a/net-nntp/slrn/Manifest
+++ b/net-nntp/slrn/Manifest
@@ -1,4 +1,4 @@
 AUX slrn-1.0.2-make.patch 1044 BLAKE2B 4c2100b402e57383ccca4dd26a25bdea05ae065f978c1a96ea53881b859e5fd7a28a1d6c54ef59fcc21238c456a19ad953f8c1e78d2d7c573779e4d78291f3a6 SHA512 14859999f7739121027a7ddd6b0f157534a3e64a5c63b2354c4962c0391b9fbc5b4f80bc4260909561b534d79abcb3bdcca6f737eb52029f9c48cb0aae5f6473
 DIST slrn-1.0.3a.tar.bz2 997138 BLAKE2B a349783edae24e0269ab1b8ddc328e578340e40e72285bbf070237b3724f475450f08bbc655d3b212684b8fffc495129008bde71a481fb3d2f4326bf396e5981 SHA512 11cef2dfe41f441af15acc22fb675cf607e932f0dd6d4a998e51ecda05c9a50d7abf10a3e693ffc857ad77e09634f460404e4d5b289169e7bbffdaf5d6d565a3
-EBUILD slrn-1.0.3.ebuild 827 BLAKE2B bf24e86821dffbd31c108c06dc7e77db2bb8ae08dc584d8734a966f2aef67dc759a520f5cd3c201c14447af7f1a5e83205606a0599071f94ed90d68e1a49f113 SHA512 f7e084541837c70c1e5e1dc9ef710fbb785b8e1f619144865c80b26f4605ee740779df88f8eeda715b78e83bc2a1606be85a6f77d4800e449a458bccc4e312c0
+EBUILD slrn-1.0.3-r1.ebuild 853 BLAKE2B a112171c3e2c345a0a4f55b77cbd150fdd5a3257b5ac9f016b317d9127511178c0d4678a4cf87f7085b7397cb9aef36de856cab87315cd791843b1ee9af86225 SHA512 d0f74bb8800a1a480e5b14d2082c528068961498d2d84405dca1ab05600e56bbd5c1f4847b75c51c96f037128234597faad7020d25d91c1b8f8c9c3a9b36d9cc
 MISC metadata.xml 689 BLAKE2B c4d3973c8f45237e1c85138fd3ba20b3e55dbc69d93ed6347c345a80fea281072fc221e179227f820806a1ee66037a5289e9d4abba02449721d018d3056ceeab SHA512 1888873d11646ac7c7359e0a4d569565007cfe3d91429d15d1d91c7af74e9a266f2f025342f9d199ce18de93546cb97da37958efec20791fc530c2b4124b9ff1
diff --git a/net-nntp/slrn/slrn-1.0.3.ebuild b/net-nntp/slrn/slrn-1.0.3-r1.ebuild
index 33c6035550e8..ea2f93eec04e 100644
--- a/net-nntp/slrn/slrn-1.0.3.ebuild
+++ b/net-nntp/slrn/slrn-1.0.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 MY_P="${P}a"
 
@@ -17,7 +17,7 @@ IUSE="canlock nls ssl uudeview"
 RDEPEND="app-arch/sharutils
 	>=sys-libs/slang-2.2.3
 	virtual/mta
-	canlock? ( net-libs/canlock )
+	canlock? ( net-libs/canlock:=[legacy(+)] )
 	ssl? (
 		dev-libs/openssl:0=
 	)
@@ -31,7 +31,7 @@ src_configure() {
 	econf \
 		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--with-slrnpull \
-		$(use_with canlock) \
+		$(use_with canlock canlock /usr) \
 		$(use_enable nls) \
 		$(use_with ssl) \
 		$(use_with uudeview uu)
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index 81f2227cb870..5eb97d9ea626 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -1,3 +1,5 @@
 DIST tin-2.4.5.tar.xz 1559164 BLAKE2B 4efea88c7f76aef91a848c9ed5d82efac640360e41c515015d406e84ed5ce639bbcd17eff29939312ebf83adb8bb84bc7a4f04833cd7cc0781f92b377a0cb31f SHA512 4ec1c4990ce8d9a46204c0064f19c5c2b99848201c37562f8df76de5be84fdd2bcd35cbc3e9f20233f636522e086ac031a5a9cb65bd22a53eda619dcce86adbc
-EBUILD tin-2.4.5-r1.ebuild 1780 BLAKE2B 040add152e5d93840962ecc1217fc0fa2bbc721ebe8a09fe61d5f4c801a42272ab8f8c33ae40ed3a1ec8a726a7e24707829aea2bc92dba6a509c37ea2d7fb5b7 SHA512 db7b439ca03746cbaf67f6803fec71a705df5f699c4b569321386e5fcad004b9c8fb9aa53b93505a37983be2cac0d062f30f68a08b41f086f4f91c2e6e83520c
-MISC metadata.xml 456 BLAKE2B e606f48de760db9a54bc0d98453c04b71070d0eede202c65ab8ab64ad13557d794c24709c141837cb79468eb063ff6ecf17361385145c2294d90c43f585fe81a SHA512 c73827179e20f2487344e28828b999de4ccf1925a09dac5ae2fbdffbf398c3b147db96f6c69c14e8156bdc84c070dda5b7a24109efb57853ec7a8064a16c8bae
+DIST tin-2.6.0.tar.xz 1575564 BLAKE2B 2f42261457b359c63461953335f25de21fd3e54b3730b5db39daf0f25929e8c39a4c89be4d558bed9ce81801d2e3cad3d163c1827d2f3064144d8b2bf34ae645 SHA512 d843bd313fd144fbb5f4c40e3f0f776cab3a974494adc7004ee265235ab538dde520bc72c956d5a8517225fdb50e754b444f25bd3b661ddf51ff9e4135904862
+EBUILD tin-2.4.5-r1.ebuild 1785 BLAKE2B e05676a978ab997a0272ba82ffbcafc157f0e7d61fed6aa776bcff533bb4fc6ee156370973f5a35fc8ae6db42b9d635c18b278bdd6015d951cf49b39f51bb0e5 SHA512 3d6de868af081b012e990bdc874133351a33f6ba65340516668ecca4888e99b3b5ac02cf3862619f2b8e11d44466550dfb5a311a9e3205fa64b0636f4924bc89
+EBUILD tin-2.6.0.ebuild 2016 BLAKE2B c1234241d44f65509637643544c55e51aadcdb817084c72dd66f3288c46c11a5f4373e9bcccf4129f56a052c65fbc2cc798f5014e8535be4cacfd59117198ef8 SHA512 7d97ec34bfcc5242a69bb67fe96b91a62e0917eb38ed53e4cb0821ad36b2d31d32cd263154d079db562816852136505c9e5d3a82067508a1bc7dcbd79f8cd012
+MISC metadata.xml 500 BLAKE2B 6d8d3b07a119267cc50b3891ecc5d2414a79e9258c3c4c0ecf9c52581a6baed7723213ffa01267c42a3985487b21f2d34fe646e8b470304a5fa5f2b0a9adb70a SHA512 93a1fe0ce3eae638d1517db23a2e88f2bf99943a942db0d38bb5b1d4893005897627dd960f79e9584d3aaadb441f6781ecef1e1d9614fc802817b8dc1adf3bb9
diff --git a/net-nntp/tin/metadata.xml b/net-nntp/tin/metadata.xml
index 54d0b1a01589..bd47f200bdb0 100644
--- a/net-nntp/tin/metadata.xml
+++ b/net-nntp/tin/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 <!-- maintainer-needed -->
 <use>
-<flag name="cancel-locks">Enable Cancel-Lock header functionality (also enables USE=evil)</flag>
+<flag name="cancel-locks">Enable Cancel-Lock header functionality</flag>
 <flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> support</flag>
-<flag name="etiquette">Enable the display off posting etiquettes</flag>
-<flag name="mime">Add MIME support</flag>
+<flag name="etiquette" restrict="&lt;net-nntp/tin-2.6.0">Enable the display off posting etiquettes</flag>
+<flag name="mime" restrict="&lt;net-nntp/tin-2.6.0">Add MIME support</flag>
 </use>
 </pkgmetadata>
diff --git a/net-nntp/tin/tin-2.4.5-r1.ebuild b/net-nntp/tin/tin-2.4.5-r1.ebuild
index d9022f05e519..a5435105bbfb 100644
--- a/net-nntp/tin/tin-2.4.5-r1.ebuild
+++ b/net-nntp/tin/tin-2.4.5-r1.ebuild
@@ -9,7 +9,7 @@ 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="GPL-2"
+LICENSE="BSD GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cancel-locks debug doc +etiquette gpg idn ipv6 mime nls sasl socks5 spell unicode"
diff --git a/net-nntp/tin/tin-2.6.0.ebuild b/net-nntp/tin/tin-2.6.0.ebuild
new file mode 100644
index 000000000000..9a67b30ff9ac
--- /dev/null
+++ b/net-nntp/tin/tin-2.6.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 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 gpg nls sasl socks5"
+
+RDEPEND="
+	dev-libs/icu:=
+	dev-libs/libpcre:3
+	dev-libs/uulib
+	sys-libs/ncurses:=[unicode(+)]
+	cancel-locks? ( >=net-libs/canlock-3.0:= )
+	gpg? ( app-crypt/gnupg )
+	nls? ( virtual/libintl )
+	sasl? ( virtual/gsasl )
+	socks5? ( net-proxy/dante )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	virtual/yacc
+"
+
+DOCS=(
+	README{,.MAC,.WIN}
+	doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW,filtering}
+)
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	econf_args=(
+		$(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)
+		--disable-mime-strict-charset
+		--enable-nntp-only
+		--enable-prototypes
+		--with-coffee
+		--with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.io}}"
+		--with-pcre=/usr
+		--with-screen=ncursesw
+	)
+
+	# set default paths for utilities
+	econf_args+=(
+		--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
+	)
+
+	econf "${econf_args[@]}"
+}
+
+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 "view MIME articles" net-mail/metamail
+	optfeature "spell checker support" app-text/aspell
+}