summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2005-12-12 06:24:21 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2005-12-12 06:24:21 +0000
commit1215d81c411929162f46cc130bf6bb1eeff520af (patch)
tree51c2e929acc7da985c0b2dc6eacb56b41752622a /sci-chemistry
parent(#114648) Add xbitmaps to modular X deps. (diff)
downloadhistorical-1215d81c411929162f46cc130bf6bb1eeff520af.tar.gz
historical-1215d81c411929162f46cc130bf6bb1eeff520af.tar.bz2
historical-1215d81c411929162f46cc130bf6bb1eeff520af.zip
Add modular X dependencies.
Package-Manager: portage-2.0.53
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/molmol/ChangeLog5
-rw-r--r--sci-chemistry/molmol/Manifest6
-rw-r--r--sci-chemistry/molmol/molmol-2k_p2.ebuild13
3 files changed, 18 insertions, 6 deletions
diff --git a/sci-chemistry/molmol/ChangeLog b/sci-chemistry/molmol/ChangeLog
index 7b695487fc93..d7ee3a2789ec 100644
--- a/sci-chemistry/molmol/ChangeLog
+++ b/sci-chemistry/molmol/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-chemistry/molmol
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.6 2005/07/14 19:02:35 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.7 2005/12/12 06:24:21 spyderous Exp $
+
+ 12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; molmol-2k_p2.ebuild:
+ Add modular X dependencies.
14 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>; molmol-2k_p2.ebuild:
(#99001) Parallel build broken.
diff --git a/sci-chemistry/molmol/Manifest b/sci-chemistry/molmol/Manifest
index f466dbf31a12..d13229e9c1cb 100644
--- a/sci-chemistry/molmol/Manifest
+++ b/sci-chemistry/molmol/Manifest
@@ -1,5 +1,5 @@
-MD5 cfcfc40e08128dd6fc59f345e9b3159e molmol-2k_p2.ebuild 1807
-MD5 af1bfbb0777267a03e889b08173f2757 metadata.xml 248
-MD5 8b8d28a5adfc26969d938e9e37ac04ab ChangeLog 953
+MD5 e6e67adb10c709e4c00ad2500cc28f4d ChangeLog 1060
MD5 362482186ee96b64ce53b5e0bea55df6 files/digest-molmol-2k_p2 140
MD5 52b16a9f8b5a23f8012e63250234a5f3 files/pjf_RH9_molmol2k2.diff 3138
+MD5 af1bfbb0777267a03e889b08173f2757 metadata.xml 248
+MD5 556cbabeedf964d767f3153133b06cc3 molmol-2k_p2.ebuild 2037
diff --git a/sci-chemistry/molmol/molmol-2k_p2.ebuild b/sci-chemistry/molmol/molmol-2k_p2.ebuild
index f8e83316367a..399ff43d61e1 100644
--- a/sci-chemistry/molmol/molmol-2k_p2.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 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.4 2005/07/14 19:02:35 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2.ebuild,v 1.5 2005/12/12 06:24:21 spyderous Exp $
inherit eutils toolchain-funcs multilib
@@ -16,7 +16,8 @@ SLOT="0"
KEYWORDS="~ppc ~x86"
IUSE=""
DEPEND="virtual/motif
- virtual/x11
+ || ( x11-libs/libXpm virtual/x11 )
+ virtual/opengl
media-libs/jpeg
media-libs/tiff
media-libs/libpng
@@ -29,6 +30,14 @@ 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
+ fi
+
unpack ${A}
# Patch from http://pjf.net/science/molmol.html, where src.rpm is provided