[patch] diff -uN tin-1.8.3.ebuild tin-1.9.4.ebuild cleanup

tin-1.9.4.ebuild-diff (text/plain), 2.19 KB, created by Sebastian Lüttich on 2009-04-15 11:03:00 UTC

--- /usr/portage/net-nntp/tin/tin-1.8.3.ebuild	2009-04-05 10:08:24.000000000 +0200
+++ tin-1.9.4.ebuild	2009-04-15 12:58:04.000000000 +0200
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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: $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 arm ia64 ppc sparc x86"
-IUSE="crypt debug idn ipv6 nls unicode"
+IUSE="cancel-locks crypt debug evil forgery idn ipv6 nls unicode socks5 no-etiquette"
 
 DEPEND="dev-libs/libpcre
 	dev-libs/uulib
@@ -21,21 +21,34 @@
 	unicode? ( dev-libs/icu sys-libs/ncurses[unicode] )
 	!unicode? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )
-	crypt? ( app-crypt/gnupg )"
+	crypt? ( app-crypt/gnupg )
+	socks5? ( net-proxy/dante )"
 RDEPEND="${DEPEND}
 	net-misc/urlview"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/1.8.2-various.patch
-}
 
 src_configure() {
+	if use evil
+	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"
+	
+	if use no-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
 
 	econf \
 		--with-pcre=/usr \
@@ -44,13 +57,15 @@
 		--disable-echo \
 		--disable-mime-strict-charset \
 		--with-coffee  \
-		--enable-fascist-newsadmin \
 		--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} \
 		|| die "econf failed"
 }
 
@@ -59,6 +74,9 @@
 }
 
 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"
 
 	dodoc doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW,*.sample,*.txt} || die "dodoc failed"