Fix for bug #248351

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 121 insertions, 2 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/Manifest b/sci-electronics/gwave/Manifest
index 066242238217..6582194da167 100644
--- a/sci-electronics/gwave/Manifest
+++ b/sci-electronics/gwave/Manifest
@@ -1,3 +1,4 @@
+AUX gwave-20090213-as-needed.patch 2257 RMD160 e8f068abcb0d8bb5bbdd5eca53f76759be842ea6 SHA1 23357e006e93bfa233ec75f584e148ed427c79eb SHA256 02a9606cd1182b1a86ed1793299105cd76bef10284ebdf1c6f74d0364918b469
 DIST gwave-20031224.tar.gz 441342 RMD160 84fb474610c6c62e7d6e63cf133ad55b3a597f41 SHA1 405c0cdaa49ba080e3ed3a6690fe673062898151 SHA256 258282a6e4f83a36c751f5369eba2a86f3ceadde7ac3b05f4e9315e57bbc9abf
 DIST gwave-20051222.tar.gz 479477 RMD160 d9f46d885d2c0e15662046a36cdc114980c48f30 SHA1 51f3d1e9bf85744dcfd48724596d132f2c5d7e97 SHA256 32c9d78f702f0620101a208efc3704c10c9c23be38868463a2db96a49c9344e3
 DIST gwave-20060606.tar.gz 490107 RMD160 67c6e9bb5a001352f627662bd6eb225a78d028e8 SHA1 e335822815ec7580b1e66ac253fe438ef439dfbe SHA256 4e69e31f261cf020b91fe66588ec85b58333adc70a38c7d96ff565b40faca92e
@@ -7,6 +8,7 @@ EBUILD gwave-20031224.ebuild 846 RMD160 5946b46ceff34f584bf742a36fc49b6339bd8e10
 EBUILD gwave-20051222.ebuild 894 RMD160 7b7e5976ecc0a9f8771c73c3b0534e318b25f7d3 SHA1 c6f01f057f7504506a23959f361e75d3d2a6a5f0 SHA256 95d4c64ab0fe4ffa176f9ad373df7e46b06f7aaae800e6b37b256f37560a024d
 EBUILD gwave-20060606.ebuild 1028 RMD160 fbb5fed6d2eba0c32d7ade99b9eac8193bab5011 SHA1 b2b60a90186a4a67aad1fba97888ced7af23d33d SHA256 95a6b01d03eaf9d3b17f299d2a9978fd3ac61464db1d4f35567528227915feb4
 EBUILD gwave-20080127.ebuild 875 RMD160 b816ed9f9e5e55a1c8a457594658c0c30225805f SHA1 2e44f96a5cfc8f2fb2aed24f2c2ba36a9b1e3af0 SHA256 51b348f4280a43537b7696661d3b35d6beaa8ea59f7a471ff776ee8a7e1e210b
+EBUILD gwave-20090213-r1.ebuild 1398 RMD160 7c5aa5d7cbc7fc30287d6b0eed91746d335c2c73 SHA1 3aa7620890c967932f92b575d84ba52e8b8b5855 SHA256 c59d6ce79a76a1dedbe8734472dc8a9c0a218592f7f6027ffeb4ed87db990b73
 EBUILD gwave-20090213.ebuild 1432 RMD160 ee09ce7f0c19e523a4a2d6b714ec23372361dae9 SHA1 b6e2829df61b1bdfb515655bba191a2ea9a7abf8 SHA256 b1900468a6e0e695420012f3fb43ad8eaaf0229fc4915a3b975ed2eba75b679e
-MISC ChangeLog 4524 RMD160 75f7931fdf829b5fda8baa103dcf062a96688e08 SHA1 e87fcc36a6227aa808b6e6e0fe3aa1c27345491d SHA256 d7e0cb5434a8b64faec0f3d066d9b8491f14722869a80471d37b80ddb5cfe0e9
+MISC ChangeLog 4697 RMD160 855dddf65fbbc2860180b1798afc98b40c4bdda4 SHA1 3d802753ac56910349138703795463378a164731 SHA256 f9dd5dd8d054516d8db033b40a950791411c2a7d201cf411e7dfa674df44ecb3
 MISC metadata.xml 545 RMD160 c5d9c7f4c1c8a7ea1844c1a70642ad39eab0efbe SHA1 21d3e59ddb73fc130d6291069bc7e2509d27d285 SHA256 8780bd44288620adc70b182e7750865f957233b073a3979413d69fa799c55f22
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
+}