Fix for bug #248351

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 118 insertions, 1 deletions

diff --git a/sci-electronics/gwave/ChangeLog b/sci-electronics/gwave/ChangeLog
index 9c199f832372..ff0f14147d37 100644
--- a/sci-electronics/gwave/ChangeLog
+++ b/sci-electronics/gwave/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-electronics/gwave
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gwave/ChangeLog,v 1.24 2010/05/17 18:35:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gwave/ChangeLog,v 1.25 2010/05/30 15:14:36 tomjbe Exp $
+
+*gwave-20090213-r1 (30 May 2010)
+
+  30 May 2010; Thomas Beierlein <tomjbe@gentoo.org>
+  +gwave-20090213-r1.ebuild, +files/gwave-20090213-as-needed.patch:
+  Fix for bug #248351
 
   17 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   gwave-20090213.ebuild:
diff --git a/sci-electronics/gwave/files/gwave-20090213-as-needed.patch b/sci-electronics/gwave/files/gwave-20090213-as-needed.patch
new file mode 100644
index 000000000000..7ec72ed2aab7
--- /dev/null
+++ b/sci-electronics/gwave/files/gwave-20090213-as-needed.patch
@@ -0,0 +1,54 @@
+--- gwave2-20090213.orig/src/Makefile.am	2008-01-22 05:36:59.000000000 +0100
++++ gwave2-20090213/src/Makefile.am	2010-02-06 18:10:38.011218381 +0100
+@@ -15,8 +15,7 @@
+ 	rgeval.c xgserver.c measurebtn.c measurebtn.h \
+ 	GtkTable_indel.c GtkTable_indel.h  xsnarf.h
+ 
+-gwave_LDADD = ../spicefile/libspicefile.a  @GTK_LIBS@ @GUILE_GNOME_LIBS@ 
+-gwave_LDFLAGS =  @GUILE_LDFLAGS@
++gwave_LDADD = ../spicefile/libspicefile.a  @GTK_LIBS@ @GUILE_GNOME_LIBS@ @GUILE_LDFLAGS@
+ 
+ AM_CFLAGS = @GTK_CFLAGS@ @GUILE_CFLAGS@ @GUILE_GNOME_CFLAGS@ \
+ 	-DDATADIR=\"$(datadir)\" -DBINGWAVE=\"$(bindir)/gwave\"
+--- gwave2-20090213.orig/spicefile/Makefile.am	2008-01-22 05:31:45.000000000 +0100
++++ gwave2-20090213/spicefile/Makefile.am	2010-02-06 18:11:53.008964326 +0100
+@@ -10,11 +10,9 @@
+ 
+ noinst_PROGRAMS = test_read
+ test_read_SOURCES =  test_read.c
+-test_read_LDFLAGS = @GTK_LIBS@
+-test_read_LDADD = libspicefile.a
++test_read_LDADD = libspicefile.a @GTK_LIBS@
+ 
+ bin_PROGRAMS=sp2sp
+ sp2sp_SOURCES=sp2sp.c
+-sp2sp_LDFLAGS= @GTK_LIBS@
+-sp2sp_LDADD= libspicefile.a
++sp2sp_LDADD= libspicefile.a @GTK_LIBS@
+ 
+--- gwave2-20090213.orig/configure.ac	2009-02-13 06:00:57.000000000 +0100
++++ gwave2-20090213/configure.ac	2010-02-06 18:23:11.522964311 +0100
+@@ -84,7 +84,8 @@
+ dnl GUILE_MODULE_REQUIRED(gnome gtk)
+ 
+ PKG_CHECK_MODULES(GUILE_GNOME, guile-gnome-gtk-2, ,AC_MSG_ERROR(Can not find Guile-gnome-platform))
+-
++PKG_CHECK_MODULES([X11], [x11])
++PKG_CHECK_MODULES([GLIB], [glib-2.0])
+ dnl remind myself how to check for somthing I know exists
+ dnl GUILE_MODULE_EXPORTS(foo_widget_show, (gnome-0)(gnome gtk),gtk-widget-show)
+ dnl if test "$foo_widget_show" = yes; then
+--- gwave2-20090213.orig/remote/Makefile.am	2010-02-06 18:33:14.340215309 +0100
++++ gwave2-20090213/remote/Makefile.am	2010-02-06 18:34:19.810967947 +0100
+@@ -4,7 +4,9 @@
+ AM_CFLAGS = @GTK_CFLAGS@ 
+ bin_PROGRAMS=gwave-exec gwaverepl
+ gwave_exec_SOURCES=gwave-exec.c xgclient.c xgexec.h
+-gwave_exec_LDADD= @GTK_LIBS@
++gwave_exec_CFLAGS= @X11_CFLAGS@
++gwave_exec_LDADD= @GTK_LIBS@ @X11_LIBS@
+ 
+ gwaverepl_SOURCES=gwaverepl.c xgclient.c xgexec.h repllib.c
+-gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@
++gwaverepl_CFLAGS= @X11_CFLAGS@ @GLIB_CFLAGS@
++gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@ @X11_LIBS@ @GLIB_LIBS@
diff --git a/sci-electronics/gwave/gwave-20090213-r1.ebuild b/sci-electronics/gwave/gwave-20090213-r1.ebuild
new file mode 100644
index 000000000000..a0fddfa661bc
--- /dev/null
+++ b/sci-electronics/gwave/gwave-20090213-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gwave/gwave-20090213-r1.ebuild,v 1.1 2010/05/30 15:14:36 tomjbe Exp $
+
+EAPI="2"
+
+inherit autotools eutils fdo-mime gnome2-utils
+
+MY_PN="gwave2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Analog waveform viewer for SPICE-like simulations"
+LICENSE="GPL-2"
+HOMEPAGE="http://www.geda.seul.org/tools/gwave/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gnuplot plotutils"
+SLOT="0"
+
+DEPEND="=dev-scheme/guile-1.8*[networking]
+	=dev-scheme/guile-gnome-platform-2.16*"
+
+RDEPEND="${DEPEND}
+	sci-electronics/electronics-menu
+	gnuplot? ( sci-visualization/gnuplot )
+	plotutils? ( media-libs/plotutils )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation failed"
+	dodoc AUTHORS NEWS README TODO || die "Installation of documentation failed"
+	newicon icons/wave-drag-ok.xpm gwave.xpm
+	make_desktop_entry gwave "Gwave" gwave "Electronics"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}