Version bump, some changes (see log)

diff --git a/media-gfx/labplot/ChangeLog b/media-gfx/labplot/ChangeLog
index 9aa17bd5e29cc050270c1d9acf42904b7c5b0757..061896d9e1eb7ae894bf91dac98081351e352159 100644 (file)
--- a/media-gfx/labplot/ChangeLog
+++ b/media-gfx/labplot/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/labplot
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/labplot/ChangeLog,v 1.3 2004/12/28 20:29:12 ribosome Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/labplot/ChangeLog,v 1.4 2005/01/05 14:44:59 phosphan Exp $
+
+*labplot-1.4.0 (05 Jan 2005)
+
+  05 Jan 2005; Patrick Kursawe <phosphan@gentoo.org> +files/getversion.patch,
+  +labplot-1.4.0.ebuild:
+  Version bump. Using USE flags for cdf and netcdf now. Added a patch for the
+  cdf version string (referred to a header that isn't installed by default).
+  Depending on fftw3 now to avoid potential trouble when fftw3 is used and
+  de-installed (which would not break the old dependency).
 
   28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> labplot-1.3.0.ebuild:
   Dependency update: dev-libs/gsl -> sci-libs/gsl.

diff --git a/media-gfx/labplot/Manifest b/media-gfx/labplot/Manifest
index 009560273bf3afc55b8c50935fd63d59064c721c..3b51bf2aa4b7d295f897d9d81beec07467db1667 100644 (file)
--- a/media-gfx/labplot/Manifest
+++ b/media-gfx/labplot/Manifest
@@ -1,5 +1,8 @@
-MD5 9f7394b0239b0f5cff831d8da52ab834 ChangeLog 1571
-MD5 b70e71ea12ac099c6b901c3dbd8b67a9 labplot-1.3.0.ebuild 1085
+MD5 c29f2d9bf9c757e8b6a93a7f147b5766 labplot-1.4.0.ebuild 1607
+MD5 748a8b231bf5d0a9186881a422260f0c ChangeLog 1994
+MD5 b0a2bc6284b5a7b45c583448d979ddf7 labplot-1.3.0.ebuild 1085
 MD5 201497e376059503f8b7afd504d41023 metadata.xml 179
 MD5 b717f0448045aa171f74df43edcf4409 files/digest-labplot-1.3.0 66
+MD5 0e5477ba8d6a62e6a2dde93c7e12cef6 files/digest-labplot-1.4.0 66
+MD5 1db5faa2d87be7b123c3ffdecd45ddec files/getversion.patch 945
 MD5 56ca5a2584d30cb2ec78d04714df475a files/labplot-1.3.0-amd64.patch 855

diff --git a/media-gfx/labplot/files/digest-labplot-1.4.0 b/media-gfx/labplot/files/digest-labplot-1.4.0
new file mode 100644 (file)
index 0000000..076a796
--- /dev/null
+++ b/media-gfx/labplot/files/digest-labplot-1.4.0
@@ -0,0 +1 @@
+MD5 479e417cad0b9b7bbbffeb1c505074ac LabPlot-1.4.0.tar.gz 7928234

diff --git a/media-gfx/labplot/files/getversion.patch b/media-gfx/labplot/files/getversion.patch
new file mode 100644 (file)
index 0000000..5e96534
--- /dev/null
+++ b/media-gfx/labplot/files/getversion.patch
@@ -0,0 +1,41 @@
+--- src/LabPlotDialog.cc       2004-10-28 23:18:53.000000000 +0200
++++ ../LabPlot-1.4.0-new/src/LabPlotDialog.cc  2005-01-05 14:04:35.017794811 +0100
+@@ -21,7 +21,7 @@
+ #endif
+ 
+ #ifdef HAVE_FFTW
+-#include <fftw-config.h>
++#include <fftw.h>
+ #endif
+ 
+ #ifdef HAVE_MAGICK
+@@ -33,10 +33,6 @@
+ #include <qsaglobal.h>
+ #endif
+ 
+-#ifdef HAVE_CDF
+-#include <cdfrev.h>
+-#endif
+-
+ LabPlotDialog::LabPlotDialog(const char *name)
+       : Dialog(0, name)
+ {
+@@ -82,7 +78,7 @@
+ #ifdef HAVE_FFTW3
+       s="not used";
+ #elif HAVE_FFTW
+-      s=FFTW_VERSION;
++      s=fftw_version;
+ #endif
+       tmp = new QLabel(s,hb);
+       tmp->setAlignment(Qt::AlignRight);
+@@ -132,8 +128,7 @@
+       new QLabel(i18n("Common Data Form library (CDF) : "),hb);
+       s = "no";
+ #ifdef HAVE_CDF
+-      s = QString::number(CDF_LIBRARY_VERSION)+'.'+QString::number(CDF_LIBRARY_RELEASE)+'.'+ 
+-              QString::number(CDF_LIBRARY_INCREMENT);
++      s = CDF_VERSION;
+ #endif
+       tmp = new QLabel(s,hb);
+       tmp->setAlignment(Qt::AlignRight);

diff --git a/media-gfx/labplot/labplot-1.3.0.ebuild b/media-gfx/labplot/labplot-1.3.0.ebuild
index 0b044e974b9880c60d1940154c7e2a2f3164de6f..bcf0f16326a9d57cc96d5e060eadba94d95a9cbe 100644 (file)
--- a/media-gfx/labplot/labplot-1.3.0.ebuild
+++ b/media-gfx/labplot/labplot-1.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/labplot/labplot-1.3.0.ebuild,v 1.3 2004/12/29 02:40:19 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/labplot/labplot-1.3.0.ebuild,v 1.4 2005/01/05 14:44:59 phosphan Exp $
 
 inherit eutils gnuconfig kde
 

diff --git a/media-gfx/labplot/labplot-1.4.0.ebuild b/media-gfx/labplot/labplot-1.4.0.ebuild
new file mode 100644 (file)
index 0000000..f737ed2
--- /dev/null
+++ b/media-gfx/labplot/labplot-1.4.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/labplot/labplot-1.4.0.ebuild,v 1.1 2005/01/05 14:44:59 phosphan Exp $
+
+inherit eutils gnuconfig kde
+
+MPN="LabPlot"
+
+DESCRIPTION="KDE application for plotting and analysis of 2d and 3d functions and data"
+HOMEPAGE="http://labplot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MPN}-${PV}.tar.gz"
+LICENSE="GPL-2"
+
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+IUSE="arts fftw imagemagick tiff audiofile cdf netcdf"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+DEPEND=">=sci-libs/gsl-1.3
+       fftw? ( >=sci-libs/fftw-3 )
+       imagemagick? ( >=media-gfx/imagemagick-5.5.6-r1 )
+       x86? ( >=media-gfx/pstoedit-3.33 )
+       audiofile? ( media-libs/audiofile )
+       tiff? ( >=media-libs/tiff-3.5.5 )
+       >=media-libs/jasper-1.700.5-r1
+       netcdf? ( sci-libs/netcdf )
+       !amd64? ( cdf? ( sci-libs/cdf ) )
+       >=sys-apps/sed-4"
+
+need-kde 3.1
+
+S="${WORKDIR}/${MPN}-${PV}"
+
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/getversion.patch
+       local cdfversion=\"$(cdfinquire -id | grep "CDF dist" | \
+                                               cut -f 2 -d "V" | tr -d " \n")\"
+       sed -e "s~CDF_VERSION~${cdfversion}~" -i src/LabPlotDialog.cc || \
+               die "sed failed on CDF_VERSION"
+}
+
+src_compile() {
+       local myconf
+       if use amd64; then
+               myconf="$(use_enable cdf)"
+       else
+               myconf="--disable-cdf"
+       fi
+
+       local myconf="${myconf} \
+               --disable-fftw \
+               $(use_enable fftw fftw3) \
+               $(use_enable imagemagick ImageMagick) \
+               $(use_enable audiofile) \
+               $(use_with arts) \
+               $(use_enable tiff) \
+               $(use_enable netcdf)"
+       gnuconfig_update
+       kde_src_compile
+}
+