Added netcdf support. This fixes bug #158771.

Package-Manager: portage-2.1.2_rc3-r7

diff --git a/sci-chemistry/vmd/ChangeLog b/sci-chemistry/vmd/ChangeLog
index 1e4769808fb14d15fe39c21d497bd8530367e399..c2c4ee203fb83174524ca9917775363e1bf6979b 100644 (file)
--- a/sci-chemistry/vmd/ChangeLog
+++ b/sci-chemistry/vmd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/vmd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.9 2006/11/09 14:08:51 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.10 2006/12/22 14:00:25 markusle Exp $
+
+  22 Dec 2006; Markus Dittrich <markusle@gentoo.org>
+  files/vmd-1.8.5-config-gentoo.patch, vmd-1.8.5.ebuild:
+  Added netcdf support. This fixes bug #158771.
 
   09 Nov 2006; Markus Dittrich <markusle@gentoo.org> vmd-1.8.5.ebuild:
   Enabled IMD functionality. Thanks to Stephane Gagne 

diff --git a/sci-chemistry/vmd/Manifest b/sci-chemistry/vmd/Manifest
index a9e6c358d793e2f1de8f4d3aacd8226d055caf51..07979512c5277302b1758e6f8384272ffa0c3156 100644 (file)
--- a/sci-chemistry/vmd/Manifest
+++ b/sci-chemistry/vmd/Manifest
@@ -10,10 +10,10 @@ AUX vmd-1.8.4-plugin-autopsf.patch 723 RMD160 6ccb492685cdeedc762f16e6f8ba010e28
 MD5 94569757919baac0e2b61400d356cb74 files/vmd-1.8.4-plugin-autopsf.patch 723
 RMD160 6ccb492685cdeedc762f16e6f8ba010e2833908a files/vmd-1.8.4-plugin-autopsf.patch 723
 SHA256 7230d8f5f4281b7b8615cc7ff60fc3b77432b3ec12cc507f3016566178b07fae files/vmd-1.8.4-plugin-autopsf.patch 723
-AUX vmd-1.8.5-config-gentoo.patch 4301 RMD160 1863fcea2d82944934d55453420cf823a5f91193 SHA1 00f24221840f29ba0f5591e137d7b5a12790727c SHA256 97b017327d08281017bece0b3ab776e275a449dca3d0688d9bd8ea85ad17ad22
-MD5 32a1ca03385a385a9b9cdf800e29d246 files/vmd-1.8.5-config-gentoo.patch 4301
-RMD160 1863fcea2d82944934d55453420cf823a5f91193 files/vmd-1.8.5-config-gentoo.patch 4301
-SHA256 97b017327d08281017bece0b3ab776e275a449dca3d0688d9bd8ea85ad17ad22 files/vmd-1.8.5-config-gentoo.patch 4301
+AUX vmd-1.8.5-config-gentoo.patch 4714 RMD160 192224a4a05e249c357f08e13d0811dcfb60f7ea SHA1 9b008b3313c969517dacf1c721e894151d0771f7 SHA256 8e7ac5124de52dbef9469c8416b1f011ffe3420043c5a58c2183b67dd66a6be9
+MD5 d6b046bc901c4b95ac869c6298c03f3e files/vmd-1.8.5-config-gentoo.patch 4714
+RMD160 192224a4a05e249c357f08e13d0811dcfb60f7ea files/vmd-1.8.5-config-gentoo.patch 4714
+SHA256 8e7ac5124de52dbef9469c8416b1f011ffe3420043c5a58c2183b67dd66a6be9 files/vmd-1.8.5-config-gentoo.patch 4714
 DIST vmd-1.8.4.src.tar.gz 12042149 RMD160 f49a68ae63a607cd37a58d894df2f22d7df55b85 SHA1 0a19265074bf8c2fa688485018204f452c8daf92 SHA256 29b046767f1efe90d5f3e3dbbdcd4988d5335d1db226405f5ddb9f171c811cac
 DIST vmd-1.8.5.src.tar.gz 17106456 RMD160 70087a42ae20180f2ed18cc4492764ed24b19aa4 SHA1 c3da36d75262b75423ddd2a07c17415b9859504a SHA256 208d7829e4fc2744e30c778e1485b96d35018b1e0dbc02388630ce4a2733c30b
 EBUILD vmd-1.8.4-r1.ebuild 4003 RMD160 64ef2882391b5b051e1fea41ee4fd6e9e7607d4c SHA1 77dcb634ec0bcd6b82a1cd9c22b4e4a6624c0aa0 SHA256 4914216543216e69c2bffc4dca6539ed83119cf14e353dbfa1922923163dd728
@@ -24,14 +24,14 @@ EBUILD vmd-1.8.4.ebuild 3744 RMD160 feaaa172c06211db51b474f60cc8abfc97aef4ea SHA
 MD5 e494359bcb14b7fe3f295f118c7c5f7b vmd-1.8.4.ebuild 3744
 RMD160 feaaa172c06211db51b474f60cc8abfc97aef4ea vmd-1.8.4.ebuild 3744
 SHA256 bcf706a28add41d94d5ac2120d448c8210203f67fada754161f116955bc24d8b vmd-1.8.4.ebuild 3744
-EBUILD vmd-1.8.5.ebuild 4005 RMD160 b7dc56af8cc748bcab40ed248b792fb43b05fe3f SHA1 88de5bc6693b57202efadb7bae8a23b61edfb4fb SHA256 a0f93c177a817f25f372eded8cf00c2604d595c90bf9f3ffc3ad57eff6a4ea33
-MD5 f491c0fe61d111a17411868e8bb61de0 vmd-1.8.5.ebuild 4005
-RMD160 b7dc56af8cc748bcab40ed248b792fb43b05fe3f vmd-1.8.5.ebuild 4005
-SHA256 a0f93c177a817f25f372eded8cf00c2604d595c90bf9f3ffc3ad57eff6a4ea33 vmd-1.8.5.ebuild 4005
-MISC ChangeLog 1798 RMD160 64210518463caebff9621eb69ac0c0b81357f9d1 SHA1 1ade5d550cbc835aa11a306a00ba73caaf1e8632 SHA256 9fa8449cdafbd7fd051c7b9361e1d1c14e48486ac00171fc0bf34777cd9b5d07
-MD5 a4be295242894c30f379832bd44e78fd ChangeLog 1798
-RMD160 64210518463caebff9621eb69ac0c0b81357f9d1 ChangeLog 1798
-SHA256 9fa8449cdafbd7fd051c7b9361e1d1c14e48486ac00171fc0bf34777cd9b5d07 ChangeLog 1798
+EBUILD vmd-1.8.5.ebuild 4209 RMD160 bb6d524b76e92a74e83aac9a40986e68e98cbe62 SHA1 95d224b8a65655ba6654cf7c4db14d119341fdd4 SHA256 c5849ac25ae7a446a388f331e3adc044f1f59cfeb609d40bec19335a0daec210
+MD5 3d7f750a62aa25b66a3877b7e26c4630 vmd-1.8.5.ebuild 4209
+RMD160 bb6d524b76e92a74e83aac9a40986e68e98cbe62 vmd-1.8.5.ebuild 4209
+SHA256 c5849ac25ae7a446a388f331e3adc044f1f59cfeb609d40bec19335a0daec210 vmd-1.8.5.ebuild 4209
+MISC ChangeLog 1958 RMD160 ae8bfee3938817f17b590e20ecda940a2183496c SHA1 ef98e9c5eb395f4a9bfa91bae79c04ab60900d5a SHA256 dfbee5b602503864b6b4e33c7a0a69d34b77a268d0193f699945a0c47b0c5106
+MD5 79f7f5a0ee710c975abe5976e6a48da9 ChangeLog 1958
+RMD160 ae8bfee3938817f17b590e20ecda940a2183496c ChangeLog 1958
+SHA256 dfbee5b602503864b6b4e33c7a0a69d34b77a268d0193f699945a0c47b0c5106 ChangeLog 1958
 MISC metadata.xml 282 RMD160 539a53475b01291eadb86c8c53a0fbc02b4a34d4 SHA1 7f42dcea44641b8a77ab9644791344ec6ed6c327 SHA256 3c1785eb4ab63774ed3a6b1bddd602ef24cd6795f690bb3289d5a980bca06349
 MD5 cf7436fe44a27481d1001082eb06326e metadata.xml 282
 RMD160 539a53475b01291eadb86c8c53a0fbc02b4a34d4 metadata.xml 282

diff --git a/sci-chemistry/vmd/files/vmd-1.8.5-config-gentoo.patch b/sci-chemistry/vmd/files/vmd-1.8.5-config-gentoo.patch
index 55a22ed9862fdbaaed85f4179b7d3786c65ec25d..754977954aaacd980c177fdb57c74caf8d29b819 100644 (file)
--- a/sci-chemistry/vmd/files/vmd-1.8.5-config-gentoo.patch
+++ b/sci-chemistry/vmd/files/vmd-1.8.5-config-gentoo.patch
@@ -1,6 +1,6 @@
 diff -Naur vmd-1.8.5/configure vmd-1.8.5-new/configure
 --- vmd-1.8.5/configure        2006-08-25 16:39:51.000000000 -0400
-+++ vmd-1.8.5-new/configure    2006-08-26 09:57:30.000000000 -0400
++++ vmd-1.8.5-new/configure    2006-12-22 08:26:32.000000000 -0500
 @@ -13,10 +13,10 @@
  $install_name = "vmd";
  
@@ -66,6 +66,17 @@ diff -Naur vmd-1.8.5/configure vmd-1.8.5-new/configure
  $fltk_libs        = "-lfltk -lX11";
  #@fltk_cc          = ('forms_ui.c');
  @fltk_ccpp        = ( 'ColorFltkMenu.C',
+@@ -797,8 +774,8 @@
+ #######################
+ $netcdf_defines     = "";
+ $netcdf_dir         = "$vmd_library_dir/netcdf";
+-$netcdf_include     = "-I$netcdf_dir/include";
+-$netcdf_library     = "-L$netcdf_dir/lib_$config_arch";
++$netcdf_include     = "-Igentoo-netcdf-include";
++$netcdf_library     = "-Lgentoo-netcdf-libs";
+ $netcdf_libs        = "-lnetcdf";
+ @netcdf_cc          = ();
+ @netcdf_ccpp        = ();
 @@ -859,9 +836,9 @@
  ###################
  $python_defines     = "-DVMDPYTHON";

diff --git a/sci-chemistry/vmd/vmd-1.8.5.ebuild b/sci-chemistry/vmd/vmd-1.8.5.ebuild
index f95560d2a48058ecffa91caf6158a669cad40904..805a14c4de7637ba0e0383022996e02b78e4a157 100644 (file)
--- a/sci-chemistry/vmd/vmd-1.8.5.ebuild
+++ b/sci-chemistry/vmd/vmd-1.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.5.ebuild,v 1.2 2006/11/09 14:08:51 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.5.ebuild,v 1.3 2006/12/22 14:00:25 markusle Exp $
 
 inherit eutils toolchain-funcs python
 
@@ -11,7 +11,7 @@ SRC_URI="${P}.src.tar.gz"
 
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE="hardened"
+IUSE="hardened netcdf"
 
 RESTRICT="fetch"
 
@@ -19,11 +19,11 @@ DEPEND="app-shells/tcsh
        || ( x11-libs/libXft virtual/x11 )
        virtual/opengl
        x11-libs/fltk
-       sci-libs/netcdf
        =dev-lang/tcl-8.4*
        =dev-lang/tk-8.4*
        >=dev-lang/python-2.3
        sci-biology/stride
+       netcdf? ( sci-libs/netcdf )
        hardened? ( sys-apps/paxctl )"
 
 
@@ -43,7 +43,6 @@ src_unpack() {
 
        # apply LINUX-arch patches to vmd configure
        epatch "${FILESDIR}"/${P}-config-gentoo.patch
-#      epatch "${FILESDIR}"/${P}-plugin-autopsf.patch
 
        # prepare the plugins 
 
@@ -80,6 +79,11 @@ src_unpack() {
                -e "s:gentoo-fltk-libs:/usr/$(get_libdir)/fltk-1.1:" \
                -i configure || die "failed setting up fltk"
 
+       if use netcdf; then
+               sed -e "s:gentoo-netcdf-include:/usr/include:" \
+                       -e "s:gentoo-netcdf-libs:/usr/$(get_libdir):" \
+                       -i configure || die "failed to set up netcdf"
+       fi
 
        # get installed python version
        python_version
@@ -97,6 +101,10 @@ src_unpack() {
 
        local myconfig="LINUX OPENGL FLTK TK TCL PTHREADS PYTHON IMD"
 
+       if use netcdf; then
+               myconfig="${myconfig} NETCDF"
+       fi
+
        rm -f configure.options && echo $myconfig >> configure.options
 
        ./configure &> /dev/null || die "failed to configure"