7 files changed, 255 insertions, 0 deletions
diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index cdc784947..34089234d 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.10 2006/05/26 14:58:54 cryos Exp $
 
+*qtiplot-0.9 (1 Oct 2007)
+  1 Oct 2007; Andrey Grozin <A.G.Grozin@inp.nsk.su>
+  +qtiplot-0.9.ebuild; +files/qtiplot-0.9-qmake.patch;
+  +files/qtiplot-0.9-fitRational0.patch;
+  +files/qtiplot-0.9-fitRational1.patch:
+  Version bump.
+  Depends on x11-libs/qwtplot3d built with qt-4 (bug #184652).
+  Uses built-in liborigin.
+
 *qtiplot-0.8.8 (5 Nov 2006)
 
   5 Nov 2006; Andrey Grozin <A.G.Grozin@inp.nsk.su>
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index ff50dad1e..98d4dc436 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -10,13 +10,31 @@ AUX qtiplot-0.8.8-qmake.patch 1929 RMD160 42487da996dccced2a968eac92a890b4f6deaf
 MD5 8e87a15f22d41fcba1fe0e4d0cb7c33f files/qtiplot-0.8.8-qmake.patch 1929
 RMD160 42487da996dccced2a968eac92a890b4f6deafac files/qtiplot-0.8.8-qmake.patch 1929
 SHA256 b4bc43873588111403087933ae8e43d7008e780d03ac20ec83d1ed9ff933fb46 files/qtiplot-0.8.8-qmake.patch 1929
+AUX qtiplot-0.9-fitRational0.patch 567 RMD160 1bdb713ae41bab936576586847968d03e2e19a8c SHA1 b9436ed980df79d9ae5b859568b224d36d51dce5 SHA256 f71a2c37936aa1e43cbdef4e761ef15c3bcb0f794a24aa6ce95d180b19024435
+MD5 68e192d943e7879bcb70788aadc78c66 files/qtiplot-0.9-fitRational0.patch 567
+RMD160 1bdb713ae41bab936576586847968d03e2e19a8c files/qtiplot-0.9-fitRational0.patch 567
+SHA256 f71a2c37936aa1e43cbdef4e761ef15c3bcb0f794a24aa6ce95d180b19024435 files/qtiplot-0.9-fitRational0.patch 567
+AUX qtiplot-0.9-fitRational1.patch 567 RMD160 9ad6e67a087f10e38a835fcf5f9d5eb729cb68ea SHA1 b673a0fdd8eac39de4a3df6631e4630c84b87de3 SHA256 f0fddda719bb4af7995f30e4fc5f980015f77520e996ce22e8c73ffdc1569ff9
+MD5 ad9ca6075142a4ac46900b035a7cfc45 files/qtiplot-0.9-fitRational1.patch 567
+RMD160 9ad6e67a087f10e38a835fcf5f9d5eb729cb68ea files/qtiplot-0.9-fitRational1.patch 567
+SHA256 f0fddda719bb4af7995f30e4fc5f980015f77520e996ce22e8c73ffdc1569ff9 files/qtiplot-0.9-fitRational1.patch 567
+AUX qtiplot-0.9-qmake.patch 2691 RMD160 5bb876228ae5b5dff6f640ee2d7367498f829997 SHA1 e056b57a75cb5565fae29a2b848453a90a2ea48f SHA256 0c8e547760d62199a3c4b9ab68a541d949d50146b43a65fac92e8be26401cddb
+MD5 3156e9c8ac64ef03ce0db0ce1b22e0ce files/qtiplot-0.9-qmake.patch 2691
+RMD160 5bb876228ae5b5dff6f640ee2d7367498f829997 files/qtiplot-0.9-qmake.patch 2691
+SHA256 0c8e547760d62199a3c4b9ab68a541d949d50146b43a65fac92e8be26401cddb files/qtiplot-0.9-qmake.patch 2691
+DIST manual-en.tar.bz2 6213122 RMD160 f369041c6dfe043b5baa963b6c489bd57005ac2a SHA1 15ec670c3e1ebac2f2e1472f52ea243cd1f4cdb3 SHA256 331a45e87b7fa87ab78067a2b408ecac23dd57393751d66404c56200cb0be2ae
 DIST manual-en.zip 5148221 RMD160 34535d2ec54027c00945b35c05f5b6d48d966897 SHA1 33e4c1a0662e57be7cf82b5056fde73879e59db1 SHA256 cf2cbf2342530b98f6ce1a6ec0e4ac928bcbe0424264b39580171b1cb5afab0f
 DIST manual-es.zip 291117 RMD160 df6161700fc5e18b4020e7963eedac1ef690bc42 SHA1 d259421b19a2d9999a20947c180e655ebe86ae26 SHA256 41cb6f04baa23cb1f15469a049f9833506c6899b9410b8af064677a221d413c9
 DIST qtiplot-0.8.8.tar.bz2 788071 RMD160 21e36e1238ec9c758398eba71ec70b899befc77d SHA1 8eaf0fcf31887d0732a462e3b39a0c41ccfae7ff SHA256 b55fced5c8fbcfc81eb85e54bef7e34051af284958a0487648cadb7ba96bb273
+DIST qtiplot-0.9.tar.bz2 825530 RMD160 6b2d8c81297d18f78c4e18287dd7a02611957e7c SHA1 31cc8781e1691e81beaafbc9c129832462e85c9d SHA256 a4a8cbf0619f902ce029286a9f2960da66d587d6b2f2fffdb9ed8042fa2873db
 EBUILD qtiplot-0.8.8.ebuild 3266 RMD160 18a72f72dd55e54d6599e722305ae11c246e505e SHA1 7f863e275c835173c513a7f55fe64102fab905b2 SHA256 d1c94aa991f3ca4b831a039cee1d07900f15d954db6480f0ea181b52ff19c6cd
 MD5 c54d4e6eaa9fffa80397ce756b11cb97 qtiplot-0.8.8.ebuild 3266
 RMD160 18a72f72dd55e54d6599e722305ae11c246e505e qtiplot-0.8.8.ebuild 3266
 SHA256 d1c94aa991f3ca4b831a039cee1d07900f15d954db6480f0ea181b52ff19c6cd qtiplot-0.8.8.ebuild 3266
+EBUILD qtiplot-0.9.ebuild 3439 RMD160 7c069c0ff7248a1f9aa58a88fea855cf81e78ccf SHA1 dc65815f1d6668aced4c31b0702b7a78002fb4d5 SHA256 a413c05acb75601b918f99bfe22a49d160ced4eb14fff9cebffed9822ee6e5b5
+MD5 3304d42bb837bb97e2a9a625279ad0bf qtiplot-0.9.ebuild 3439
+RMD160 7c069c0ff7248a1f9aa58a88fea855cf81e78ccf qtiplot-0.9.ebuild 3439
+SHA256 a413c05acb75601b918f99bfe22a49d160ced4eb14fff9cebffed9822ee6e5b5 qtiplot-0.9.ebuild 3439
 MISC ChangeLog 3855 RMD160 bfb42ae5549b6c3d0dc66a12c549ab68fdf7f82d SHA1 9577ecfbd5bb25c94ad914447880ede5977939ea SHA256 8b18dd184c095854f8d43211c303157c43cfa5a694d235babd53448d500e2b45
 MD5 62ca211867221385cec5254fc437d555 ChangeLog 3855
 RMD160 bfb42ae5549b6c3d0dc66a12c549ab68fdf7f82d ChangeLog 3855
@@ -25,6 +43,13 @@ MISC metadata.xml 604 RMD160 1e0ed48d48668781cafc44ef8a14c3fb1e41eb28 SHA1 0f1b6
 MD5 be5373660391ac23dc1d97a654ca9e79 metadata.xml 604
 RMD160 1e0ed48d48668781cafc44ef8a14c3fb1e41eb28 metadata.xml 604
 SHA256 094795782ea49d41a8c4106510bb80d360f1bdaae3ab89c23c369def31bab56c metadata.xml 604
+MISC qtiplot-0.9.ebuild~ 3629 RMD160 1d350474ea16a5a1d52c76165e485cacaba83d38 SHA1 75c2fa770426e7099b6a4abe8fb1738991084f4e SHA256 0a1487d6bf80e04d66b494715ea3a2d5519216cb0b6655844c3b49e59099da9d
+MD5 2d20d1dd74f7263b5bcd7b46d1439233 qtiplot-0.9.ebuild~ 3629
+RMD160 1d350474ea16a5a1d52c76165e485cacaba83d38 qtiplot-0.9.ebuild~ 3629
+SHA256 0a1487d6bf80e04d66b494715ea3a2d5519216cb0b6655844c3b49e59099da9d qtiplot-0.9.ebuild~ 3629
 MD5 8092c838356ef8921c65e9cd90464a19 files/digest-qtiplot-0.8.8 687
 RMD160 12adc6a5d93844d753bc06040db00334eb3754e3 files/digest-qtiplot-0.8.8 687
 SHA256 0cee448f399325ca4c65244e885fee398b827c2f364d00196d1efe4af5e85daf files/digest-qtiplot-0.8.8 687
+MD5 2317bf43c46d6a589fd1403a75a833c5 files/digest-qtiplot-0.9 693
+RMD160 0589ca563315c2a43a7191b6d194ad3def6abb42 files/digest-qtiplot-0.9 693
+SHA256 2ad324f7eed671019470fbc381e883fee3d412ed007fa069bae42e7e1f640780 files/digest-qtiplot-0.9 693
diff --git a/sci-visualization/qtiplot/files/digest-qtiplot-0.9 b/sci-visualization/qtiplot/files/digest-qtiplot-0.9
new file mode 100644
index 000000000..3eade45a3
--- /dev/null
+++ b/sci-visualization/qtiplot/files/digest-qtiplot-0.9
@@ -0,0 +1,9 @@
+MD5 8a7075d0a3038b740a9ba2e357d34593 manual-en.tar.bz2 6213122
+RMD160 f369041c6dfe043b5baa963b6c489bd57005ac2a manual-en.tar.bz2 6213122
+SHA256 331a45e87b7fa87ab78067a2b408ecac23dd57393751d66404c56200cb0be2ae manual-en.tar.bz2 6213122
+MD5 920a78cbd4a72d23f1bc79ba89e2a1f9 manual-es.zip 291117
+RMD160 df6161700fc5e18b4020e7963eedac1ef690bc42 manual-es.zip 291117
+SHA256 41cb6f04baa23cb1f15469a049f9833506c6899b9410b8af064677a221d413c9 manual-es.zip 291117
+MD5 117601fb9ba06b41f99e5492920f0864 qtiplot-0.9.tar.bz2 825530
+RMD160 6b2d8c81297d18f78c4e18287dd7a02611957e7c qtiplot-0.9.tar.bz2 825530
+SHA256 a4a8cbf0619f902ce029286a9f2960da66d587d6b2f2fffdb9ed8042fa2873db qtiplot-0.9.tar.bz2 825530
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9-fitRational0.patch b/sci-visualization/qtiplot/files/qtiplot-0.9-fitRational0.patch
new file mode 100644
index 000000000..755d0c058
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9-fitRational0.patch
@@ -0,0 +1,15 @@
+--- fitRational0.pro.orig	2007-09-28 22:45:35.000000000 +0700
++++ fitRational0.pro	2007-09-28 22:48:13.000000000 +0700
+@@ -12,10 +12,6 @@
+ DESTDIR           = ../
+  
+-# statically link against GSL in 3rdparty
+-INCLUDEPATH += ../../3rdparty/gsl
+-LIBS         += ../3rdparty/gsl/lib/libgsl.a
+-LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
+-#dynamically link against GSL installed system-wide
+-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
++INCLUDEPATH += /usr/include/gsl
++LIBS         += -lgsl -lgslcblas
+ 
+ target.path=/usr/lib$${libsuff}/qtiplot/plugins
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9-fitRational1.patch b/sci-visualization/qtiplot/files/qtiplot-0.9-fitRational1.patch
new file mode 100644
index 000000000..b09f28bb9
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9-fitRational1.patch
@@ -0,0 +1,15 @@
+--- fitRational1.pro.orig	2007-09-28 22:50:01.000000000 +0700
++++ fitRational1.pro	2007-09-28 22:50:55.000000000 +0700
+@@ -12,10 +12,6 @@
+ DESTDIR           = ../
+  
+-# statically link against GSL in 3rdparty
+-INCLUDEPATH += ../../3rdparty/gsl
+-LIBS         += ../3rdparty/gsl/lib/libgsl.a
+-LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
+-#dynamically link against GSL installed system-wide
+-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
++INCLUDEPATH += /usr/include/gsl
++LIBS         += -lgsl -lgslcblas
+ 
+ target.path=/usr/lib$${libsuff}/qtiplot/plugins
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9-qmake.patch b/sci-visualization/qtiplot/files/qtiplot-0.9-qmake.patch
new file mode 100644
index 000000000..f5279b23b
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9-qmake.patch
@@ -0,0 +1,74 @@
+--- qtiplot.pro.orig	2007-09-30 00:00:02.000000000 +0700
++++ qtiplot.pro	2007-09-30 01:39:57.000000000 +0700
+@@ -5,5 +5,5 @@
+ # building without muParser doesn't work yet
+ SCRIPTING_LANGS += muParser
+-SCRIPTING_LANGS += Python
++#SCRIPTING_LANGS += Python
+ 
+ # a console displaying output of scripts; particularly useful on Windows
+@@ -28,9 +28,8 @@
+ #############################################################################
+ 
+-INCLUDEPATH       += ../3rdparty/muparser/include
+-INCLUDEPATH       += ../3rdparty/qwtplot3d/include
+-INCLUDEPATH       += ../3rdparty/qwt/src
++INCLUDEPATH       += /usr/include/qwtplot3d
++INCLUDEPATH       += /usr/include/qwt5
+ INCLUDEPATH       += ../3rdparty/liborigin
+-INCLUDEPATH       += ../3rdparty/gsl/include
++INCLUDEPATH       += /usr/include/gsl
+ INCLUDEPATH       += ../3rdparty/zlib123/include
+ 
+@@ -41,19 +40,5 @@
+ ##################### Linux (Mac OS X) ######################################
+ 
+-# statically link against libraries in 3rdparty
+-LIBS         += ../3rdparty/muparser/lib/libmuparser.a
+-LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+-LIBS         += ../3rdparty/qwt/lib/libqwt.a
+-LIBS         += ../3rdparty/gsl/lib/libgsl.a
+-LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
+-
+-# dynamically link against dependencies if they are installed system-wide
+-#unix:LIBS         += -lmuparser
+-#unix:LIBS         += -lqwtplot3d
+-#unix:LIBS         += -lqwt
+-#unix:LIBS         += -lgsl -lgslcblas
+-
+-##################### Windows ###############################################
+-
++LIBS += -lgsl -lgslcblas -lqwtplot3d -lqwt -lmuparser
+ 
+ #############################################################################
+@@ -89,10 +74,5 @@
+ ###################### TRANSLATIONS #########################################
+ 
+-TRANSLATIONS    = translations/qtiplot_de.ts \
+-                  translations/qtiplot_es.ts \
+-                  translations/qtiplot_fr.ts \
+-                  translations/qtiplot_ru.ts \
+-                  translations/qtiplot_ja.ts \
+-                  translations/qtiplot_sv.ts
++TRANSLATIONS    =
+ 
+ #system(lupdate -verbose qtiplot.pro)
+@@ -102,6 +82,5 @@
+ 
+ documentation.files += ../manual/html \
+-                       ../README.html \
+-                       ../gpl_licence.txt \
++                       ../README.html
+ 
+ ###################### HEADERS ##############################################
+@@ -376,10 +355,4 @@
+   }
+ 
+-  win32 {
+-    INCLUDEPATH += $$system(call python-includepath.py)
+-    LIBS        += $$system(call python-libs-win.py)
+-    system($$system(call python-sipcmd.py) -c $${SIP_DIR} src/qti.sip)
+-  }
+-
+ ##################### SIP generated files #####################
+ 
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.ebuild
new file mode 100644
index 000000000..1bc94ee9f
--- /dev/null
+++ b/sci-visualization/qtiplot/qtiplot-0.9.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+inherit eutils multilib qt4
+
+DESCRIPTION="Qt based clone of the Origin plotting package"
+HOMEPAGE="http://soft.proindependent.com/qtiplot.html"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="python doc"
+
+LANGUAGES="de es fr ja ru sv"
+
+for LANG in ${LANGUAGES}; do
+	IUSE="${IUSE} linguas_${LANG}"
+done
+
+SRC_URI="http://soft.proindependent.com/src/${P}.tar.bz2
+	doc? ( http://soft.proindependent.com/doc/manual-en.tar.bz2
+		linguas_es? ( http://soft.proindependent.com/doc/manual-es.zip ) )"
+
+RDEPEND="$(qt4_min_version 4.2)
+	>=x11-libs/qwt-5.0.2
+	x11-libs/qwtplot3d
+	sci-libs/gsl
+	>=dev-cpp/muParser-1.28
+	python? ( >=dev-lang/python-2.4
+		>=dev-python/PyQt4-4.2
+		dev-python/pygsl
+		sci-libs/scipy )"
+
+DEPEND="${RDEPEND}
+	python? ( >=dev-python/sip-4.5.2 )
+	doc? ( lingias_es? ( app-arch/unzip ) )"
+
+pkg_setup() {
+	if ! built_with_use x11-libs/qt qt3support; then
+		eerror "qt-4 must be emerged with the USE flag qt3support"
+		die "This package needs qt-4 with USE=qt3support"
+	fi
+}
+
+src_unpack() {
+	local TRANSLATIONS
+	unpack ${A}
+	cd "${S}"
+	mv "${PN}.pro" "${PN}.pro.orig"
+	tr -d '\r' < "${PN}.pro.orig" > "${PN}.pro"
+	cd qtiplot
+	mv "${PN}.pro" "${PN}.pro.orig"
+	tr -d '\r' < "${PN}.pro.orig" \
+		| sed -e '/^[[:space:]#]*win32:/d' -e '/^[[:space:]#]*mac:/d' \
+		-e 's/^\([[:space:]]*\)unix:/\1/' \
+		> "${PN}.pro"
+	epatch "${FILESDIR}/${P}-qmake.patch" || die "epatch qtiplot.pro failed"
+	sed -i -e 's|/usr/lib$${libsuff}|_LIBDIR_|' "${PN}.pro" || die "sed failed."
+	sed -i -e "s|_LIBDIR_|/usr/$(get_libdir)|" "${PN}.pro" || die "sed failed."
+	use python && sed -i -e 's/^#\(SCRIPTING_LANGS += Python\)/\1/' "${PN}.pro"
+	TRANSLATIONS=""
+	for LANG in ${LANGUAGES}; do
+		use "linguas_${LANG}" && TRANSLATIONS="${TRANSLATIONS} translations/qtiplot_${LANG}.ts"
+	done
+	sed -i -e "s|^\\(TRANSLATIONS =\\)|\\1${TRANSLATIONS}|" "${PN}.pro"
+	cd ../fitPlugins/fitRational0
+	mv fitRational0.pro fitRational0.pro.orig
+	tr -d '\r' < fitRational0.pro.orig \
+		| sed -e '/^[[:space:]#]*win32:/d' -e '/^[[:space:]#]*mac:/d' \
+		-e 's/^\([[:space:]]*\)unix:/\1/' \
+		> fitRational0.pro
+	epatch "${FILESDIR}/${P}-fitRational0.patch" \
+		|| die "epatch fitRational0.pro failed"
+	sed -i -e 's|/usr/lib$${libsuff}|_LIBDIR_|' fitRational0.pro
+	sed -i -e "s|_LIBDIR_|/usr/$(get_libdir)|" fitRational0.pro
+	cd ../fitRational1
+	mv fitRational1.pro fitRational1.pro.orig
+	tr -d '\r' < fitRational1.pro.orig \
+		| sed -e '/^[[:space:]#]*win32:/d' -e '/^[[:space:]#]*mac:/d' \
+		-e 's/^\([[:space:]]*\)unix:/\1/' \
+		> fitRational1.pro
+	epatch "${FILESDIR}/${P}-fitRational1.patch" \
+		|| die "epatch fitRational1.pro failed"
+	sed -i -e 's|/usr/lib$${libsuff}|_LIBDIR_|' fitRational1.pro
+	sed -i -e "s|_LIBDIR_|/usr/$(get_libdir)|" fitRational1.pro
+}
+
+src_compile() {
+	qmake "${PN}.pro" || die 'qmake failed.'
+	emake || die 'emake failed.'
+}
+
+src_install() {
+	local PYTHONLIB
+	make_desktop_entry qtiplot qtiplot qtiplot Graphics
+	emake INSTALL_ROOT="${D}" install || die 'emake install failed'
+	if use doc; then
+		insinto "/usr/share/doc/${PF}"
+		doins -r "${WORKDIR}/manual-en"
+		use linguas_es && doins -r "${WORKDIR}/manual-es"
+	fi
+	if use python; then
+		insinto /etc
+		doins qtiplot/qtiplotrc.py
+		PYTHONLIB=`python -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
+		insinto "${PYTHONLIB}"
+		doins qtiUtil.py
+	fi
+}