summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2009-09-18 15:01:49 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2009-09-18 15:01:49 +0000
commited5e11938bd7d84be97644cd241272f64bc89638 (patch)
treeb0576ca1d42c62c1a7fa2850098ccb4ed3f31db6 /sci-chemistry/molmol
parentwhitespace (diff)
downloadgentoo-2-ed5e11938bd7d84be97644cd241272f64bc89638.tar.gz
gentoo-2-ed5e11938bd7d84be97644cd241272f64bc89638.tar.bz2
gentoo-2-ed5e11938bd7d84be97644cd241272f64bc89638.zip
Migrate to EAPI 2 in order to remove built_with_use usage.
(Portage version: 2.2_rc40/cvs/Linux i686)
Diffstat (limited to 'sci-chemistry/molmol')
-rw-r--r--sci-chemistry/molmol/ChangeLog7
-rw-r--r--sci-chemistry/molmol/molmol-2k_p2.ebuild20
2 files changed, 12 insertions, 15 deletions
diff --git a/sci-chemistry/molmol/ChangeLog b/sci-chemistry/molmol/ChangeLog
index beb559af0a2c..a56e34296533 100644
--- a/sci-chemistry/molmol/ChangeLog
+++ b/sci-chemistry/molmol/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-chemistry/molmol
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.16 2008/06/27 10:30:13 ulm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.17 2009/09/18 15:01:49 betelgeuse Exp $
+
+ 18 Sep 2009; Petteri Räty <betelgeuse@gentoo.org> molmol-2k_p2.ebuild:
+ Migrate to EAPI 2 in order to remove built_with_use usage.
27 Jun 2008; Ulrich Mueller <ulm@gentoo.org> molmol-2k_p2.ebuild:
Change dependency from virtual/motif to x11-libs/openmotif, bug 224749.
diff --git a/sci-chemistry/molmol/molmol-2k_p2.ebuild b/sci-chemistry/molmol/molmol-2k_p2.ebuild
index 920d4d039c34..a2a8d11771c1 100644
--- a/sci-chemistry/molmol/molmol-2k_p2.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.12 2008/06/27 10:30:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2.ebuild,v 1.13 2009/09/18 15:01:49 betelgeuse Exp $
+
+EAPI="2"
inherit eutils toolchain-funcs multilib
@@ -17,7 +19,7 @@ KEYWORDS="~amd64 ppc x86"
IUSE=""
DEPEND="x11-libs/openmotif
x11-libs/libXpm
- media-libs/mesa
+ media-libs/mesa[motif]
media-libs/jpeg
media-libs/tiff
media-libs/libpng
@@ -29,15 +31,7 @@ S=${WORKDIR}
MMDIR="/usr/$(get_libdir)/molmol"
-src_unpack() {
- if ! built_with_use media-libs/mesa motif; then
- msg="Build media-libs/mesa with USE=motif"
- eerror "${msg}"
- die "${msg}"
- fi
-
- unpack ${A}
-
+src_prepare() {
# Patch from http://pjf.net/science/molmol.html, where src.rpm is provided
epatch ${FILESDIR}/pjf_RH9_molmol2k2.diff
@@ -71,5 +65,5 @@ src_install() {
insinto ${MMDIR}
doins -r auxil help macros man setup tips || die
- dodoc HISTORY README
+ dodoc HISTORY README || die
}