Version bump

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.23-gentoo-r9 x86_64

4 files changed, 134 insertions, 6 deletions

diff --git a/sci-visualization/labplot/ChangeLog b/sci-visualization/labplot/ChangeLog
index 8ce1df3d4de9..6e27c5a8dbd6 100644
--- a/sci-visualization/labplot/ChangeLog
+++ b/sci-visualization/labplot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/labplot
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/labplot/ChangeLog,v 1.22 2008/08/06 18:52:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/labplot/ChangeLog,v 1.23 2008/08/30 17:03:34 bicatali Exp $
+
+*labplot-1.6.0.2 (30 Aug 2008)
+
+  30 Aug 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/labplot-1.6.0.2-gcc43.patch, +labplot-1.6.0.2.ebuild:
+  Version bump
 
   06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index 221d3ff941b0..0633e5659a75 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -6,14 +6,17 @@ AUX labplot-1.6.0.1-desktop.patch 443 RMD160 5b1950323c76a9c20a367cfe41e0612bad1
 AUX labplot-1.6.0.1-init-smg.patch 740 RMD160 66804eb18a5d700cbae86185bc1fd404de714092 SHA1 cc1b4029241a7f4b587ea57b5bf303dc48e27776 SHA256 9d020efe68f00f4a690e3721aaabd4efa385fb34bc0c05e00344f8819ac0cf8a
 AUX labplot-1.6.0.1-liborigin.patch 5274 RMD160 56d86b873953493005f7ae62041fa9431fa98bdb SHA1 d9613cd6688c8597222557e017d26e854bc07325 SHA256 2768ba19e6aec7f67ada3e0aa3c3e91ffc7edfe801e81c4121da2371045dbffe
 AUX labplot-1.6.0.1-linkexec.patch 388 RMD160 b220c747429d5492290df3f46618289af9249a05 SHA1 90cc26d566a6c893e318b7d171f1e925f4f5b314 SHA256 d0923c39ebc3401be7ecbf59c3a350e9aaa0ed94677a8c53315b532fc1ef2e67
+AUX labplot-1.6.0.2-gcc43.patch 251 RMD160 090d1b35e4f0e681d18af723e2d1f7fdec0aad90 SHA1 26bca276e3cc60a3b4ac8e2750847d88366f8b1d SHA256 d3f5239cdf7504c546e48453b1b30a85cba5a816681df2844cffe853552039a5
 DIST LabPlot-1.6.0.1.tar.gz 11903145 RMD160 6e970c2f889a5b2b38ac0f3d82963c3a0aed945c SHA1 d2a2718431a2641953d61973536cd933d705a03d SHA256 a3b7cead9100489f0bf55e548a5b21bfb6fef2219d3ed1e3d638bd68c80cfb78
+DIST LabPlot-1.6.0.2.tar.gz 11596875 RMD160 ba4467f6d6ae4510c4b640d964ce0d68adee07f3 SHA1 2df566fa440f1afa53043c8bd8d0f84df8264b87 SHA256 f19377c22f77a3cf9449532e713f9e2b0400abc21dbb66a8766551a88d931b1d
 EBUILD labplot-1.6.0.1-r1.ebuild 2976 RMD160 f76289e8fde9c5e4568e499836aa35764b06ad1d SHA1 8026a779b5d01f20250e43bb5e5d8791043ae527 SHA256 ec89d21e1e135ddb0d4c37647c3c4ec6466f3a9ed70e9de1b4e4e2f9dab1c1d9
-MISC ChangeLog 6214 RMD160 62bb2fd07b0f183309aa9f4432338202d9e2d150 SHA1 737979ddca32b6525f75b4637386c78754b5b1db SHA256 e5dce23964a0869e4a0a97ba17263c675be69b312f3390f4b4fe0113090e37a6
+EBUILD labplot-1.6.0.2.ebuild 3006 RMD160 56c107eb0f5aa79d5ff201ace644e9ef9ec4fec9 SHA1 07c79a50e7bbd9e462e6293e86ce4f05de69ec8c SHA256 fee45173463d241bbe313aec373991ea4d83d52ee50e3ff611798a99c4350428
+MISC ChangeLog 6385 RMD160 279ede78f2b23d96ec83cba26673c97231fef208 SHA1 fa7b75eddee3862da55ab4f5bedb9d05524ac7f4 SHA256 56c2a9adfc39cd453e5b89b4e4661de2462c6f20617cad6295aa67411175d275
 MISC metadata.xml 861 RMD160 b253178265718b8a8788e1f0571273a34634417c SHA1 e26133c213a828394a55479c78c4e1b888e94900 SHA256 1d0ca1977a8191d1c849c1ccd093c21d1f837b672447c98d0b73003f89b198df
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiZ8vsACgkQOeoy/oIi7uxVgACgxLju48yVtP+G2CW0NahqNwAH
-kzUAn2vg5fc8DRNyv55IbnpnihJw48ki
-=aT55
+iEYEARECAAYFAki5fXQACgkQ1ycZbhPLE2AQugCgoBQfFB/LKACwc+iI0X2vfHHK
+qO4AoLJ0yk7vVvK8bK5ohekCEgBWhGR6
+=zLYe
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/labplot/files/labplot-1.6.0.2-gcc43.patch b/sci-visualization/labplot/files/labplot-1.6.0.2-gcc43.patch
new file mode 100644
index 000000000000..2c4cd23651ef
--- /dev/null
+++ b/sci-visualization/labplot/files/labplot-1.6.0.2-gcc43.patch
@@ -0,0 +1,10 @@
+--- src/Spreadsheet.cc.orig	2008-08-30 17:07:41.000000000 +0100
++++ src/Spreadsheet.cc	2008-08-30 17:08:40.000000000 +0100
+@@ -3,6 +3,7 @@
+ #include <stdlib.h>
+ #include <time.h>
+ #ifdef HAVE_SGI_STL
++#include <algorithm>
+ #include <vector>
+ #endif
+ 
diff --git a/sci-visualization/labplot/labplot-1.6.0.2.ebuild b/sci-visualization/labplot/labplot-1.6.0.2.ebuild
new file mode 100644
index 000000000000..43c0d07e4412
--- /dev/null
+++ b/sci-visualization/labplot/labplot-1.6.0.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/labplot/labplot-1.6.0.2.ebuild,v 1.1 2008/08/30 17:03:34 bicatali Exp $
+
+inherit eutils kde multilib
+
+MY_P="LabPlot-${PV}"
+
+DESCRIPTION="KDE application for data plotting and function analysis."
+HOMEPAGE="http://labplot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="audiofile bindist cdf fftw hdf5 gsl imagemagick jpeg2k kexi
+	netcdf opengl qhull R tiff"
+
+RDEPEND="media-gfx/pstoedit
+	>=sci-libs/liborigin-20080225
+	virtual/ghostscript
+	gsl? ( bindist? ( <sci-libs/gsl-1.10 ) !bindist? ( sci-libs/gsl ) )
+	audiofile? ( media-libs/audiofile )
+	fftw? ( >=sci-libs/fftw-3 )
+	imagemagick? ( media-gfx/imagemagick )
+	jpeg2k? ( media-libs/jasper )
+	tiff? ( media-libs/tiff )
+	opengl? ( virtual/opengl x11-libs/qwtplot3d-qt3 )
+	kexi? ( || ( app-office/kexi app-office/koffice ) )
+	cdf? ( sci-libs/cdf )
+	netcdf? ( sci-libs/netcdf )
+	hdf5? ( sci-libs/hdf5 )
+	qhull? ( media-libs/qhull )
+	R? ( dev-lang/R )"
+
+DEPEND="${RDEPEND}"
+PATCHES="${FILESDIR}/${PN}-1.6.0.1-linkexec.patch
+	${FILESDIR}/${PN}-1.6.0.1-desktop.patch
+	${FILESDIR}/${PN}-1.6.0.1-audiofile.patch
+	${FILESDIR}/${PN}-1.6.0.1-liborigin.patch
+	${FILESDIR}/${P}-gcc43.patch"
+
+need-kde 3.5
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	kde_src_unpack
+
+	cd "${S}"
+
+	# 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!" >| liborigin*/OPJFile.h
+
+	# sed for qwtplot3d, qt3 version (gentoo-specific)
+	# (should be gone when labplot using 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 || die
+}
+
+src_compile() {
+	export QTDIR="/usr/qt/3"
+	export QWT3D_PATH="/usr"
+	export KEXIDB_DIR="/usr"
+	use R && export R_HOME=/usr/$(get_libdir)/R
+
+	# reasons for disabling options:
+	# - fftw is fftw2, so we prefer fftw3
+	# - texvc external would need mediawiki (big), internal conflicts with it
+	# - ocaml: only used to compile internal texvc
+	# - qsa in portage tree is too buggy
+	# file a bug if you have workarounds
+	local myconf="
+		--disable-fftw
+		--disable-texvc
+		--disable-ocaml
+		--disable-qsa
+		--enable-ps2eps
+		--enable-system-liborigin
+		$(use_enable audiofile)
+		$(use_enable fftw fftw3)
+		$(use_enable gsl)
+		$(use_enable imagemagick ImageMagick)
+		$(use_enable jpeg2k jasper)
+		$(use_enable tiff)
+		$(use_enable kexi KexiDB)
+		$(use_enable cdf)
+		$(use_enable hdf5)
+		$(use_enable netcdf)
+		$(use_enable netcdf system-netcdf)
+		$(use_enable opengl gl)
+		$(use_enable opengl system-qwtplot3d)
+		$(use_enable qhull)
+		$(use_enable R)"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+	dodoc BUGS* WISHLIST CHANGES FEATURES \
+		TIPS PLAN CREDITS || die
+}