Version bump fixing bug #196437, thanks to Masaru Kimura.

(Portage version: 2.1.3.15)

7 files changed, 43 insertions, 224 deletions

diff --git a/sci-electronics/gtkwave/ChangeLog b/sci-electronics/gtkwave/ChangeLog
index e0366c2834cb..c4d81658a369 100644
--- a/sci-electronics/gtkwave/ChangeLog
+++ b/sci-electronics/gtkwave/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-electronics/gtkwave
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/ChangeLog,v 1.35 2007/09/18 08:57:07 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/ChangeLog,v 1.36 2007/10/20 22:50:34 calchan Exp $
+
+*gtkwave-3.1.1 (20 Oct 2007)
+
+  20 Oct 2007; Denis Dupeyron <calchan@gentoo.org> -gtkwave-3.0.23.ebuild,
+  -gtkwave-3.0.28.ebuild, +gtkwave-3.1.1.ebuild:
+  Version bump fixing bug #196437, thanks to Masaru Kimura.
 
 *gtkwave-3.1.0 (18 Sep 2007)
 
diff --git a/sci-electronics/gtkwave/files/digest-gtkwave-3.0.23 b/sci-electronics/gtkwave/files/digest-gtkwave-3.0.23
deleted file mode 100644
index 7b1fc4977dcd..000000000000
--- a/sci-electronics/gtkwave/files/digest-gtkwave-3.0.23
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 28d9e9ee08ec55684ab62ddac3bc855a gtkwave-3.0.23.tar.gz 2506904
-RMD160 df44282200d87a3172ec9e0b8aaeeca06087dcb1 gtkwave-3.0.23.tar.gz 2506904
-SHA256 b67a32b50394790979853e6c79e76fbbe890c381642ebd39483a73692631fbd6 gtkwave-3.0.23.tar.gz 2506904
-MD5 c61b4077afd81dcaf8e5e2ad38950cf8 gtkwave-doc-3.0.23.tar.gz 1213018
-RMD160 8bf5d0ced3b437a54751d3413adf880d6ce7529e gtkwave-doc-3.0.23.tar.gz 1213018
-SHA256 e4b1110d8e9220f43d1fba5099feb046eec8f3f31bb96d5f9c40dc469f2d41fb gtkwave-doc-3.0.23.tar.gz 1213018
diff --git a/sci-electronics/gtkwave/files/digest-gtkwave-3.0.28 b/sci-electronics/gtkwave/files/digest-gtkwave-3.0.28
deleted file mode 100644
index 15474b308e55..000000000000
--- a/sci-electronics/gtkwave/files/digest-gtkwave-3.0.28
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 fda04d744ce240d581ffc3de17326eaa gtkwave-3.0.28.tar.gz 2491886
-RMD160 a6abda49f456cc66d5c03e8a66b5a0fe7402a531 gtkwave-3.0.28.tar.gz 2491886
-SHA256 c55fc3531a5b4c822ab610812de95ffd21b8fa13b3988126f4389bec3a955aa0 gtkwave-3.0.28.tar.gz 2491886
-MD5 867d08b2a24eb0ca2bac653a11a6e0c3 gtkwave-doc-3.0.27.tar.gz 1213938
-RMD160 f452f6703390d66be984dd1a2811aec563a1c3c5 gtkwave-doc-3.0.27.tar.gz 1213938
-SHA256 9ed3a38349201466c08cf61ae1f38c9b8838912f4e9429ba5940b61e0a97000a gtkwave-doc-3.0.27.tar.gz 1213938
diff --git a/sci-electronics/gtkwave/files/digest-gtkwave-3.1.1 b/sci-electronics/gtkwave/files/digest-gtkwave-3.1.1
new file mode 100644
index 000000000000..698f45f6259d
--- /dev/null
+++ b/sci-electronics/gtkwave/files/digest-gtkwave-3.1.1
@@ -0,0 +1,6 @@
+MD5 8342dbbb915666cd46730e90d64721b3 gtkwave-3.1.1.tar.gz 2736384
+RMD160 cb8fcc31d5bcfc0bf700a62f72f1376fa66c349e gtkwave-3.1.1.tar.gz 2736384
+SHA256 50f77b1704732a9cca4b3adfffde66e0e1d70719c79af672a65e9fcec7a9793b gtkwave-3.1.1.tar.gz 2736384
+MD5 ceee62dd2f18d76ce21bde4a620c03cf gtkwave-doc-3.1.0.tar.gz 1215809
+RMD160 f14cc4a3f5fcd03575ab285319a4ffefe67c57f6 gtkwave-doc-3.1.0.tar.gz 1215809
+SHA256 0c9c60a64b8052c388314c347d11987b60ed3aaa3b978852a40a69ba049d769a gtkwave-doc-3.1.0.tar.gz 1215809
diff --git a/sci-electronics/gtkwave/gtkwave-3.0.23.ebuild b/sci-electronics/gtkwave/gtkwave-3.0.23.ebuild
deleted file mode 100644
index 0a242fb559d1..000000000000
--- a/sci-electronics/gtkwave/gtkwave-3.0.23.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/gtkwave-3.0.23.ebuild,v 1.1 2007/04/01 15:17:14 calchan Exp $
-
-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-${PV}.tar.gz )"
-
-IUSE="doc examples"
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-DEPEND=">=x11-libs/gtk+-2
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Using sed below, because equivalent patch is much bigger
-
-	# configure must not be interactive, force GTK2
-	sed -i \
-		-e 's:echo "Build GTKWave for GTK+-1.x or 2.x?:# Build for GTK2:' \
-		-e 's:read X:X="2":' \
-		configure \
-		|| die "sed failed"
-
-	# Fix command substitution
-	sed -i \
-		-e 's:`pkg-config gtk+-2.0 --libs`:$(shell pkg-config gtk+-2.0 --libs):' \
-		-e 's:`pkg-config gtk+-2.0 --cflags`:$(shell pkg-config gtk+-2.0 --cflags):' \
-		src/Makefile_GTK2.in \
-		contrib/rtlbrowse/Makefile_GTK2.in \
-		|| die "sed failed"
-
-	# Comply with DESTDIR
-	sed -i \
-		-e 's:$(bindir):$(DESTDIR)/$(bindir):' \
-		-e 's:$(mandir):$(DESTDIR)/$(mandir):' \
-		Makefile.in \
-		|| die "sed failed"
-
-	# CFLAGS fixes
-	sed -i \
-		-e 's:CFLAGS = -O2:CFLAGS +=:' \
-		src/Makefile_GTK2.in \
-		*/*/Makefile*.in \
-		|| die "sed failed"
-	sed -i \
-		-e 's:=$(COPT): +=:' \
-		contrib/pccts/*/*/Makefile.in \
-		|| die "sed failed"
-	sed -i \
-		-e 's:= $(COPT):+=:' \
-		contrib/pccts/*/Makefile.in \
-		|| die "sed failed"
-
-	# LDFLAGS fixes
-	sed -i \
-		-e 's:$(CFLAGS) $(OBJS):$(CFLAGS) $(LDFLAGS) $(OBJS):' \
-		src/Makefile_GTK2.in \
-		|| die "sed failed"
-	sed -i \
-		-e 's:LDFLAGS=:LDFLAGS+=:' \
-		contrib/rtlbrowse/Makefile_GTK2.in \
-		|| die "sed failed"
-	sed -i \
-		-e 's:$(CC) $(CFLAGS) -o:$(CC) $(CFLAGS) $(LDFLAGS) -o:' \
-		contrib/pccts/*/Makefile.in \
-		src/helpers/Makefile.in \
-		|| die "sed failed"
-	sed -i \
-		-e 's:$(CC) -o:$(CC) $(LDFLAGS) -o:' \
-		contrib/vertex/Makefile.in \
-		contrib/pccts/sorcerer/Makefile.in \
-		contrib/pccts/support/genmk/Makefile.in \
-		|| die "sed failed"
-	sed -i \
-		-e 's:-o ghwdump:$(LDFLAGS) -o ghwdump:' \
-		src/helpers/Makefile.in \
-		|| die "sed failed"
-}
-
-src_compile() {
-	econf || die 'Configuration failed'
-
-	# Bug #142871
-	emake -j1 || die 'Compilation 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 "${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.0.28.ebuild b/sci-electronics/gtkwave/gtkwave-3.0.28.ebuild
deleted file mode 100644
index 4ea52529dc92..000000000000
--- a/sci-electronics/gtkwave/gtkwave-3.0.28.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/gtkwave-3.0.28.ebuild,v 1.1 2007/04/30 21:23:06 calchan Exp $
-
-DOC_VERSION="3.0.27"
-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"
-
-DEPEND=">=x11-libs/gtk+-2
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Using sed below, because equivalent patch is much bigger
-
-	# configure must not be interactive, force GTK2
-	sed -i \
-		-e 's:echo "Build GTKWave for GTK+-1.x or 2.x?:# Build for GTK2:' \
-		-e 's:read X:X="2":' \
-		configure \
-		|| die "sed 1 failed"
-
-	# Fix command substitution
-	sed -i \
-		-e 's:`pkg-config gtk+-2.0 --libs`:$(shell pkg-config gtk+-2.0 --libs):' \
-		-e 's:`pkg-config gtk+-2.0 --cflags`:$(shell pkg-config gtk+-2.0 --cflags):' \
-		src/Makefile_GTK2.in \
-		contrib/rtlbrowse/Makefile_GTK2.in \
-		|| die "sed 2 failed"
-
-	# Comply with DESTDIR
-	sed -i \
-		-e 's:$(bindir):$(DESTDIR)/$(bindir):' \
-		-e 's:$(mandir):$(DESTDIR)/$(mandir):' \
-		Makefile.in \
-		|| die "sed 3 failed"
-
-	# CFLAGS fixes
-	sed -i \
-		-e 's:CFLAGS = -O2:CFLAGS +=:' \
-		src/Makefile_GTK2.in \
-		*/*/Makefile*.in \
-		|| die "sed 4 failed"
-	sed -i \
-		-e 's:=$(COPT): +=:' \
-		contrib/pccts/*/*/Makefile.in \
-		|| die "sed 5 failed"
-	sed -i \
-		-e 's:= $(COPT):+=:' \
-		contrib/pccts/*/Makefile.in \
-		|| die "sed 6 failed"
-
-	# LDFLAGS fixes
-	sed -i \
-		-e 's:$(CFLAGS) $(OBJS):$(CFLAGS) $(LDFLAGS) $(OBJS):' \
-		src/Makefile_GTK2.in \
-		|| die "sed 7 failed"
-	sed -i \
-		-e 's:LDFLAGS=:LDFLAGS+=:' \
-		contrib/rtlbrowse/Makefile_GTK2.in \
-		|| die "sed 8 failed"
-	sed -i \
-		-e 's:$(CC) $(CFLAGS) -o:$(CC) $(CFLAGS) $(LDFLAGS) -o:' \
-		contrib/pccts/*/Makefile.in \
-		src/helpers/Makefile.in \
-		|| die "sed 9 failed"
-	sed -i \
-		-e 's:$(CC) -o:$(CC) $(LDFLAGS) -o:' \
-		contrib/vermin/Makefile.in \
-		contrib/pccts/sorcerer/Makefile.in \
-		contrib/pccts/support/genmk/Makefile.in \
-		|| die "sed 10 failed"
-	sed -i \
-		-e 's:-o ghwdump:$(LDFLAGS) -o ghwdump:' \
-		src/helpers/Makefile.in \
-		|| die "sed 11 failed"
-}
-
-src_compile() {
-	econf || die 'Configuration failed'
-
-	# Bug #142871
-	emake -j1 || die 'Compilation 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 "${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.1.ebuild b/sci-electronics/gtkwave/gtkwave-3.1.1.ebuild
new file mode 100644
index 000000000000..89b2adfecc7e
--- /dev/null
+++ b/sci-electronics/gtkwave/gtkwave-3.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/gtkwave-3.1.1.ebuild,v 1.1 2007/10/20 22:50:35 calchan Exp $
+
+DOC_VERSION="3.1.0"
+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"
+
+DEPEND=">=x11-libs/gtk+-2
+	dev-util/pkgconfig"
+
+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
+}