Added a patch to make it work when audiofile is not selected (bug #228165) and an init patch from Debian. Removed older versions

Package-Manager: portage-2.1.4.4

7 files changed, 84 insertions, 200 deletions

diff --git a/sci-visualization/labplot/ChangeLog b/sci-visualization/labplot/ChangeLog
index 33b0a0ceaf2e..2bf8d1907b2e 100644
--- a/sci-visualization/labplot/ChangeLog
+++ b/sci-visualization/labplot/ChangeLog
@@ -1,6 +1,13 @@
 # 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.20 2008/03/17 17:51:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/labplot/ChangeLog,v 1.21 2008/06/19 11:52:11 bicatali Exp $
+
+  19 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/labplot-1.6.0.1-audiofile.patch,
+  +files/labplot-1.6.0.1-init-smg.patch, -labplot-1.5.1.6-r1.ebuild,
+  -labplot-1.6.0.1.ebuild, labplot-1.6.0.1-r1.ebuild:
+  Added a patch to make it work when audiofile is not selected (bug #228165)
+  and an init patch from Debian. Removed older versions
 
 *labplot-1.6.0.1-r1 (17 Mar 2008)
 
diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index f98357da31fb..905ef8d844bb 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX labplot-1.6.0.1-audiofile.patch 1054 RMD160 ee191754388707c21a9021b555a2e2a3bf5af546 SHA1 d0da974ade531d6d1872461a81810ede22a6b255 SHA256 4261c726155d49066bacf48b66c9147dff2f9db63216ac6b569b7708d01db0ef
 AUX labplot-1.6.0.1-desktop.patch 443 RMD160 5b1950323c76a9c20a367cfe41e0612bad188487 SHA1 6b94dad09f0b3af9f1a29fad6b3f4556d7e7dafb SHA256 e0b99b841bb3b14169aa382b4bc48c3ee8c2dc767b221f27509a3e5135b40993
+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
-DIST LabPlot-1.5.1.tar.gz 10733976 RMD160 404fe6f2c39685ed6b336c71dff3d549b3f4faa4 SHA1 854ab974d12d1441cfdb3b5cc94df5d1fd1f5684 SHA256 25f17e55e3483db33601c10ec292a77de627e7eca2effbd3a77942538a6cbfde
-DIST LabPlot-1.5.1_1.5.1.6.diff.gz 236338 RMD160 1439f4cb2d19c77e98b721c893e371b75389100e SHA1 194373ef94d1bbba78118f9a0d8898e607f80a6f SHA256 82a3868145b15ce501c62bd647ccad9871b712a6cb00b7397214d1e22ae0ea4f
 DIST LabPlot-1.6.0.1.tar.gz 11903145 RMD160 6e970c2f889a5b2b38ac0f3d82963c3a0aed945c SHA1 d2a2718431a2641953d61973536cd933d705a03d SHA256 a3b7cead9100489f0bf55e548a5b21bfb6fef2219d3ed1e3d638bd68c80cfb78
-EBUILD labplot-1.5.1.6-r1.ebuild 2443 RMD160 689003cf009514dea14377f1e5b9c00524745e38 SHA1 a002778f3775aa5ada13c8e0cc8f5c2808b47544 SHA256 0b1e63e0fd6f27f059797f73c9098db74672fda2f309315daea82991c9c73036
-EBUILD labplot-1.6.0.1-r1.ebuild 2909 RMD160 715b421b119797a27b1f4036eedc42b74758952c SHA1 a2691e0f6b30466cea434c6d7387cc7ced2b7694 SHA256 b2230fd3851d773590b3a44f948097ad124d89634d2ccff7d25a98fb2009ff86
-EBUILD labplot-1.6.0.1.ebuild 2869 RMD160 25b3dac6674d42a603428a8860af116b18734c96 SHA1 984e3350b839e41e0d7de080b45192d23ac8eff9 SHA256 d102f615f890a63aa280b7ebce391bd126a32d241f69b981faf40df36b7d6028
-MISC ChangeLog 5751 RMD160 390e5b4e592040389488b94a37c920e7bc3fc045 SHA1 c635bd0a2864c6d0625b4219f426276c707f043f SHA256 1255d78a279ec3e818e5ef9935f9ec1da9d346becc0ca69308a989bba5ea2659
+EBUILD labplot-1.6.0.1-r1.ebuild 2976 RMD160 f76289e8fde9c5e4568e499836aa35764b06ad1d SHA1 8026a779b5d01f20250e43bb5e5d8791043ae527 SHA256 ec89d21e1e135ddb0d4c37647c3c4ec6466f3a9ed70e9de1b4e4e2f9dab1c1d9
+MISC ChangeLog 6105 RMD160 7df348802a0715e16dc43ca5636af29f56b6b9e8 SHA1 638670a45ed5c8785e0520a86f312ddb55a32e07 SHA256 317b68dc4ec4c1ef22a583cb529af37371eb4cd0c1528df288da5a179afcce16
 MISC metadata.xml 469 RMD160 5afbc4d35d6e77f6297ac4bbcbca2ac380ea840d SHA1 efdb8b43050f290eca28afb7f1acde3e18594691 SHA256 3caf0d19109b8b58f57165fc108f9dfe17ff0ea65059000806f5219acf677b58
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH3q+81ycZbhPLE2ARAizvAJ9RkijaCfDOU5ObqDtZaU4TgO9fDQCgjvcN
-if8OqEgyL/s2yJJiJWMItYU=
-=tbMD
+iEYEARECAAYFAkhaSH8ACgkQ1ycZbhPLE2AdPwCgqrI/h8qUAP4aaHlvLlUTEekl
+UwEAn3u3gyJSDLFj52rLhdYs2aEX6WfP
+=pDRn
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/labplot/files/labplot-1.6.0.1-audiofile.patch b/sci-visualization/labplot/files/labplot-1.6.0.1-audiofile.patch
new file mode 100644
index 000000000000..c36420a17335
--- /dev/null
+++ b/sci-visualization/labplot/files/labplot-1.6.0.1-audiofile.patch
@@ -0,0 +1,40 @@
+--- src/ExportDialog.cc.orig	2008-06-19 12:01:25.000000000 +0100
++++ src/ExportDialog.cc	2008-06-19 12:02:44.000000000 +0100
+@@ -28,7 +28,9 @@
+ #ifdef HAVE_NETCDF
+ #include <netcdf.h>
+ #endif
++#ifdef HAVE_AUDIOFILE
+ #include <audiofile.h>
++#endif
+ #ifdef HAVE_MAGICK
+ #include <Magick++.h>
+ using namespace Magick;
+--- src/LabPlotDialog.cc.orig	2007-10-27 15:18:59.000000000 +0100
++++ src/LabPlotDialog.cc	2008-06-19 12:08:11.000000000 +0100
+@@ -14,7 +14,9 @@
+ #include <jasper/jas_config.h>
+ #endif
+ 
++#ifdef HAVE_AUDIOFILE
+ #include <audiofile.h>
++#endif
+ 
+ #ifdef HAVE_GSL
+ #include <gsl/gsl_version.h>
+@@ -186,11 +188,15 @@
+ 	// audiofile
+ 	hb = new QHBox(vbox);
+ 	new QLabel(i18n("audiofile library : "),hb);
++#ifdef HAVE_AUDIOFILE
+ 	st = QString::number(LIBAUDIOFILE_MAJOR_VERSION)+'.'+QString::number(LIBAUDIOFILE_MINOR_VERSION);
+ #ifdef LIBAUDIOFILE_MICRO_VERSION
+ 	st += '.'+QString::number(LIBAUDIOFILE_MICRO_VERSION);
+ #endif
+ 	tmp = new QLabel(st,hb);
++#else
++	tmp = new QLabel("no",hb);
++#endif
+ 	tmp->setAlignment(Qt::AlignRight);
+ 
+ 	// R
diff --git a/sci-visualization/labplot/files/labplot-1.6.0.1-init-smg.patch b/sci-visualization/labplot/files/labplot-1.6.0.1-init-smg.patch
new file mode 100644
index 000000000000..00bf0e7c331f
--- /dev/null
+++ b/sci-visualization/labplot/files/labplot-1.6.0.1-init-smg.patch
@@ -0,0 +1,25 @@
+--- src/MainWin.cc.orig
++++ src/MainWin.cc
+@@ -218,11 +218,6 @@ MainWin::MainWin(const char *name, const char *filen, bool is_part)
+ 		readScript(fn);
+ #endif
+ 
+-	if(QFile::exists(fn) && fn.contains(".lpl"))
+-		openLPL(fn);
+-	else if(QFile::exists(fn) && ( fn.contains(".lml") || fn.contains(".xml") ))
+-		openXML(fn);
+-
+ 	modified = false;
+ 	is_fullscreen=false;
+ 
+@@ -231,6 +226,10 @@ MainWin::MainWin(const char *name, const char *filen, bool is_part)
+ 	smg = new QSignalMapper(this);
+ 	connect(smg,SIGNAL(mapped(int)),this,SLOT(changeGraph(int)));
+ 
++	if(QFile::exists(fn) && fn.contains(".lpl"))
++		openLPL(fn);
++	else if(QFile::exists(fn) && ( fn.contains(".lml") || fn.contains(".xml") ))
++		openXML(fn);
+ }
+ 
+ MainWin::~MainWin() {
diff --git a/sci-visualization/labplot/labplot-1.5.1.6-r1.ebuild b/sci-visualization/labplot/labplot-1.5.1.6-r1.ebuild
deleted file mode 100644
index b3061da9199a..000000000000
--- a/sci-visualization/labplot/labplot-1.5.1.6-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.3 2008/03/07 03:02:44 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="bindist cdf fftw imagemagick jpeg2k kexi opengl tiff"
-
-DEPEND="bindist? ( <sci-libs/gsl-1.10 )
-	!bindist? ( sci-libs/gsl )
-	media-gfx/pstoedit
-	sci-libs/netcdf
-	<sci-libs/liborigin-20080225
-	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 > 2.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
-}
diff --git a/sci-visualization/labplot/labplot-1.6.0.1-r1.ebuild b/sci-visualization/labplot/labplot-1.6.0.1-r1.ebuild
index 98a22e413223..25da57c243ab 100644
--- a/sci-visualization/labplot/labplot-1.6.0.1-r1.ebuild
+++ b/sci-visualization/labplot/labplot-1.6.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2008/03/17 17:51:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/labplot/labplot-1.6.0.1-r1.ebuild,v 1.2 2008/06/19 11:52:11 bicatali Exp $
 
 inherit eutils kde multilib
 
@@ -37,6 +37,8 @@ RDEPEND="media-gfx/pstoedit
 DEPEND="${RDEPEND}"
 PATCHES="${FILESDIR}/${P}-linkexec.patch
 	${FILESDIR}/${P}-desktop.patch
+	${FILESDIR}/${P}-audiofile.patch
+	${FILESDIR}/${P}-init-smg.patch
 	${FILESDIR}/${P}-liborigin.patch"
 
 need-kde 3.5
diff --git a/sci-visualization/labplot/labplot-1.6.0.1.ebuild b/sci-visualization/labplot/labplot-1.6.0.1.ebuild
deleted file mode 100644
index 0256c86cc614..000000000000
--- a/sci-visualization/labplot/labplot-1.6.0.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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.3 2008/03/07 03:02:44 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}/${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
-}