sci-electronics/gspiceui: Version bump, plus conversion to EAPI 2 and more improvements. Thanks to Rafael G. Martins.

svn path=/sunrise/; revision=9653

5 files changed, 81 insertions, 50 deletions

diff --git a/sci-electronics/gspiceui/ChangeLog b/sci-electronics/gspiceui/ChangeLog
index 6cc90ac73..7ec023910 100644
--- a/sci-electronics/gspiceui/ChangeLog
+++ b/sci-electronics/gspiceui/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-electronics/gspiceui
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Dec 2009; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
+  -gspiceui-0.9.65.ebuild, +gspiceui-0.9.98.ebuild, metadata.xml:
+  Version bump, plus conversion to EAPI 2 and more improvements. Thanks to
+  Rafael G. Martins.
+
   19 Nov 2008; Thomas Beierlein (TomJBE) <tb@forth-ev.de>
   -gspiceui-0.8.90.ebuild, +gspiceui-0.9.65.ebuild:
   Version bump. changed SRC_URI to sourceforge
diff --git a/sci-electronics/gspiceui/Manifest b/sci-electronics/gspiceui/Manifest
index 393715da8..d09728d3f 100644
--- a/sci-electronics/gspiceui/Manifest
+++ b/sci-electronics/gspiceui/Manifest
@@ -1,4 +1,4 @@
-DIST gspiceui-v0.9.65.tar.gz 461168 RMD160 9aa0b685c29a7e32442311c5752d220af8d5ae18 SHA1 b3c94007716df8d49dcf7374aede66f19138bb3c SHA256 d914c7b4fa07c64e69a23920e48976a6d449d84478d8a788ad15483fe35da5ad
-EBUILD gspiceui-0.9.65.ebuild 1192 RMD160 5360ff4fab379f1cc58d9a8077ba1d2ab6ed655b SHA1 146f677dd3eb706f616372cad4e46b2e8ba4331f SHA256 9b35c46532031fae1f7e6f0cba29813faf68679670dbb94036447814955fb0a8
-MISC ChangeLog 578 RMD160 267b0bead7e9ddd7df5d11f7e490183ef8e6f3f8 SHA1 867acf8a1f2023138435d10c191a7509168a807f SHA256 54b3eb74acf5295e0ac568c8145c7a5c4294e53c33f01a13c997ed23ccc3ab89
-MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
+DIST gspiceui-v0.9.98.tar.gz 504306 RMD160 47a24e44a9d0614b16d9bb55564f348da3a8e40a SHA1 1e2b42c46472f35b534922bc08e21fc040521af9 SHA256 afe4012073e1842890ec24581d2ddfa558d3564e1cc8a258e16836c269cdc734
+EBUILD gspiceui-0.9.98.ebuild 1756 RMD160 54d5d71bce9015d079e993a2149084a7ad52780d SHA1 f77701b670fb16cf370bb61c119f88cc2072a0b5 SHA256 ca771678b91b627dcb8928e8a9354e0680702f4fce4117441ea0d69262dbc48e
+MISC ChangeLog 807 RMD160 f9dd38589c8dc2fb9dd13815d3abb2c1f7902f23 SHA1 6fe8a97ba942e24b6f41fdf4ae78dd763a243125 SHA256 ceddba1ffa6a8934f46853711941ef92068be5d68c2ca4d2bde6e2044c148eb2
+MISC metadata.xml 379 RMD160 3c18c1ddf8c293d9777cb97a42ab668f869734dd SHA1 6ddf31c54e7194705ee5f0bdd36568f4dca00640 SHA256 4d9e009c2d801996fc033559cd6a8046f768673fce00e64a486bc8634fdfa10f
diff --git a/sci-electronics/gspiceui/gspiceui-0.9.65.ebuild b/sci-electronics/gspiceui/gspiceui-0.9.65.ebuild
deleted file mode 100644
index e50551189..000000000
--- a/sci-electronics/gspiceui/gspiceui-0.9.65.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-WX_GTK_VER="2.8"
-inherit eutils wxwidgets
-
-MY_P="${PN}-v${PV}"
-DESCRIPTION="GUI frontend for Ngspice and Gnucap"
-HOMEPAGE="http://www.geda.seul.org/tools/gspiceui/index.html"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND="=x11-libs/wxGTK-2.8*"
-RDEPEND="${DEPEND}
-	|| ( sci-electronics/ng-spice-rework sci-electronics/gnucap )
-	sci-electronics/gwave
-	sci-electronics/geda"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e "s:CXXFLAGS =-O -pipe:CXXFLAGS +=:" \
-		src/Makefile || die "Patching src/Makefile failed"
-	sed -i \
-		-e "s:/share/gspiceui/html/gSpiceUI.html:/share/doc/${P}/html/gSpiceUI.html:" \
-		src/main/HelpTasks.cpp \
-		|| die "Patching src/main/HelpTasks.cpp failed"
-}
-
-src_install() {
-	dobin bin/gspiceui
-	dodoc AUTHORS ChangeLog README TODO
-	insinto /usr/share/doc/${P}/html
-	dohtml html/*.html html/*.css html/*.jpeg
-	newicon src/icons/gspiceui-48x48.xpm gspiceui.xpm
-	make_desktop_entry gspiceui "GNU Spice GUI" gspiceui.xpm "Education;Science;Electronics"
-}
diff --git a/sci-electronics/gspiceui/gspiceui-0.9.98.ebuild b/sci-electronics/gspiceui/gspiceui-0.9.98.ebuild
new file mode 100644
index 000000000..3c820e045
--- /dev/null
+++ b/sci-electronics/gspiceui/gspiceui-0.9.98.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+WX_GTK_VER="2.8"
+inherit wxwidgets
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="GUI frontend for Ngspice and Gnucap"
+HOMEPAGE="http://www.geda.seul.org/tools/gspiceui/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples schematics waveform"
+
+DEPEND="x11-libs/wxGTK:2.8[X]
+	sci-electronics/electronics-menu"
+RDEPEND="${DEPEND}
+	|| ( sci-electronics/ng-spice-rework sci-electronics/gnucap )
+	waveform? ( sci-electronics/gwave )
+	schematics? ( sci-electronics/geda )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Removing pre-configured CXXFLAGS from Makefile. The Makefile then only appends 
+	# the flags required for wxwidgets to the Gentoo preset.
+	sed -i \
+		-e "s:CXXFLAGS = -O -pipe:CXXFLAGS += :" \
+		src/Makefile || die "Patching src/Makefile failed"
+
+	# Adjusting the doc path at src/main/HelpTasks.cpp
+	sed -i \
+		-e "s:/share/gspiceui/html/gSpiceUI.html:/share/doc/${P}/html/gSpiceUI.html:" \
+		src/main/HelpTasks.cpp \
+		|| die "Patching src/main/HelpTasks.cpp failed"
+}
+
+src_install() {
+	dobin bin/gspiceui || die
+	dodoc ChangeLog || die
+	doman gspiceui.1 || die
+	newicon src/icons/gspiceui-48x48.xpm gspiceui.xpm || die
+
+	dohtml html/*.html html/*.jpeg || die
+
+	# installing examples
+	if use examples ; then
+		insinto /usr/share/doc/${P}/sch
+		doins -r sch/* || die
+	fi
+
+	make_desktop_entry gspiceui "GNU Spice GUI" gspiceui.xpm "Electronics"
+}
+
+pkg_postinst() {
+	if use examples ; then
+		elog "If you want to use the examples, copy then from"
+		elog "/usr/share/doc/${P}/sch to your home to be able"
+		elog "to generate the netlists as an normal user."
+	fi
+}
diff --git a/sci-electronics/gspiceui/metadata.xml b/sci-electronics/gspiceui/metadata.xml
index 7e3286984..64dea8699 100644
--- a/sci-electronics/gspiceui/metadata.xml
+++ b/sci-electronics/gspiceui/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>maintainer-wanted</herd>
+        <use>
+                <flag name='schematics'>Use sci-electronics/geda for schematics editing</flag>
+                <flag name='waveform'>Use sci-electronics/gwave for waveform display</flag>
+	</use>
 </pkgmetadata>