summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2009-09-18 14:32:58 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2009-09-18 14:32:58 +0000
commitdff178be6fa741be9671d614f84343f2bd7df5fb (patch)
tree117a431773f4bca6d8c2e73de2adb6cb90cc33c1 /sci-chemistry/vmd
parentRemove old. (diff)
downloadgentoo-2-dff178be6fa741be9671d614f84343f2bd7df5fb.tar.gz
gentoo-2-dff178be6fa741be9671d614f84343f2bd7df5fb.tar.bz2
gentoo-2-dff178be6fa741be9671d614f84343f2bd7df5fb.zip
Remove built_with_use and use proper DEPEND atoms that work properly for both tk 8.4 and 8.5 users.
(Portage version: 2.2_rc40/cvs/Linux i686)
Diffstat (limited to 'sci-chemistry/vmd')
-rw-r--r--sci-chemistry/vmd/ChangeLog6
-rw-r--r--sci-chemistry/vmd/vmd-1.8.7.ebuild19
2 files changed, 12 insertions, 13 deletions
diff --git a/sci-chemistry/vmd/ChangeLog b/sci-chemistry/vmd/ChangeLog
index 67b9272b479b..cb91a83015f6 100644
--- a/sci-chemistry/vmd/ChangeLog
+++ b/sci-chemistry/vmd/ChangeLog
@@ -1,6 +1,10 @@
# 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.25 2009/08/11 13:59:47 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.26 2009/09/18 14:32:58 betelgeuse Exp $
+
+ 18 Sep 2009; Petteri Räty <betelgeuse@gentoo.org> vmd-1.8.7.ebuild:
+ Remove built_with_use and use proper DEPEND atoms that work properly for
+ both tk 8.4 and 8.5 users.
11 Aug 2009; Markus Dittrich <markusle@gentoo.org> vmd-1.8.7.ebuild,
+files/vmd.desktop, +files/vmd.png:
diff --git a/sci-chemistry/vmd/vmd-1.8.7.ebuild b/sci-chemistry/vmd/vmd-1.8.7.ebuild
index af027138f8da..fda26861a614 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.4 2009/08/11 13:59:47 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.7.ebuild,v 1.5 2009/09/18 14:32:58 betelgeuse Exp $
EAPI="2"
@@ -17,11 +17,16 @@ IUSE=""
RESTRICT="fetch"
+# currently, tk-8.5* with USE=truetype breaks some
+# tk apps such as Sequence Viewer or Timeline.
DEPEND="x11-libs/libXft
virtual/opengl
x11-libs/fltk:1.1
>=dev-lang/tcl-8.4
- >=dev-lang/tk-8.4
+ || (
+ >=dev-lang/tk-8.5[-truetype]
+ =dev-lang/tk-8.4*
+ )
=dev-lang/python-2*
dev-lang/perl
dev-python/numpy
@@ -43,16 +48,6 @@ 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"