Removed old version and forced liborigin:0

(Portage version: 2.2_rc28/cvs/Linux x86_64)

3 files changed, 10 insertions, 114 deletions

diff --git a/sci-visualization/labplot/ChangeLog b/sci-visualization/labplot/ChangeLog
index 6e27c5a8dbd6..746e9181d4a4 100644
--- a/sci-visualization/labplot/ChangeLog
+++ b/sci-visualization/labplot/ChangeLog
@@ -1,6 +1,10 @@
 # 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.23 2008/08/30 17:03:34 bicatali Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/labplot/ChangeLog,v 1.24 2009/04/08 07:52:54 bicatali Exp $
+
+  08 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -labplot-1.6.0.1-r1.ebuild, labplot-1.6.0.2.ebuild:
+  Removed old version and forced liborigin:0
 
 *labplot-1.6.0.2 (30 Aug 2008)
 
diff --git a/sci-visualization/labplot/labplot-1.6.0.1-r1.ebuild b/sci-visualization/labplot/labplot-1.6.0.1-r1.ebuild
deleted file mode 100644
index 25da57c243ab..000000000000
--- a/sci-visualization/labplot/labplot-1.6.0.1-r1.ebuild
+++ /dev/null
@@ -1,109 +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-r1.ebuild,v 1.2 2008/06/19 11:52:11 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
-	${FILESDIR}/${P}-audiofile.patch
-	${FILESDIR}/${P}-init-smg.patch
-	${FILESDIR}/${P}-liborigin.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/labplot-1.6.0.2.ebuild b/sci-visualization/labplot/labplot-1.6.0.2.ebuild
index 43c0d07e4412..57eddaa3f754 100644
--- a/sci-visualization/labplot/labplot-1.6.0.2.ebuild
+++ b/sci-visualization/labplot/labplot-1.6.0.2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/labplot/labplot-1.6.0.2.ebuild,v 1.2 2009/04/08 07:52:54 bicatali Exp $
 
+EAPI=1
 inherit eutils kde multilib
 
 MY_P="LabPlot-${PV}"
@@ -18,7 +19,7 @@ IUSE="audiofile bindist cdf fftw hdf5 gsl imagemagick jpeg2k kexi
 	netcdf opengl qhull R tiff"
 
 RDEPEND="media-gfx/pstoedit
-	>=sci-libs/liborigin-20080225
+	>=sci-libs/liborigin-20080225:0
 	virtual/ghostscript
 	gsl? ( bindist? ( <sci-libs/gsl-1.10 ) !bindist? ( sci-libs/gsl ) )
 	audiofile? ( media-libs/audiofile )