7 files changed, 32 insertions, 174 deletions
diff --git a/sci-electronics/gtkwave/ChangeLog b/sci-electronics/gtkwave/ChangeLog
index 316ace738e7a..cb253d816f74 100644
--- a/sci-electronics/gtkwave/ChangeLog
+++ b/sci-electronics/gtkwave/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-electronics/gtkwave
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/ChangeLog,v 1.55 2010/11/14 13:49:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/ChangeLog,v 1.56 2010/11/28 16:10:55 rafaelmartins Exp $
+
+*gtkwave-3.3.16 (28 Nov 2010)
+
+  28 Nov 2010; Rafael G. Martins <rafaelmartins@gentoo.org>
+  -gtkwave-3.1.6.ebuild, -gtkwave-3.1.7.ebuild, -gtkwave-3.2.0.ebuild,
+  -gtkwave-3.2.1.ebuild, -gtkwave-3.2.3.ebuild, +gtkwave-3.3.16.ebuild:
+  Version bump. Clean up old versions.
 
   14 Nov 2010; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Move local USE lzma to global USE
diff --git a/sci-electronics/gtkwave/Manifest b/sci-electronics/gtkwave/Manifest
index d06c9f7449e3..186f613f4ad8 100644
--- a/sci-electronics/gtkwave/Manifest
+++ b/sci-electronics/gtkwave/Manifest
@@ -1,32 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST gtkwave-3.1.1.tar.gz 2736384 RMD160 cb8fcc31d5bcfc0bf700a62f72f1376fa66c349e SHA1 badbc85ff3b4a74a79180f6610205b8f0cafbc12 SHA256 50f77b1704732a9cca4b3adfffde66e0e1d70719c79af672a65e9fcec7a9793b
-DIST gtkwave-3.1.6.tar.gz 2979893 RMD160 801d0a456415ffd31e0a46b15a35a6640e555fd4 SHA1 be2b2e11e4447a783b0cc2d867537cada2b65ac8 SHA256 084d91c2cbe137c0c9dcb3c699606780937b996d135fdb184e04a4e9f48bd84d
-DIST gtkwave-3.1.7.tar.gz 2979943 RMD160 1d957665172cd7f6142698bfa4babba003f9fb52 SHA1 1d94b453075fe46984015d7fbd0bfee06758cf9a SHA256 87c1d03999a2e1e27bcac9db43c11f42b4b6f2c1caccb454ad8e1b4fe1062d6f
 DIST gtkwave-3.1.9.tar.gz 2982612 RMD160 6543f467e3e7fa4a63956fc819b375fdbb78c7eb SHA1 0266c77bf25d918fdb48ed7d7afd4fc6f7082f0f SHA256 4cc9cb9284c02042bd10ec4fdab3097fc74ffaf709424cd58a5d6a154fc44d80
-DIST gtkwave-3.2.0.tar.gz 3024915 RMD160 20e25e1d69b85af37942ffb897f90b9d9ae8f1b5 SHA1 4eded1fe5b71e409ca9c1d84832ca9c68fe65d7f SHA256 4481189fe7f14fe47b0a04581b3b50131b2a52329ae5a70681ce00e460ccfcc4
-DIST gtkwave-3.2.1.tar.gz 3016335 RMD160 5f29c24a7ceaf7aa20d0ecdb34b0a7883352e063 SHA1 15f186ec08a8bb129170869050534f7dd574273f SHA256 f1b8bbaaf9eec719cf2ec5292d4636a300e2c1bce8b5413a39a81ef158c3d070
-DIST gtkwave-3.2.3.tar.gz 3095929 RMD160 1a4a026c7b07a8a1d0ec797b7f85c3b753c60c35 SHA1 f3868c479d71d4643386aafe2dcef055069f3978 SHA256 40bb075f89284073cd65c07358ccb70fcff88e2fcac08f01b2cf9ccd0c77a8fa
 DIST gtkwave-3.3.13.tar.gz 3160773 RMD160 134b4d3bdacfccb129f7f2103beb67780d78a4d6 SHA1 33283e8381d1a835d45e2cf7386348cbcd5914cb SHA256 79c7964e10f15cf912b8d680516f163814707ab63c4dc474debadd29b95a7be3
 DIST gtkwave-3.3.14.tar.gz 3164195 RMD160 841bb296b1cb8b8ef6a77e733785c867caf24814 SHA1 2722b5769b41033bdc6c02ac0e8f534f59c097dc SHA256 75a475b55a173474e2952323327564e49324ce867009c449066be988918388e0
+DIST gtkwave-3.3.16.tar.gz 3167396 RMD160 38ebcd66e8d996dca80faf7bd86fc0a5b85848d5 SHA1 caf3745b4e01ba87797f94b98c82fb22bb30b389 SHA256 43f98c92bf87aee53c80f5c791634bf5fe2256d4d294e2314d52e19fcc407dd1
 DIST gtkwave-doc-3.1.0.tar.gz 1215809 RMD160 f14cc4a3f5fcd03575ab285319a4ffefe67c57f6 SHA1 afedcb7f54a9fa4147e40baec385731ba264e838 SHA256 0c9c60a64b8052c388314c347d11987b60ed3aaa3b978852a40a69ba049d769a
 DIST gtkwave-doc-3.1.5.tar.gz 1266207 RMD160 02ab73455200c7428a0b80faec1ac2eb58c9fe64 SHA1 00977ffe8a552a253ef1cd49374894e3aed7a04b SHA256 12d568a0efcadd83ed1f31ee24090560a4b2c9f022a51b5c1ba0f8e8298f7a21
 EBUILD gtkwave-3.1.1.ebuild 1012 RMD160 815f43b6038c434f2717493c139052af0a41e269 SHA1 b086152df243c6985978aa3c465ae35a34e8ba37 SHA256 c7ae657c7e7dfa2d472aff21cec057638e3ce787c77f937d912fb804fbc1e109
-EBUILD gtkwave-3.1.6.ebuild 1068 RMD160 24c04dfcf7a7317221c30260cbdb1fb6cb6dded8 SHA1 1a31e1ef742fdba33fb3e72dae3c61df7df8019b SHA256 12dfc30c5e5a12a839422c6433a9ed11783ea8f849675aee3228ec65c462a0c9
-EBUILD gtkwave-3.1.7.ebuild 1068 RMD160 c2afd2646a055b730b195a28ef296511e7c9dbea SHA1 e964dfabe4bdcf1d0cfc66b2a1ba1b924ac4bfb7 SHA256 05369ff4a05cd64b036c3df75cbf0b05d401e3b1950115bc7fb00c31aebd12bd
 EBUILD gtkwave-3.1.9.ebuild 1068 RMD160 2341e5fa786d2bd75ce9903e01eb7af4adced542 SHA1 ba0ecd90e8a2f0fffd969ee54c7be5ad60d7b3f5 SHA256 5f1e2c77918d863ac13f1fa3eef0bfab6b67b564ed9c3c2fa63a7f3f8909e354
-EBUILD gtkwave-3.2.0.ebuild 1005 RMD160 9f4a96d756a2719fbd35e9a732aa44ed3ea77cf3 SHA1 e45c057b058526286961e0c3197517ec72d52738 SHA256 1ba677eb60b8a9a33555af0c20c6598df7425337e601cd6b3aab8e9c2174a7e2
-EBUILD gtkwave-3.2.1.ebuild 1062 RMD160 75594f5e8762fc938a3fced2649df421aa87764b SHA1 b219d0b0b383fd5d7fc03e35b983ba918af24e99 SHA256 71c03eb96f4309d00a5c57b2a1648382012d6f40351633bd186be0a085890ac6
-EBUILD gtkwave-3.2.3.ebuild 1087 RMD160 c04980a1afdb6d95cc62dcb9b29dc2c69a36461d SHA1 6c72d9d551d34d4ba7ea187a352447954d4003c0 SHA256 ed42933945f918c3f0d34c5a285a908bc95f5f005b267d1277bd84154117e109
 EBUILD gtkwave-3.3.13.ebuild 1485 RMD160 572db70edb79cf97777555051059b9807c66bda1 SHA1 68c7a0f9daf078c2b455a6da91daa606be3812bd SHA256 27e3d21cad0e4988d69af5ce2fd483f0da96e054035f2608429fd38785900ce1
 EBUILD gtkwave-3.3.14.ebuild 1492 RMD160 4f9233659db2f76e4d5b24a07a2e0624123b820c SHA1 12a5eab388d7c58b71579ed66d2ee5ef3be9ed18 SHA256 8630c82642310420adb1eb0ebe2145c427f2a1d7078ecc336929203ea0a74c11
-MISC ChangeLog 8606 RMD160 bead738d7eb8812d35b564da47e90b693ef256f1 SHA1 bd7c37ca3f8a10a051dab42e4da29a91c7d3927c SHA256 e2b5d040140c346dcfe968343555c2141ad116f9ae24070b1cd2b886ab538865
+EBUILD gtkwave-3.3.16.ebuild 1492 RMD160 da4818c12a454721909c75b4082ad5a0ca2d087e SHA1 8798246489a4ba1f6924a4729ff80bf192f4ed69 SHA256 b0761ce3fc54618e3ebbb67bfcf1f84cd15c1723ddcf45a7364ae60bcb9b6cfa
+MISC ChangeLog 8889 RMD160 e0394c4a18232da72c349305cf6580448af2605a SHA1 4ed2eee71c51417a0b7f97dc10c996fa6f452f13 SHA256 4845327a0e076efff06b8f0a8a6c1ab940c1f5cb413b7bf5902fe38421185070
 MISC metadata.xml 628 RMD160 08e521327a81eb4df52aab41f86c8cccab5841c3 SHA1 61a67a9483290726d12305b5230a50c2be7268ad SHA256 4d1b28ece3bae7e7f1c5b9af110809d973eac85ad7e044e45a645836e9079fab
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzf6NEACgkQgAnW8HDreRaYigCcC6GONCCGK5sUP5FjDxlc8fO1
-ax0An1OlGJocuIs38xJjdqBGN1DcAOAi
-=/43N
------END PGP SIGNATURE-----
diff --git a/sci-electronics/gtkwave/gtkwave-3.1.6.ebuild b/sci-electronics/gtkwave/gtkwave-3.1.6.ebuild
deleted file mode 100644
index 68a145dd694d..000000000000
--- a/sci-electronics/gtkwave/gtkwave-3.1.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/gtkwave-3.1.6.ebuild,v 1.2 2008/03/21 08:53:11 calchan Exp $
-
-DOC_VERSION="3.1.5"
-DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
-HOMEPAGE="http://home.nc.rr.com/gtkwave/"
-SRC_URI="http://home.nc.rr.com/gtkwave/${P}.tar.gz
-	doc? ( http://home.nc.rr.com/gtkwave/${PN}-doc-${DOC_VERSION}.tar.gz )"
-
-IUSE="doc examples"
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	x11-libs/pango"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/gperf"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-	dodoc ANALOG_README.TXT CHANGELOG.TXT
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins "${WORKDIR}/${PN}.pdf" || die "Failed to install documentation."
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die "Failed to install examples."
-	fi
-}
diff --git a/sci-electronics/gtkwave/gtkwave-3.1.7.ebuild b/sci-electronics/gtkwave/gtkwave-3.1.7.ebuild
deleted file mode 100644
index b84646ca6e35..000000000000
--- a/sci-electronics/gtkwave/gtkwave-3.1.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/gtkwave-3.1.7.ebuild,v 1.1 2008/03/29 17:59:46 calchan Exp $
-
-DOC_VERSION="3.1.5"
-DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
-HOMEPAGE="http://home.nc.rr.com/gtkwave/"
-SRC_URI="http://home.nc.rr.com/gtkwave/${P}.tar.gz
-	doc? ( http://home.nc.rr.com/gtkwave/${PN}-doc-${DOC_VERSION}.tar.gz )"
-
-IUSE="doc examples"
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	x11-libs/pango"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/gperf"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-	dodoc ANALOG_README.TXT CHANGELOG.TXT
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins "${WORKDIR}/${PN}.pdf" || die "Failed to install documentation."
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die "Failed to install examples."
-	fi
-}
diff --git a/sci-electronics/gtkwave/gtkwave-3.2.0.ebuild b/sci-electronics/gtkwave/gtkwave-3.2.0.ebuild
deleted file mode 100644
index ac435fa80a2f..000000000000
--- a/sci-electronics/gtkwave/gtkwave-3.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/gtkwave-3.2.0.ebuild,v 1.1 2009/03/07 21:54:55 patrick Exp $
-
-DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
-HOMEPAGE="http://gtkwave.sourceforge.net/"
-
-SRC_URI="http://gtkwave.sourceforge.net/${P}.tar.gz"
-
-IUSE="doc examples"
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	x11-libs/pango"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/gperf"
-
-# S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-	dodoc ANALOG_README.TXT CHANGELOG.TXT
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins "doc/${PN}.odt" || die "Failed to install documentation."
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die "Failed to install examples."
-	fi
-}
diff --git a/sci-electronics/gtkwave/gtkwave-3.2.1.ebuild b/sci-electronics/gtkwave/gtkwave-3.2.1.ebuild
deleted file mode 100644
index 2b7f19c42162..000000000000
--- a/sci-electronics/gtkwave/gtkwave-3.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/gtkwave-3.2.1.ebuild,v 1.1 2009/07/11 20:14:17 calchan Exp $
-
-EAPI="2"
-
-DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
-HOMEPAGE="http://gtkwave.sourceforge.net/"
-
-SRC_URI="http://gtkwave.sourceforge.net/${P}.tar.gz"
-
-IUSE="doc examples"
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	x11-libs/pango"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/gperf"
-
-src_prepare(){
-	sed -i -e 's/doc examples//' Makefile.in || die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-	dodoc ANALOG_README.TXT CHANGELOG.TXT
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins "doc/${PN}.odt" || die "Failed to install documentation."
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die "Failed to install examples."
-	fi
-}
diff --git a/sci-electronics/gtkwave/gtkwave-3.2.3.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.16.ebuild
index 5be85d6b0a89..4fd7ad63392a 100644
--- a/sci-electronics/gtkwave/gtkwave-3.2.3.ebuild
+++ b/sci-electronics/gtkwave/gtkwave-3.3.16.ebuild
@@ -1,22 +1,25 @@
-# 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/sci-electronics/gtkwave/gtkwave-3.2.3.ebuild,v 1.2 2009/11/24 20:27:33 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/gtkwave-3.3.16.ebuild,v 1.1 2010/11/28 16:10:55 rafaelmartins Exp $
 
 EAPI="2"
 
 DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
 HOMEPAGE="http://gtkwave.sourceforge.net/"
 
-SRC_URI="http://gtkwave.sourceforge.net/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-IUSE="doc examples"
+IUSE="doc examples fasttree fatlines judy lzma tcl"
 LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-libs/glib-2
 	>=x11-libs/gtk+-2
-	x11-libs/pango"
+	x11-libs/pango
+	judy? ( dev-libs/judy )
+	tcl? ( dev-lang/tcl dev-lang/tk )
+	lzma? ( app-arch/xz-utils )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -26,9 +29,21 @@ src_prepare(){
 	sed -i -e 's/doc examples//' Makefile.in || die "sed failed"
 }
 
+src_configure(){
+	econf --disable-local-libz \
+		--disable-local-libbz2 \
+		--disable-dependency-tracking \
+		--enable-largefile \
+		$(use_enable fatlines) \
+		$(use_enable tcl) \
+		$(use_enable lzma xz) \
+		$(use_enable fasttree) \
+		$(use_enable judy)
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "Installation failed"
-	dodoc ANALOG_README.TXT CHANGELOG.TXT
+	dodoc ANALOG_README.TXT SYSTEMVERILOG_README.TXT CHANGELOG.TXT
 	if use doc ; then
 		insinto /usr/share/doc/${PF}
 		doins "doc/${PN}.odt" || die "Failed to install documentation."