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

Package-Manager: portage-2.1.4_rc3

6 files changed, 140 insertions, 17 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/Manifest b/sci-visualization/labplot/Manifest
index 62846ec326dc..32a6dc230c4f 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1,18 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST LabPlot-1.5.1.tar.gz 10733976 RMD160 404fe6f2c39685ed6b336c71dff3d549b3f4faa4 SHA1 854ab974d12d1441cfdb3b5cc94df5d1fd1f5684 SHA256 25f17e55e3483db33601c10ec292a77de627e7eca2effbd3a77942538a6cbfde
 DIST LabPlot-1.5.1_1.5.1.5.diff.gz 233161 RMD160 4183272ec66ab4fbff8e642076895ba5a989e72a SHA1 5d44944b7c56d0af7de638edd32c7ce040665d36 SHA256 e1dbca7e4b9b84d1a6300ef926545571969cfcb8ffb38f9ba07d4ccad97faebf
 DIST LabPlot-1.5.1_1.5.1.6.diff.gz 236338 RMD160 1439f4cb2d19c77e98b721c893e371b75389100e SHA1 194373ef94d1bbba78118f9a0d8898e607f80a6f SHA256 82a3868145b15ce501c62bd647ccad9871b712a6cb00b7397214d1e22ae0ea4f
-EBUILD labplot-1.5.1.5.ebuild 2228 RMD160 6bae8074f239a6f0a36c595ff9ad9da7daa1c809 SHA1 7e0e880f9c65d6ed568687694e4e3d525175285f SHA256 9a2cd1a0de9e278b79df58f8f629aaf43080cd52a5788b5d0ce7dd359ec4f6ee
-MD5 1137b1421cd3ae6ec98bc5731a5addea labplot-1.5.1.5.ebuild 2228
-RMD160 6bae8074f239a6f0a36c595ff9ad9da7daa1c809 labplot-1.5.1.5.ebuild 2228
-SHA256 9a2cd1a0de9e278b79df58f8f629aaf43080cd52a5788b5d0ce7dd359ec4f6ee labplot-1.5.1.5.ebuild 2228
-EBUILD labplot-1.5.1.6.ebuild 2491 RMD160 42a31076e63b9348cd4d29c1020ebd994c6c74f9 SHA1 650c572e3e506af96072735e1f4bf6338532dfa9 SHA256 e0423231b83ec42c15fc696d5e57d5f2be80832336d3257890c1f9a4b6c30f66
-MD5 2939197b0b9897a9b91c3a3667e85cab labplot-1.5.1.6.ebuild 2491
-RMD160 42a31076e63b9348cd4d29c1020ebd994c6c74f9 labplot-1.5.1.6.ebuild 2491
-SHA256 e0423231b83ec42c15fc696d5e57d5f2be80832336d3257890c1f9a4b6c30f66 labplot-1.5.1.6.ebuild 2491
-MISC ChangeLog 4449 RMD160 6a1e3c30c248da8a76761aedf9d0351f42268029 SHA1 e4432b0243ba49f977ccd887a739541185b8af32 SHA256 2855a58edc2a5f678930037e2ad93a30b43ab7be95e1231cc0b435feefa3e599
-MD5 d4d8b300eed99f203728cb44ad60ca7c ChangeLog 4449
-RMD160 6a1e3c30c248da8a76761aedf9d0351f42268029 ChangeLog 4449
-SHA256 2855a58edc2a5f678930037e2ad93a30b43ab7be95e1231cc0b435feefa3e599 ChangeLog 4449
+EBUILD labplot-1.5.1.5.ebuild 2234 RMD160 50ff4519791b40a362d84f71e09b276b9624d312 SHA1 aa30176c92611c8a5b951edc277defc8d0ff7699 SHA256 edad1968e76080f6e3c7b61ac62725767587bcc6afeb4575804bc245df71af25
+MD5 a9933af49b557ef113b6ecd1eddc4b36 labplot-1.5.1.5.ebuild 2234
+RMD160 50ff4519791b40a362d84f71e09b276b9624d312 labplot-1.5.1.5.ebuild 2234
+SHA256 edad1968e76080f6e3c7b61ac62725767587bcc6afeb4575804bc245df71af25 labplot-1.5.1.5.ebuild 2234
+EBUILD labplot-1.5.1.6-r1.ebuild 2647 RMD160 db6386e250081a38106168619ad9a9535a7bf674 SHA1 97c81e3005885075aaec128ed243441df0ba670c SHA256 ee99c511adf267507709f988ff2b1674b43b7a81db5a96499dd655c56cdf0a2c
+MD5 a1ae0c0fc22a9eb759191a23b1fa259b labplot-1.5.1.6-r1.ebuild 2647
+RMD160 db6386e250081a38106168619ad9a9535a7bf674 labplot-1.5.1.6-r1.ebuild 2647
+SHA256 ee99c511adf267507709f988ff2b1674b43b7a81db5a96499dd655c56cdf0a2c labplot-1.5.1.6-r1.ebuild 2647
+EBUILD labplot-1.5.1.6.ebuild 2497 RMD160 ff86b267874baa27ea7d3b6ec56c235d5d2ff9c1 SHA1 9f8c1061ff95ee339b0d5c3cd76aa6082b3517ad SHA256 4a28f06850769d3ddef4d66a754c611d0161c2622988079e4e7cd8ade80b8316
+MD5 1a7ccfb463f271e5d26ff19067f303f3 labplot-1.5.1.6.ebuild 2497
+RMD160 ff86b267874baa27ea7d3b6ec56c235d5d2ff9c1 labplot-1.5.1.6.ebuild 2497
+SHA256 4a28f06850769d3ddef4d66a754c611d0161c2622988079e4e7cd8ade80b8316 labplot-1.5.1.6.ebuild 2497
+MISC ChangeLog 4749 RMD160 3dedfb53627c1ec11b009f9aa9b3194ea384a950 SHA1 1ba33a0224cceec5b7ea7a0022193503d9490c34 SHA256 3ceb2f78323c85905055397d9b983aea7b364e9ef3f104c15d98303ea41fe062
+MD5 b5c1f6988448a64359d84d7c9af0b625 ChangeLog 4749
+RMD160 3dedfb53627c1ec11b009f9aa9b3194ea384a950 ChangeLog 4749
+SHA256 3ceb2f78323c85905055397d9b983aea7b364e9ef3f104c15d98303ea41fe062 ChangeLog 4749
 MISC metadata.xml 173 RMD160 2c44d67bec5e1a71d69b0d047235439817109d99 SHA1 ed014e13b4663db94fbe01400a2b9d615ffe6447 SHA256 54c85281e6ed7a935800439f474ea006370b24c1fe3e821ee57f17f02f714785
 MD5 862e7941cb21c9dd10e8bd6183f21fb0 metadata.xml 173
 RMD160 2c44d67bec5e1a71d69b0d047235439817109d99 metadata.xml 173
@@ -23,3 +30,13 @@ SHA256 f2715e47d1d7bdbdbd47bde0d8f3e2a734e218dcc3158b9987d1c3078c4bbb1d files/di
 MD5 3ccd6eca1cd5bb6a98902a5c91bf776e files/digest-labplot-1.5.1.6 515
 RMD160 62ae693ed50528b95fe7a5665c76882750fbc6fa files/digest-labplot-1.5.1.6 515
 SHA256 4241280a9d1c676d25399951fba25eaeb09413e1d55943d42c9c2ab53d13a5ad files/digest-labplot-1.5.1.6 515
+MD5 3ccd6eca1cd5bb6a98902a5c91bf776e files/digest-labplot-1.5.1.6-r1 515
+RMD160 62ae693ed50528b95fe7a5665c76882750fbc6fa files/digest-labplot-1.5.1.6-r1 515
+SHA256 4241280a9d1c676d25399951fba25eaeb09413e1d55943d42c9c2ab53d13a5ad files/digest-labplot-1.5.1.6-r1 515
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHTfsq1ycZbhPLE2ARAjEbAJ4zF4l6exfnR6fMJzQ0z+qL5TH+0gCfTfKs
+f4znHgBBCezvOIAGGbENgv8=
+=UU8x
+-----END PGP SIGNATURE-----
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 )