sci-chemistry/gsim: Version BUmp, seems to fix segf #412303

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

3 files changed, 116 insertions, 1 deletions

diff --git a/sci-chemistry/gsim/ChangeLog b/sci-chemistry/gsim/ChangeLog
index fe50ab6ad66e..25d66064799c 100644
--- a/sci-chemistry/gsim/ChangeLog
+++ b/sci-chemistry/gsim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/gsim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gsim/ChangeLog,v 1.8 2013/03/02 23:17:52 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gsim/ChangeLog,v 1.9 2013/03/06 14:26:39 jlec Exp $
+
+*gsim-21.0 (06 Mar 2013)
+
+  06 Mar 2013; Justin Lecher <jlec@gentoo.org> +gsim-21.0.ebuild,
+  +files/gsim-21.0-build.conf.patch:
+  Version BUmp, seems to fix segf #412303
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> gsim-0.20.1.ebuild:
   Move Qt dependencies to the new category
diff --git a/sci-chemistry/gsim/files/gsim-21.0-build.conf.patch b/sci-chemistry/gsim/files/gsim-21.0-build.conf.patch
new file mode 100644
index 000000000000..cbd529a49ac4
--- /dev/null
+++ b/sci-chemistry/gsim/files/gsim-21.0-build.conf.patch
@@ -0,0 +1,42 @@
+ gsim.pro | 23 ++++++++++++++---------
+ 1 file changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/gsim.pro b/gsim.pro
+index f06e5d2..6e28178 100755
+--- a/gsim.pro
++++ b/gsim.pro
+@@ -16,20 +16,25 @@
+ #CONFIG+=use_script
+ 
+ # Change directories locations for libcmatrix, MinUIT and muParser libraries
+-unix:INCLUDEPATH += /home/dch1vz/libcmatrixR3/include \
+-		    /home/dch1vz/Minuit2/include \
++#unix:INCLUDEPATH += /home/dch1vz/libcmatrixR3/include \
++#		    /home/dch1vz/Minuit2/include \
+ 
+-win32:INCLUDEPATH += "C:\gsim\libcmatrixR3\include" "C:\gsim\Minuit2\include" "C:\gsim\muparser\include"
++#win32:INCLUDEPATH += "C:\gsim\libcmatrixR3\include" "C:\gsim\Minuit2\include" "C:\gsim\muparser\include"
+ 
+-unix:LIBS += -lcmatrix -L/home/dch1vz/libcmatrixR3/lib  -lMinuit2Base -L/home/dch1vz/Minuit2/lib -lmuparser
++#unix:LIBS += -lcmatrix -L/home/dch1vz/libcmatrixR3/lib  -lMinuit2Base -L/home/dch1vz/Minuit2/lib -lmuparser
+ 
+-win32:LIBS += -lcmatrix -L"C:\gsim\libcmatrixR3\lib" -lMinuit2 -L"C:\gsim\Minuit2\lib" -L"C:\gsim\muparser\lib" -lmuparser
++#win32:LIBS += -lcmatrix -L"C:\gsim\libcmatrixR3\lib" -lMinuit2 -L"C:\gsim\Minuit2\lib" -L"C:\gsim\muparser\lib" -lmuparser
+ 
+ #Change directories location for libEMF (if used)
+-use_emf {
+-	DEFINES+=USE_EMF_OUTPUT
+-	unix:LIBS +=-lEMF -L/usr/include/libEmf
+-	win32:LIBS +=-lgdi32
++#use_emf {
++#	DEFINES+=USE_EMF_OUTPUT
++#	unix:LIBS +=-lEMF -L/usr/include/libEmf
++#	win32:LIBS +=-lgdi32
++#}
++
++GSIM_ROOT = .
++!include( $$GSIM_ROOT/build.conf ) {
++  message( "You need a build.conf file with local settings!" )
+ }
+ 
+ #################################################################################################
diff --git a/sci-chemistry/gsim/gsim-21.0.ebuild b/sci-chemistry/gsim/gsim-21.0.ebuild
new file mode 100644
index 000000000000..b7b56bf05b39
--- /dev/null
+++ b/sci-chemistry/gsim/gsim-21.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gsim/gsim-21.0.ebuild,v 1.1 2013/03/06 14:26:39 jlec Exp $
+
+EAPI=5
+
+inherit eutils qt4-r2 toolchain-funcs
+
+DESCRIPTION="Programm for visualisation and processing of experimental and simulated NMR spectra"
+HOMEPAGE="http://sourceforge.net/projects/gsim/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="emf opengl"
+
+RDEPEND="
+	dev-cpp/muParser
+	media-libs/freetype
+	sci-libs/libcmatrix
+	sci-libs/minuit
+	virtual/blas
+	dev-qt/qtsvg:4
+	emf? ( media-libs/libemf )
+	opengl? ( dev-qt/qtopengl:4 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-build.conf.patch )
+DOCS="release.txt README_GSIM.* quickstart.* changes.log programming.*"
+
+src_prepare() {
+	edos2unix ${PN}.pro
+
+	qt4-r2_src_prepare
+
+	cat >> build.conf <<- EOF
+	INCLUDEPATH += "${EPREFIX}/usr/include/libcmatrixR3/" \
+		"${EPREFIX}/usr/include/Minuit2" \
+		"${EPREFIX}/usr/include"
+	LIBS += -lcmatrix  -lMinuit2 -lmuparser $($(tc-getPKG_CONFIG) --libs cblas)
+	EOF
+
+	use opengl && echo "CONFIG+=use_opengl" >> build.conf
+
+	if use emf; then
+		cat >> build.conf <<- EOF
+		CONFIG+=use_emf
+		DEFINES+=USE_EMF_OUTPUT
+		LIBS += -L\"${EPREFIX}/usr/include/libEMF\" -lEMF
+		EOF
+	fi
+	sed \
+		-e "s:quickstart.pdf:../share/doc/${PF}/quickstart.pdf:g" \
+		-e "s:README_GSIM.pdf:../share/doc/${PF}/README_GSIM.pdf:g" \
+		-i mainform.h || die
+}
+
+src_install() {
+	qt4-r2_src_install
+	dobin ${PN}
+	insinto /usr/share/${PN}
+	doins -r images ${PN}.ico
+	insinto /usr/share/${PN}/ui
+	doins *.ui
+}