summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-chemistry/molmol')
-rw-r--r--sci-chemistry/molmol/ChangeLog5
-rw-r--r--sci-chemistry/molmol/molmol-2k_p2.ebuild13
2 files changed, 15 insertions, 3 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/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