Version bump. Translations are now handled correctly.

Package-Manager: portage-2.1.4.4

5 files changed, 240 insertions, 12 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 995987c60839..0ab1627b6cea 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/qtiplot
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.22 2008/04/30 15:37:36 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.23 2008/05/18 16:26:49 grozin Exp $
+
+*qtiplot-0.9.6 (19 May 2008)
+
+  19 May 2008; Andrey Grozin <grozin@gentoo.org>
+  +files/qtiplot-0.9.6-fitplugins.patch, +files/qtiplot-0.9.6-profile.patch,
+  +qtiplot-0.9.6.ebuild:
+  Version bump. Translations are now handled correctly.
 
 *qtiplot-0.9.5-r1 (30 Apr 2008)
 
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index 7797318022bb..54df08076561 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -1,28 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX qtiplot-0.7.7-qmake.patch 11384 RMD160 fa0491bd504d3445645817871fa831d0b70b4602 SHA1 5cd18e99d39664ef48e0d18069d89cb4b417a175 SHA256 2d89427ab1304b1ec8165d6ceaedf474a48ba59d55dafbb4977b5ddaab8509ca
 AUX qtiplot-0.8.5-qmake.patch 467 RMD160 00b5de4a8ab62eb3d2b3b7cb4a0a69a92d42cb44 SHA1 6fdb19a48c501b3f1256e7105d383f567f17182e SHA256 51230401a221a49371db906d37eca2b2734346ff82684dc572e37294fbd1ed0f
 AUX qtiplot-0.9.2-systemlibs.patch 4666 RMD160 e6fcf31a5d807e167c858c68847768e3e8fce093 SHA1 e27ab1c0bf647d35778440dc3964fdb6892d47d1 SHA256 3310cbc330e03ee8b2bb1337a1414bb8eff645743dc623a58452d0587d696e84
 AUX qtiplot-0.9.4-systemlibs.patch 4586 RMD160 72e9c8a3dcd26d8465f0321724abd5e4e4c6f35b SHA1 219e58530855509ca3a2f1dcf32efd1e34c2ee73 SHA256 ad876acb11df070e331a0f6ce0c44e074d31b6f78785eb09b0800dc77e68362d
 AUX qtiplot-0.9.5-fitplugins.patch 1354 RMD160 8fc112bed04c45ed1151348413dd56ff900b3cfb SHA1 6f3f065b86eed38cb0c2e301ea74de17bf69f828 SHA256 e61bed99864e0ca3ce013da4d9f5b0fd179d3f8ee5d9c79aafd36ec783882f53
 AUX qtiplot-0.9.5-profile.patch 3335 RMD160 a2a0e2cebba0727d35a79fcf38aaa066ce3334e1 SHA1 a8f5d11b8401c99f050be1fbc95bc8572698e8c9 SHA256 41ef02bf24e80b9c458b217b0ffb49671963ebe0dd88ce6219af3cbe89e98bfd
+AUX qtiplot-0.9.6-fitplugins.patch 1568 RMD160 af8b05f8f49dd567fa3619b9efe799f1d74632e6 SHA1 b5c53f8a33de778366e5f1072fe283bb357d2311 SHA256 63df38507723ce3ef8ce897d9db7f0c0e86424790b8f855f529de0a48fdf1a48
+AUX qtiplot-0.9.6-profile.patch 3520 RMD160 04567e97a638e794235b0140137ceddce9ba1662 SHA1 3243e876ac365b771a09b13f05159159bc392f41 SHA256 db4700e098df15077e0702c8b24686dcd3fe531ee251ffafc5ac5e6bad890328
 DIST qtiplot-0.7.7.zip 812738 RMD160 6f62b32059eec57bf931b5bae9f524672d436ee9 SHA1 b201e600ec057ff0f7b4b4572850b0b072a0e0fb SHA256 937849c42cc3047df3975d1cb7a26a2503a499d548066937589340f55bd1ab01
 DIST qtiplot-0.8.5.tar.bz2 530579 RMD160 72f4f60f1171c57e6c2614a1a5a7b6dfc3bda4f5 SHA1 d8142877bfc86fad8a43e64f6f3e0a16126e5f0a SHA256 81831d8dfaddbdf32d85a6e7eaf0e54e2321e2fba6ffaabfe6943bc326a6f874
 DIST qtiplot-0.9.4-manual-en.tar.bz2 5378862 RMD160 4ecda8eb33fa22b8b7d59c68ac4c39968733dbbf SHA1 41e3bd6b5da3a07417d77adda978e7b236a1321e SHA256 f779d83a82982748ee4426e5f9eda25a2e23a10fb5b8c7fc21ef0446ec844ac6
 DIST qtiplot-0.9.4.tar.bz2 7025345 RMD160 db952eb7a27d8d1ed42d60e814228655e76226cd SHA1 afee76a819b1c6054dc1b4eabd731d03001c21d1 SHA256 7b4f9b734e8b258459a2a8d85beeda0c964340891d64822aa944a1fb93c60da1
 DIST qtiplot-0.9.5-manual-en.tar.bz2 5379734 RMD160 cffbb17564a2e42159ecfc2b62ea462c625fd6c7 SHA1 438556dadcd3dd8d1ab11475fd1884e866834dfe SHA256 bc0d8580750c1cd856f036c68e44d19afcba19b57654dde33ea12a6dea244ff0
 DIST qtiplot-0.9.5.tar.bz2 7047424 RMD160 3ba2aabf727b27f6cb3996b23ffa9fab06661cbe SHA1 3cb1f0b8454c6ca85a63da3da70ec25846d6b70d SHA256 29f6f0b81ee02fa64db2f1024d3fafeedcf22ae498eadef04e5092371d1e3be2
+DIST qtiplot-0.9.6-manual-en.tar.bz2 11094755 RMD160 1b75339cb787a47beff0f39e260277b523c0b3e7 SHA1 7156100e1eae6a466f0a573be9c44bec8adc1fc6 SHA256 10867d1cc4af68c29c3da1f0fd8046d953f4851f7e32acdfb2e2d508deee8254
+DIST qtiplot-0.9.6.tar.bz2 6431763 RMD160 7d0a28b9ab3132dc72abf42f6c89283b7d9c82b0 SHA1 ae32fc3cad883c71f7cbf2d3a285a56ed7388796 SHA256 9892f48eaf08f7e9f9932156c755a37a3570f5028e1777263706cd1fb688c7c1
 EBUILD qtiplot-0.7.7.ebuild 1098 RMD160 50d0e366309fcee9a7cf69f71715fd7215966548 SHA1 4d61725b4ec204c099b6f66e70a74f59bf537081 SHA256 f913ffe4fb0f32c572ef81c5df7ba0fdaa4eb70b0e24d9a7c8aa61adca6e10dd
 EBUILD qtiplot-0.8.5.ebuild 1218 RMD160 b1a7916212cb8aabb8a503a14e542d2ae15ca3ab SHA1 fef63fb5398145209f712edb2005e5b0127f548d SHA256 a0ced0f0ee26a36101305794060ada41bf72be6ddc70bd5f961b12a1a229384c
 EBUILD qtiplot-0.9.4.ebuild 2299 RMD160 145d0c97d4a7eb60651fb4c8f013ab875f3f269d SHA1 2caf74868ee051c9ce4b62ca764bcf95e5f75423 SHA256 1626dd2f9febc50ed00f5b6f453404ab5950faf9485fa9624fd45b81923c7012
 EBUILD qtiplot-0.9.5-r1.ebuild 2390 RMD160 cb3aa53e9dc91543fa50f14e778c5031bb8a5219 SHA1 34e54cb9d1a0aab275f075c4443184e0a40a9db6 SHA256 4805ba837a795dd934bea3b295886507daa5f1b9e9966e3b4f3b0d2fd544f540
-MISC ChangeLog 6633 RMD160 ef8898b111ca21096cef56977ef430cc63447a2d SHA1 02b9392675b1f636728d3a908b29a8c578d1a5d4 SHA256 01be26328e22e898e0a234e6fc1139093cc436494d613d12ad32276f8177ff4c
+EBUILD qtiplot-0.9.6.ebuild 2699 RMD160 9a0cb73f44a56f5ea5726e70aa5999f4fe0e2f1d SHA1 130de7f916c04b0bf25f907b4a631bee48d74c85 SHA256 625f996bdc69907e695d6c6df7866da8e507d344cd3661b652bd36b55424d7f6
+MISC ChangeLog 6869 RMD160 3c9c833e4418a05082d47c246a91d94c9b0faa81 SHA1 2e0b56edf341c34ada0dd7031080543dd3e2c616 SHA256 cf4a2efa1997b8a256b2a6d7cbefcc4ccff85746c7eec3594f0112b2b312fed6
 MISC metadata.xml 604 RMD160 1e0ed48d48668781cafc44ef8a14c3fb1e41eb28 SHA1 0f1b65755c3b923539a54b7e05dfda9679c4d758 SHA256 094795782ea49d41a8c4106510bb80d360f1bdaae3ab89c23c369def31bab56c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFIGJJK1ycZbhPLE2ARAqICAJ4jvDAMIFb6tKADQI2W9Hc53WiqZQCeOBwi
-TU1zutcJWjW/FbVxeBT7hDs=
-=TARZ
------END PGP SIGNATURE-----
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.6-fitplugins.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.6-fitplugins.patch
new file mode 100644
index 000000000000..64e54655df61
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.6-fitplugins.patch
@@ -0,0 +1,32 @@
+diff -U2 -r qtiplot-0.9.6.orig/fitPlugins/fitRational0/fitRational0.pro qtiplot-0.9.6/fitPlugins/fitRational0/fitRational0.pro
+--- qtiplot-0.9.6.orig/fitPlugins/fitRational0/fitRational0.pro	2007-10-29 05:44:06.000000000 +0600
++++ qtiplot-0.9.6/fitPlugins/fitRational0/fitRational0.pro	2008-05-15 10:42:10.000000000 +0700
+@@ -13,10 +13,8 @@
+  

+ # statically link against GSL in 3rdparty

+-INCLUDEPATH += ../../3rdparty/gsl/include/

+-LIBS        += ../../3rdparty/gsl/lib/libgsl.a

+-LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a

++INCLUDEPATH += /usr/include/gsl

+ 

+ #dynamically link against GSL installed system-wide

+-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas

++unix:LIBS += $$system(pkg-config --libs gsl)

+ 

+ target.path=/usr/lib$${libsuff}/qtiplot/plugins

+diff -U2 -r qtiplot-0.9.6.orig/fitPlugins/fitRational1/fitRational1.pro qtiplot-0.9.6/fitPlugins/fitRational1/fitRational1.pro
+--- qtiplot-0.9.6.orig/fitPlugins/fitRational1/fitRational1.pro	2007-10-29 05:44:06.000000000 +0600
++++ qtiplot-0.9.6/fitPlugins/fitRational1/fitRational1.pro	2008-05-15 10:43:01.000000000 +0700
+@@ -13,10 +13,8 @@
+  

+ # statically link against GSL in 3rdparty

+-INCLUDEPATH += ../../3rdparty/gsl/include/

+-LIBS        += ../../3rdparty/gsl/lib/libgsl.a

+-LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a

++INCLUDEPATH += /usr/include/gsl

+ 

+ #dynamically link against GSL installed system-wide

+-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas

++unix:LIBS += $$system(pkg-config --libs gsl)

+ 

+ target.path=/usr/lib$${libsuff}/qtiplot/plugins

diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.6-profile.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.6-profile.patch
new file mode 100644
index 000000000000..18b1a1babfe4
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.6-profile.patch
@@ -0,0 +1,89 @@
+diff -r -U2 qtiplot-0.9.6.orig/qtiplot/qtiplot.pro qtiplot-0.9.6/qtiplot/qtiplot.pro
+--- qtiplot-0.9.6.orig/qtiplot/qtiplot.pro	2008-05-13 17:22:46.000000000 +0700
++++ qtiplot-0.9.6/qtiplot/qtiplot.pro	2008-05-19 05:59:59.000000000 +0700
+@@ -18,8 +18,8 @@
+ # the *.path variables defined bellow.

+ ######################################################################################

+-#CONFIG          += CustomInstall

++CONFIG          += CustomInstall

+ 

+-#CONFIG          += release

+-CONFIG          += debug

++CONFIG          += release

++#CONFIG          += debug

+ win32: CONFIG   += console

+ 

+@@ -28,10 +28,9 @@
+ #############################################################################

+ 

+-INCLUDEPATH       += ../3rdparty/muparser/include

+-INCLUDEPATH       += ../3rdparty/qwtplot3d/include

+-INCLUDEPATH       += ../3rdparty/qwt/src

+-INCLUDEPATH       += ../3rdparty/liborigin

+-INCLUDEPATH       += ../3rdparty/gsl/include

+-INCLUDEPATH       += ../3rdparty/zlib123/include

++INCLUDEPATH       += /usr/include/muparser

++INCLUDEPATH       += /usr/include/qwtplot3d

++INCLUDEPATH       += /usr/include/qwt5

++INCLUDEPATH       += /usr/include/liborigin

++INCLUDEPATH       += /usr/include/gsl

+ 

+ ##################### 3rd PARTY LIBRARIES SECTION ###########################

+@@ -42,15 +41,17 @@
+ 

+ # statically link against libraries in 3rdparty

+-unix:LIBS         += ../3rdparty/muparser/lib/libmuparser.a

+-unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a

+-unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a

+-unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a

+-unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a

++#unix:LIBS         += ../3rdparty/muparser/lib/libmuparser.a

++#unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a

++#unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a

++#unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a

++#unix: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

++unix:LIBS         += -lmuparser

++unix:LIBS         += -lqwtplot3d

++unix:LIBS         += -lqwt

++unix:LIBS         += $$system(pkg-config --libs gsl)

++unix:LIBS         += -lorigin

++unix:LIBS         += -lz

+ 

+ ##################### Windows ###############################################

+@@ -127,5 +128,5 @@
+ 

+ #system(lupdate -verbose qtiplot.pro)

+-#system(lrelease -verbose qtiplot.pro)

++system(lrelease -verbose qtiplot.pro)

+ 

+ translations.files += translations/qtiplot_de.qm \

+@@ -141,6 +142,5 @@
+ 				../manual/qtiplot-manual-en.pdf

+ 

+-documentation.files += ../README.html \

+-                       ../gpl_licence.txt

++documentation.files += ../README.html

+ 

+ unix: man.files += ../qtiplot.1

+@@ -240,6 +240,6 @@
+ ###############################################################

+ 

+-	HEADERS += ../3rdparty/liborigin/OPJFile.h

+-	SOURCES += ../3rdparty/liborigin/OPJFile.cpp

++#	HEADERS += ../3rdparty/liborigin/OPJFile.h

++#	SOURCES += ../3rdparty/liborigin/OPJFile.cpp

+ 

+ ###############################################################

+@@ -474,5 +474,5 @@
+   						qti_wordlist.txt \

+ 

+-  	unix: pythonconfig.path = /usr/local/qtiplot

++  	unix: pythonconfig.path = /usr/share/qtiplot

+   	win32: pythonconfig.path = $$INSTALLBASE

+   	DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\ ")\\\"

diff --git a/sci-visualization/qtiplot/qtiplot-0.9.6.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.6.ebuild
new file mode 100644
index 000000000000..36354f0040b9
--- /dev/null
+++ b/sci-visualization/qtiplot/qtiplot-0.9.6.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.6.ebuild,v 1.1 2008/05/18 16:26:49 grozin Exp $
+
+EAPI="1"
+inherit eutils multilib qt4
+
+DESCRIPTION="Qt based clone of the Origin plotting package"
+HOMEPAGE="http://soft.proindependent.com/qtiplot.html"
+SRC_URI="http://soft.proindependent.com/src/${P}.tar.bz2
+	doc? ( mirror://gentoo/${P}-manual-en.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="python doc bindist"
+
+LANGS="de es fr ja ru sv"
+for l in ${LANGS}; do
+	IUSE="${IUSE} linguas_${l}"
+done
+
+CDEPEND=">=x11-libs/qwt-5.1
+	>=x11-libs/qwtplot3d-0.2.7
+	>=dev-cpp/muParser-1.28
+	!bindist? ( sci-libs/gsl )
+	bindist? ( <sci-libs/gsl-1.10 )"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	python? ( >=dev-python/sip-4.5.2 )"
+
+RDEPEND="${CDEPEND}
+	python? ( >=dev-lang/python-2.5
+		dev-python/PyQt4
+		dev-python/pygsl
+		sci-libs/scipy )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-profile.patch
+	epatch "${FILESDIR}"/${P}-fitplugins.patch
+
+	sed -i \
+		-e '/manual/d'\
+		-e '/3rd/d' \
+		qtiplot.pro || die "sed qtiplot.pro failed"
+	sed -i \
+		-e '/manual/d' \
+		-e "s:doc/${PN}:doc/${PF}:" \
+		qtiplot/qtiplot.pro || die " sed for qtiplot/qtiplot.pro failed"
+
+	if ! use python; then
+		sed -i \
+			-e '/^SCRIPTING_LANGS += Python/d' \
+			-e '/sipcmd/d' \
+			qtiplot/qtiplot.pro || die "sed for python option failed"
+	fi
+
+	# the lib$$suff did not work in the fitRational*.pro files
+	sed -i \
+		-e "s|/usr/lib\$\${libsuff}|/usr/$(get_libdir)|g" \
+		fitPlugins/fit*/fitRational*.pro \
+		|| die "sed fitRational* failed"
+
+	for l in ${LANGS}; do
+		if ! use linguas_${l}; then
+			sed -i \
+				-e "s:translations/qtiplot_${l}.ts::" \
+				-e "s:translations/qtiplot_${l}.qm::" \
+				qtiplot/qtiplot.pro || die
+		fi
+	done
+}
+
+src_compile() {
+	eqmake4 || die "eqmake4 failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die 'emake install failed'
+	rm -f "${D}"/usr/share/${PN}/translations/*.ts
+
+	newicon qtiplot_logo.png qtiplot.png
+	make_desktop_entry qtiplot QtiPlot qtiplot
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}/html
+		doins -r "${WORKDIR}"/qtiplot-manual-en/* \
+			|| die "install manual failed"
+		rm -rf "${D}"/usr/share/doc/${PF}/html/*/.svn
+	fi
+}
+
+pkg_postinst() {
+	if use doc; then
+		elog "On the first start, do Help -> Choose Help Folder"
+		elog "and select /usr/share/doc/${PF}/html"
+		elog "Also do View -> Preferences, in the tab File Locations"
+		elog "set Python Configuration Files to /usr/share/${PN}"
+		elog "and Translations to /usr/share/${PN}/translations"
+	fi
+}