[gentoo-proxy-maint] [PATCH v2 3/3] net-nntp/tin: add 2.6.0

[Anna Vyalkova]

From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@×××××.in>

* set correct LICENSE (main code is licensed under 3-clause BSD, only
  metamutt script is GPL)

* remove "doc" USE flag as unnecessary

* remove "etiquette" USE flag (can be toggled in tinrc)

* remove "ipv6" USE flag (no external deps)

* remove "unicode" USE flag (tin 2.6 builds with ncursesw only)

* remove "mime" and "spell" USE flags (optional runtime functionality)

* depend unconditionally on dev-libs/icu

* depend on virtual/libintl instead of gettext (tarball already has .gmo
  files)

* add yacc build dependency

* unbundle libcanlock

* gmane.org -> gmane.io

* install localized manpages

* do not remove mbox.5 and mmdf.5 manpages (e-file reports no
  collisions)

Couldn't reproduce bug #725226

Bug: https://bugs.gentoo.org/725226
Closes: https://bugs.gentoo.org/550620
Signed-off-by: Anna Vyalkova <cyber+gentoo@×××××.in>
---
 net-nntp/tin/Manifest              |  1 +
 net-nntp/tin/metadata.xml          |  6 +--
 net-nntp/tin/tin-2.4.5-r1.ebuild   |  2 +-
 net-nntp/tin/tin-2.6.0.ebuild      | 87 ++++++++++++++++++++++++++++++
 profiles/arch/arm/package.use.mask |  4 ++
 5 files changed, 96 insertions(+), 4 deletions(-)
 create mode 100644 net-nntp/tin/tin-2.6.0.ebuild

diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index 339871627b9..001b34ab27e 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -1 +1,2 @@
 DIST tin-2.4.5.tar.xz 1559164 BLAKE2B 4efea88c7f76aef91a848c9ed5d82efac640360e41c515015d406e84ed5ce639bbcd17eff29939312ebf83adb8bb84bc7a4f04833cd7cc0781f92b377a0cb31f SHA512 4ec1c4990ce8d9a46204c0064f19c5c2b99848201c37562f8df76de5be84fdd2bcd35cbc3e9f20233f636522e086ac031a5a9cb65bd22a53eda619dcce86adbc
+DIST tin-2.6.0.tar.xz 1575564 BLAKE2B 2f42261457b359c63461953335f25de21fd3e54b3730b5db39daf0f25929e8c39a4c89be4d558bed9ce81801d2e3cad3d163c1827d2f3064144d8b2bf34ae645 SHA512 d843bd313fd144fbb5f4c40e3f0f776cab3a974494adc7004ee265235ab538dde520bc72c956d5a8517225fdb50e754b444f25bd3b661ddf51ff9e4135904862
diff --git a/net-nntp/tin/metadata.xml b/net-nntp/tin/metadata.xml
index 54d0b1a0158..bd47f200bdb 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 d9022f05e51..a5435105bbf 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 00000000000..2f0923bd8d9
--- /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 GPL-2+"
+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
+}
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index de57f5b8cf0..0b0f7f6b812 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Anna Vyalkova <cyber@gentoo@×××××.in> (2021-09-04)
+# net-libs/canlock not keyworded
+>=net-nntp/tin-2.6.0 cancel-locks
+
 # Sam James <sam@g.o> (2021-08-14)
 # Needs Raspberry Pi specific applications
 media-video/mjpg-streamer -input-raspicam
-- 
2.33.0