Version Bump, per 309361; PREFIX ready, but not keyworded

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 172 insertions, 6 deletions

diff --git a/sci-visualization/scidavis/ChangeLog b/sci-visualization/scidavis/ChangeLog
index a2a2aefd9912..1ec01d55b185 100644
--- a/sci-visualization/scidavis/ChangeLog
+++ b/sci-visualization/scidavis/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/scidavis
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/ChangeLog,v 1.12 2010/01/12 15:34:31 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/ChangeLog,v 1.13 2010/03/15 22:09:04 jlec Exp $
+
+*scidavis-0.2.4 (15 Mar 2010)
+
+  15 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +scidavis-0.2.4.ebuild, +files/scidavis-0.2.4-profile.patch:
+  Version Bump, per 309361
+  Prefix ready, not keyworded.
 
   12 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   scidavis-0.2.3.ebuild:
diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest
index c0e8ac6c9287..e4921ce2ea94 100644
--- a/sci-visualization/scidavis/Manifest
+++ b/sci-visualization/scidavis/Manifest
@@ -3,14 +3,17 @@ Hash: SHA1
 
 AUX scidavis-0.2.3-profile.patch 3384 RMD160 15e40da628f2e59c40c520c9082f567e28928a25 SHA1 ad9e323d29c4ae90ae63738556a63482c3963ebe SHA256 2df4ea4ac663c0b2ed180bacdf76ba454650381b1e0c77a8238c4aa9584c792f
 AUX scidavis-0.2.3-sip49.patch 1079 RMD160 bfd6ee4495c64b1f8e4f2c3acafedb44f5f8a808 SHA1 b31e9d15397fa90ac1417e805b6a317461a49df6 SHA256 8e08c71a3d91c8871f6675623a3e3f9ac0d8c30d9e6420d2d02d8704b6d58fdf
+AUX scidavis-0.2.4-profile.patch 3722 RMD160 66c8a23d240a7c85cbf82bd0ae3340be2df7858b SHA1 f7f0655b12b5427a7f26cfee36f0e23820022390 SHA256 cb289d9d0e45252af9c9ac44b7596eb4a7fec6ea1388ff1df39d576b21a9d0cb
 DIST scidavis-0.2.3.tar.bz2 1309491 RMD160 ca3c3232af443bcf3c0a254ad2c1aea4cb1b1c2a SHA1 410e84d894c6cecca0b2c657709f81320eae022b SHA256 812e965709072ca3d583c5844c2ba85e5a3614605806754ec0ec86dc14f5df20
+DIST scidavis-0.2.4.tar.bz2 1426695 RMD160 a265a8fea2e26ca26e0ba08dd3069389bb5f4735 SHA1 f8e0eeac08f0e06fe12cb55bb6b008c3963cb3de SHA256 81381c3a9c2e66c25945cbdfb4e6270f94f0adb0832b6947ba05fa79f0f439f6
 EBUILD scidavis-0.2.3.ebuild 1868 RMD160 48c2ca4f508248ad5c4bc05d4853b1980333d2fd SHA1 44d6b154545b9dabe466ebe62c7a9ab01ba42dfe SHA256 5369de101e9ffe3d3b58ab2ccee248de1833dee466ebf26748119bc112376bcf
-MISC ChangeLog 2708 RMD160 a73c52d6af7cf0a6569901059dd6f3ff9075aea8 SHA1 eba7bfb11332e2a2db05ab32a0362e2624668209 SHA256 6930457f13d3496fd6afe4134df946c0c07330e10d054c2bb3bddeecd2620384
+EBUILD scidavis-0.2.4.ebuild 1888 RMD160 6e00f5748d93eaaabac5bd09b900cbe905ef67bd SHA1 cc70cec364d5fd0d0603ed4773fce24952c46cef SHA256 d4a1fcf5fbe8b5521d1ef8f70a85dbc4a451932c0bf171e3a68ff3d5954c2fdf
+MISC ChangeLog 2914 RMD160 2069366a5bd70bf7cac525a191a90f430d5ed743 SHA1 e1fbde558c4835246a41a3095270f0b0e28d8f3b SHA256 05d889917972110013f335711d723a918c9ba2ad4e5b3f3f929f54ed7c6053c1
 MISC metadata.xml 394 RMD160 1d6b5ccbd9c2820b9744c46afb90677f1e55bfb1 SHA1 8afc8ac6dda2ffbff823a343fb50a28fd75e29b6 SHA256 bfe78b4c2ef8ac7942bbd94c5a65f0408dc9f663aa9446dd99dbc09a3675cb6a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktMlo0ACgkQNQqtfCuFnePPbwCfUqnZRakdX+Awq4yerDxa6KJX
-P3QAnilihaQEiVjmlfRHWsgFZ8fcaYK8
-=PzEL
+iEYEARECAAYFAkuesAYACgkQgAnW8HDreRamxQCfVxH16V5iS15mvcWHhjpLU5Ro
+Y+YAoLbynyI78MVb+9vRKlnvJus3Ubdm
+=vZDi
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/scidavis/files/scidavis-0.2.4-profile.patch b/sci-visualization/scidavis/files/scidavis-0.2.4-profile.patch
new file mode 100644
index 000000000000..c7b6751b8b1a
--- /dev/null
+++ b/sci-visualization/scidavis/files/scidavis-0.2.4-profile.patch
@@ -0,0 +1,74 @@
+diff --git a/scidavis/scidavis.pro b/scidavis/scidavis.pro
+index fa33d0e..0af10c6 100644
+--- a/scidavis/scidavis.pro
++++ b/scidavis/scidavis.pro
+@@ -33,7 +33,7 @@ exists(/usr/bin/lupdate-qt4) {
+ linux-g++-64: libsuff = 64 
+ 
+ ### where to install
+-unix: INSTALLBASE = /usr           # this is what is called "prefix" when using GNU autotools
++unix: INSTALLBASE = @GENTOO_PORTAGE_EPREFIX@/usr           # this is what is called "prefix" when using GNU autotools
+ win32: INSTALLBASE = c:/scidavis
+ unix: target.path = "$$INSTALLBASE/bin"               # where to install the binary on Linux/MacOS X
+ win32: target.path = "$$INSTALLBASE"                  # where to install the exe on Windows
+@@ -56,7 +56,7 @@ win32: translationfiles.path = "$$INSTALLBASE/translations"
+ ### scidavisrc.py and scidavisUtil.py, respectively. Alternatively you can also put scidavisrc.py 
+ ### (or ".scidavis.py") into the users home directory. scidavisUtil.py must be either in the 
+ ### directory specified here or somewhere else in the python path (sys.path) where "import" can find it
+-unix: pythonconfig.path = /etc						# where scidavisrc.py is installed
++unix: pythonconfig.path = $$INSTALLBASE/share/scidavis						# where scidavisrc.py is installed
+ win32: pythonconfig.path = $$INSTALLBASE    
+ unix: pythonutils.path = $$INSTALLBASE/share/scidavis        # where the scidavisUtil python modules is installed
+ win32: pythonutils.path = $$INSTALLBASE        
+@@ -76,6 +76,7 @@ include( python.pri )
+ ### instead of the one provided in "3rdparty", uncomment the following 2 lines:
+ # CONFIG += dynamic_liborigin
+ # LIBS += -lorigin
++# INCLUDEPATH  += @GENTOO_PORTAGE_EPREFIX@/usr/include/liborigin2
+ ### Unfortunately, due to liborigin being in alpha stage, we cannot promise
+ ### that SciDAVis works with any other version that the one in "3rdparty".
+ ################### end of liborigin block 
+@@ -87,16 +88,17 @@ include( python.pri )
+ ### are compiled against Qt4), dynamically against everything else.
+ #############################################################################
+ 
+-unix:INCLUDEPATH  += ../3rdparty/qwtplot3d/include
+-unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
++unix:INCLUDEPATH  += @GENTOO_PORTAGE_EPREFIX@/usr/include/qwtplot3d
++unix:LIBS         += -lqwtplot3d
+ 
+-unix:INCLUDEPATH  += ../3rdparty/qwt/src
+-unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
++unix:INCLUDEPATH  += @GENTOO_PORTAGE_EPREFIX@/usr/include/qwt5
++unix:LIBS         += -lqwt
+ 
+-unix:LIBS         += -L/usr/lib$${libsuff}
+-unix:LIBS         += -lgsl -lgslcblas -lz
+-unix:LIBS         += -lmuparser
+-unix:INCLUDEPATH  += /usr/include/muParser
++unix:INCLUDEPATH  += $$system(pkg-config --cflags gsl)
++unix:LIBS         += $$system(pkg-config --libs gsl)
++unix:LIBS         += $$system(pkg-config --libs muparser)
++unix:INCLUDEPATH  += $$system(pkg-config --cflags muparser)
++unix:LIBS         += -lz
+ 
+ #############################################################################
+ ### Link everything dynamically
+diff --git a/scidavis/sourcefiles.pri b/scidavis/sourcefiles.pri
+index 892b45f..bd349c6 100644
+--- a/scidavis/sourcefiles.pri
++++ b/scidavis/sourcefiles.pri
+@@ -48,12 +48,8 @@ contains( INSTALLS, translationfiles ){
+ ###################### DOCUMENTATION ########################################
+ 
+ documentation.files += ../manual/html \
+-                       ../INSTALL.html \
+                        ../scidavis.css \
+-                       ../scidavis-logo.png \
+-                       ../README \
+-                       ../CHANGES \
+-                       ../gpl.txt 
++                       ../scidavis-logo.png
+ 
+ ###################### DESKTOP INTEGRATION ##################################
+ 
diff --git a/sci-visualization/scidavis/scidavis-0.2.4.ebuild b/sci-visualization/scidavis/scidavis-0.2.4.ebuild
new file mode 100644
index 000000000000..8e3566621638
--- /dev/null
+++ b/sci-visualization/scidavis/scidavis-0.2.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/scidavis-0.2.4.ebuild,v 1.1 2010/03/15 22:09:04 jlec Exp $
+
+EAPI="3"
+
+inherit eutils fdo-mime prefix qt4
+
+DESCRIPTION="Scientific Data Analysis and Visualization"
+HOMEPAGE="http://scidavis.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+LANGS="de es fr ja ru sv"
+for l in ${LANGS}; do
+	IUSE="${IUSE} linguas_${l}"
+done
+
+CDEPEND="sys-libs/zlib
+	>=x11-libs/qwt-5.1[svg]
+	>=x11-libs/qwtplot3d-0.2.7
+	x11-libs/qt-assistant:4
+	x11-libs/qt-qt3support:4
+	>=dev-cpp/muParser-1.30
+	>=sci-libs/gsl-1.8"
+# remove because unsupported for now
+#	sci-libs/liborigin:2"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	>=dev-python/sip-4.7"
+
+RDEPEND="${CDEPEND}
+	>=dev-python/PyQt4-4.4[X]
+	dev-python/pygsl
+	sci-libs/scipy"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-profile.patch
+	eprefixify ${PN}/${PN}.pro
+	sed -i -e '/lgsl/d' fitPlugins/*/*.pro || die "sed gsl link failed"
+	sed -i \
+		-e "s:doc/${PN}:doc/${PF}:g" \
+		${PN}/${PN}.pro || die "sed doc dir failed"
+	# the libsuff thingy does not work
+	sed -i \
+		-e "s|/usr/lib\$\${libsuff}|/usr/$(get_libdir)|g" \
+		-i fit*/*/*.pro || die "sed plugins failed"
+
+	sed -i \
+		-e '/^include( python.pri )$/d' \
+		${PN}/${PN}.pro || die "sed python failed"
+}
+
+src_configure() {
+	eqmake4
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die 'emake install failed'
+	dodoc README CHANGES || die
+	doicon scidavis/icons/hicolor-48/scidavis.png || die
+	cd ${PN}/translations
+	insinto /usr/share/${PN}/translations
+	for l in ${LANGS}; do
+		if use linguas_${l}; then
+			doins ${PN}_${l}.qm || die
+		fi
+	done
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}