A bit of a mess.. It appears the manchester APT group gtkwave-2 is no longer being...

Package-Manager: portage-2.0.51.22-r3

diff --git a/sci-electronics/gtkwave/ChangeLog b/sci-electronics/gtkwave/ChangeLog
index b235c0159949e686ca2d4dbf6b40e057c0e712a0..c700c14ad0577751efa19301746b0868ea31c0a9 100644 (file)
--- a/sci-electronics/gtkwave/ChangeLog
+++ b/sci-electronics/gtkwave/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-electronics/gtkwave
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/ChangeLog,v 1.6 2005/05/17 18:18:07 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/ChangeLog,v 1.7 2005/10/11 14:26:22 chrb Exp $
+
+*gtkwave-1.3.72 (11 Oct 2005)
+
+  11 Oct 2005; Chris Bainbridge <chrb@gentoo.org>
+  +files/gtkwave-1.3.72.patch, +gtkwave-1.3.72.ebuild,
+  -gtkwave-2.0.0_pre20030319.ebuild, -gtkwave-2.0.0_pre20040527.ebuild:
+  A bit of a mess.. It appears the manchester APT group gtkwave-2 is no longer
+  being developed or supported. In the meantime, gtkwave 1.3 is undergoing
+  active development, and has been ported to gtk-2. So the old 2.0_pre ebuilds
+  are gone, and the newer yet numerically older 1.3 version arrives.
 
   17 May 2005; Michael Hanselmann <hansmi@gentoo.org>
   gtkwave-2.0.0_pre20030319.ebuild:

diff --git a/sci-electronics/gtkwave/Manifest b/sci-electronics/gtkwave/Manifest
index c009197b76330c8bf6cf461b45e6a7240f7f696a..1125074c2dda3f59706e73b2b6a2bfde224097df 100644 (file)
--- a/sci-electronics/gtkwave/Manifest
+++ b/sci-electronics/gtkwave/Manifest
@@ -1,6 +1,5 @@
-MD5 f05845f75666d8cee2703cf607a2dfc7 gtkwave-2.0.0_pre20030319.ebuild 776
+MD5 d0b1cd098149962bb1f7345da0a693ba ChangeLog 2726
+MD5 f1d090e18da1b0e6b1a4766759e8f5b1 gtkwave-1.3.72.ebuild 842
 MD5 e49bb02132d2cd74ad4e6ee291e102d9 metadata.xml 220
-MD5 2f8513c3d34d69aa20592aca02fec6c5 ChangeLog 2217
-MD5 d11ab4c438aa5e7554e8fc15b04a0646 gtkwave-2.0.0_pre20040527.ebuild 771
-MD5 5c81820b6ee779da36af4ac90c4f6cae files/digest-gtkwave-2.0.0_pre20040527 69
-MD5 f9a4105574e921c749a8a537dadab907 files/digest-gtkwave-2.0.0_pre20030319 78
+MD5 7e6ede08e69e6bcfe6fb6ffeda3b184e files/digest-gtkwave-1.3.72 66
+MD5 fd860eb1520e149a0a71b3bfdf99b9df files/gtkwave-1.3.72.patch 747

diff --git a/sci-electronics/gtkwave/files/digest-gtkwave-1.3.72 b/sci-electronics/gtkwave/files/digest-gtkwave-1.3.72
new file mode 100644 (file)
index 0000000..e8acb1e
--- /dev/null
+++ b/sci-electronics/gtkwave/files/digest-gtkwave-1.3.72
@@ -0,0 +1 @@
+MD5 58d73560385ca310e724f20780d15f3c gtkwave-1.3.72.tar.gz 825477

diff --git a/sci-electronics/gtkwave/files/digest-gtkwave-2.0.0_pre20030319 b/sci-electronics/gtkwave/files/digest-gtkwave-2.0.0_pre20030319
deleted file mode 100644 (file)
index 424d035..0000000
--- a/sci-electronics/gtkwave/files/digest-gtkwave-2.0.0_pre20030319
+++ /dev/null
@@ -1 +0,0 @@
-MD5 32c7c58dae7d37834062785a9626d349 gtkwave-2.0.0pre3-20030319.tar.gz 706605

diff --git a/sci-electronics/gtkwave/files/digest-gtkwave-2.0.0_pre20040527 b/sci-electronics/gtkwave/files/digest-gtkwave-2.0.0_pre20040527
deleted file mode 100644 (file)
index 70bfd03..0000000
--- a/sci-electronics/gtkwave/files/digest-gtkwave-2.0.0_pre20040527
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d1837e53b933643e0b6c6a6527022907 gtkwave-2.0.0pre5.tar.gz 720414

diff --git a/sci-electronics/gtkwave/files/gtkwave-1.3.72.patch b/sci-electronics/gtkwave/files/gtkwave-1.3.72.patch
new file mode 100644 (file)
index 0000000..0e0270f
--- /dev/null
+++ b/sci-electronics/gtkwave/files/gtkwave-1.3.72.patch
@@ -0,0 +1,41 @@
+--- configure.orig     2005-10-11 14:49:08.435818500 +0000
++++ configure  2005-10-11 14:51:25.392377750 +0000
+@@ -32,34 +32,7 @@
+       exit
+       fi
+ 
+-while [ 1 ]
+-do
+-
+-# in case of automatic build, default to gtk+-1.x...
+-
+-X=""
+-echo "Build GTKWave for GTK+-1.x or 2.x? Please enter '1' or '2'"
+-read X
+-
+-if [ "$X" = "" ]
+-      then X="1"
+-      fi
+-
+-if [ "$X" = "1" ]
+-      then echo "Building for GTK+-1.x..."
+-      ln -fs Makefile_GTK1.in src/Makefile.in
+-      ./configure2 "$@"
+-      ./configure3
+-      exit
+-      fi
+-
+-if [ "$X" = "2" ]
+-      then echo "Building for GTK+-2.x..."
+-      ln -fs Makefile_GTK2.in src/Makefile.in
+-      ./configure2 "$@"
+-      ./configure3
+-      exit
+-      fi
+-
+-done
+-
++echo "Building for GTK+-2.x..."
++ln -fs Makefile_GTK2.in src/Makefile.in
++./configure2 "$@"
++./configure3

diff --git a/sci-electronics/gtkwave/gtkwave-2.0.0_pre20040527.ebuild b/sci-electronics/gtkwave/gtkwave-1.3.72.ebuild
similarity index 51%
rename from sci-electronics/gtkwave/gtkwave-2.0.0_pre20040527.ebuild
rename to sci-electronics/gtkwave/gtkwave-1.3.72.ebuild
index e6d67ffaae7918443ef436c5b5df8c61e4d6954e..f4caef961e3c2536136b90d3fb67cca84c6a0b16 100644 (file)
--- a/sci-electronics/gtkwave/gtkwave-2.0.0_pre20040527.ebuild
+++ b/sci-electronics/gtkwave/gtkwave-1.3.72.ebuild
@@ -1,31 +1,39 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/gtkwave-2.0.0_pre20040527.ebuild,v 1.3 2005/05/06 13:02:41 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/gtkwave-1.3.72.ebuild,v 1.1 2005/10/11 14:26:22 chrb Exp $
+
+inherit eutils
 
-MY_P=${P/_pre*/pre5}
 DESCRIPTION="A wave viewer for LXT and Verilog VCD/EVCD files"
-HOMEPAGE="http://www.cs.man.ac.uk/apt/tools/gtkwave/index.html"
-SRC_URI="ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/2.0/${MY_P}.tar.gz"
+HOMEPAGE="http://home.nc.rr.com/gtkwave/"
+SRC_URI="mirror://gentoo/gtkwave-1.3.72.tar.gz"
 
 IUSE=""
-LICENSE="GPL-2"
+LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~ppc"
 
 DEPEND="virtual/x11
-       =x11-libs/gtk+-1.2*
-       =dev-libs/glib-1.2*
+       >=x11-libs/gtk+-2*
+       >=dev-libs/glib-2*
        app-arch/bzip2"
 
-S=${WORKDIR}/${MY_P}
+#S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/${P}.patch
+}
 
 src_compile() {
        econf || die
+       sed -i -e "s/mandir = /mandir = \${prefix}/" ${S}/Makefile
        emake || die
 }
 
 src_install() {
-       emake DESTDIR=${D} install || die
+       emake prefix=${D} install || die
        dodoc AUTHORS ChangeLog README
        dohtml -r doc/*
 }

diff --git a/sci-electronics/gtkwave/gtkwave-2.0.0_pre20030319.ebuild b/sci-electronics/gtkwave/gtkwave-2.0.0_pre20030319.ebuild
deleted file mode 100644 (file)
index f357872..0000000
--- a/sci-electronics/gtkwave/gtkwave-2.0.0_pre20030319.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gtkwave/gtkwave-2.0.0_pre20030319.ebuild,v 1.3 2005/05/17 18:18:07 hansmi Exp $
-
-MY_P=${P/_pre/pre3-}
-DESCRIPTION="A wave viewer for LXT and Verilog VCD/EVCD files"
-HOMEPAGE="http://www.cs.man.ac.uk/apt/tools/gtkwave/index.html"
-SRC_URI="ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/snapshots/${MY_P}.tar.gz"
-
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc ~sparc x86"
-
-DEPEND="virtual/x11
-       =x11-libs/gtk+-1.2*
-       =dev-libs/glib-1.2*
-       app-arch/bzip2"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-       econf || die
-       emake || die
-}
-
-src_install() {
-       emake DESTDIR=${D} install || die
-       dodoc AUTHORS ChangeLog README
-       dohtml -r doc/*
-}