Fixed for sip-4.9

(Portage version: 2.2_rc54/cvs/Linux x86_64)

7 files changed, 37 insertions, 256 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/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" \