Version bump. Rewrite ebuild to take care of extra dependencies, some comments.

(Portage version: 2.1.4.1)

7 files changed, 151 insertions, 97 deletions

diff --git a/sci-visualization/labplot/ChangeLog b/sci-visualization/labplot/ChangeLog
index bb3c0ef3595a..0738c8b33336 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.15 2007/11/28 23:34:56 bicatali Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/labplot/ChangeLog,v 1.16 2008/02/08 19:00:49 bicatali Exp $
+
+*labplot-1.6.0.1 (08 Feb 2008)
+
+  08 Feb 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/labplot-1.6.0.1-desktop.patch,
+  +files/labplot-1.6.0.1-linkexec.patch, metadata.xml,
+  labplot-1.5.1.6-r1.ebuild, +labplot-1.6.0.1.ebuild:
+  Version bump. Rewrite ebuild to take care of extra dependencies, some comments.
 
 *labplot-1.5.1.6-r1 (28 Nov 2007)
 
diff --git a/sci-visualization/labplot/files/labplot-1.6.0.1-desktop.patch b/sci-visualization/labplot/files/labplot-1.6.0.1-desktop.patch
new file mode 100644
index 000000000000..f17240a80489
--- /dev/null
+++ b/sci-visualization/labplot/files/labplot-1.6.0.1-desktop.patch
@@ -0,0 +1,11 @@
+--- src/LabPlot.desktop.orig	2008-02-08 13:09:35.000000000 +0000
++++ src/LabPlot.desktop	2008-02-08 13:09:56.000000000 +0000
+@@ -8,7 +8,7 @@
+ Comment=An application for plotting of data sets and functions
+ Comment[de]=Ein Programm zum Plotten von Daten und Funktionen
+ Comment[pl]=Program do wykreślania funkcji oraz manipulacji na danych
+-Terminal=yes
++Terminal=true
+ Name=LabPlot
+ MimeType=application/x-LabPlot-plot;
+ #Protocols=file;ftp
diff --git a/sci-visualization/labplot/files/labplot-1.6.0.1-linkexec.patch b/sci-visualization/labplot/files/labplot-1.6.0.1-linkexec.patch
new file mode 100644
index 000000000000..eb378328d384
--- /dev/null
+++ b/sci-visualization/labplot/files/labplot-1.6.0.1-linkexec.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	2008-02-08 18:17:53.000000000 +0000
++++ src/Makefile.in	2008-02-08 18:41:48.000000000 +0000
+@@ -1144,7 +1144,7 @@
+ 	$(YACC) parser.y
+ 	mv y.tab.c $@
+ 
+-install-data-local:
++install-data-local: install-binPROGRAMS
+ 	rm -rf $(DESTDIR)$(kde_bindir)/labplot
+ 	if ! test -e $(DESTDIR)/$(kde_bindir)/labplot; then \
+ 		ln -fs LabPlot $(DESTDIR)$(kde_bindir)/labplot; \
diff --git a/sci-visualization/labplot/labplot-1.5.1.5.ebuild b/sci-visualization/labplot/labplot-1.5.1.5.ebuild
deleted file mode 100644
index fcd0684d52a4..000000000000
--- a/sci-visualization/labplot/labplot-1.5.1.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.5 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-1.6
-	sci-libs/netcdf
-	virtual/ghostscript
-	<x11-libs/qwtplot3d-0.2.7
-	media-libs/audiofile
-	fftw? ( >=sci-libs/fftw-3 )
-	imagemagick? ( >=media-gfx/imagemagick-5.5.6-r1 )
-	jpeg2k? ( >=media-libs/jasper-1.700.5-r1 )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	opengl? ( virtual/opengl )
-	kexi? ( || ( app-office/kexi app-office/koffice ) )
-	!amd64? ( cdf? ( sci-libs/cdf )
-		>=media-gfx/pstoedit-3.33 )
-	!sci-libs/liborigin"
-
-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
-}
-
-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"
-
-	if use amd64; then
-		myconf="${myconf} --disable-cdf"
-	else
-		myconf="${myconf} $(use_enable cdf)"
-	fi
-
-	local myconf="${myconf} \
-		$(use_enable fftw fftw3) \
-		$(use_enable imagemagick ImageMagick) \
-		$(use_enable jpeg2k jasper) \
-		$(use_enable tiff) \
-		$(use_enable kexi KexiDB) \
-		$(use_enable opengl)"
-	kde_src_compile
-}
diff --git a/sci-visualization/labplot/labplot-1.5.1.6-r1.ebuild b/sci-visualization/labplot/labplot-1.5.1.6-r1.ebuild
index c133b49d531b..f4921fa54365 100644
--- a/sci-visualization/labplot/labplot-1.5.1.6-r1.ebuild
+++ b/sci-visualization/labplot/labplot-1.5.1.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.5.1.6-r1.ebuild,v 1.1 2007/11/28 23:34:56 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/labplot/labplot-1.5.1.6-r1.ebuild,v 1.2 2008/02/08 19:00:49 bicatali Exp $
 
 inherit eutils kde
 
@@ -20,11 +20,13 @@ LICENSE="GPL-2"
 
 KEYWORDS="~x86 ~amd64"
 SLOT="0"
-IUSE="cdf fftw imagemagick jpeg2k kexi opengl tiff"
+IUSE="bindist cdf fftw imagemagick jpeg2k kexi opengl tiff"
 
-DEPEND="sci-libs/gsl
+DEPEND="bindist? ( <sci-libs/gsl-1.10 )
+	!bindist? ( sci-libs/gsl )
 	media-gfx/pstoedit
 	sci-libs/netcdf
+	sci-libs/liborigin
 	virtual/ghostscript
 	x11-libs/qwtplot3d-qt3
 	media-libs/audiofile
@@ -44,13 +46,14 @@ need-kde 3.5
 
 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)
+	# (gone in versions > 2.0, with qt4)
 	sed -i \
 		-e 's:-lqwtplot3d:-lqwtplot3d-qt3:g' \
 		-e 's:include/qwtplot3d:include/qwtplot3d-qt3:g' \
@@ -79,14 +82,3 @@ src_compile() {
 		$(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.6.0.1.ebuild b/sci-visualization/labplot/labplot-1.6.0.1.ebuild
new file mode 100644
index 000000000000..4506f7f49122
--- /dev/null
+++ b/sci-visualization/labplot/labplot-1.6.0.1.ebuild
@@ -0,0 +1,105 @@
+# 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.1.ebuild,v 1.1 2008/02/08 19:00:49 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
+	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}/${P}-linkexec.patch ${FILESDIR}/${P}-desktop.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
+}
diff --git a/sci-visualization/labplot/metadata.xml b/sci-visualization/labplot/metadata.xml
index adaba9a99949..b8f098d464ce 100644
--- a/sci-visualization/labplot/metadata.xml
+++ b/sci-visualization/labplot/metadata.xml
@@ -3,4 +3,10 @@
 <pkgmetadata>
 <herd>sci</herd>
 <herd>kde</herd>
+<longdescription lang="en">
+  LabPlot is for scientific 2D and 3D data and function plotting. The
+  various display and analysis functions are explained in the handbook
+  (KDE help center). LabPlot also provides a component for easily
+  viewing the project files in Konqueror.
+</longdescription>
 </pkgmetadata>