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
commit1adc777d193a438af311b3aa0481f829b53e7317 (patch)
treec858ce91cd07f740a30b976664cbee9aef6cf2d1 /sci-chemistry
parentwhitespace (diff)
downloadhistorical-1adc777d193a438af311b3aa0481f829b53e7317.tar.gz
historical-1adc777d193a438af311b3aa0481f829b53e7317.tar.bz2
historical-1adc777d193a438af311b3aa0481f829b53e7317.zip
Migrate to EAPI 2 in order to remove built_with_use usage.
Package-Manager: portage-2.2_rc40/cvs/Linux i686
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/molmol/ChangeLog7
-rw-r--r--sci-chemistry/molmol/Manifest12
-rw-r--r--sci-chemistry/molmol/molmol-2k_p2.ebuild20
3 files changed, 18 insertions, 21 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/Manifest b/sci-chemistry/molmol/Manifest
index 4b6c827ec89c..35525bdb2fe1 100644
--- a/sci-chemistry/molmol/Manifest
+++ b/sci-chemistry/molmol/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
AUX pjf_RH9_molmol2k2.diff 3138 RMD160 1792aa433a21c2f64880b244d11b6bbd2552c95b SHA1 e654f3105d496538af42a8282f1d55c272ff3d4d SHA256 5b7c3ede5714b123824cc0b8533f679d22d1c5219bf88e8d6a4cebe8e245aeb9
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 1980 RMD160 810803183d7e211f18491c916563c742366aee16 SHA1 dbd00692b5fdfa3e50195476fc3a2675c8d2dca6 SHA256 d503a66cf150fdab263d39cf28a2606d0558d924a83432efb961b156370b539d
-MISC ChangeLog 2161 RMD160 b1416583f97586b820a09a9d8c47156d61840bf3 SHA1 cc07cb709ea14f7ab7ab4a80e7c3d1bde0d21b2a SHA256 0614c57203c994bc0d74887ae084c10060d0e1e37a243ef6c13a5a2b14a45911
+EBUILD molmol-2k_p2.ebuild 1866 RMD160 db4e7aee4a4877160716fd2563d3c9e2f5a96a1a SHA1 d303302cd6c9dfd87cafb9b32ad1d7bd6a48a31c SHA256 9fe0415aed3b93c6548b896fb96a8e77e8e97d29d8e71db57976729dc8c535e6
+MISC ChangeLog 2304 RMD160 dd758821284beb7bae05351d7a46f512e7eeaabf SHA1 de5a2a3cf18a68ad907aaaa6b37e03cdbcebfef2 SHA256 1a26c59272d88ac7ded9b8c05f94848a9c5fdf9f1cff73f669bb685f4cbc0133
MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkhkwWQACgkQOeoy/oIi7uynXgCgqHUJGelMWkPcrAPAcKGqzQ7b
-wdsAn2LM9GdrQGf4llfMIgzYMHJz8tDX
-=BYnf
+iEYEARECAAYFAkqzoOQACgkQcxLzpIGCsLQY4QCePr1M2140ijd8InqoCGJ6wVfV
+Cw8Ani4t1MuGsLLp8rVHnK6LWyvKVSHD
+=pctO
-----END PGP SIGNATURE-----
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
}