Specify mesa for bug #152426

Package-Manager: portage-2.1.1-r1

4 files changed, 28 insertions, 23 deletions

diff --git a/sci-chemistry/molmol/ChangeLog b/sci-chemistry/molmol/ChangeLog
index ee245f5eef41..61baac07285c 100644
--- a/sci-chemistry/molmol/ChangeLog
+++ b/sci-chemistry/molmol/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/molmol
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.12 2006/09/20 05:09:00 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.13 2006/10/23 04:29:39 je_fro Exp $
+
+  23 Oct 2006; Jeff Gardner <je_fro@gentoo.org> molmol-2k_p2.ebuild:
+  Specify mesa in DEPEND - bug 152426
 
   20 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml:
   (#148281) Change herd to sci-chemistry from sci.
diff --git a/sci-chemistry/molmol/Manifest b/sci-chemistry/molmol/Manifest
index 70280d182fc8..12701768efe6 100644
--- a/sci-chemistry/molmol/Manifest
+++ b/sci-chemistry/molmol/Manifest
@@ -2,20 +2,20 @@ AUX pjf_RH9_molmol2k2.diff 3138 RMD160 1792aa433a21c2f64880b244d11b6bbd2552c95b
 MD5 52b16a9f8b5a23f8012e63250234a5f3 files/pjf_RH9_molmol2k2.diff 3138
 RMD160 1792aa433a21c2f64880b244d11b6bbd2552c95b files/pjf_RH9_molmol2k2.diff 3138
 SHA256 5b7c3ede5714b123824cc0b8533f679d22d1c5219bf88e8d6a4cebe8e245aeb9 files/pjf_RH9_molmol2k2.diff 3138
-DIST molmol-2k.2.0-doc.tar.gz 1062297
-DIST molmol-2k.2.0-src.tar.gz 1088805
-EBUILD molmol-2k_p2.ebuild 2042 RMD160 9919914d873239a7bb2bd8d9892bb427ec1a0e93 SHA1 ad4dbdf872642e6a5fe94b388ce28328582ec677 SHA256 65f6585df2b12e861b644f8b72a3157d6092fc37c13cbe95cd3d0c4fbb7066ba
-MD5 b551456db2d6214643b312aac9444c52 molmol-2k_p2.ebuild 2042
-RMD160 9919914d873239a7bb2bd8d9892bb427ec1a0e93 molmol-2k_p2.ebuild 2042
-SHA256 65f6585df2b12e861b644f8b72a3157d6092fc37c13cbe95cd3d0c4fbb7066ba molmol-2k_p2.ebuild 2042
-MISC ChangeLog 1655 RMD160 90f5d47747779b201dcd7d9c954422735bec22d0 SHA1 2cf23c9ff8ba3cc785169e7c38308522e5f750cc SHA256 0729f5fb505ec6051896f447af1e2133bb8c1b20c0b91c091a6570e0482dced4
-MD5 e567e1e9af6769889e9cae985da1a43f ChangeLog 1655
-RMD160 90f5d47747779b201dcd7d9c954422735bec22d0 ChangeLog 1655
-SHA256 0729f5fb505ec6051896f447af1e2133bb8c1b20c0b91c091a6570e0482dced4 ChangeLog 1655
+DIST molmol-2k.2.0-doc.tar.gz 1062297 RMD160 08b3e21ab6eb7c9044e59373334181ff91ca8a53 SHA1 b47551283fa19f57f4d5edcbd52f725055d80b7f SHA256 07e1c3fd04ffe7c9e9d91eaefa0bf72e6d0913a981eec3bf0879bfc65537a6be
+DIST molmol-2k.2.0-src.tar.gz 1088805 RMD160 b1de89953631dd9b11928751d7853cb511bf45f0 SHA1 09482a1dea601563ca64e773dc0ec47019e22c63 SHA256 1104dcb1b2517581c7d6b1695ff2e92f4076ad34afc48dd896eec38e5acf2287
+EBUILD molmol-2k_p2.ebuild 1981 RMD160 b19c0fcaa0abebdb0ef290b6055279a3b69215a3 SHA1 d69ad74e6ea4616c64291113959741e8d4a5f8c0 SHA256 1db7e95b75b404034a5d90631ff2e1b68136f9d0ec7ad2865b76f6d938ff9e9f
+MD5 351d96191cb744e7383a86d8104c3747 molmol-2k_p2.ebuild 1981
+RMD160 b19c0fcaa0abebdb0ef290b6055279a3b69215a3 molmol-2k_p2.ebuild 1981
+SHA256 1db7e95b75b404034a5d90631ff2e1b68136f9d0ec7ad2865b76f6d938ff9e9f molmol-2k_p2.ebuild 1981
+MISC ChangeLog 1760 RMD160 aa318d2bcec8e6393962fe34142236b6333eeea7 SHA1 30e7ab5172bf89f1ae3dfca47d96f223f626f8b9 SHA256 179e8b60d635aeb950ab3abea42e683d0d16522d1e22462b6258da5621606436
+MD5 b5c63715e00bea59f2b723e400995612 ChangeLog 1760
+RMD160 aa318d2bcec8e6393962fe34142236b6333eeea7 ChangeLog 1760
+SHA256 179e8b60d635aeb950ab3abea42e683d0d16522d1e22462b6258da5621606436 ChangeLog 1760
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 MD5 43628e9f5743b5c3b018a82669a76bc7 metadata.xml 166
 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 metadata.xml 166
 SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 metadata.xml 166
-MD5 362482186ee96b64ce53b5e0bea55df6 files/digest-molmol-2k_p2 140
-RMD160 c625512746cebd5680d2a96bf7423696006b81a1 files/digest-molmol-2k_p2 140
-SHA256 2464530e85b7e9ac3a9031fbc65c7a9e4a8ae6dfeb0526ae413bd7d7983009eb files/digest-molmol-2k_p2 140
+MD5 81e91ab929105f81d6825b67968e12b7 files/digest-molmol-2k_p2 512
+RMD160 e3d07499bf471137214b5d1b0f1ab921af95d4c7 files/digest-molmol-2k_p2 512
+SHA256 ecbae9ca51c73042f4c36e056f7107bcd2536eb56bcbf8f2bd737ab24c46dedd files/digest-molmol-2k_p2 512
diff --git a/sci-chemistry/molmol/files/digest-molmol-2k_p2 b/sci-chemistry/molmol/files/digest-molmol-2k_p2
index ace8b09d3c59..437abd311e6a 100644
--- a/sci-chemistry/molmol/files/digest-molmol-2k_p2
+++ b/sci-chemistry/molmol/files/digest-molmol-2k_p2
@@ -1,2 +1,6 @@
-MD5 e1f4416d8041a67fa08cadb03ed91c7c molmol-2k.2.0-src.tar.gz 1088805
 MD5 517545b60b0179ab691a679ed29903a7 molmol-2k.2.0-doc.tar.gz 1062297
+RMD160 08b3e21ab6eb7c9044e59373334181ff91ca8a53 molmol-2k.2.0-doc.tar.gz 1062297
+SHA256 07e1c3fd04ffe7c9e9d91eaefa0bf72e6d0913a981eec3bf0879bfc65537a6be molmol-2k.2.0-doc.tar.gz 1062297
+MD5 e1f4416d8041a67fa08cadb03ed91c7c molmol-2k.2.0-src.tar.gz 1088805
+RMD160 b1de89953631dd9b11928751d7853cb511bf45f0 molmol-2k.2.0-src.tar.gz 1088805
+SHA256 1104dcb1b2517581c7d6b1695ff2e92f4076ad34afc48dd896eec38e5acf2287 molmol-2k.2.0-src.tar.gz 1088805
diff --git a/sci-chemistry/molmol/molmol-2k_p2.ebuild b/sci-chemistry/molmol/molmol-2k_p2.ebuild
index 4b44c9dabf33..d99a78f1efc4 100644
--- a/sci-chemistry/molmol/molmol-2k_p2.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2.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/molmol/molmol-2k_p2.ebuild,v 1.7 2006/07/09 07:12:33 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2.ebuild,v 1.8 2006/10/23 04:29:39 je_fro Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ppc x86"
 IUSE=""
 DEPEND="virtual/motif
 	|| ( x11-libs/libXpm virtual/x11 )
-	virtual/opengl
+	media-libs/mesa
 	media-libs/jpeg
 	media-libs/tiff
 	media-libs/libpng
@@ -30,12 +30,10 @@ S=${WORKDIR}
 MMDIR="/usr/$(get_libdir)/molmol"
 
 src_unpack() {
-	if best_version virtual/opengl | grep mesa; then
-		if ! built_with_use media-libs/mesa motif; then
-			msg="Build media-libs/mesa with USE=motif"
-			eerror "${msg}"
-			die "${msg}"
-		fi
+	if ! built_with_use media-libs/mesa motif; then
+		msg="Build media-libs/mesa with USE=motif"
+		eerror "${msg}"
+		die "${msg}"
 	fi
 
 	unpack ${A}