Moved to EAPI=3 for PREFIX support, keyworded for *-linux, tested by me

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

3 files changed, 83 insertions, 7 deletions

diff --git a/sci-chemistry/molmol/ChangeLog b/sci-chemistry/molmol/ChangeLog
index a56e34296533..97ef0cc90dde 100644
--- a/sci-chemistry/molmol/ChangeLog
+++ b/sci-chemistry/molmol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/molmol
-# 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 $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.18 2010/03/07 11:19:03 jlec Exp $
+
+*molmol-2k_p2-r1 (07 Mar 2010)
+
+  07 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +molmol-2k_p2-r1.ebuild:
+  Moved to EAPI=3 for PREFIX support, keyworded for *-linux, tested by me
 
   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.
diff --git a/sci-chemistry/molmol/Manifest b/sci-chemistry/molmol/Manifest
index 35525bdb2fe1..638794addaaa 100644
--- a/sci-chemistry/molmol/Manifest
+++ b/sci-chemistry/molmol/Manifest
@@ -4,13 +4,14 @@ 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-r1.ebuild 1909 RMD160 9dd6b12cce618759517e7dedd43839534961b475 SHA1 1d3fb5372f52b191144eb08f31385188cc10df9b SHA256 15cf929c2d200c0fff5b8163b51dc85a1e8f01380c9cf1b23d1e6354af624d9b
 EBUILD molmol-2k_p2.ebuild 1866 RMD160 db4e7aee4a4877160716fd2563d3c9e2f5a96a1a SHA1 d303302cd6c9dfd87cafb9b32ad1d7bd6a48a31c SHA256 9fe0415aed3b93c6548b896fb96a8e77e8e97d29d8e71db57976729dc8c535e6
-MISC ChangeLog 2304 RMD160 dd758821284beb7bae05351d7a46f512e7eeaabf SHA1 de5a2a3cf18a68ad907aaaa6b37e03cdbcebfef2 SHA256 1a26c59272d88ac7ded9b8c05f94848a9c5fdf9f1cff73f669bb685f4cbc0133
+MISC ChangeLog 2486 RMD160 fd1d2bbc27bbd2ac636de3230ac0495626d34136 SHA1 be7674b75c6e25f03f4f941903561fd6d9c49c2f SHA256 e8e5a782b593c455f74dfaa87cd51fad63fe62097945733004e804c9f2f594ca
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkqzoOQACgkQcxLzpIGCsLQY4QCePr1M2140ijd8InqoCGJ6wVfV
-Cw8Ani4t1MuGsLLp8rVHnK6LWyvKVSHD
-=pctO
+iEYEARECAAYFAkuTi60ACgkQgAnW8HDreRZUFACfboUD7nGue4jCgCXUgxcY2Acy
+lRQAoK3ez8pBFVPpwYMlsQ+EFrRsDHwZ
+=HLLP
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r1.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r1.ebuild
new file mode 100644
index 000000000000..2dc8184afede
--- /dev/null
+++ b/sci-chemistry/molmol/molmol-2k_p2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2-r1.ebuild,v 1.1 2010/03/07 11:19:03 jlec Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs multilib
+
+MY_PV="${PV/_p/.}.0"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Publication-quality molecular visualization package"
+HOMEPAGE="http://hugin.ethz.ch/wuthrich/software/molmol/index.html"
+SRC_URI="ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-src.tar.gz
+	ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-doc.tar.gz"
+LICENSE="molmol"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+DEPEND="x11-libs/openmotif
+	x11-libs/libXpm
+	media-libs/mesa[motif]
+	media-libs/jpeg
+	media-libs/tiff
+	media-libs/libpng
+	sys-libs/zlib"
+# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
+#RDEPEND=""
+# Yeah, the gz's aren't in a subdir.
+S=${WORKDIR}
+
+MMDIR="/usr/$(get_libdir)/molmol"
+
+src_prepare() {
+	# Patch from http://pjf.net/science/molmol.html, where src.rpm is provided
+	epatch ${FILESDIR}/pjf_RH9_molmol2k2.diff
+
+	ln -s makedef.lnx ${S}/makedef
+
+	# 1) The Korn shell is only taken by default because the Bourne shell
+	# on DEC systems cannot handle the script.
+	# We don't want this needless dependency.
+	# 2) Fix up MOLMOLHOME, which determines the directory the binary's in.
+	sed -i \
+		-e "s:/bin/ksh:${EPREFIX}/bin/sh:" \
+		-e "s:^MOLMOLHOME.*:MOLMOLHOME=${EPREFIX}/${MMDIR}:" \
+		${S}/molmol
+	# 1) Set CFLAGS.
+	# 2) Set compiler.
+	sed -i \
+		-e "s:^MCFLAGS.*:MCFLAGS = ${CFLAGS}:" \
+		-e "s:^CC.*:CC = $(tc-getCC):" \
+		${S}/makedef
+}
+
+src_compile() {
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	dobin molmol || die
+
+	exeinto ${MMDIR}
+	newexe src/main/molmol molmol.lnx || die
+	insinto ${MMDIR}
+	doins -r auxil help macros man setup tips || die
+
+	dodoc HISTORY README || die
+}