Version Bump, #355707

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

3 files changed, 200 insertions, 6 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 1013d18b3aee..214fb783385b 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/qtiplot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.75 2011/02/09 13:20:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.76 2011/03/05 15:20:52 jlec Exp $
+
+*qtiplot-0.9.8.4 (05 Mar 2011)
+
+  05 Mar 2011; Justin Lecher <jlec@gentoo.org> +qtiplot-0.9.8.4.ebuild:
+  Version Bump, #355707
 
   09 Feb 2011; Justin Lecher <jlec@gentoo.org> qtiplot-0.9.8.3.ebuild:
   Change DEPEND on app-text/docbook-sgml-utils to a grep-2.7 compatible version
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index 1bd1bfe56f22..e0f25aafa3f9 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -16,15 +16,17 @@ AUX qtiplot-0.9.8.3-popup.patch 1892 RMD160 b07794d6b46396ea4df9a7084f01c7c0466d
 DIST qtiplot-0.9.7.14.tar.bz2 8119824 RMD160 09bf50211c77159dad674fcab4f9772fe4267947 SHA1 3e31b2c3fea827a573da96fb50118e6d9cc33f4b SHA256 10edfe55651d0e82f87b10b53fe068cee54782d1df2cbf482a7bafcc27eb3d18
 DIST qtiplot-0.9.8.2.tar.bz2 8244887 RMD160 0ee5e9f5eb50c44b2666cf904ef7ff23850c4c0b SHA1 dd8d1003cee8767d4ba9e616e5263da1302c290d SHA256 f544a42a1b103c1fb8cf28f00313fc984fac6ed5d7748a511e726410612e2c02
 DIST qtiplot-0.9.8.3.tar.bz2 8195869 RMD160 864e45bd9e74f3dd7526c84d387ab88438c1ee70 SHA1 e5ffdd25f1f69611f3f39a0b22e8c23959ab51e1 SHA256 9c8b89c4b931db2d51a902cb74c87f14cdef4e0ab33127ae59196429ae3ab4a7
+DIST qtiplot-0.9.8.4.tar.bz2 8562510 RMD160 0fe2617d93db7065ce26df5dd231b91648a68da9 SHA1 a3b67c9ae6ad120742f507472cd14e877eaabad4 SHA256 beb140e5c7a578c6f71894bf0ccc65d4b5e1fe91a22b7002b6fe5707cf77d440
 EBUILD qtiplot-0.9.7.14-r1.ebuild 5266 RMD160 dda37270380e55ce41764387d0193e93b2bbba81 SHA1 60ca72cace34bb6bb6bdbddc93f5dcff48ac2870 SHA256 eb69b81789638963f55715b2d5c54972580c0279dd066324830231334e1c550f
 EBUILD qtiplot-0.9.8.2.ebuild 5375 RMD160 70ab10972c0b90fad943b58b4b4a87c7e8fb3b1f SHA1 881a0300d9c77ad5703571b08c2b88d7c9a570f7 SHA256 16f0c7fd8951e88456417125c55e23fb7c2cd5a9ad24f6ea23297707d1557b5a
 EBUILD qtiplot-0.9.8.3.ebuild 6167 RMD160 f3394e726b85cceed7ac617d523009d132157a66 SHA1 ff47b797ecbd4dfe99160e87abe01da37c988eac SHA256 6d8cb9a6005c99ad5c2011c287331d07dfc66b9d9dd104d4fcf345f1cbcad042
-MISC ChangeLog 18727 RMD160 823a97d5960d74222329d19f54010b19b7f76e13 SHA1 2e39bac84f7735a97f7255d00918d8736278170c SHA256 f94e9c2762f59bb5a0346d5580178f70545d50ce3d87cd53d5602f648bad4926
+EBUILD qtiplot-0.9.8.4.ebuild 5071 RMD160 3bd6dcbcaa496e626cd1c44f9efd3a2e5e61cbea SHA1 ca6aee98d6c87bc7696d3b28c4ebd7e04c77769e SHA256 9147a247e17c385d36a6a46fa7b9586503dc0bc0d180b779057200a0e2a5d8ae
+MISC ChangeLog 18856 RMD160 572927034115ed7614e7e72f34be8ad802364ba2 SHA1 bf82c2a5191a9040e5ab03f222df437d4b42ff29 SHA256 bc9f7be04d8e8df044968a66a8a11d9b05cbc226878b0333e616673e688e0301
 MISC metadata.xml 989 RMD160 cf1449138cf801f3fc3979c4fe40e3302023d447 SHA1 f0641601108c83fe92a01d46289690f96ecc13c5 SHA256 8bf244a880004c274083ba6ececebe326da0eab799dfee41910044c4ede564ab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1SlJMACgkQgAnW8HDreRaOdACg0QVWw6/P9u87EBaMiQqgXmpV
-wJsAoNASyv4bX35fIAoK9vKrsohc4uxH
-=igcO
+iEYEARECAAYFAk1yVN0ACgkQgAnW8HDreRaBfQCgkCuUO291dkLs0uzkfXLBEVSh
+sloAn1O11T8ZuWJKy1VD/u3v9wHDpNU0
+=BEaH
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.4.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.4.ebuild
new file mode 100644
index 000000000000..ecade6fa2441
--- /dev/null
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.4.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.4.ebuild,v 1.1 2011/03/05 15:20:52 jlec Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2"
+
+inherit eutils qt4-r2 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 ~amd64-linux ~x86-linux"
+IUSE="bindist doc latex png python"
+
+LANGS="cn cz de es fr ja ro ru 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.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 )
+	x11-libs/qt-svg:4
+	>=x11-libs/gl2ps-1.3.5[png?]
+	>=dev-cpp/muParser-1.32
+	>=dev-libs/boost-1.35.0
+	sci-libs/gsl
+	sci-libs/tamu_anova
+	latex? ( dev-tex/qtexengine )
+	png? ( media-libs/libpng )"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	python? ( >=dev-python/sip-4.9 )
+	doc? (
+			>=app-text/docbook-sgml-utils-0.6.14-r1
+		   >=app-text/docbook-xml-dtd-4.4-r2:4.4 )"
+
+RDEPEND="${CDEPEND}
+	python? ( dev-python/PyQt4[X] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.7.12-system-gl2ps.patch"
+	"${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch"
+	)
+
+pkg_setup() {
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost} || die
+	sed \
+		-e "s:dll:static:g" \
+		-e "/INSTALLS/d" \
+		-i 3rdparty/qwtplot3d/*.pro
+
+	# 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)
+	QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src
+	QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
+	QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include
+	QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
+	SYS_LIBS = -lgl2ps
+
+	PYTHON = python
+	LUPDATE = lupdate
+	LRELEASE = lrelease
+
+	SCRIPTING_LANGS += muParser
+
+	CONFIG          += release
+	CONFIG          += CustomInstall
+	DEFINES         += SCRIPTING_CONSOLE
+
+	EOF
+
+	use bindist && echo "DEFINES         += QTIPLOT_SUPPORT" >> build.conf
+	use bindist || echo "DEFINES         += QTIPLOT_PRO" >> build.conf
+	use python && echo "SCRIPTING_LANGS += Python" >> build.conf
+	use latex && echo "TEX_ENGINE_LIBS = -lQTeXEngine" >> build.conf
+	use png && echo "LIBPNG_LIBS = -lpng" >> build.conf
+	echo "TAMUANOVA_LIBS = -ltamuanova" >> build.conf && \
+	echo "TAMUANOVA_INCLUDEPATH = \"${EPREFIX}/usr/include/tamu_anova\"" >> build.conf
+
+	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
+
+	sed -e "s:QTIPLOT_PRO:QTIPLOT_PROFESSIONAL:g" -i qtiplot/src/core/main.cpp || 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() {
+	qt4-r2_src_install
+	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() {
+	if use python; then
+		elog "You might want to emerge"
+		elog "\t dev-python/pygsl"
+		elog "\t dev-python/rpy"
+		elog "\t sci-libs/scipy and"
+		elog "\t dev-python/sympy"
+		elog "to gain full python support."
+	fi
+
+	fdo-mime_desktop_database_update
+	python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	python_mod_cleanup ${PN}
+}