Fixed for sip-4.9

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

8 files changed, 50 insertions, 264 deletions

diff --git a/sci-visualization/scidavis/ChangeLog b/sci-visualization/scidavis/ChangeLog
index 94caa1f1100a..7abcbb89fd86 100644
--- a/sci-visualization/scidavis/ChangeLog
+++ b/sci-visualization/scidavis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/scidavis
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/ChangeLog,v 1.8 2009/08/07 22:08:22 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/ChangeLog,v 1.9 2009/12/03 21:59:10 bicatali Exp $
+
+  03 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -scidavis-0.2.1-r1.ebuild, -files/scidavis-0.2.1-lupdate.patch,
+  -files/scidavis-0.2.1-profile.patch, -scidavis-0.2.2.ebuild,
+  scidavis-0.2.3.ebuild, +files/scidavis-0.2.3-sip49.patch:
+  Fixed for sip-4.9
 
 *scidavis-0.2.3 (07 Aug 2009)
 
diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest
index 1ba39bbeb7ad..ce38c89d36ef 100644
--- a/sci-visualization/scidavis/Manifest
+++ b/sci-visualization/scidavis/Manifest
@@ -1,11 +1,16 @@
-AUX scidavis-0.2.1-lupdate.patch 579 RMD160 7172d3fa7f3c8f8817f37af76fb068ecdb3cda27 SHA1 eaa27bee5446ea343e0c47b019ef8c52f9512c53 SHA256 78617197abb3dd98e98dcd5a7b53bb7fe46900b7dfbe84bd22750ab10e839b69
-AUX scidavis-0.2.1-profile.patch 3406 RMD160 4eb3a0f2ca5c48b1eb584349229216a13e9b8eb1 SHA1 c547931b79f5519b9c556e719596771080e58158 SHA256 c2f25992357dc3c693598ff6fed61a0a092d9e7cb1b1ca6067dea2054a2c4397
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX scidavis-0.2.3-profile.patch 3384 RMD160 15e40da628f2e59c40c520c9082f567e28928a25 SHA1 ad9e323d29c4ae90ae63738556a63482c3963ebe SHA256 2df4ea4ac663c0b2ed180bacdf76ba454650381b1e0c77a8238c4aa9584c792f
-DIST scidavis-0.2.1.tar.bz2 1225768 RMD160 147517a0dd7bc18dc724684d0f9c8a19b1c932b1 SHA1 e77dcf4d7fd57de6380f38ba4af04eaa102223d2 SHA256 afc3042879e4d56d8e2845fe11cde623b7107349036637c9f9ec00c5e6cec75a
-DIST scidavis-0.2.2.tar.bz2 1305283 RMD160 669786a5f22d28d6c1816d57603e87cd61ca7872 SHA1 97a9dff1730cec2cbb2c616ff04788e5ee312ca5 SHA256 44ab356c34ec2cb1223ce88b2ccfff0b3c5b8ee9438ea1785ce30019ea9b6334
+AUX scidavis-0.2.3-sip49.patch 1079 RMD160 bfd6ee4495c64b1f8e4f2c3acafedb44f5f8a808 SHA1 b31e9d15397fa90ac1417e805b6a317461a49df6 SHA256 8e08c71a3d91c8871f6675623a3e3f9ac0d8c30d9e6420d2d02d8704b6d58fdf
 DIST scidavis-0.2.3.tar.bz2 1309491 RMD160 ca3c3232af443bcf3c0a254ad2c1aea4cb1b1c2a SHA1 410e84d894c6cecca0b2c657709f81320eae022b SHA256 812e965709072ca3d583c5844c2ba85e5a3614605806754ec0ec86dc14f5df20
-EBUILD scidavis-0.2.1-r1.ebuild 1883 RMD160 1b1850b868f57265c84e1380f4be47233604e635 SHA1 a5f857c64089c47626c69dae910801a75c879f6d SHA256 8faa0ad0421ff77414b387997a1b2635486b0116a600d3e5525c6da92abc2281
-EBUILD scidavis-0.2.2.ebuild 1900 RMD160 07633e3de91ec4c404f0547b3adb10f9fbd6d73f SHA1 3a4aaf9f79e905d27ceda4fa34505e985ce079a2 SHA256 131daf689ce39fa45d82e4866dd30286862c9811dbcb4341a107baeb2f9e826e
-EBUILD scidavis-0.2.3.ebuild 1893 RMD160 48d6c98134d7f3026c1ce547ace6d8078843ba78 SHA1 90089c2e588255f9b58ce5aef21c2b85248df55c SHA256 2436e6517b386f534506541f1bdddcaa5cd04e61ee755a45c227fadcc06eeb54
-MISC ChangeLog 2051 RMD160 d9dbe06f655bc32c0c23da477523e7474cd805dc SHA1 1e02f606db362a7b131a37be8a5cb46e77d5b1f8 SHA256 2fee73fcd6c2b0ec0d1fce0ef671034038f30252430848aede1ba5b3dca47023
+EBUILD scidavis-0.2.3.ebuild 1932 RMD160 48449a646702c318b1ff94f528235ac394ad8d7c SHA1 66c9ea3cc056ff9f0013affdebf0eebbd0ddd9f1 SHA256 d6037f16cc671224a1211123caa9849f5ec46e08a9b35f82c95749e2af3ae78c
+MISC ChangeLog 2316 RMD160 39f7b1cff420f23b8ccefca2c82356f079ee675d SHA1 21a34f8c6f4b753098de1789569d55ed3df54e58 SHA256 0879adf6c5c3bd961062a6f033072a3b1fcb35856c020911006e4eb45d328d1a
 MISC metadata.xml 394 RMD160 1d6b5ccbd9c2820b9744c46afb90677f1e55bfb1 SHA1 8afc8ac6dda2ffbff823a343fb50a28fd75e29b6 SHA256 bfe78b4c2ef8ac7942bbd94c5a65f0408dc9f663aa9446dd99dbc09a3675cb6a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksYPiUACgkQ1ycZbhPLE2AIwwCglRVjrZY5MoZqMtNBNQQUL/5U
+ha0AniXZt6CsDdyyBTQtgSj8uPaAA0Aw
+=grNU
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/scidavis/files/scidavis-0.2.1-lupdate.patch b/sci-visualization/scidavis/files/scidavis-0.2.1-lupdate.patch
deleted file mode 100644
index 3ae77bcce38e..000000000000
--- a/sci-visualization/scidavis/files/scidavis-0.2.1-lupdate.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- scidavis/muparser.pri.orig	2009-03-22 18:58:01.000000000 +0100
-+++ scidavis/muparser.pri	2009-03-22 18:58:19.000000000 +0100
-@@ -5,3 +5,4 @@
- 
- SOURCES += src/muParserScript.cpp \
-            src/muParserScripting.cpp \
-+
---- scidavis/python.pri.orig	2009-03-22 18:58:11.000000000 +0100
-+++ scidavis/python.pri	2009-03-22 18:58:28.000000000 +0100
-@@ -77,4 +77,5 @@
-              $${SIP_DIR}/sipscidavisColumn.cpp \
- 				 $${SIP_DIR}/sipscidavisQwtSymbol.cpp \
- 				 $${SIP_DIR}/sipscidavisQwtPlotCurve.cpp \
-+
- ###############################################################
diff --git a/sci-visualization/scidavis/files/scidavis-0.2.1-profile.patch b/sci-visualization/scidavis/files/scidavis-0.2.1-profile.patch
deleted file mode 100644
index d5d16e092dab..000000000000
--- a/sci-visualization/scidavis/files/scidavis-0.2.1-profile.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- scidavis/scidavis.pro.orig	2009-03-31 16:56:38.000000000 +0100
-+++ scidavis/scidavis.pro	2009-03-31 17:13:15.000000000 +0100
-@@ -26,8 +26,8 @@
- LUPDATE_BIN = lupdate
- LRELEASE_BIN = lrelease
- } else {                   ### Linux (and other Unix systems)
--LUPDATE_BIN = lupdate-qt4
--LRELEASE_BIN = lrelease-qt4
-+LUPDATE_BIN = lupdate
-+LRELEASE_BIN = lrelease
- }
- 
- ### 64 Linux only suffix
-@@ -52,7 +52,7 @@
- ### 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        
-@@ -71,7 +71,8 @@
- ### Note to packagers: If you want to use systemwide installed liborigin
- ### instead of the one provided in "3rdparty", uncomment the following 2 lines:
- # CONFIG += dynamic_liborigin
--# LIBS += -lorigin
-+#LIBS += -lorigin2
-+#INCLUDEPATH  += /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 
-@@ -83,18 +84,17 @@
- ### are compiled against Qt4), dynamically against everything else.
- #############################################################################
- 
--unix:INCLUDEPATH  += ../3rdparty/qwtplot3d/include
--unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
-+unix:INCLUDEPATH  += /usr/include/qwtplot3d
-+unix:LIBS         += -lqwtplot3d
- 
--unix:INCLUDEPATH  += ../3rdparty/qwt/src
--unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
-+unix:INCLUDEPATH  += /usr/include/qwt5
-+unix:LIBS         += -lqwt
- 
--unix:LIBS         += -L/usr/lib$${libsuff}
--unix:LIBS         += -lgsl -lgslcblas -lz
--### muparser 1.30 does not compile as a shared lib on Linux
--unix:LIBS         += -L/usr/local/lib$${libsuff}
--unix:LIBS         += /usr/local/lib/libmuparser.a
--unix:INCLUDEPATH  += /usr/local/include
-+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
---- scidavis/sourcefiles.pri.orig	2009-03-31 17:15:04.000000000 +0100
-+++ scidavis/sourcefiles.pri	2009-03-31 17:15:48.000000000 +0100
-@@ -42,12 +42,8 @@
- ###################### 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/files/scidavis-0.2.3-sip49.patch b/sci-visualization/scidavis/files/scidavis-0.2.3-sip49.patch
new file mode 100644
index 000000000000..f323ccf5042a
--- /dev/null
+++ b/sci-visualization/scidavis/files/scidavis-0.2.3-sip49.patch
@@ -0,0 +1,28 @@
+Index: python.pri
+===================================================================
+--- scidavis/python.pri	(Revision 1264)
++++ scidavis/python.pri	(Revision 1265)
+@@ -53,7 +53,6 @@
+              $${SIP_DIR}/sipscidavisPythonScript.cpp\
+              $${SIP_DIR}/sipscidavisPythonScripting.cpp\
+              $${SIP_DIR}/sipscidavisFolder.cpp\
+-             $${SIP_DIR}/sipscidavisQList.cpp\
+              $${SIP_DIR}/sipscidavisFit.cpp \
+              $${SIP_DIR}/sipscidavisExponentialFit.cpp \
+              $${SIP_DIR}/sipscidavisTwoExpFit.cpp \
+@@ -84,4 +83,15 @@
+              $${SIP_DIR}/sipscidavisQwtPlot.cpp \
+ 				 $${SIP_DIR}/sipscidavisGrid.cpp \
+ 
++exists($${SIP_DIR}/sipscidavisQList.cpp) {
++# SIP < 4.9
++	SOURCES += $${SIP_DIR}/sipscidavisQList.cpp
++} else {
++	SOURCES += \
++			   $${SIP_DIR}/sipscidavisQList0100QDateTime.cpp\
++			   $${SIP_DIR}/sipscidavisQList0101Folder.cpp\
++			   $${SIP_DIR}/sipscidavisQList0101MyWidget.cpp\
++			   $${SIP_DIR}/sipscidavisQList0101AbstractAspect.cpp\
++}
++
+ ###############################################################
diff --git a/sci-visualization/scidavis/scidavis-0.2.1-r1.ebuild b/sci-visualization/scidavis/scidavis-0.2.1-r1.ebuild
deleted file mode 100644
index c7a3b46283ff..000000000000
--- a/sci-visualization/scidavis/scidavis-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/scidavis-0.2.1-r1.ebuild,v 1.1 2009/04/14 18:29:26 bicatali Exp $
-
-EAPI=2
-inherit eutils qt4 fdo-mime
-
-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="python"
-
-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
-	>=dev-cpp/muParser-1.30
-	>=sci-libs/gsl-1.8"
-# remove because unsupported for now
-#	sci-libs/liborigin:2"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	python? ( >=dev-python/sip-4.7 )"
-
-RDEPEND="${CDEPEND}
-	python? ( >=dev-python/PyQt4-4.4
-		dev-python/pygsl
-		sci-libs/scipy )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-profile.patch
-	epatch "${FILESDIR}"/${P}-lupdate.patch
-	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"
-
-	if use python; then
-		sed -i \
-			-e '/^include( python.pri )$/d' \
-			${PN}/${PN}.pro || die "sed python failed"
-	fi
-}
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die 'emake install failed'
-	dodoc README CHANGES
-	doicon scidavis/icons/hicolor-48/scidavis.png
-	cd ${PN}/translations
-	insinto /usr/share/${PN}/translations
-	for l in ${LANGS}; do
-		if use linguas_${l}; then
-			doins ${PN}_${l}.qm
-		fi
-	done
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/scidavis/scidavis-0.2.2.ebuild b/sci-visualization/scidavis/scidavis-0.2.2.ebuild
deleted file mode 100644
index 29c6b51fb973..000000000000
--- a/sci-visualization/scidavis/scidavis-0.2.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/scidavis-0.2.2.ebuild,v 1.3 2009/08/07 19:56:32 markusle Exp $
-
-EAPI=2
-inherit eutils qt4 fdo-mime
-
-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="python"
-
-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
-	python? ( >=dev-python/sip-4.7 )"
-
-RDEPEND="${CDEPEND}
-	python? ( >=dev-python/PyQt4-4.4[X]
-		dev-python/pygsl
-		sci-libs/scipy )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.2.1-profile.patch
-	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"
-
-	if use python; then
-		sed -i \
-			-e '/^include( python.pri )$/d' \
-			${PN}/${PN}.pro || die "sed python failed"
-	fi
-}
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die 'emake install failed'
-	dodoc README CHANGES
-	doicon scidavis/icons/hicolor-48/scidavis.png
-	cd ${PN}/translations
-	insinto /usr/share/${PN}/translations
-	for l in ${LANGS}; do
-		if use linguas_${l}; then
-			doins ${PN}_${l}.qm
-		fi
-	done
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/scidavis/scidavis-0.2.3.ebuild b/sci-visualization/scidavis/scidavis-0.2.3.ebuild
index 7d4472860bbc..b7f006d7dee2 100644
--- a/sci-visualization/scidavis/scidavis-0.2.3.ebuild
+++ b/sci-visualization/scidavis/scidavis-0.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/scidavis-0.2.3.ebuild,v 1.1 2009/08/07 22:08:22 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/scidavis/scidavis-0.2.3.ebuild,v 1.2 2009/12/03 21:59:10 bicatali Exp $
 
 EAPI=2
 inherit eutils qt4 fdo-mime
@@ -40,6 +40,7 @@ RDEPEND="${CDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-profile.patch
+	epatch "${FILESDIR}"/${P}-sip49.patch
 	sed -i -e '/lgsl/d' fitPlugins/*/*.pro || die "sed gsl link failed"
 	sed -i \
 		-e "s:doc/${PN}:doc/${PF}:g" \