gentoo resync : 29.05.2018

4 files changed, 3 insertions, 99 deletions

diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index a4c9fb7d33dc..c4bb26a3952e 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -1,5 +1,3 @@
-DIST tin-2.2.1.tar.xz 1378384 BLAKE2B d68157e778f272c55cb3021987beddb27e89bd31d39e985b16e51a4aa942cb59abcc6ada46611c69320e785506085210a0451227091964866b4130e99c5f1ac5 SHA512 2c5b4b50be38c168404ba55c9429355c0dd2232c580116086fa9ea24a8907ad2d71d91b2d1c533bf7ff4d24fd1946d5ba61bc0833b20d5383e013e2f18c10bbd
 DIST tin-2.4.2.tar.xz 1491388 BLAKE2B 16fab433443d5859cc9661790ff837e8f45767e7f45bafc54a8cffc94fd52cb4ee7afb98e579db49c16148b0f521374404a0f26d75a07a24c1c7a1dc5e3a57fe SHA512 70a9957d5bf5af1bb182a3f4e62795cd5862b7282b7fc0c231c3bd02d83950cdbdd502d8a2cc5eae20b29af584e4f794f03378742b47ed93fc5c61ac5bbb01b6
-EBUILD tin-2.2.1.ebuild 2108 BLAKE2B 98593eb9525eedaa9db21033dbe3b22a82ed91aea8f6edb5aa0c63c0fe72aea4c82cbb428aba96c5a022c83d59f569c5118802e826d0ff012e663a5feaf9eff2 SHA512 a5c1801e538bda92d121767a16d27f86c91165d2507b3027a11d37f0fe53e73c106f0182019308e9747b3ab2b1cf317a7811491db7af9c0389a5d39e3c1a4d60
-EBUILD tin-2.4.2.ebuild 1725 BLAKE2B ed0dc0ef4b03db8f4f932598b1114924abb35510571605fd4605cc2005bc27262ffadab177019ec253edb604e7d6fd343569529c26d0137a6b655d9b0ee38731 SHA512 65936b63c5d894ecce55eea61f6aa3a7e86c0768954d322d2955679be86f51d7da076e1058672566db9af02db7152adaad77bb0b51c5bb3ec489d801cfc5d088
-MISC metadata.xml 545 BLAKE2B 677b122bf3d9d837fb2159f63e44726719f51308612399ff463717a5df307b9796d841941e0156f569a9719ca2d6946d4aaa543ca9fad34cb68120da299768b7 SHA512 21578f131458fa9445675790df540870888edf0a46a0690e84ce35d42ad0c3b636fc0f003826b6711e797c3f4af56ac0febbc48276e6a5675d4d193be4656eda
+EBUILD tin-2.4.2.ebuild 1724 BLAKE2B 24f674ddf5f8d634e868fa91cf4dba5821abaa17a57765413fb0c057e844684c782c8280632d807db66193dea0f72df5f58e88a109452fffa09e236622584834 SHA512 12a9ecb8e52ecb9f16f2cc086b74afaa4b962310fbb5d29d23f595d10bbedacb27dbcf3a6459a0eccea608165005fff3b9c090523eeab7c4494035302366d7d7
+MISC metadata.xml 414 BLAKE2B fe665703858fccabe75c0a828e67676d069bc212c0ff3e5f00fb4fcdc35063be3cee444a554c69e1852033d391152fa404f1df99cfa0d00faf57456d531cc84e SHA512 2e64c73f2de75fb290a163c7a6555636db4ce9306308d2df3d56ae9b342afdbd755b29bc891dbf44dd34b655d3269e9c09bd85c988867a79fca6537a903469db
diff --git a/net-nntp/tin/metadata.xml b/net-nntp/tin/metadata.xml
index 2b3330cd1660..ca0ce1646b9b 100644
--- a/net-nntp/tin/metadata.xml
+++ b/net-nntp/tin/metadata.xml
@@ -4,8 +4,6 @@
 <!-- maintainer-needed -->
 <use>
 <flag name="cancel-locks">Enable Cancel-Lock header functionality (also enables USE=evil)</flag>
-<flag name="evil">Let tin generate a message ID</flag>
-<flag name="forgery">Cancel messages posted from a different account</flag>
 <flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> support</flag>
 <flag name="etiquette">Enable the display off posting etiquettes</flag>
 </use>
diff --git a/net-nntp/tin/tin-2.2.1.ebuild b/net-nntp/tin/tin-2.2.1.ebuild
deleted file mode 100644
index ebf4f25d29b5..000000000000
--- a/net-nntp/tin/tin-2.2.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs versionator
-
-TIN_PV=$(get_version_component_range 1-2)
-DESCRIPTION="A threaded NNTP and spool based UseNet newsreader"
-HOMEPAGE="http://www.tin.org/"
-SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/v${TIN_PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cancel-locks debug doc +etiquette evil forgery gpg idn ipv6 mime nls sasl socks5 spell unicode"
-
-RDEPEND="
-	dev-libs/libpcre
-	dev-libs/uulib
-	gpg? ( app-crypt/gnupg )
-	idn? ( net-dns/libidn )
-	mime? ( net-mail/metamail )
-	net-misc/urlview
-	nls? ( sys-devel/gettext )
-	sasl? ( virtual/gsasl )
-	socks5? ( net-proxy/dante )
-	sys-libs/ncurses[unicode?]
-	unicode? ( dev-libs/icu:= )
-"
-
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -i src/Makefile.in -e 's| -s | |g' || die
-	sed -i configure -e '/CFLAGS/s|-g||g' || die
-}
-
-src_configure() {
-	if use evil || use cancel-locks; then
-		sed -i -e"s/# -DEVIL_INSIDE/-DEVIL_INSIDE/" src/Makefile.in
-	fi
-
-	if use forgery
-	then
-		sed -i -e"s/^CPPFLAGS.*/& -DFORGERY/" src/Makefile.in
-	fi
-
-	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() {
-	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.4.2.ebuild b/net-nntp/tin/tin-2.4.2.ebuild
index 65abd1a10785..1d4e391a4e78 100644
--- a/net-nntp/tin/tin-2.4.2.ebuild
+++ b/net-nntp/tin/tin-2.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+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"
 
 RDEPEND="