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
commitb6710402eb4d8965e90a1a455a7d9687796e9800 (patch)
treeb3c734c9d6d2ffa7a7f88aacb55a1344281cd7d7
parentRemove old. (diff)
downloadhistorical-b6710402eb4d8965e90a1a455a7d9687796e9800.tar.gz
historical-b6710402eb4d8965e90a1a455a7d9687796e9800.tar.bz2
historical-b6710402eb4d8965e90a1a455a7d9687796e9800.zip
Remove built_with_use and use proper DEPEND atoms that work properly for both tk 8.4 and 8.5 users.
Package-Manager: portage-2.2_rc40/cvs/Linux i686
-rw-r--r--sci-chemistry/vmd/ChangeLog6
-rw-r--r--sci-chemistry/vmd/Manifest14
-rw-r--r--sci-chemistry/vmd/vmd-1.8.7.ebuild19
3 files changed, 24 insertions, 15 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/Manifest b/sci-chemistry/vmd/Manifest
index 489f65bad8f3..4f7e76fd7065 100644
--- a/sci-chemistry/vmd/Manifest
+++ b/sci-chemistry/vmd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX vmd-1.8.5-config-gentoo.patch 4714 RMD160 192224a4a05e249c357f08e13d0811dcfb60f7ea SHA1 9b008b3313c969517dacf1c721e894151d0771f7 SHA256 8e7ac5124de52dbef9469c8416b1f011ffe3420043c5a58c2183b67dd66a6be9
AUX vmd-1.8.6-config-gentoo.patch 4666 RMD160 1fb149ab58292f42abbe4d658aff0334d3fe73f9 SHA1 27a7ea51772e93e858ef23bf09d819e75d6418b5 SHA256 6dc232ee1c01a56bb94bdf193f024e868f957a22b6c1c8666d2d443801a36f03
AUX vmd-1.8.6-fix-crash-on-tcl8.5.patch 1355 RMD160 19f86942aabda74eb5726346b84012b6509b67f1 SHA1 921c554d9a6e296251ce01e22f5bf03c7bcc8841 SHA256 98bcd0c524f0392a12149c5d6ab15cff489edf1092315a74110f655de482ca4e
@@ -11,6 +14,13 @@ DIST vmd-1.8.6.src.tar.gz 18045341 RMD160 66f8ee5a0313000ea8dd3cb79881fd26a2836a
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 5011 RMD160 525b9c559beda1952b2d230abf7513a8ef41d9af SHA1 8ebb90b3816ce88feef5cbe2ab8fe2685312ebd0 SHA256 86741280ed52e9acad1fba890229c7b4a9eee6e6d8dc8cbce9bec3109972218c
-MISC ChangeLog 4775 RMD160 6cf86eb6e41268e0f64bea034327bd8118d6fcfa SHA1 fbcd82379b7693d39d69c5c8ed96439c417c1c7d SHA256 5ff055d0c21c31ddfe33e740186577229e6bf943b44565476f276eab23bcb210
+EBUILD vmd-1.8.7.ebuild 4738 RMD160 88f166bf015e3d35249a7c722cc55b84ad3b22d8 SHA1 68b95594e87621c7e0e71d42e0f3315e7488cb31 SHA256 18be6e35b62c51b2c005db1012e1286b3785a18d6c2b5daebdb532069ef6eef8
+MISC ChangeLog 4953 RMD160 026ed29919f95b72da7b68c82f5b784cb2600c36 SHA1 ff2376d95c5435554e76e2e6c8c1e29f9d767744 SHA256 f178181a66c25abb958b81748dbc0aba059ac4ef3be3623b5d5baf75a3e55019
MISC metadata.xml 282 RMD160 539a53475b01291eadb86c8c53a0fbc02b4a34d4 SHA1 7f42dcea44641b8a77ab9644791344ec6ed6c327 SHA256 3c1785eb4ab63774ed3a6b1bddd602ef24cd6795f690bb3289d5a980bca06349
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqzmiQACgkQcxLzpIGCsLRaZQCePF8pEbIw/SMUaK6ysQlTcTW/
+TF4AnjaIWYoQVd40UbnaVCj+nuTYjok+
+=AMi5
+-----END PGP SIGNATURE-----
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"