Get view->console back, bug #300689, thank urcindalo for report. Set constant path for manual. Move into separated dir and optimize python modules.

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

3 files changed, 194 insertions, 2 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index be1bdb70481d..dd42f4a700c1 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/qtiplot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.52 2010/01/12 18:07:37 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.53 2010/01/12 19:59:17 pva Exp $
+
+*qtiplot-0.9.7.11-r4 (12 Jan 2010)
+
+  12 Jan 2010; Peter Volkov <pva@gentoo.org> +qtiplot-0.9.7.11-r4.ebuild:
+  Get view->console back, bug #300689, thank urcindalo for report. Set
+  constant path for manual. Move into separated dir and optimize python
+  modules.
 
 *qtiplot-0.9.7.11-r3 (12 Jan 2010)
 
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index 18cd42540262..a4f042940c97 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -15,5 +15,6 @@ DIST qtiplot-0.9.7.11.tar.bz2 8015168 RMD160 d04669eed2c444ca390711281ecea1e0ad2
 EBUILD qtiplot-0.9.7.10.ebuild 3305 RMD160 98cbadff023c23cd5f68dfc73a0f28a4024bd8e3 SHA1 85b8ac3758bcfb48e57f128c6586254648f474ae SHA256 c9228bfda1e2e75f4fff30fc0c9e6a04e38578a01980cd77697768b2c4c64ff4
 EBUILD qtiplot-0.9.7.11-r2.ebuild 4810 RMD160 158ba1f09025e60913635d7dad8b161f39239ec9 SHA1 1af4f61e28113d6889c18df14e61f5c68f07b66a SHA256 c2537011214b6ce7f42bf38679e08f33afb779da36b40d7a0539365ddfe22654
 EBUILD qtiplot-0.9.7.11-r3.ebuild 4777 RMD160 f60681ccbad46c0b330004cfa7182ca571bafbe0 SHA1 1e1f837f28e7a85c4868d60bde8642b325627b90 SHA256 63de8932257c499c2292e57f0d40cb2db76dc7c7289ecde09939a38e8e4e7fbb
-MISC ChangeLog 14449 RMD160 2915f2166edf999aee2f3d054c2c8eccff1bff01 SHA1 acfc97e8a95e48969350d4aeda1d08b7ff950fc7 SHA256 ffd12484315ad3444e39e4f89710d3ab06ee177ae89657874675e7afa0ec9c97
+EBUILD qtiplot-0.9.7.11-r4.ebuild 4912 RMD160 355e81db4221409071de03533a4a3201e5f51722 SHA1 a59061677cbc59686bebd01a38e518725536f87f SHA256 18401f2ca62fde5e9e2ab4ab2bf6f6ae76ed54ce6070c03669c406e126d8e806
+MISC ChangeLog 14714 RMD160 4509c438738c61c79a3b46288402d56bbce5921e SHA1 98e5025fcb16063035dcb10bf9a2c33c1a01d4e8 SHA256 9e818429f5e1bff0563dee67980691b82711c1dadff6e2f8d1df806b8b252f53
 MISC metadata.xml 857 RMD160 f0b19f02132816e5a98dade3c25c17b578ef5f33 SHA1 1a7a0769a7989384e15a2d098441966630652866 SHA256 d001c7b867a7bbc14047fc029821afe1dde7a65e2e8d146c3f467c57da26d24a
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.7.11-r4.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.11-r4.ebuild
new file mode 100644
index 000000000000..2f0dc459a3dd
--- /dev/null
+++ b/sci-visualization/qtiplot/qtiplot-0.9.7.11-r4.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.11-r4.ebuild,v 1.1 2010/01/12 19:59:17 pva Exp $
+
+EAPI=2
+inherit eutils qt4 fdo-mime python
+
+DESCRIPTION="Qt based clone of the Origin plotting package"
+HOMEPAGE="http://soft.proindependent.com/qtiplot.html"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc python ods xls"
+
+LANGS="cn cz de es fr ro ru ja sv"
+for l in ${LANGS}; do
+	lu=${l/cz/cs}
+	lu=${lu/cn/zh_CN}
+	IUSE="${IUSE} linguas_${lu}"
+done
+
+# qwtplot3d much modified from original upstream
+# >=x11-libs/qwt-5.3 they are using trunk checkouts
+CDEPEND="
+	x11-libs/qt-opengl:4
+	x11-libs/qt-qt3support:4
+	x11-libs/qt-assistant:4
+	x11-libs/qt-svg:4
+	>=x11-libs/gl2ps-1.3.5
+	>=dev-cpp/muParser-1.30
+	>=dev-libs/boost-1.35.0
+	>=sci-libs/liborigin-20090406:2
+	sci-libs/gsl
+	dev-libs/boost
+	dev-tex/qtexengine
+	xls? ( dev-libs/libxls )
+	ods? ( dev-libs/quazip )"
+# Still unable to build
+#	emf? ( media-libs/libemf
+#		media-libs/emfengine )
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	python? ( >=dev-python/sip-4.9 )
+	doc? ( app-text/docbook-sgml-utils
+		   >=app-text/docbook-xml-dtd-4.4-r2:4.4 )"
+
+RDEPEND="${CDEPEND}
+	python? ( >=dev-lang/python-2.5
+		dev-python/PyQt4[X]
+		dev-python/pygsl
+		dev-python/rpy
+		sci-libs/scipy )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-system-QTeXEngine.patch"
+	"${FILESDIR}/${P}-system-liborigin.patch"
+	"${FILESDIR}/${P}-system-gl2ps.patch"
+	"${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch"
+	"${FILESDIR}/${P}-transparency.patch"
+	)
+
+src_prepare() {
+	qt4_src_prepare
+
+	rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/}
+
+	# Check build.conf for changes on bump.
+	cat >build.conf <<-EOF
+	# Automatically generated by Gentoo ebuild
+	isEmpty( QTI_ROOT ) {
+	  message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
+	}
+
+	MUPARSER_LIBS = \$\$system(pkg-config --libs muparser)
+	GSL_LIBS = \$\$system(pkg-config --libs gsl)
+	BOOST_INCLUDEPATH = /usr/include/boost
+	BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt
+	QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src
+	QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
+	LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
+	LIB_ORIGIN_LIBS = -lorigin2
+	SYS_LIBS = -lQTeXEngine -lgl2ps
+
+	PYTHON = python
+	LUPDATE = lupdate
+	LRELEASE = lrelease
+
+	SCRIPTING_LANGS += muParser
+
+	CONFIG          += release
+	CONFIG          += CustomInstall
+	DEFINES         += SCRIPTING_CONSOLE
+
+	EOF
+
+	use python && echo "SCRIPTING_LANGS += Python" >> build.conf
+	use xls && echo "XLS_LIBS = -lxlsreader" >> build.conf
+	if use ods; then
+		echo "QUAZIP_INCLUDEPATH = /usr/include/quazip" >> build.conf
+		echo "QUAZIP_LIBS = -lquazip" >> build.conf
+	fi
+
+	# Fails to build...
+	#if use emf; then
+	#	echo "EMF_ENGINE_INCLUDEPATH = /usr/include/libEMF" >> build.conf
+	#	echo "EMF_ENGINE_LIBS = -lEMF" >> build.conf
+	#fi
+
+	python_version
+
+	sed -e "s:doc/${PN}/manual:doc/${PN}/html:" \
+		-e "s:/usr/local/${PN}:$(python_get_sitedir)/qtiplot:" \
+			-i qtiplot/qtiplot.pro || die
+
+	sed -e '/INSTALLS.*documentation/d' \
+		-e '/INSTALLS.*manual/d' \
+			-i qtiplot/qtiplot.pro || die
+	sed -e '/manual/d' -i qtiplot.pro || die
+
+	# Drop langs only if LINGUAS is not empty
+	if [[ -n ${LINGUAS} ]]; then
+		for l in ${LANGS}; do
+			lu=${l/cz/cs}
+			lu=${lu/cn/zh_CN}
+			use linguas_${lu} || \
+				sed -e "s:translations/qtiplot_${l}.[tq][sm]::" \
+						-i qtiplot/qtiplot.pro || die
+		done
+	fi
+	chmod -x qtiplot/qti_wordlist.txt
+
+	# sed out debian paths
+	sed -e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \
+		-i manual/qtiplot.dsl || die
+	sed -e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \
+		-i manual/qtiplot_html.xsl || die
+}
+
+src_configure() {
+	use amd64 && export QMAKESPEC="linux-g++-64"
+	eqmake4
+}
+
+src_compile() {
+	emake || die "emake failed"
+	lrelease qtiplot/qtiplot.pro || die
+	if use doc; then
+		cd manual
+		emake web || die "html docbook building failed"
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die 'emake install failed'
+	newicon qtiplot_logo.png qtiplot.png
+	make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot
+	if use doc; then
+		insinto /usr/share/doc/${PN}/html
+		doins -r manual/html/* || die "install manual failed"
+	fi
+
+	if [[ -n ${LINGUAS} ]]; then
+		insinto /usr/share/${PN}/translations
+		for l in ${LANGS}; do
+			lu=${l/cz/cs}
+			lu=${lu/cn/zh_CN}
+			use linguas_${lu} && \
+				doins qtiplot/translations/qtiplot_${l}.qm
+		done
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	python_mod_optimize "$(python_get_sitedir)/qtiplot"
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	python_mod_cleanup "$(python_get_sitedir)/qtiplot"
+}