Version Bump, prefix ready

Package-Manager: portage-2.2_rc97/cvs/Linux x86_64

4 files changed, 215 insertions, 9 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 0ac6ca0c653e..163e456b5f0b 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,12 @@
 # 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.69 2010/10/10 16:55:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.70 2010/10/16 10:23:41 jlec Exp $
+
+*qtiplot-0.9.8.3 (16 Oct 2010)
+
+  16 Oct 2010; Justin Lecher <jlec@gentoo.org> qtiplot-0.9.8.2.ebuild,
+  +qtiplot-0.9.8.3.ebuild:
+  Version Bump, prefix ready
 
   10 Oct 2010; Justin Lecher <jlec@gentoo.org> -qtiplot-0.9.7.12.ebuild,
   qtiplot-0.9.7.14-r1.ebuild, -qtiplot-0.9.8.ebuild, qtiplot-0.9.8.2.ebuild:
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index 38fc3e9f82c2..1344519862a4 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -11,14 +11,16 @@ AUX qtiplot-0.9.8.2-origin-build-failure.patch 2472 RMD160 a66c6f704ce7227939bb2
 AUX qtiplot-0.9.8.2-syslibs.patch 572 RMD160 98cd19606d7badb89b70d5024c06e2b9a6a81345 SHA1 3a01e6169da7429a67054e1980d4a1b48b1a840d SHA256 5d478fac2785f2b79273fff83dbd5030aa2a376cb277782adeefeb40bb5d536d
 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
 EBUILD qtiplot-0.9.7.14-r1.ebuild 5266 RMD160 dda37270380e55ce41764387d0193e93b2bbba81 SHA1 60ca72cace34bb6bb6bdbddc93f5dcff48ac2870 SHA256 eb69b81789638963f55715b2d5c54972580c0279dd066324830231334e1c550f
-EBUILD qtiplot-0.9.8.2.ebuild 5397 RMD160 654fbeb7e6037f2012a8a54223a82c812049862d SHA1 06e915ed50379d1c4e69ef06d845b99a20c9f8d0 SHA256 e3a3fa9665089ae626f72c0bf438e65f65d8cf1a0f8b9123c0d445b589b0896e
-MISC ChangeLog 17980 RMD160 0d7b412c9024d57b39cd98e8615d068d4ecf12ee SHA1 af9a1c0bea3819f1c11db7e1b24706719861967e SHA256 5084057cae7a1192a0478048745605e120b815cc3170cbed3d65000f3d85a0ad
+EBUILD qtiplot-0.9.8.2.ebuild 5373 RMD160 cdb6f2364733cf7e0a1c1dc4801acfb0a33bab65 SHA1 acebe72c591291b8faf76deaca87fdc10517eec3 SHA256 e11b2a2c8853f352368ad4e4a3877259e8a8d677c36669a741e59cf4a235bd50
+EBUILD qtiplot-0.9.8.3.ebuild 5398 RMD160 a02d1e0e39d3360142776ce048a08be0c04461b2 SHA1 74310ce5b3ccbe5fd1183e605d39d3dfa5c0a604 SHA256 c26bcea49793b04072fa6d8ff4230010b47351f39331b16f7c968f4002a41298
+MISC ChangeLog 18140 RMD160 54e90e50134b3032774ee00af593fe8c70bcbfc0 SHA1 b863e6220c7890e38c24e7ac6d49ce026bca13da SHA256 70d46c69840a136272b929bb6a54aaad3ccc7080fb4d08c16cc063acec1564bf
 MISC metadata.xml 857 RMD160 f0b19f02132816e5a98dade3c25c17b578ef5f33 SHA1 1a7a0769a7989384e15a2d098441966630652866 SHA256 d001c7b867a7bbc14047fc029821afe1dde7a65e2e8d146c3f467c57da26d24a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyx8A8ACgkQgAnW8HDreRbbRQCeIzmNc8QflmGR/Nn73kW9Xkar
-zbMAnAxMe7uISqBURMHhWudSatdQ39aj
-=JVW+
+iEYEARECAAYFAky5fTAACgkQgAnW8HDreRZ1BQCdHSsrXrtsRocTRM9q1UFE/vLD
+oPsAnAiTvxs6BKz8LR/hinREIK4C//QJ
+=MI81
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild
index 191f87369507..c7324c149e27 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild
@@ -1,6 +1,6 @@
 # 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.8.2.ebuild,v 1.4 2010/10/10 16:55:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild,v 1.5 2010/10/16 10:23:41 jlec Exp $
 
 EAPI=3
 
@@ -14,10 +14,10 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc python ods"
 
-LANGS="cn cz de es fr ro ru ja sv"
+LANGS="cn cz de es fr ja ro ru sv"
 for l in ${LANGS}; do
 	lu=${l/cz/cs}
 	lu=${lu/cn/zh_CN}
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.3.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.3.ebuild
new file mode 100644
index 000000000000..82904190b1b5
--- /dev/null
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.3.ebuild
@@ -0,0 +1,198 @@
+# 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.8.3.ebuild,v 1.1 2010/10/16 10:23:41 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="doc python ods"
+
+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
+	>=dev-cpp/muParser-1.32
+	>=dev-libs/boost-1.35.0
+	>=sci-libs/liborigin-20100903:2
+	sci-libs/gsl
+	dev-libs/boost
+	dev-tex/qtexengine
+	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-python/PyQt4[X] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.7.12-system-QTeXEngine.patch"
+	"${FILESDIR}/${PN}-0.9.7.14-system-liborigin.patch"
+	"${FILESDIR}/${PN}-0.9.7.12-system-gl2ps.patch"
+	"${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch"
+	"${FILESDIR}/${PN}-0.9.8.2-syslibs.patch"
+	"${FILESDIR}/${PN}-0.9.8.2-origin-build-failure.patch"
+	)
+
+pkg_setup() {
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	qt4-r2_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 = "${EPREFIX}/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
+	QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include
+	QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
+	LIB_ORIGIN_INCLUDEPATH = "${EPREFIX}/usr/include/liborigin2"
+	LIB_ORIGIN_LIBS = -lorigin2
+	QTEXENGINE_LIBS = -lQTeXEngine
+	SYS_LIBS = -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
+	if use ods; then
+		echo "QUAZIP_INCLUDEPATH = ${EPREFIX}/usr/include/quazip" >> build.conf
+		echo "QUAZIP_LIBS = -lquazip" >> build.conf
+	fi
+
+	sed '/^INSTALLS/d;' -i 3rdparty/qwtplot3d/qwtplot3d.pro || die
+
+	# Fails to build...
+	#if use emf; then
+	#	echo "EMF_ENGINE_INCLUDEPATH = /usr/include/libEMF" >> build.conf
+	#	echo "EMF_ENGINE_LIBS = -lEMF" >> build.conf
+	#fi
+
+	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="${ED}" 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() {
+	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}
+}