gentoo resync : 16.01.2021

4 files changed, 93 insertions, 79 deletions

diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index 5363cb420800..2df170072061 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -1,5 +1,5 @@
-DIST tin-2.4.5.tar.xz 1559164 BLAKE2B 4efea88c7f76aef91a848c9ed5d82efac640360e41c515015d406e84ed5ce639bbcd17eff29939312ebf83adb8bb84bc7a4f04833cd7cc0781f92b377a0cb31f SHA512 4ec1c4990ce8d9a46204c0064f19c5c2b99848201c37562f8df76de5be84fdd2bcd35cbc3e9f20233f636522e086ac031a5a9cb65bd22a53eda619dcce86adbc
 DIST tin-2.6.0.tar.xz 1575564 BLAKE2B 2f42261457b359c63461953335f25de21fd3e54b3730b5db39daf0f25929e8c39a4c89be4d558bed9ce81801d2e3cad3d163c1827d2f3064144d8b2bf34ae645 SHA512 d843bd313fd144fbb5f4c40e3f0f776cab3a974494adc7004ee265235ab538dde520bc72c956d5a8517225fdb50e754b444f25bd3b661ddf51ff9e4135904862
-EBUILD tin-2.4.5-r1.ebuild 1785 BLAKE2B e05676a978ab997a0272ba82ffbcafc157f0e7d61fed6aa776bcff533bb4fc6ee156370973f5a35fc8ae6db42b9d635c18b278bdd6015d951cf49b39f51bb0e5 SHA512 3d6de868af081b012e990bdc874133351a33f6ba65340516668ecca4888e99b3b5ac02cf3862619f2b8e11d44466550dfb5a311a9e3205fa64b0636f4924bc89
+DIST tin-2.6.1.tar.xz 1570500 BLAKE2B ec9c54b8b89ecd33a42ede37c8db50828de2dce56ddff01900121903a18d73bde8a06733ca2dfb72c676eb373b5ea874cecb9a1ee7890ada4ad6539d9ff1a435 SHA512 dc9ace5e24cac1efcaac25df1747dd435573130cff4e9c846c89e8faaed8e8120d66a2021332c01f350744155bcb7be608657285560a1a2457b4635cc8fa22b3
 EBUILD tin-2.6.0.ebuild 2012 BLAKE2B 8581e98cc3f83f1bf54baabdaa0330c1ec0e43ab6a8bc2baaf633804c41ebc0df59c802e18a60a2abf3a92682da1c79470ad1f511f63a13f0e74d681b44cb744 SHA512 681e501d03e8ae70bfd45f253e70b83ccad34b33ab52a2a3257ac0abeb4d28efed5ae78d10822f5da6f747ce68b15b0480272ed488766264126ac1be83fd7337
-MISC metadata.xml 501 BLAKE2B c61498cbd6e1e838d45af07c61b9089e8c507259153c2b9463d5e157c04cf3318fb226deab66e14a112124bcddc09b1a586b1c895cba2b2cc432ea5abd9b17cc SHA512 6b391ac4ba621a8117fde87f64b6c86373ea3ebb8d07e529e722f6a3307ce0a89467bb9beb50bcb31fa289ab44f1fa7c82e2a7dff3e38affb5d99b8ad975a24b
+EBUILD tin-2.6.1.ebuild 2019 BLAKE2B 458b0211d506f3b7addd6e3d6d05ffb22fb5889f71ac0539893c63c333734409dded892e9952ef3ccd798ae6bc5b65aafcef11419bb2dd484f0e6ba9fbfb29df SHA512 22aa7fadfc9f19082ce011855cdf05512167ef1c413bb794f762420a79608d6cd83a3fcd9d44a0275b75241504e7e31d84841f38404705d85291bda72d59c8be
+MISC metadata.xml 408 BLAKE2B a89a2128685a8dc089ba37438352ae8c7171b74c90a8f838a5b7d930b142a90e6d69672ec4ec3f4e97e71c6b38ef9daf988bd5b46d6ccc9f3e4aa0f173075679 SHA512 26855098ca6c2da9fa4edf5620be29402f3c854280e3ca1b26a43af9d630ca34d229a34cc7b513c20c0a03c9e500830fc586f0086668042cff645d08741306b3
diff --git a/net-nntp/tin/metadata.xml b/net-nntp/tin/metadata.xml
index 4a1d8ee295b7..e9e3c1ae47e8 100644
--- a/net-nntp/tin/metadata.xml
+++ b/net-nntp/tin/metadata.xml
@@ -2,10 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
+<upstream>
+<doc>http://www.tin.org/bin/man.cgi?section=1&amp;topic=tin</doc>
+</upstream>
 <use>
 <flag name="cancel-locks">Enable Cancel-Lock header functionality</flag>
 <flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> 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
deleted file mode 100644
index a5435105bbfb..000000000000
--- a/net-nntp/tin/tin-2.4.5-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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 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"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	dev-libs/libpcre
-	dev-libs/uulib
-	sys-libs/ncurses:=[unicode(+)?]
-	gpg? ( app-crypt/gnupg )
-	idn? ( net-dns/libidn )
-	mime? ( net-mail/metamail )
-	nls? ( sys-devel/gettext )
-	sasl? ( virtual/gsasl )
-	socks5? ( net-proxy/dante )
-	unicode? ( dev-libs/icu:= )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local screen="ncurses"
-	use unicode && screen="ncursesw"
-
-	tc-export AR CC RANLIB
-
-	econf \
-		$(use_enable cancel-locks) \
-		$(use_enable debug) \
-		$(use_enable etiquette) \
-		$(use_enable gpg pgp-gpg) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with mime metamail /usr) \
-		$(use_with socks5 socks) $(use_with socks5) \
-		$(use_with spell ispell /usr) \
-		--disable-mime-strict-charset \
-		--enable-echo \
-		--enable-nntp-only \
-		--enable-prototypes \
-		--with-coffee  \
-		--with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.org}}" \
-		--with-pcre=/usr \
-		--with-screen=${screen}
-}
-
-src_compile() {
-	# To build from the root dir you have to call `make build`, not just
-	# `make`.
-	emake build
-}
-
-src_install() {
-	default
-
-	# File collision?
-	rm -f "${ED}"/usr/share/man/man5/{mbox,mmdf}.5
-
-	dodoc doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW}
-	use doc && dodoc doc/{*.sample,*.txt}
-
-	insinto /etc/tin
-	doins doc/tin.defaults
-}
diff --git a/net-nntp/tin/tin-2.6.1.ebuild b/net-nntp/tin/tin-2.6.1.ebuild
new file mode 100644
index 000000000000..d9d070ef4f73
--- /dev/null
+++ b/net-nntp/tin/tin-2.6.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 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 "MIME articles support" net-mail/metamail
+	optfeature "spell checker support" app-text/aspell
+}