Remove netcdf use flag and enable netcdf support by default since it is needed by the catdcd plugin. This fixes bug #159081.

Package-Manager: portage-2.1.2_rc3-r7

3 files changed, 20 insertions, 22 deletions

diff --git a/sci-chemistry/vmd/ChangeLog b/sci-chemistry/vmd/ChangeLog
index c2c4ee203fb8..dab04607acdb 100644
--- 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.10 2006/12/22 14:00:25 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.11 2006/12/27 03:04:20 markusle Exp $
+
+  27 Dec 2006; Markus Dittrich <markusle@gentoo.org> vmd-1.8.5.ebuild:
+  Remove netcdf use flag and enable netcdf support by default
+  since it is needed by the catdcd plugin. This fixes bug #159081.
 
   22 Dec 2006; Markus Dittrich <markusle@gentoo.org>
   files/vmd-1.8.5-config-gentoo.patch, vmd-1.8.5.ebuild:
diff --git a/sci-chemistry/vmd/Manifest b/sci-chemistry/vmd/Manifest
index 07979512c527..2baff578d426 100644
--- a/sci-chemistry/vmd/Manifest
+++ b/sci-chemistry/vmd/Manifest
@@ -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 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
+EBUILD vmd-1.8.5.ebuild 4111 RMD160 1c96985cc0e9b41022c9328d0b6ca56e6fc70e50 SHA1 97c3c7834dc9f013d54f7048b263f7f1717313b2 SHA256 ff77eb968647853c8354e94a5805860cb1afc70125ad36638de274fa2e288955
+MD5 4ac9655c1183c1c79993957e96c30357 vmd-1.8.5.ebuild 4111
+RMD160 1c96985cc0e9b41022c9328d0b6ca56e6fc70e50 vmd-1.8.5.ebuild 4111
+SHA256 ff77eb968647853c8354e94a5805860cb1afc70125ad36638de274fa2e288955 vmd-1.8.5.ebuild 4111
+MISC ChangeLog 2159 RMD160 58061c32ab18431cfbe2c2cc41025fa91d0a2b60 SHA1 ee0866e06d81b7975fb7e8ea39704947d564898d SHA256 944aea93566ce743e6363b0a88c6cb280aa222fa071bf13fd7c7982a9c0cd5f8
+MD5 f545dd200720431425ec41b1ffe0835b ChangeLog 2159
+RMD160 58061c32ab18431cfbe2c2cc41025fa91d0a2b60 ChangeLog 2159
+SHA256 944aea93566ce743e6363b0a88c6cb280aa222fa071bf13fd7c7982a9c0cd5f8 ChangeLog 2159
 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/vmd-1.8.5.ebuild b/sci-chemistry/vmd/vmd-1.8.5.ebuild
index 805a14c4de76..1b3d0c55ff97 100644
--- 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.3 2006/12/22 14:00:25 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.5.ebuild,v 1.4 2006/12/27 03:04:20 markusle Exp $
 
 inherit eutils toolchain-funcs python
 
@@ -11,7 +11,7 @@ SRC_URI="${P}.src.tar.gz"
 
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE="hardened netcdf"
+IUSE="hardened"
 
 RESTRICT="fetch"
 
@@ -23,7 +23,7 @@ DEPEND="app-shells/tcsh
 	=dev-lang/tk-8.4*
 	>=dev-lang/python-2.3
 	sci-biology/stride
-	netcdf? ( sci-libs/netcdf )
+	sci-libs/netcdf
 	hardened? ( sys-apps/paxctl )"
 
 
@@ -79,11 +79,9 @@ 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
+	sed -e "s:gentoo-netcdf-include:/usr/include:" \
+		-e "s:gentoo-netcdf-libs:/usr/$(get_libdir):" \
+		-i configure || die "failed to set up netcdf"
 
 	# get installed python version
 	python_version
@@ -99,11 +97,7 @@ src_unpack() {
 		-e "s:LINUXAMD64:LINUX:g" \
 		-i ${S}/bin/vmd || die "failed setting up vmd wrapper script"
 
-	local myconfig="LINUX OPENGL FLTK TK TCL PTHREADS PYTHON IMD"
-
-	if use netcdf; then
-		myconfig="${myconfig} NETCDF"
-	fi
+	local myconfig="LINUX OPENGL FLTK TK TCL PTHREADS PYTHON IMD NETCDF"
 
 	rm -f configure.options && echo $myconfig >> configure.options