Now uses splitted qwtplot3d from qt3. Older revisions using older qwtplot3d. Also amd64 has cdf now. Closing bug #199407.

(Portage version: 2.1.4_rc3)

5 files changed, 111 insertions, 5 deletions

diff --git a/sci-visualization/labplot/ChangeLog b/sci-visualization/labplot/ChangeLog
index e7a80b687442..bb3c0ef3595a 100644
--- a/sci-visualization/labplot/ChangeLog
+++ b/sci-visualization/labplot/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-visualization/labplot
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/labplot/ChangeLog,v 1.14 2007/05/06 14:35:58 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/labplot/ChangeLog,v 1.15 2007/11/28 23:34:56 bicatali Exp $
+
+*labplot-1.5.1.6-r1 (28 Nov 2007)
+
+  28 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  labplot-1.5.1.5.ebuild, labplot-1.5.1.6.ebuild,
+  +labplot-1.5.1.6-r1.ebuild:
+  Now uses splitted qwtplot3d from qt3. Older revisions using older qwtplot3d.
+  Also amd64 has cdf now. Closing bug #199407.
 
 *labplot-1.5.1.6 (06 May 2007)
 
diff --git a/sci-visualization/labplot/files/digest-labplot-1.5.1.6-r1 b/sci-visualization/labplot/files/digest-labplot-1.5.1.6-r1
new file mode 100644
index 000000000000..5a354f093350
--- /dev/null
+++ b/sci-visualization/labplot/files/digest-labplot-1.5.1.6-r1
@@ -0,0 +1,6 @@
+MD5 9247a4871b00e1a5a435ed48150761a8 LabPlot-1.5.1.tar.gz 10733976
+RMD160 404fe6f2c39685ed6b336c71dff3d549b3f4faa4 LabPlot-1.5.1.tar.gz 10733976
+SHA256 25f17e55e3483db33601c10ec292a77de627e7eca2effbd3a77942538a6cbfde LabPlot-1.5.1.tar.gz 10733976
+MD5 0eac9b2923274f95105fe52f3b63024f LabPlot-1.5.1_1.5.1.6.diff.gz 236338
+RMD160 1439f4cb2d19c77e98b721c893e371b75389100e LabPlot-1.5.1_1.5.1.6.diff.gz 236338
+SHA256 82a3868145b15ce501c62bd647ccad9871b712a6cb00b7397214d1e22ae0ea4f LabPlot-1.5.1_1.5.1.6.diff.gz 236338
diff --git a/sci-visualization/labplot/labplot-1.5.1.5.ebuild b/sci-visualization/labplot/labplot-1.5.1.5.ebuild
index 0f3ee906f879..fcd0684d52a4 100644
--- a/sci-visualization/labplot/labplot-1.5.1.5.ebuild
+++ b/sci-visualization/labplot/labplot-1.5.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/labplot/labplot-1.5.1.5.ebuild,v 1.4 2007/07/15 02:36:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/labplot/labplot-1.5.1.5.ebuild,v 1.5 2007/11/28 23:34:56 bicatali Exp $
 
 inherit eutils kde
 
@@ -25,7 +25,7 @@ IUSE="cdf fftw imagemagick jpeg2k kexi opengl tiff"
 DEPEND=">=sci-libs/gsl-1.6
 	sci-libs/netcdf
 	virtual/ghostscript
-	x11-libs/qwtplot3d
+	<x11-libs/qwtplot3d-0.2.7
 	media-libs/audiofile
 	fftw? ( >=sci-libs/fftw-3 )
 	imagemagick? ( >=media-gfx/imagemagick-5.5.6-r1 )
diff --git a/sci-visualization/labplot/labplot-1.5.1.6-r1.ebuild b/sci-visualization/labplot/labplot-1.5.1.6-r1.ebuild
new file mode 100644
index 000000000000..c133b49d531b
--- /dev/null
+++ b/sci-visualization/labplot/labplot-1.5.1.6-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/labplot/labplot-1.5.1.6-r1.ebuild,v 1.1 2007/11/28 23:34:56 bicatali Exp $
+
+inherit eutils kde
+
+PV_BUGFIX="${PV/?.?.?/}"
+MY_PV="${PV%${PV_BUGFIX}}"
+MY_P="LabPlot-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+BUGFIX="LabPlot-${MY_PV}_${PV}.diff"
+
+DESCRIPTION="LabPlot is a KDE application for data plotting and function analysis."
+HOMEPAGE="http://labplot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/labplot/${MY_P}.tar.gz"
+[[ -n PV_BUGFIX ]] && SRC_URI="${SRC_URI} mirror://sourceforge/labplot/${BUGFIX}.gz"
+
+LICENSE="GPL-2"
+
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+IUSE="cdf fftw imagemagick jpeg2k kexi opengl tiff"
+
+DEPEND="sci-libs/gsl
+	media-gfx/pstoedit
+	sci-libs/netcdf
+	virtual/ghostscript
+	x11-libs/qwtplot3d-qt3
+	media-libs/audiofile
+	fftw? ( >=sci-libs/fftw-3 )
+	imagemagick? ( media-gfx/imagemagick )
+	jpeg2k? ( media-libs/jasper )
+	tiff? ( media-libs/tiff )
+	opengl? ( virtual/opengl )
+	kexi? ( || ( app-office/kexi app-office/koffice ) )
+	cdf? ( sci-libs/cdf )"
+
+RDEPEND="${DEPEND}"
+
+need-kde 3.5
+
+[[ -n PV_BUGFIX ]] && PATCHES="${WORKDIR}/${BUGFIX}"
+
+src_unpack() {
+	kde_src_unpack
+	# let's make sure we don't use included libs
+	echo "# Using shared libs!" >| netcdf/netcdf.h
+	echo "# Using shared libs!" >| qwtplot3d/qwt3d_plot.h
+	echo "# Using shared libs!" >| audiofile/audiofile.h
+
+	# sed for qwtplot3d, qt3 version (gentoo-specific)
+	# (gone in versions > 1.6.0, with qt4)
+	sed -i \
+		-e 's:-lqwtplot3d:-lqwtplot3d-qt3:g' \
+		-e 's:include/qwtplot3d:include/qwtplot3d-qt3:g' \
+		-e 's:AC_CHECK_LIB(qwtplot3d,:AC_CHECK_LIB(qwtplot3d-qt3,:' \
+		configure configure.in || die
+}
+
+src_compile() {
+	export QTDIR="/usr/qt/3"
+	export QWT3D_PATH="/usr"
+	export KEXIDB_DIR="/usr"
+
+	# texvc not in Portage and I'm not keen maintaining it
+	# qsa ebuilds in bad shape atm.
+	local myconf="--disable-fftw --enable-gsl --enable-ps2eps \
+		--disable-texvc --disable-ocaml --enable-netcdf --enable-audiofile \
+		--enable-system-qwtplot3d --enable-libundo --disable-qsa"
+
+	myconf="${myconf} \
+		$(use_enable fftw fftw3) \
+		$(use_enable imagemagick ImageMagick) \
+		$(use_enable jpeg2k jasper) \
+		$(use_enable tiff) \
+		$(use_enable kexi KexiDB) \
+		$(use_enable opengl) \
+		$(use_enable cdf)"
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+	mv "${D}"/usr/bin/opj2dat "${D}"/usr/bin/LabPlot-opj2dat
+}
+
+pkg_postinst() {
+	kde_pkg_postinst
+	elog "Please notice that /usr/bin/opj2dat conflicts with the one installed by"
+	elog "sci-libs/liborigin and has therefore be renamed to LabPlot-opj2dat."
+}
diff --git a/sci-visualization/labplot/labplot-1.5.1.6.ebuild b/sci-visualization/labplot/labplot-1.5.1.6.ebuild
index f17b7f5489e7..e8056573853c 100644
--- a/sci-visualization/labplot/labplot-1.5.1.6.ebuild
+++ b/sci-visualization/labplot/labplot-1.5.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/labplot/labplot-1.5.1.6.ebuild,v 1.2 2007/05/30 20:38:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/labplot/labplot-1.5.1.6.ebuild,v 1.3 2007/11/28 23:34:56 bicatali Exp $
 
 inherit eutils kde
 
@@ -25,7 +25,7 @@ IUSE="cdf fftw imagemagick jpeg2k kexi opengl tiff"
 DEPEND=">=sci-libs/gsl-1.6
 	sci-libs/netcdf
 	virtual/ghostscript
-	x11-libs/qwtplot3d
+	<x11-libs/qwtplot3d-0.2.7
 	media-libs/audiofile
 	fftw? ( >=sci-libs/fftw-3 )
 	imagemagick? ( >=media-gfx/imagemagick-5.5.6-r1 )