sci-chemistry/gsim: Add missing dep, move to EAPI=4

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

3 files changed, 37 insertions, 29 deletions

diff --git a/sci-chemistry/gsim/ChangeLog b/sci-chemistry/gsim/ChangeLog
index 4bc41fb6261e..80a21d3e1be0 100644
--- a/sci-chemistry/gsim/ChangeLog
+++ b/sci-chemistry/gsim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/gsim
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gsim/ChangeLog,v 1.4 2011/08/31 14:28:51 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gsim/ChangeLog,v 1.5 2012/05/21 15:08:27 jlec Exp $
+
+  21 May 2012; Justin Lecher <jlec@gentoo.org> gsim-0.19.1.ebuild,
+  gsim-0.20.1.ebuild:
+  Add missing dep, move to EAPI=4
 
 *gsim-0.20.1 (31 Aug 2011)
 
diff --git a/sci-chemistry/gsim/gsim-0.19.1.ebuild b/sci-chemistry/gsim/gsim-0.19.1.ebuild
index 8c1222940b71..53500e1b4f32 100644
--- a/sci-chemistry/gsim/gsim-0.19.1.ebuild
+++ b/sci-chemistry/gsim/gsim-0.19.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gsim/gsim-0.19.1.ebuild,v 1.3 2011/04/10 07:12:58 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gsim/gsim-0.19.1.ebuild,v 1.4 2012/05/21 15:08:27 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit eutils qt4-r2
 
 DESCRIPTION="Programm for visualisation and processing of experimental and simulated NMR spectra"
-HOMEPAGE="http://sourceforge.net/projects/gsim"
+HOMEPAGE="http://sourceforge.net/projects/gsim/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -16,11 +16,12 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="emf opengl"
 
 RDEPEND="
-	x11-libs/qt-svg:4
 	dev-cpp/muParser
+	media-libs/freetype
 	sci-libs/libcmatrix
+	sci-libs/minuit
 	virtual/blas
-	media-libs/freetype
+	x11-libs/qt-svg:4
 	emf? ( media-libs/libemf )
 	opengl? ( x11-libs/qt-opengl:4 )"
 DEPEND="${RDEPEND}"
@@ -34,18 +35,20 @@ src_prepare() {
 	qt4-r2_src_prepare
 
 	cat >> build.conf <<- EOF
-	INCLUDEPATH += \"${EPREFIX}/usr/include/libcmatrixR3/\" \
-		\"${EPREFIX}/usr/include/Minuit2\" \
-		\"${EPREFIX}/usr/include\"
+	INCLUDEPATH += "${EPREFIX}/usr/include/libcmatrixR3/" \
+		"${EPREFIX}/usr/include/Minuit2" \
+		"${EPREFIX}/usr/include"
 	LIBS += -lcmatrix  -lMinuit2 -lmuparser $(pkg-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
+		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" \
@@ -55,9 +58,9 @@ src_prepare() {
 
 src_install() {
 	qt4-r2_src_install
-	dobin ${PN} || die "no ${PN}"
+	dobin ${PN}
 	insinto /usr/share/${PN}
-	doins -r images ${PN}.ico || die "no images"
+	doins -r images ${PN}.ico
 	insinto /usr/share/${PN}/ui
-	doins *.ui || die
+	doins *.ui
 }
diff --git a/sci-chemistry/gsim/gsim-0.20.1.ebuild b/sci-chemistry/gsim/gsim-0.20.1.ebuild
index fa18fc00d965..885a7b6062b3 100644
--- a/sci-chemistry/gsim/gsim-0.20.1.ebuild
+++ b/sci-chemistry/gsim/gsim-0.20.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gsim/gsim-0.20.1.ebuild,v 1.1 2011/08/31 14:28:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gsim/gsim-0.20.1.ebuild,v 1.2 2012/05/21 15:08:27 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit eutils qt4-r2
 
 DESCRIPTION="Programm for visualisation and processing of experimental and simulated NMR spectra"
-HOMEPAGE="http://sourceforge.net/projects/gsim"
+HOMEPAGE="http://sourceforge.net/projects/gsim/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -16,11 +16,12 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="emf opengl"
 
 RDEPEND="
-	x11-libs/qt-svg:4
 	dev-cpp/muParser
-	>=sci-libs/libcmatrix-3.9.0
-	virtual/blas
 	media-libs/freetype
+	sci-libs/libcmatrix
+	sci-libs/minuit
+	virtual/blas
+	x11-libs/qt-svg:4
 	emf? ( media-libs/libemf )
 	opengl? ( x11-libs/qt-opengl:4 )"
 DEPEND="${RDEPEND}"
@@ -57,9 +58,9 @@ src_prepare() {
 
 src_install() {
 	qt4-r2_src_install
-	dobin ${PN} || die "no ${PN}"
+	dobin ${PN}
 	insinto /usr/share/${PN}
-	doins -r images ${PN}.ico || die "no images"
+	doins -r images ${PN}.ico
 	insinto /usr/share/${PN}/ui
-	doins *.ui || die
+	doins *.ui
 }