Fix LDFLAGS and CXXFLAGS, remove icon extension in desktop file

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

4 files changed, 53 insertions, 14 deletions

diff --git a/sci-electronics/gspiceui/ChangeLog b/sci-electronics/gspiceui/ChangeLog
index 8d934d242811..77c8b72487f9 100644
--- a/sci-electronics/gspiceui/ChangeLog
+++ b/sci-electronics/gspiceui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/gspiceui
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gspiceui/ChangeLog,v 1.2 2010/10/19 09:40:15 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gspiceui/ChangeLog,v 1.3 2010/10/31 23:41:55 dilfridge Exp $
+
+  31 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  gspiceui-0.9.99.ebuild, +files/gspiceui-0.9.99-flags.patch:
+  Fix LDFLAGS and CXXFLAGS, remove icon extension in desktop file
 
   19 Oct 2010; Markos Chandras <hwoarang@gentoo.org> gspiceui-0.9.99.ebuild:
   Stable on amd64 wrt bug #341545
diff --git a/sci-electronics/gspiceui/Manifest b/sci-electronics/gspiceui/Manifest
index aa98b485e743..04c5d8e14d3d 100644
--- a/sci-electronics/gspiceui/Manifest
+++ b/sci-electronics/gspiceui/Manifest
@@ -1,14 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gspiceui-0.9.99-flags.patch 987 RMD160 e098fa43886802877a4c9c580f7c09216b0b66af SHA1 065840806df150d42eb4af023893c2fbc9bf8188 SHA256 f3fbd320b4b47b017cbf136954c9df7dfeee11355f039b6d07c8dbddd9239eca
 DIST gspiceui-v0.9.99.tar.gz 574595 RMD160 5e8078ff3864a5ea0d5d811db5ad3bbbd296e5b3 SHA1 5d258093a3d3ea81be1fb2ab5dc13aa93164f90e SHA256 9d76db157c4b3f0d4b7bba289653f6646da5183eb7cdc08c9f1056aa7d3f9533
-EBUILD gspiceui-0.9.99.ebuild 2015 RMD160 f15beac64979ea6d0ee8470eaee73f7f856d2683 SHA1 85434981573c4fc0a7f4031028d8a707263b6aff SHA256 50721565deb81073edad4527d75206c461b8ce29fea441a8fffd0f2a9fe0e991
-MISC ChangeLog 564 RMD160 1077828b431d7b54f36f5b4cd02174f68e2bcf93 SHA1 c54a4eaac953bda2a952db79dab268dcc435ad2b SHA256 3aa6c3d8320697f528f9b4ca77f6925268f1f7d091db81cd244b50157ac21b64
+EBUILD gspiceui-0.9.99.ebuild 1845 RMD160 b91f9d26f99c394c3e6a0ee97a103788e0d41018 SHA1 267abbcdc6bc63978b1d947da95e662ddc53457b SHA256 203b7fc3f64d278ed4e5902c4f2b46c7487c418eec2945917f623fecfe9d8dd4
+MISC ChangeLog 751 RMD160 4f78f7c24431ac6301b1d971f84f527232441e6c SHA1 2a8ad1592021b09c0bae6b63102120eae0ef2a2b SHA256 2401c0fad4dcc79f00f8c48d95dffd4bb96ed340b936b33a46d20c9b710fc4d4
 MISC metadata.xml 426 RMD160 4f83194fc96fa997263115398ae5c9f0b4f25001 SHA1 dd8a38bdad3bc4db4c1d59b6aaf5a29b226cc205 SHA256 fcdf00fa0e75997dc6326344470c80e7c380f4c9d3e163f49581302387b36132
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAky9Z4IACgkQ9/cejkQaxBB89ACfYU1G2UiEx8fqu6mEdkfsZcDW
-+CYAn3si+3U3Bq5wRfdPi6i3eqrTz0nW
-=6W94
+iQIcBAEBAgAGBQJMzf6UAAoJENwGBM22xffem6YP/1gQW1fL7qEOAJmAr4Gxwzbp
+qzApWQaP7qLTQ7ehoHt2wquTFtr6GhdMdixfpUfvH0t/GMaWTPCitGM3UZxpeHAX
+QZPJgscwYaP4J6giiOVsr8O0r4udHYbhjLK56kM8d2WhxAam2AK50ZweeCn6fzy4
+fKQwvBFUM86f2kPKwBuFaNrLvwyaXfLkwfauydRV7iE2iqJLzcPFTkNfTV2JHx2d
+gerc+sDnd1J0iXrZB/JQgJfOuvVjHuegkyBj/FPsO7/SkS0/ZBw2r5cQLxmKl6PQ
+7o0U+UqMFkICuP39rK5CiO1ERMsXMmpSVLIQDtKq+RXirGjTjOWyoHhw7YL5PpMa
+iAbzbpL7LZYnPsHv3X85kBL2TNdbvS4OXG7HLrhNPv7rF0ZlBKhaSoKOK6XitLAY
+NxG57lDCX2HLb1cc4BSiBwOXKKc9D7C2W2bt6q4//4Wgc4gfeo2s84HsIyLnqHe6
+MtAVeTD05qOdsMQbFgppffL7Gtw4uPA+NtdLXPZ/l38Ofh71iy/4YS8kYTBiP0MN
+3NoGVOpO7EIRKhwfX2IaOmN9FWI3pAIhxEETMZyeMKPeV58jN6H7G5swMmijSQI0
+mt6Yh7fNZRCxBHuPEMV9BVeVfPTRjYY3MLlqJ3aP7vdEct1WLLC60N/8Ftlp7DLb
+y3/ls2zEi0njB5fHQlTN
+=i1Zo
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/gspiceui/files/gspiceui-0.9.99-flags.patch b/sci-electronics/gspiceui/files/gspiceui-0.9.99-flags.patch
new file mode 100644
index 000000000000..5129929dc159
--- /dev/null
+++ b/sci-electronics/gspiceui/files/gspiceui-0.9.99-flags.patch
@@ -0,0 +1,27 @@
+diff -urN gspiceui-v0.9.99.orig/src/Makefile gspiceui-v0.9.99/src/Makefile
+--- gspiceui-v0.9.99.orig/src/Makefile	2010-04-16 10:43:59.000000000 +0200
++++ gspiceui-v0.9.99/src/Makefile	2010-11-01 00:25:32.000000000 +0100
+@@ -59,13 +59,7 @@
+ INSTALLDIR = /usr/local/bin
+ 
+ # Compiler options
+-ifeq ($(GSPICEUI_DBG),0)
+-  # Options for release (not using -Wall since it's GCC specific)
+-  CXXFLAGS := -O -pipe $(shell $(WXCFG) --cxxflags)
+-else
+-  # Options for development
+-  CXXFLAGS := -Wall -g -pipe $(shell $(WXCFG) --cxxflags)
+-endif
++CXXFLAGS += $(shell $(WXCFG) --cxxflags)
+ 
+ # Includes
+ INCLUDES = -I/usr/include -I/usr/X11R6/include -I.
+@@ -108,7 +102,7 @@
+ #   -o     specify the output file name
+ 
+ $(BINDIR)/$(PROG) : $(OBJS)
+-	$(CC) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LIBS)
++	$(CC) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LDFLAGS) $(LIBS)
+ ifeq ($(ROOT)/GSpiceUI.app,$(wildcard $(ROOT)/GSpiceUI.app))
+ 	cp $(BINDIR)/$(PROG) $(ROOT)/GSpiceUI.app/Contents/MacOS/gspiceui
+ endif
diff --git a/sci-electronics/gspiceui/gspiceui-0.9.99.ebuild b/sci-electronics/gspiceui/gspiceui-0.9.99.ebuild
index dbf493779a91..6f33e03fc4fc 100644
--- a/sci-electronics/gspiceui/gspiceui-0.9.99.ebuild
+++ b/sci-electronics/gspiceui/gspiceui-0.9.99.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gspiceui/gspiceui-0.9.99.ebuild,v 1.2 2010/10/19 09:40:15 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gspiceui/gspiceui-0.9.99.ebuild,v 1.3 2010/10/31 23:41:55 dilfridge Exp $
 
 EAPI="2"
 
 WX_GTK_VER="2.8"
-inherit wxwidgets
+inherit eutils wxwidgets
 
 MY_P="${PN}-v${PV}"
 
@@ -28,11 +28,8 @@ RDEPEND="${DEPEND}
 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"
+	# Use Gentoo LDFLAGS and CXXFLAGS
+	epatch "${FILESDIR}/${P}-flags.patch"
 
 	# Adjusting the doc path at src/main/HelpTasks.cpp
 	sed -i \
@@ -57,7 +54,7 @@ src_install() {
 		doins -r lib/* || die
 	fi
 
-	make_desktop_entry gspiceui "GNU Spice GUI" gspiceui.xpm "Electronics"
+	make_desktop_entry gspiceui "GNU Spice GUI" gspiceui "Electronics"
 }
 
 pkg_postinst() {