Make modular X friendly.

(Portage version: 2.0.54)

5 files changed, 27 insertions, 19 deletions

diff --git a/net-analyzer/ttt/ChangeLog b/net-analyzer/ttt/ChangeLog
index d41036b3918d..be455e324dff 100644
--- a/net-analyzer/ttt/ChangeLog
+++ b/net-analyzer/ttt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/ttt
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ttt/ChangeLog,v 1.9 2005/07/19 16:41:39 dholm Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ttt/ChangeLog,v 1.10 2006/01/19 02:07:40 vanquirius Exp $
+
+*ttt-1.8.1-r1 (19 Jan 2006)
+
+  19 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> -ttt-1.8.ebuild,
+  +ttt-1.8.1-r1.ebuild:
+  Make modular X friendly.
 
   19 Jul 2005; David Holm <dholm@gentoo.org> ttt-1.8.1.ebuild:
   Added to ~ppc.
diff --git a/net-analyzer/ttt/Manifest b/net-analyzer/ttt/Manifest
index 5cd143d2d669..cf9099b650e1 100644
--- a/net-analyzer/ttt/Manifest
+++ b/net-analyzer/ttt/Manifest
@@ -1,9 +1,9 @@
 MD5 de81fd8ae104d63bfc10ca6ef6214d25 ChangeLog 1256
-MD5 685a02ea9c7601ba2b8fb03fb5d1e1d4 metadata.xml 264
-MD5 46ca343fdd4095fb1001eb37d4f02d1b ttt-1.8.ebuild 1114
-MD5 4999ceb02eb08ff19c953db45af3fbdc ttt-1.8.1.ebuild 1286
-MD5 525b88bccd59588c935e7951ad328ffe files/digest-ttt-1.8 59
+MD5 699a57dff753234cd7f51906bd1f3e31 files/digest-ttt-1.8.1 61
+MD5 699a57dff753234cd7f51906bd1f3e31 files/digest-ttt-1.8.1-r1 61
 MD5 31221ee949d56df92f0c8299be79fc64 files/ttt-1.8-linux-sll.patch 2203
 MD5 731900a46e4de27b97ffefca6b161c37 files/ttt-1.8-pcap.patch 297
-MD5 699a57dff753234cd7f51906bd1f3e31 files/digest-ttt-1.8.1 61
 MD5 ea183ebbe91882d8b994ad70cf0a0eca files/ttt-gcc4.diff 683
+MD5 685a02ea9c7601ba2b8fb03fb5d1e1d4 metadata.xml 264
+MD5 dabdb378f6398efa1fcff59d4f859732 ttt-1.8.1-r1.ebuild 1330
+MD5 4999ceb02eb08ff19c953db45af3fbdc ttt-1.8.1.ebuild 1286
diff --git a/net-analyzer/ttt/files/digest-ttt-1.8 b/net-analyzer/ttt/files/digest-ttt-1.8
deleted file mode 100644
index 5944854b816b..000000000000
--- a/net-analyzer/ttt/files/digest-ttt-1.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b4e36fd166ba00d68899961b0610f6e0 ttt-1.8.tar.gz 134687
diff --git a/net-analyzer/ttt/files/digest-ttt-1.8.1-r1 b/net-analyzer/ttt/files/digest-ttt-1.8.1-r1
new file mode 100644
index 000000000000..223260ed5207
--- /dev/null
+++ b/net-analyzer/ttt/files/digest-ttt-1.8.1-r1
@@ -0,0 +1 @@
+MD5 651ea8ad895bcbca66e53be1fda0a26c ttt-1.8.1.tar.gz 135067
diff --git a/net-analyzer/ttt/ttt-1.8.ebuild b/net-analyzer/ttt/ttt-1.8.1-r1.ebuild
index 8fae04ecd0be..354626849c5f 100644
--- a/net-analyzer/ttt/ttt-1.8.ebuild
+++ b/net-analyzer/ttt/ttt-1.8.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ttt/ttt-1.8.ebuild,v 1.6 2005/01/29 05:12:52 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ttt/ttt-1.8.1-r1.ebuild,v 1.1 2006/01/19 02:07:40 vanquirius Exp $
 
 inherit eutils
 
@@ -10,25 +10,28 @@ HOMEPAGE="http://www.csl.sony.co.jp/person/kjc/kjc/software.html"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="x86"
+KEYWORDS="~ppc ~x86"
 IUSE="ipv6"
 
 DEPEND="virtual/libc
-	virtual/x11
 	dev-lang/tcl
 	dev-lang/tk
 	>=dev-tcltk/blt-2.4
 	virtual/libpcap
-	sys-apps/grep"
+	|| ( ( >=x11-libs/libXt-1.0.0 )
+	virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
+	grep 'pcap_lookupnet.*const' /usr/include/pcap.h &>/dev/null && \
+		epatch "${FILESDIR}"/${PN}-1.8-pcap.patch
 
-	cd ${S}
-	grep -q 'pcap_lookupnet.*const' /usr/include/pcap.h &&
-		epatch ${FILESDIR}/${P}-pcap.patch
+	epatch "${FILESDIR}"/${PN}-1.8-linux-sll.patch
 
-	epatch ${FILESDIR}/${P}-linux-sll.patch
+	epatch "${FILESDIR}"/${PN}-gcc4.diff
+	# remove -Wwrite-strings -fwritable-strings (naughty)
+	sed -i 's/\(GCCFLAGS="\).*\("\)/\1-Wall\2/' configure || die "sed failed"
 }
 
 src_compile() {
@@ -36,7 +39,6 @@ src_compile() {
 	use ipv6 && myconf="${myconf} --enable-ipv6"
 
 	econf ${myconf} || die "./configure failed"
-
 	emake || die "make failed"
 }
 
@@ -45,6 +47,6 @@ src_install() {
 	dodir /usr/bin
 	dodir /usr/lib/ttt
 	dodir /usr/share/man/man1
-	einstall exec_prefix=${D}/usr install-man || die "make install failed"
+	einstall exec_prefix="${D}"/usr install-man || die "make install failed"
 	prepall
 }