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

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

4 files changed, 45 insertions, 36 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/Manifest b/sci-chemistry/gsim/Manifest
index 62e94923c33d..fecb409afdf1 100644
--- a/sci-chemistry/gsim/Manifest
+++ b/sci-chemistry/gsim/Manifest
@@ -5,14 +5,15 @@ AUX 0.19.1-build.conf.patch 2248 RMD160 02bd4a029e59bdd1d932154b6dded8e1946972ba
 AUX 0.20.1-build.conf.patch 1890 RMD160 aae6909aeba16dde57503d7557e8c2c2f2c8dcac SHA1 5aa34cc8c46d076949a8566c090d5d32b3bb85cd SHA256 e5949f23eeab361149b4455b14d492f7e6f2c65f9ae6b816935c64e91aaa668b
 DIST gsim-0.19.1.tar.gz 3374301 RMD160 abd1c2402073584498a219e9195381f327efece5 SHA1 1e2640c139061c71fcf10bdadbda00eb1485d4ed SHA256 487c67869e561a334a0030392156b1bcb5663624e764b55cc4ca5a086c05a6a2
 DIST gsim-0.20.1.tar.gz 6088362 RMD160 a30863c2cae9ba019abea7e9a9aa926100b8ee19 SHA1 37250d624dbc84bb38b3e22b38f4d114019ec1db SHA256 0a63c52e3dc14450a3c58fb59f8dd51dfd5c685d2c7ef8f5448760c0b571fe7c
-EBUILD gsim-0.19.1.ebuild 1683 RMD160 4a58de166a04577d74b61db352bf954bc54a509c SHA1 83ef65d1ee374ba207a452e51567d7c5d5a54ee2 SHA256 7ae3f0cf2c07d4facb72578472eb5bbb6f0fe9aa048a7cec64858ad12145d614
-EBUILD gsim-0.20.1.ebuild 1692 RMD160 72458fbc0eb365591bbd12d7ca62e3c70ff796b4 SHA1 3a7e510e012f9955a263fb4c0b2fa54f4f25d16c SHA256 d1c4991c2196b770db1826f30dc666dd74421cf667d1375722696bc3786f8456
-MISC ChangeLog 752 RMD160 031e837e6dd00a807d1892a99813933a683a42d0 SHA1 e41d90e126495788b64c2d6994b01e99376311ae SHA256 102e364643592384baf9a1ffe40280b5695a0470c157e3fa49501d33b4b99e74
+EBUILD gsim-0.19.1.ebuild 1656 RMD160 aa4dc91ae8a34ccf068210669f22a4608f966079 SHA1 cee75279ccdcfc7b3de5420f61eff4c8e641189b SHA256 cc5fa4da5ce3c4fe1b06cf9dfce8913ea9ec8af7e8cb5ca1cb7f1d5ecb5fde0c
+EBUILD gsim-0.20.1.ebuild 1656 RMD160 479a46ee22a0fb2303572b95f803407a5ea31fd4 SHA1 37ba4b166701d93867869a27ed59dad486632ef5 SHA256 eb8611aff38581af7b7958fdaef8bd7af2cd7f7ba929964feecbf567b2af8786
+MISC ChangeLog 876 RMD160 36f9eb5f67dab56e867e63db887702b6e64b8e5f SHA1 cc4c679fa21cf266f639eeb1cce14b13c4ac8516 SHA256 3687c3378cd9f9c11a86fa258ecdbae922af18267901572d9ff7f4a6a182f9ba
 MISC metadata.xml 284 RMD160 480f282753b645f32a269e3171b2997e26ee78d1 SHA1 8dc2f602d3b58cb2b70443464c7b104b8e670d4c SHA256 346c39bfb62e65ca1e8f4c4ad4fa484457d1f08b1946a36fc6dd0f04fd1f23a4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk5eRSkACgkQgAnW8HDreRYMzQCdEjRgDi6nWbA4fXWKkbXHtV9p
-LPoAn21feSN+SSVJUdo5L80nJoOY1tge
-=rWCa
+iEYEAREKAAYFAk+6WnAACgkQgAnW8HDreRYYQQCeI7npGaITQQSM6k1/5e1cHFNf
+Nu8AoM4dVLyUvl5hR5MZXW010wOdVh3R
+=xCtG
 -----END PGP SIGNATURE-----
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
 }