Describe cancel-locks USE flag better. Do not strip. Do not install the colliding man pages. Set unicode USE dep for ncurses. Unify if-thens in configure or replace them with [..] || [..]. Do not die() when USE="cancel-locks -evil". econf needs no die(). Run emake build (or it will compile in src_install(). emake instead of make. Sort DEPENDs alphanumerically.

Package-Manager: portage-2.2_rc61/cvs/Linux i686

6 files changed, 125 insertions, 36 deletions

diff --git a/net-nntp/tin/ChangeLog b/net-nntp/tin/ChangeLog
index 21a20ce7e851..aba78c107df3 100644
--- a/net-nntp/tin/ChangeLog
+++ b/net-nntp/tin/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-nntp/tin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/tin/ChangeLog,v 1.24 2010/01/08 17:44:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/tin/ChangeLog,v 1.25 2010/01/09 19:11:02 jer Exp $
+
+*tin-1.9.4-r1 (09 Jan 2010)
+
+  09 Jan 2010; Jeroen Roovers <jer@gentoo.org> tin-1.8.3.ebuild,
+  tin-1.9.4.ebuild, +tin-1.9.4-r1.ebuild, metadata.xml:
+  Describe cancel-locks USE flag better. Do not strip. Do not install the
+  colliding man pages. Set unicode USE dep for ncurses. Unify if-thens in
+  configure or replace them with [..] [..]. Do not die() when
+  USE="cancel-locks -evil". econf needs no die(). Run emake build (or it
+  will compile in src_install(). emake instead of make. Sort DEPENDs
+  alphanumerically.
 
   08 Jan 2010; Patrick Lauer <patrick@gentoo.org> tin-1.9.4.ebuild:
   Fixing unneeded built_with_use for eapi2
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index 5698cd39eb21..eb2150adab66 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -1,7 +1,8 @@
 AUX 1.8.2-various.patch 2196 RMD160 8718046ac1b3c0f3f480c435ef74cdceacffd80f SHA1 eed722a1371333ec51a8bf89e426213e659e25a4 SHA256 7dcc7ffd6dd65f88117fa26a47e78608c3a6f0a59da85e2cb65b4e56c27e424f
 DIST tin-1.8.3.tar.bz2 1437604 RMD160 7e165eccb099cfc8aae073781a5642266321dd3e SHA1 3822e7281d22433862075270b06bfa6b82226b0e SHA256 5ed70aff723181b6c8e26923a96054f7e2376204bf62b9a49fdf2b677f283f9f
 DIST tin-1.9.4.tar.bz2 1526534 RMD160 6a85e47ea06f2e86f2b8f688df137432ecb7c4e9 SHA1 e1f5ff2f04923137f43119b144f8a20e733eea23 SHA256 9d56a210709f91b1faafc0c6cb564c62b9e4443fe8704aaedbdafe0895508ef7
-EBUILD tin-1.8.3.ebuild 1662 RMD160 d6d1a8ef1b14f350a0f89e28be8592046c92a893 SHA1 1aaf589c5d06ca8005ed7144d0ee0653984f4bc4 SHA256 9a3bbd9712e25e0f88afcf8a48be85656a118a27102b5036e877c2fe1d07176a
-EBUILD tin-1.9.4.ebuild 2082 RMD160 0990fa5c4c508c8335df538f48ed816a26d762c7 SHA1 17d84d4e27a55dd1b3430c5e6723bb1222a493be SHA256 9526e00b22e21917c499636ae406afba11a3b9865e8174d75c88d62931af8b4c
-MISC ChangeLog 4593 RMD160 8820a8f97fa00b592bb706d26b21243699ccd989 SHA1 17eebf26faaa0256ba75783e67382348625fa727 SHA256 415ed0d94e40803ea6976e790c409ae34f1768c94ec628ea4f58f47ab3f2c54b
-MISC metadata.xml 442 RMD160 15df9c7afeee30f01a27f676ce3d35f6839aaf3d SHA1 8074542118dee9ba217598ae80a3ca0d49907cb0 SHA256 38aec1d1fc6fdb7b7a156efc0671bd362f471d12deda01c807f1dd9bc9ecfb5e
+EBUILD tin-1.8.3.ebuild 1638 RMD160 cdcf9c9298c856cf7e2b2c3bc0ee3142b21c2883 SHA1 afa9f0c82d203445e6a420c1701567d1c68c247c SHA256 6cfa74b8f07e41409824d951e272c6ccd7ce93455a6b81e27db35861a4a02bb4
+EBUILD tin-1.9.4-r1.ebuild 2049 RMD160 35f93352f80c61cc1008d066a1f5f869cc75a4a0 SHA1 c1683950f014fb2f6fd2c9c96dc8db5fe293b4b9 SHA256 46a80ec136d60067cf297aa6155245d171430900b7754fb87eaa155049dc4364
+EBUILD tin-1.9.4.ebuild 2046 RMD160 84216e6fdad3d83bb76a01af682ee8f7d3fc7c90 SHA1 9ea3ef5275af8722a24cbea09b1e2b727ae764ad SHA256 5aaee4bfaf979e4148210943e8bd9921625a58ae185d32a2100866b34da145f3
+MISC ChangeLog 5112 RMD160 1a692ea6e00511c34bee07d7100c26fe5e5ef448 SHA1 5b855514063f71fc0f4d8afba95597aee7cb7f58 SHA256 afef1b11d434b1f18e4ce9590411cc890b33ec9cb9b016a767067d88a1661b25
+MISC metadata.xml 474 RMD160 e5286d4ab4f8805cfe3202ee2b28f90035c2fe31 SHA1 391998b267bc5c63657b02e90374a01ad21b63f5 SHA256 bfe5c7e89a1538a887ee1a678184132231047b6c12269fa8c9116c165dd8a848
diff --git a/net-nntp/tin/metadata.xml b/net-nntp/tin/metadata.xml
index 84f03bcd5f09..b3076b70479e 100644
--- a/net-nntp/tin/metadata.xml
+++ b/net-nntp/tin/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>net-news</herd>
 <use>
-<flag name='cancel-locks'>Enable CancelLock functionality</flag>
+<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='etiquette'>Enable the display off posting etiquettes</flag>
diff --git a/net-nntp/tin/tin-1.8.3.ebuild b/net-nntp/tin/tin-1.8.3.ebuild
index 0bb128f0805c..5c54216e55c9 100644
--- a/net-nntp/tin/tin-1.8.3.ebuild
+++ b/net-nntp/tin/tin-1.8.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/tin/tin-1.8.3.ebuild,v 1.7 2009/03/08 10:30:25 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/tin/tin-1.8.3.ebuild,v 1.8 2010/01/09 19:11:02 jer Exp $
 
 EAPI="2"
 
@@ -25,10 +25,7 @@ DEPEND="dev-libs/libpcre
 RDEPEND="${DEPEND}
 	net-misc/urlview"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/1.8.2-various.patch
 }
 
diff --git a/net-nntp/tin/tin-1.9.4-r1.ebuild b/net-nntp/tin/tin-1.9.4-r1.ebuild
new file mode 100644
index 000000000000..b75410e048b1
--- /dev/null
+++ b/net-nntp/tin/tin-1.9.4-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/tin/tin-1.9.4-r1.ebuild,v 1.1 2010/01/09 19:11:02 jer Exp $
+
+EAPI="2"
+
+inherit versionator eutils
+
+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$(get_version_component_range 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="cancel-locks crypt debug evil forgery idn ipv6 nls unicode socks5 +etiquette"
+
+DEPEND="
+	crypt? ( app-crypt/gnupg )
+	idn? ( net-dns/libidn )
+	nls? ( sys-devel/gettext )
+	socks5? ( net-proxy/dante )
+	unicode? ( dev-libs/icu )
+	dev-libs/libpcre
+	dev-libs/uulib
+	sys-libs/ncurses[unicode?]
+"
+
+RDEPEND="${DEPEND}
+	net-misc/urlview"
+
+src_prepare() {
+	# Do not strip
+	sed -i src/Makefile.in -e '388s|-s ||g' || die "sed src/Makefile.in failed"
+}
+
+src_compile() {
+	emake build || die "emake failed"
+}
+
+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"
+
+	use etiquette || myconf="${myconf} --disable-etiquette"
+
+	econf \
+		--with-pcre=/usr \
+		--enable-nntp-only \
+		--enable-prototypes \
+		--disable-echo \
+		--disable-mime-strict-charset \
+		--with-coffee  \
+		--with-screen=${screen} \
+		--with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.org}}" \
+		$(use_enable ipv6) \
+		$(use_enable debug) \
+		$(use_enable crypt pgp-gpg) \
+		$(use_enable nls) \
+		$(use_enable cancel-locks) \
+		$(use_with socks5) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	rm -f "${D}"/usr/share/man/man5/{mbox,mmdf}.5
+
+	dodoc doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW,*.sample,*.txt} || die "dodoc failed"
+	insinto /etc/tin
+	doins doc/tin.defaults || die "doins failed"
+}
diff --git a/net-nntp/tin/tin-1.9.4.ebuild b/net-nntp/tin/tin-1.9.4.ebuild
index 319cc4d8044f..ef35a5d64741 100644
--- a/net-nntp/tin/tin-1.9.4.ebuild
+++ b/net-nntp/tin/tin-1.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/tin/tin-1.9.4.ebuild,v 1.3 2010/01/08 17:44:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/tin/tin-1.9.4.ebuild,v 1.4 2010/01/09 19:11:02 jer Exp $
 
 EAPI="2"
 
@@ -15,23 +15,31 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 IUSE="cancel-locks crypt debug evil forgery idn ipv6 nls unicode socks5 +etiquette"
 
-DEPEND="sys-libs/ncurses
-	dev-libs/libpcre
-	dev-libs/uulib
+DEPEND="
+	crypt? ( app-crypt/gnupg )
 	idn? ( net-dns/libidn )
-	unicode? ( dev-libs/icu
-		sys-libs/ncurses[unicode] )
 	nls? ( sys-devel/gettext )
-	crypt? ( app-crypt/gnupg )
-	socks5? ( net-proxy/dante )"
+	socks5? ( net-proxy/dante )
+	unicode? ( dev-libs/icu )
+	dev-libs/libpcre
+	dev-libs/uulib
+	sys-libs/ncurses[unicode?]
+"
 
 RDEPEND="${DEPEND}
 	net-misc/urlview"
 
-src_configure() {
+src_prepare() {
+	# Do not strip
+	sed -i src/Makefile.in -e '388s|-s ||g' || die "sed src/Makefile.in failed"
+}
 
-	if use evil
-	then
+src_compile() {
+	emake build || die "emake failed"
+}
+
+src_configure() {
+	if use evil || use cancel-locks; then
 		sed -i -e"s/# -DEVIL_INSIDE/-DEVIL_INSIDE/" src/Makefile.in
 	fi
 
@@ -43,13 +51,7 @@ src_configure() {
 	local screen="ncurses"
 	use unicode && screen="ncursesw"
 
-	if ! use etiquette; then
-		myconf="${myconf} --disable-etiquette"
-	fi
-
-	if ! use evil && use cancel-locks; then
-		die "USE=cancel-locks requires also USE=evil to generate MIDs and the Cancel-Lock:-Header."
-	fi
+	use etiquette || myconf="${myconf} --disable-etiquette"
 
 	econf \
 		--with-pcre=/usr \
@@ -66,15 +68,12 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable cancel-locks) \
 		$(use_with socks5) \
-		${myconf} \
-		|| die "econf failed"
+		${myconf}
 }
 
 src_install() {
-	if has_version mail-client/mutt; then
-		rm doc/mmdf.5 doc/mbox.5
-	fi
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
+	rm -f "${D}"/usr/share/man/man5/{mbox,mmdf}.5
 
 	dodoc doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW,*.sample,*.txt} || die "dodoc failed"
 	insinto /etc/tin