Version Bump, including zlib compatibility, #385715

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

4 files changed, 298 insertions, 7 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 430deff39849..c9d0e9597d26 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,12 @@
 # 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.82 2011/07/20 16:07:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.83 2011/10/05 19:28:14 jlec Exp $
+
+*qtiplot-0.9.8.8 (05 Oct 2011)
+
+  05 Oct 2011; Justin Lecher <jlec@gentoo.org> +qtiplot-0.9.8.8.ebuild,
+  +files/qtiplot-0.9.8.8-system-gl2ps.patch:
+  Version Bump, including zlib compatibility, #385715
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #70723
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index 492485d903f5..31218b4abf60 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX qtiplot-0.9.7.10-dont-install-qwt.patch 605 RMD160 e68908d5ca887e64fe99bed21ea7d1d746f5409d SHA1 23089d7955cc15f6e56e3401266421cae24975c3 SHA256 161657d37de71ea58fc0e0af3495dc45082f5c398bd82c70e40968b23d0b898b
 AUX qtiplot-0.9.7.12-system-QTeXEngine.patch 2390 RMD160 4e96caac6fe930b27dfd503354417078bfedfe34 SHA1 25f548a4c6e76a39dc72b44c4e975f13897f1d8f SHA256 9bb277a4bee32037067561ac19a1eb4bd8cf4f7b53edcea896c9f0c036dcccff
@@ -18,6 +18,7 @@ AUX qtiplot-0.9.8.6-gold.patch 535 RMD160 9153e4a2f83b2f55585ef2aec44f151eb424f7
 AUX qtiplot-0.9.8.6-kde.patch 425 RMD160 428d0b2304b02e4e70264c4100be604bca0af1db SHA1 a1d4bec744c9b8fe29bf177851e66c97cdd9d975 SHA256 4e67a67c9467290930d21460cc326ac7b5d89322b7b020d32b46a04a77d14f84
 AUX qtiplot-0.9.8.6-tamuanova.patch 894 RMD160 f71ef91129284035e378e55a60e61448ba914e04 SHA1 830b518e3ef63625df84363a8047417124f243b0 SHA256 8c4deccaf3fa09133ac6ae35327a73637dccff0a4edfaa427894a9c6592e7f4c
 AUX qtiplot-0.9.8.7-kde.patch 454 RMD160 dd38d3a9e4c1034fff061f7bc4e6ef95aa07ee10 SHA1 cc2734760b55a53c1cc7de89dd8de57ee7611565 SHA256 5cfe122907403ed1f766118934aa42eac05db41efabd0c6618df17af16e3aff1
+AUX qtiplot-0.9.8.8-system-gl2ps.patch 2436 RMD160 4ef13f2ff717759a882e91169bc81a167dc08b9e SHA1 cdbb846d85372720021b52c71f86e5230f913e32 SHA256 0787155b465aa6cdf4b2c12a87dd68e6b5aa2197b041b06a550023c1ca96c81c
 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
@@ -25,6 +26,7 @@ DIST qtiplot-0.9.8.4.tar.bz2 8562510 RMD160 0fe2617d93db7065ce26df5dd231b91648a6
 DIST qtiplot-0.9.8.5.tar.bz2 10399116 RMD160 56647644c8433fbe97b3d7f36a75919da5a4d1af SHA1 0305097eb096adf332d319b0619c14fc42f01cf4 SHA256 5bc297e236551a0e8a23719f3f08438700215eb82cf320bbc1d4c037e6d9cf33
 DIST qtiplot-0.9.8.6.tar.bz2 10415560 RMD160 830c4bb911a0680771a078dfe1796b4cd6889397 SHA1 e8a5ea1e1fb0e87cf76985f63b25e263b03f5fa9 SHA256 3fef0e8796e6045aad5404b156bf1e125e9732a034cb3e61c58dcebd5079985f
 DIST qtiplot-0.9.8.7.tar.bz2 10439239 RMD160 8f56f2b92bc46a99ecddb68a521ffd72867ab079 SHA1 f143b6e1f240cf3ed6b6145e161c2839c093420f SHA256 2dd29616016fbb302ce8fb20080d86fc15fdeb69572a1c92bb46f21cd5ba0e39
+DIST qtiplot-0.9.8.8.tar.bz2 10437325 RMD160 400b958581bf75bdcea5cfb829ebebf842de345c SHA1 02801cdf31b543c0f5d7ef1b1f358f0738d93d48 SHA256 cc4c96aff68dd6124374f228eb3866c2f6d0cd478cfb9242b43fca012ecbb0c3
 EBUILD qtiplot-0.9.7.14-r1.ebuild 5266 RMD160 dda37270380e55ce41764387d0193e93b2bbba81 SHA1 60ca72cace34bb6bb6bdbddc93f5dcff48ac2870 SHA256 eb69b81789638963f55715b2d5c54972580c0279dd066324830231334e1c550f
 EBUILD qtiplot-0.9.8.2.ebuild 5372 RMD160 c84ba2b9271f9b7861e0e2cd989fc6b99d56619e SHA1 99695c1c7a3560ae478ca68b390aa031b8b20d41 SHA256 8c2fc96bb2c71629c8ac3aeef88aa66411cd8c840088226a52b24ebc4e3b02a6
 EBUILD qtiplot-0.9.8.3.ebuild 6165 RMD160 999a63c8fd7c9be0d9b9e4586aca384b4810e844 SHA1 b31bb2a2175edbafc1dbf674be12677bd9d7a17b SHA256 bcc4497c614a408ead5b436d82c92b74a434266a3585c8290a8d2a875ee0f80c
@@ -32,12 +34,13 @@ EBUILD qtiplot-0.9.8.4.ebuild 5067 RMD160 1e3cb340afa648876c1762ff68a61db6216d4a
 EBUILD qtiplot-0.9.8.5.ebuild 5303 RMD160 2aa01c15e68d811ec17e3b81340ab6035d796398 SHA1 6c9a1d7ae48a10d87561d61595d88fd8945d94f9 SHA256 a6011883c9b4311848abe88e3d8f5b2b64877ec50884c523d91f49c040f9e7ed
 EBUILD qtiplot-0.9.8.6.ebuild 5560 RMD160 a93db0d1efba1edf9a9ddb27aead4029b1be037f SHA1 871a53d5c4b4ab91b0b3d57848ab93a33518cfba SHA256 59b72bfd5c5fceed48a1aeb49fa58a8872eaf316a446063217a38cbb36061b28
 EBUILD qtiplot-0.9.8.7.ebuild 5533 RMD160 34d8b96f9f72ab1a2c746559fe67cdce8a8e1734 SHA1 11a9f049246b58cc01a4a3c157e8abf943b77101 SHA256 dbd460f05c07cdfc8b9fb8a0ec0845c97a646b5876c898d2070cfdc1dbbe3245
-MISC ChangeLog 19979 RMD160 cef6f2916a7b790305bd58b32c4eef0b6084c648 SHA1 3e3b1e8c6c9c1a86e82f681c347d30a7bcce7703 SHA256 03295c0053f8d56dd2fdb9dacae990d1d80ce4f2aa80e9dc90cca98b2bd9acec
+EBUILD qtiplot-0.9.8.8.ebuild 5552 RMD160 f8c7deee739fe58af76f04ee5503a738c6538537 SHA1 b75bb6d538d860fd4e0d6808630b523c1bac1e94 SHA256 7123b549999a3bb92cd19ec1f4566bf3d11407f45ceeae6a588436751fd5db63
+MISC ChangeLog 20182 RMD160 e1cf14e238fadd3a449125e5e346b223ee3cab7b SHA1 2dfa6a376a700da78a6c6a9a265c1a80dc8695cd SHA256 8562cc64d4029258db2fabe6c45c257162433a824422b468ef107948ffa3fa32
 MISC metadata.xml 919 RMD160 d5a42a5872798c2f2f3a0c8ca241a15444a6f8b9 SHA1 1117f722c109e074538193ded0c6a5c5c8334dc7 SHA256 379fdffaca2a9a4769a8bfd3d6c38efca329faf1382b9e9013a2b1f4262a42ec
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4m/ToACgkQCaWpQKGI+9ROrACeIGagAPxi7dJINJqlFs4KGRB5
-Q5YAnA0iSCrGiAg9Th2fZ0MVIC0ckpjX
-=zQbQ
+iEYEAREKAAYFAk6Mr+EACgkQgAnW8HDreRbxEQCgxaWW4JQF8/wQIHbgsHGpJimC
+N98AoLtft7ngMAfpCrdV2bGdqA2HDdOn
+=n0nW
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch
new file mode 100644
index 000000000000..d7b40c414b1d
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch
@@ -0,0 +1,76 @@
+ 3rdparty/qwtplot3d/qwtplot3d.pri          |    8 ++++----
+ 3rdparty/qwtplot3d/qwtplot3d.pro          |    3 ---
+ 3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp |    2 +-
+ 3rdparty/qwtplot3d/src/qwt3d_label.cpp    |    2 +-
+ 4 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/3rdparty/qwtplot3d/qwtplot3d.pri b/3rdparty/qwtplot3d/qwtplot3d.pri
+index 45a0c3e..16bbe53 100755
+--- a/3rdparty/qwtplot3d/qwtplot3d.pri
++++ b/3rdparty/qwtplot3d/qwtplot3d.pri
+@@ -8,6 +8,8 @@ DEPENDPATH += src \
+     3rdparty\gl2ps
+ INCLUDEPATH += .
+ 
++LIBS+=-lgl2ps
++
+ # Input
+ HEADERS += include/qwt3d_extglwidget.h \
+     include/qwt3d_color.h \
+@@ -37,8 +39,7 @@ HEADERS += include/qwt3d_extglwidget.h \
+     include/qwt3d_volumeplot.h \
+     include/qwt3d_graphplot.h \
+     include/qwt3d_multiplot.h \
+-    include/qwt3d_io_gl2ps.h \
+-    3rdparty/gl2ps/gl2ps.h
++    include/qwt3d_io_gl2ps.h
+ SOURCES += src/qwt3d_extglwidget.cpp \
+     src/qwt3d_axis.cpp \
+     src/qwt3d_color.cpp \
+@@ -62,5 +63,4 @@ SOURCES += src/qwt3d_extglwidget.cpp \
+     src/qwt3d_function.cpp \
+     src/qwt3d_gridplot.cpp \
+     src/qwt3d_meshplot.cpp \
+-    src/qwt3d_io_gl2ps.cpp \
+-    3rdparty/gl2ps/gl2ps.c
++    src/qwt3d_io_gl2ps.cpp
+diff --git a/3rdparty/qwtplot3d/qwtplot3d.pro b/3rdparty/qwtplot3d/qwtplot3d.pro
+index 95c8e26..18d03e3 100755
+--- a/3rdparty/qwtplot3d/qwtplot3d.pro
++++ b/3rdparty/qwtplot3d/qwtplot3d.pro
+@@ -31,9 +31,6 @@ RCC_DIR      = $$DESTDIR/tmp
+ MOC_DIR      = $$DESTDIR/tmp

+ 

+ DEFINES     += GL2PS_HAVE_LIBPNG

+-INCLUDEPATH += ../zlib/

+-INCLUDEPATH += ../libpng/

+-LIBS        += ../libpng/libpng.a

+ 

+ # install

+ target.path = lib

+diff --git a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
+index bc7a9d8..589cfd2 100755
+--- a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
++++ b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
+@@ -6,7 +6,7 @@
+ #include <locale.h>
+ 
+ #include "qwt3d_openglhelper.h"
+-#include "../3rdparty/gl2ps/gl2ps.h"
++#include "gl2ps.h"
+ #include "qwt3d_io_gl2ps.h"
+ #include "qwt3d_plot.h"
+ 
+diff --git a/3rdparty/qwtplot3d/src/qwt3d_label.cpp b/3rdparty/qwtplot3d/src/qwt3d_label.cpp
+index 7e54ad9..cc8bd60 100755
+--- a/3rdparty/qwtplot3d/src/qwt3d_label.cpp
++++ b/3rdparty/qwtplot3d/src/qwt3d_label.cpp
+@@ -1,7 +1,7 @@
+ #include <qbitmap.h>
+ #include "qwt3d_label.h"
+ #include "qwt3d_plot.h"
+-#include "../3rdparty/gl2ps/gl2ps.h"
++#include "gl2ps.h"
+ 
+ using namespace Qwt3D;
+ 
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.8.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.8.ebuild
new file mode 100644
index 000000000000..53e011add0ec
--- /dev/null
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.8.ebuild
@@ -0,0 +1,206 @@
+# 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.8.ebuild,v 1.1 2011/10/05 19:28:14 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 mono latex 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-assistant
+	x11-libs/qt-gui
+	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
+	dev-libs/quazip
+	media-libs/libpng
+	sci-libs/gsl
+	sci-libs/tamu_anova
+	latex? ( dev-tex/qtexengine )
+	mono? ( dev-dotnet/libgdiplus )"
+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}/${P}-system-gl2ps.patch"
+	"${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch"
+	"${FILESDIR}/${PN}-0.9.8.6-gold.patch"
+	"${FILESDIR}/${PN}-0.9.8.7-kde.patch"
+	)
+
+pkg_setup() {
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	local mylibs
+
+	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
+
+	mylibs="${mylibs} -lquazip"
+	use mono && mylibs="${mylibs} $(pkg-config --libs libgdiplus)"
+
+	# 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 ${mylibs}
+
+	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
+	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}:${EPREFIX}$(python_get_sitedir)/qtiplot:" \
+		-e '/INSTALLS.*documentation/d' \
+		-e '/INSTALLS.*manual/d' \
+		-e "/INSTALLBASE/s: /usr: ${EPREFIX}/usr:g" \
+		-e 's:/usr/local/qtiplot:$$INSTALLBASE:g' \
+		-i qtiplot/qtiplot.pro || die
+
+	sed \
+		-e "/^target.path/s:/usr:${EPREFIX}/usr:g" \
+		-i fitPlugins/*/*.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
+
+	sed \
+		-e '1i#define OF(x) x' \
+		-i 3rdparty/zlib/minigzip.c || 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}
+}