sci-electronics/gspiceui: Fix wxGTK handling

svn path=/sunrise/; revision=5398

diff --git a/sci-electronics/gspiceui/ChangeLog b/sci-electronics/gspiceui/ChangeLog
index 9c02fc0cd55979b7b3edc459d0ec7bf5b1d8dbbb..b08189902f27f980a249968edfbc2ab6854f7277 100644 (file)
--- a/sci-electronics/gspiceui/ChangeLog
+++ b/sci-electronics/gspiceui/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-electronics/gspiceui
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Jan 2008; Jakub Moc <jakub@gentoo.org> gspiceui-0.8.90.ebuild:
+  Fix wxGTK handling
+
   05 Apr 2007; Jakub Moc <jakub@gentoo.org> gspiceui-0.8.90.ebuild:
   Fix desktop entry
 

diff --git a/sci-electronics/gspiceui/Manifest b/sci-electronics/gspiceui/Manifest
index e75a2fe45e7c1ca341592e1048223314bc386ad7..86e85e431d946ae5dc59d8445642c212ab77e365 100644 (file)
--- a/sci-electronics/gspiceui/Manifest
+++ b/sci-electronics/gspiceui/Manifest
@@ -1,4 +1,4 @@
 DIST gspiceui-v0.8.90.tar.gz 438270 RMD160 8a06f8b676d1f662a4d612d56f5c81f3e5dab0a5 SHA1 69d99027945598684787ee5fc2806a2b10763f85 SHA256 9618ba20a80baf054b5e0c25a75a6a5a6b54078e6e40ce196d0101a78b16d4d5
-EBUILD gspiceui-0.8.90.ebuild 1222 RMD160 df5c7b555be6518989c707311ecb0a29336f7eda SHA1 68f082678006aa05e269aee075519c6785189a1e SHA256 d22a9b1b052b0107d8524db08eded9ddee4de322e9520d17defaac47a371b494
-MISC ChangeLog 330 RMD160 eb15add30427211711531fdd77f5dd14510135e1 SHA1 c51b8ef7f666a1afa524720a81c052af18c6ab47 SHA256 874666401908385e5b7555344e5b0ed4294905ac778037d704f9d8265d5cb670
+EBUILD gspiceui-0.8.90.ebuild 1195 RMD160 1f0e33ed5a31765c48e7067164a271ff51296015 SHA1 11ad4a05214fb70c59603aee7b8937957fd0d74b SHA256 9c4875a5c9b946d1770525aad2bf9b477432f3965533a323ca4904e6aa5d85e8
+MISC ChangeLog 420 RMD160 1d56f19e33677cdf3f795dd92f9c30c8ebdc496e SHA1 cb42cd15bd2450ba2492ce7c36c6c12c00f404af SHA256 bd159e4fb401f0e9feae5e98fd074000d9b4d3c90abc3ea41239c4fed5603909
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/sci-electronics/gspiceui/gspiceui-0.8.90.ebuild b/sci-electronics/gspiceui/gspiceui-0.8.90.ebuild
index 13f049320696f27b97bbc5186df338e06414c28f..5a3901e018575548e0432354776574f733cc9cc0 100644 (file)
--- a/sci-electronics/gspiceui/gspiceui-0.8.90.ebuild
+++ b/sci-electronics/gspiceui/gspiceui-0.8.90.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+WX_GTK_VER="2.6"
+inherit eutils wxwidgets
 
 MY_P="${PN}-v${PV}"
 DESCRIPTION="GUI frontend for Ngspice and Gnucap"
@@ -15,7 +16,7 @@ SLOT="0"
 KEYWORDS="~x86"
 
 DEPEND="=x11-libs/wxGTK-2.6*"
-RDEPEND="$DEPEND
+RDEPEND="${DEPEND}
        || ( sci-electronics/ng-spice-rework sci-electronics/gnucap )
        sci-electronics/gwave
        sci-electronics/geda"
@@ -27,9 +28,7 @@ src_unpack() {
        cd "${S}"
        sed -i \
                -e "s:CXXFLAGS =-O -pipe:CXXFLAGS +=:" \
-               -e "s:WXCFG = wx-config:WXCFG = wx-config-2.6:" \
-               src/Makefile \
-               || die "Patching src/Makefile failed"
+               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 \