[gentoo-commits] repo/gentoo:master commit in: net-nntp/tin/

[Joonas Niilola]

commit:     6f0831d475b261f64bbb12eb8d343892e79c8e6b
Author:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat Jan  8 11:28:34 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jan  8 12:49:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f0831d4

net-nntp/tin: add 2.6.1, drop 2.4.5-r1

Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-nntp/tin/Manifest            |  2 +-
 net-nntp/tin/metadata.xml        |  5 ++-
 net-nntp/tin/tin-2.4.5-r1.ebuild | 74 ----------------------------------
 net-nntp/tin/tin-2.6.1.ebuild    | 87 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 91 insertions(+), 77 deletions(-)

diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index 001b34ab27e8..a553037d6376 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -1,2 +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
+DIST tin-2.6.1.tar.xz 1570500 BLAKE2B ec9c54b8b89ecd33a42ede37c8db50828de2dce56ddff01900121903a18d73bde8a06733ca2dfb72c676eb373b5ea874cecb9a1ee7890ada4ad6539d9ff1a435 SHA512 dc9ace5e24cac1efcaac25df1747dd435573130cff4e9c846c89e8faaed8e8120d66a2021332c01f350744155bcb7be608657285560a1a2457b4635cc8fa22b3

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
+}