Removed the EAPI2 check for -truetype and added explicit error logic.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 34 insertions, 7 deletions

diff --git a/sci-chemistry/vmd/ChangeLog b/sci-chemistry/vmd/ChangeLog
index 854a80b5321d..e07546317f1d 100644
--- a/sci-chemistry/vmd/ChangeLog
+++ b/sci-chemistry/vmd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/vmd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.23 2009/08/06 14:19:15 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.24 2009/08/07 13:29:11 markusle Exp $
+
+  07 Aug 2009; Markus Dittrich <markusle@gentoo.org> vmd-1.8.7.ebuild,
+  files/vmd-1.8.7-config.patch:
+  Remove the EAPI2 check for -truetype and add explicit error logic
+  so tk-8.4 users can emerge vmd as well. Also updated the config
+  patch to handle tk8.4 better.
 
 *vmd-1.8.7 (05 Aug 2009)
 
diff --git a/sci-chemistry/vmd/Manifest b/sci-chemistry/vmd/Manifest
index 61314871e6c3..231486103ea5 100644
--- a/sci-chemistry/vmd/Manifest
+++ b/sci-chemistry/vmd/Manifest
@@ -3,12 +3,12 @@ AUX vmd-1.8.6-config-gentoo.patch 4666 RMD160 1fb149ab58292f42abbe4d658aff0334d3
 AUX vmd-1.8.6-fix-crash-on-tcl8.5.patch 1355 RMD160 19f86942aabda74eb5726346b84012b6509b67f1 SHA1 921c554d9a6e296251ce01e22f5bf03c7bcc8841 SHA256 98bcd0c524f0392a12149c5d6ab15cff489edf1092315a74110f655de482ca4e
 AUX vmd-1.8.6-python-2.5.patch 860 RMD160 4f9f83800e0f5083fcd32a016404c909da4042a6 SHA1 bb401cccbb18428cc0fdce5cf4b5fd3a910a9cea SHA256 652e5dbb44d2c14c13886e9e7bc2677287bfdd520e7489547cffc2331b39d7ec
 AUX vmd-1.8.6-tcltk8.5.patch 2348 RMD160 d1661e1effd1ab35def56cbd53601801427f96a0 SHA1 b7b7fd68cb6e9c8fea12c4544179daaada5dd36b SHA256 d1e39f5d67af22281ccf1bf56e1360778e03d1b1ea6c6c184a0d269f49edee2c
-AUX vmd-1.8.7-config.patch 5519 RMD160 68d3648978db8c23e4df08dd7757018b6a6d6f88 SHA1 1a93053099ba364538463b5a06a31e96f3224e5a SHA256 0f39351b856ba5a828344e0ae8ec6451ace8a3d0f491639564cb53ac6935ef9d
+AUX vmd-1.8.7-config.patch 5960 RMD160 3cc9368c09525328a2fde0b9322e55b60f86d675 SHA1 22af045aa42113ecddb8245387d3e60cb133570a SHA256 a838a8ef8be710c2ed5cec9d0ad47055e47cbc649b9187ba8b7d551e342ad39a
 AUX vmd-1.8.7-use-bash-startup.patch 717 RMD160 f061a9e4c90115b3eab42d754e66f62240b3fb69 SHA1 73001ba99f97ce484610593b50bafcbed7943889 SHA256 3f9a8c9f8f0f461b8dd3985d71265c942e655e56e1745b75c25f547821d4228c
 DIST vmd-1.8.6.src.tar.gz 18045341 RMD160 66f8ee5a0313000ea8dd3cb79881fd26a2836a79 SHA1 62ceaab06c7fec7c2c8e9a2d7f08c83ba662679d SHA256 fe2bcf7ffea1ed6b3a7f2402d6e1cb1d6def588a8b09a5d0943c0a9f3426ead2
 DIST vmd-1.8.7.src.tar.gz 23853864 RMD160 1c4751552d7b3f376f91a4b28ee9d4a028ded01a SHA1 409b6f8959d551f581991073f98885b47c21c25c SHA256 72fe2fb7eff4c805a886ea929c7e143a3a1be57cc817b5d1719d29e591d80316
 EBUILD vmd-1.8.6-r1.ebuild 4349 RMD160 6fcb070cb84f90164db8554a0596f208a1a6490b SHA1 46b06a0c0b8decf35e379f8bbaa96774733ef847 SHA256 071f247254b1941dcb05e949e08c4d3d97568bdb8fbe3ebe480bbb764682da9c
 EBUILD vmd-1.8.6.ebuild 4299 RMD160 1e4bee161856b5996bbd1b61de1d5575c030804e SHA1 1a943a032e8699ea41b7aa135a2550e05fbfc77a SHA256 d5f4d08855fc4095bfd58099aae3a3e56c1db064e06bf9569f8ef71334f4734a
-EBUILD vmd-1.8.7.ebuild 4365 RMD160 47022a9d8dc9dfc3ff8740e7c7212c779d154d8e SHA1 7d7516c14167d80f7382086f693a019b83e59047 SHA256 4c7cbfdc2c7fad76af36ba6dc6d48031259cea72182994988e6082a147fa80f2
-MISC ChangeLog 4297 RMD160 682d4c3ad918647bf013bc7f587d09a188041bdc SHA1 55968bc11e4ee07c86fe7756cb17995d374b2519 SHA256 428ae8093899224ee135bfd253bdd63c9b430dbb1c33a20b20abc9b721eb0676
+EBUILD vmd-1.8.7.ebuild 4767 RMD160 19418cb225944610484b582795ce117102850c30 SHA1 2aad737109f8fa22743fe007b10f5d0fe7506c1e SHA256 4051ae58c2549b830603f3b6f6471cc59ae3384cd7836f75b3c0118914c6c198
+MISC ChangeLog 4567 RMD160 c00d3276699d668185d3b199937b13fdcf10b7e4 SHA1 9e17e8a5cabb0747c082af6172ff6046e071972b SHA256 060684e847674cd8ae0e4e6fb3c6378148af3d47e3303f3bb986fb83f7e5e7a6
 MISC metadata.xml 282 RMD160 539a53475b01291eadb86c8c53a0fbc02b4a34d4 SHA1 7f42dcea44641b8a77ab9644791344ec6ed6c327 SHA256 3c1785eb4ab63774ed3a6b1bddd602ef24cd6795f690bb3289d5a980bca06349
diff --git a/sci-chemistry/vmd/files/vmd-1.8.7-config.patch b/sci-chemistry/vmd/files/vmd-1.8.7-config.patch
index 633337105e97..7850e9f32b6b 100644
--- a/sci-chemistry/vmd/files/vmd-1.8.7-config.patch
+++ b/sci-chemistry/vmd/files/vmd-1.8.7-config.patch
@@ -1,6 +1,6 @@
 diff -Naur vmd-1.8.7/configure vmd-1.8.7.new/configure
 --- vmd-1.8.7/configure	2009-08-01 03:19:34.000000000 -0400
-+++ vmd-1.8.7.new/configure	2009-08-05 09:07:08.000000000 -0400
++++ vmd-1.8.7.new/configure	2009-08-07 09:12:43.000000000 -0400
 @@ -13,10 +13,10 @@
  $install_name = "vmd";
  
@@ -73,6 +73,17 @@ diff -Naur vmd-1.8.7/configure vmd-1.8.7.new/configure
  $fltk_libs        = "-lfltk -lX11";
  #@fltk_cc          = ('forms_ui.c');
  @fltk_cu          = ();
+@@ -612,8 +589,8 @@
+ if ($config_tk) { $tcl_include .= " -I$stock_tk_include_dir"; }
+ $tcl_library      = "-L$stock_tcl_library_dir";
+ if ($config_tk) { $tcl_library .= " -L$stock_tk_library_dir"; }
+-$tcl_libs         = "-ltcl8.5";  
+-if ($config_tk) { $tcl_libs = "-ltk8.5 -lX11 " . $tcl_libs; }
++$tcl_libs         = "-ltcl";  
++if ($config_tk) { $tcl_libs = "-ltk -lX11 " . $tcl_libs; }
+ 
+ @tcl_cc           = ();
+ @tcl_cu           = ();
 @@ -938,8 +915,8 @@
  #######################
  $netcdf_defines     = "";
diff --git a/sci-chemistry/vmd/vmd-1.8.7.ebuild b/sci-chemistry/vmd/vmd-1.8.7.ebuild
index 2b20f6714aba..4123b59229c4 100644
--- a/sci-chemistry/vmd/vmd-1.8.7.ebuild
+++ b/sci-chemistry/vmd/vmd-1.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild,v 1.2 2009/08/06 15:18:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild,v 1.3 2009/08/07 13:29:11 markusle Exp $
 
 EAPI="2"
 
@@ -21,7 +21,7 @@ DEPEND="x11-libs/libXft
 	virtual/opengl
 	x11-libs/fltk:1.1
 	>=dev-lang/tcl-8.4
-	>=dev-lang/tk-8.4[-truetype]
+	>=dev-lang/tk-8.4
 	=dev-lang/python-2*
 	dev-lang/perl
 	dev-python/numpy
@@ -43,6 +43,16 @@ pkg_nofetch() {
 }
 
 src_prepare() {
+	# currently, tk-8.5* with USE=truetype breaks some
+	# tk apps such as Sequence Viewer or Timeline.
+	if has_version =dev-lang/tcl-8.5* && built_with_use dev-lang/tk truetype; then
+		echo
+		eerror "Error: Your tk was build with USE=\"truetype\" which"
+		eerror "will cause some of VMD's tk apps to not work properly"
+		eerror "(Sequence Viewer, Timeline, ..)."
+		die "Please emerge tk with USE=\"-truetype\"".
+	fi
+
 	# apply LINUX-arch patches to vmd configure
 	epatch "${FILESDIR}/${P}-config.patch"
 	epatch "${FILESDIR}/${P}-use-bash-startup.patch"