From 6af8cba708d5ea1bb8eb50d7d29d3f434dad089e Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Fri, 7 Mar 2008 03:02:44 +0000 Subject: [PATCH] Force liborigin with API older than 20080225 Package-Manager: portage-2.1.4.4 --- sci-visualization/labplot/ChangeLog | 7 +- .../labplot/labplot-1.5.1.6-r1.ebuild | 4 +- .../labplot/labplot-1.5.1.6.ebuild | 89 ------------------- .../labplot/labplot-1.6.0.1.ebuild | 4 +- 4 files changed, 10 insertions(+), 94 deletions(-) delete mode 100644 sci-visualization/labplot/labplot-1.5.1.6.ebuild diff --git a/sci-visualization/labplot/ChangeLog b/sci-visualization/labplot/ChangeLog index 286b202652ac..0e6a1fac1cfd 100644 --- a/sci-visualization/labplot/ChangeLog +++ b/sci-visualization/labplot/ChangeLog @@ -1,6 +1,11 @@ # 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.18 2008/03/02 10:16:43 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/labplot/ChangeLog,v 1.19 2008/03/07 03:02:44 bicatali Exp $ + + 06 Mar 2008; Sébastien Fabbro + -labplot-1.5.1.6.ebuild, labplot-1.5.1.6-r1.ebuild, + labplot-1.6.0.1.ebuild: + Force liborigin with API older than 20080225 02 Mar 2008; Sébastien Fabbro files/labplot-1.6.0.1-desktop.patch: 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 f4921fa54365..b3061da9199a 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-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.2 2008/02/08 19:00:49 bicatali Exp $ +# $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 @@ -26,7 +26,7 @@ DEPEND="bindist? ( | 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 -} - -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 index 43a45fadc4fa..0256c86cc614 100644 --- a/sci-visualization/labplot/labplot-1.6.0.1.ebuild +++ b/sci-visualization/labplot/labplot-1.6.0.1.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.ebuild,v 1.2 2008/02/08 21:53:18 mr_bones_ Exp $ +# $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 @@ -18,7 +18,7 @@ IUSE="audiofile bindist cdf fftw hdf5 gsl imagemagick jpeg2k kexi netcdf opengl qhull R tiff" RDEPEND="media-gfx/pstoedit - sci-libs/liborigin +