Patch configure so that it doesn not link to netcdf unconditionally, thanks to Lucas Chiesa <lucas.chiesa@gmail.com> for providing the patch.

(Portage version: 2.0.53_rc6)

5 files changed, 119 insertions, 4 deletions

diff --git a/media-gfx/kst/ChangeLog b/media-gfx/kst/ChangeLog
index 9614793f5a2a..44c5fa2f58aa 100644
--- a/media-gfx/kst/ChangeLog
+++ b/media-gfx/kst/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/kst
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/ChangeLog,v 1.9 2005/09/02 19:43:41 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/ChangeLog,v 1.10 2005/10/28 13:07:32 cryos Exp $
+
+*kst-1.1.0-r1 (28 Oct 2005)
+
+  28 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/kst-1.1.0-netcdf-fix.patch, +kst-1.1.0-r1.ebuild:
+  Patch configure so that it doesn not link to netcdf unconditionally, thanks
+  to Lucas Chiesa <lucas.chiesa@gmail.com> for providing the patch.
 
   02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> kst-1.1.0.ebuild:
   Stable on ppc.
diff --git a/media-gfx/kst/Manifest b/media-gfx/kst/Manifest
index 9f6b193df978..0ac85c9c0bdd 100644
--- a/media-gfx/kst/Manifest
+++ b/media-gfx/kst/Manifest
@@ -1,6 +1,8 @@
-MD5 862e7941cb21c9dd10e8bd6183f21fb0 metadata.xml 173
 MD5 05fe67328ff1f0cd9dcf1b79388a59d6 ChangeLog 2356
-MD5 32ece781bd32421de3d124f92e6a839b kst-1.1.0.ebuild 613
-MD5 3031d578551124826d60e7fdbe69c5cb kst-0.97.ebuild 496
 MD5 19eccdaf16ff3e3301ad96c85fd3417b files/digest-kst-0.97 61
 MD5 b3c3b4529c7a84a69be4e52b98c71a53 files/digest-kst-1.1.0 63
+MD5 b3c3b4529c7a84a69be4e52b98c71a53 files/digest-kst-1.1.0-r1 63
+MD5 3031d578551124826d60e7fdbe69c5cb kst-0.97.ebuild 496
+MD5 9fcae6a0db757e404977c5c3ad12bae1 kst-1.1.0-r1.ebuild 704
+MD5 32ece781bd32421de3d124f92e6a839b kst-1.1.0.ebuild 613
+MD5 862e7941cb21c9dd10e8bd6183f21fb0 metadata.xml 173
diff --git a/media-gfx/kst/files/digest-kst-1.1.0-r1 b/media-gfx/kst/files/digest-kst-1.1.0-r1
new file mode 100644
index 000000000000..5189a462d526
--- /dev/null
+++ b/media-gfx/kst/files/digest-kst-1.1.0-r1
@@ -0,0 +1 @@
+MD5 68a38073fa6de1e52d55dd9db4e85b4d kst-1.1.0.tar.gz 10598874
diff --git a/media-gfx/kst/files/kst-1.1.0-netcdf-fix.patch b/media-gfx/kst/files/kst-1.1.0-netcdf-fix.patch
new file mode 100644
index 000000000000..cf2d0fe35c92
--- /dev/null
+++ b/media-gfx/kst/files/kst-1.1.0-netcdf-fix.patch
@@ -0,0 +1,76 @@
+--- configure.in	2005-10-27 00:25:05.000000000 -0300
++++ configure.in	2005-10-27 00:22:25.000000000 -0300
+@@ -156,7 +156,7 @@
+     AC_HELP_STRING([--with-cdf=DIR],[where the root of CDF is installed ]),
+     [  ac_cdf_includes="-I$withval/include"
+        ac_cdf_libraries="-L$withval/lib"
+-    ])
++     ])
+ 
+ all_includes_save="$all_includes"
+ all_includes="$all_includes $ac_cdf_includes"
+@@ -182,32 +182,43 @@
+ # netCDF Test
+ ac_netcdf_includes=""
+ ac_netcdf_libraries=""
+-AC_ARG_WITH(netcdf,
+-    AC_HELP_STRING([--with-netcdf=DIR],[where the root of NetCDF is installed ]),
+-    [  ac_netcdf_includes="-I$withval/include"
+-       ac_netcdf_libraries="-L$withval/lib"
+-    ])
+-
+-all_includes_save="$all_includes"
+-all_includes="$all_includes $ac_netcdf_includes"
+-KDE_CHECK_HEADER(netcdfcpp.h, AC_DEFINE(HAVE_NETCDFCPP_H, 1, [If we have NetCDF CPP headers]) have_netcdfcpp_h=yes NETCDFINCLUDES="$ac_netcdf_includes", , )
+-all_includes="$all_includes_save"
++NETCDFLIBS=""
+ 
+-ldflags_save="$LDFLAGS"
+-LDFLAGS="$LDFLAGS $ac_netcdf_libraries"
+-KDE_CHECK_LIB(netcdf, nc_open, NETCDFLIBS="$ac_netcdf_libraries -lnetcdf_c++ -lnetcdf $NETCDFLIBS", , )
+-LDFLAGS="$ldflags_save"
+-
+-if test $ac_cv_lib_netcdf_nc_open = yes; then
+-  if test $have_netcdfcpp_h = yes; then
+-    AC_SUBST(NETCDFLIBS)
+-    AC_SUBST(NETCDFINCLUDES)
+-    AC_DEFINE(KST_HAVE_NETCDF, 1, [If we have the NetCDF libraries.])
+-  fi
++AC_MSG_CHECKING([--enable-netcdf argument])
++AC_ARG_ENABLE(netcdf,
++    [  --enable-netcdf         enable netcdf support.],
++    [ enable_netcdf=$enableval ],
++    [ enable_netcdf="no" ])
++
++if test "$enable_netcdf" = "yes"; then
++    AC_ARG_WITH(netcdf,
++        AC_HELP_STRING([--with-netcdf=DIR],[where the root of NetCDF is installed ]),
++    	[  ac_netcdf_includes="-I$withval/include"
++       	   ac_netcdf_libraries="-L$withval/lib"
++    	])
++
++    all_includes_save="$all_includes"
++    all_includes="$all_includes $ac_netcdf_includes"
++    KDE_CHECK_HEADER(netcdfcpp.h, AC_DEFINE(HAVE_NETCDFCPP_H, 1, [If we have NetCDF CPP headers]) have_netcdfcpp_h=yes NETCDFINCLUDES="$ac_netcdf_includes", , )
++    all_includes="$all_includes_save"
++
++    ldflags_save="$LDFLAGS"
++    LDFLAGS="$LDFLAGS $ac_netcdf_libraries"
++    KDE_CHECK_LIB(netcdf, nc_open, NETCDFLIBS="$ac_netcdf_libraries -lnetcdf_c++ -lnetcdf $NETCDFLIBS", , )
++    LDFLAGS="$ldflags_save"
++
++    if test $ac_cv_lib_netcdf_nc_open = yes; then
++      if test $have_netcdfcpp_h = yes; then
++          AC_SUBST(NETCDFLIBS)
++          AC_SUBST(NETCDFINCLUDES)
++          AC_DEFINE(KST_HAVE_NETCDF, 1, [If we have the NetCDF libraries.])
++      fi
++    fi
+ fi
+ 
+ AM_CONDITIONAL(include_netcdf, test -n "$NETCDFLIBS")
+ 
++
+ # Readline and ncurses check
+ KDE_CHECK_HEADER(readline/readline.h, AC_DEFINE(HAVE_READLINE_H, 1, [If we have libreadline headers]) have_readline_h=yes, , )
+ KDE_CHECK_LIB(readline, rl_cleanup_after_signal, LIBREADLINE="-lreadline -lncurses", , -lncurses)
diff --git a/media-gfx/kst/kst-1.1.0-r1.ebuild b/media-gfx/kst/kst-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..2a9ab991fdd3
--- /dev/null
+++ b/media-gfx/kst/kst-1.1.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kst/kst-1.1.0-r1.ebuild,v 1.1 2005/10/28 13:07:32 cryos Exp $
+
+inherit kde
+
+DESCRIPTION="A plotting and data viewing program for KDE"
+HOMEPAGE="http://omega.astro.utoronto.ca/kst/"
+SRC_URI="http://mirrors.isc.org/pub/kde/stable/apps/KDE3.x/scientific/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE=""
+
+RDEPEND="${DEPEND}
+	sci-libs/gsl"
+
+need-kde 3.1
+
+PATCHES="${FILESDIR}/${P}-netcdf-fix.patch"
+
+src_unpack(){
+	kde_src_unpack
+	einfo "Regenerating autotools files..."
+	rm -f configure
+	autoconf || die "autoconf failed"
+}