sci-chemistry/molmol: Respect AR, #468178

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

3 files changed, 97 insertions, 5 deletions

diff --git a/sci-chemistry/molmol/ChangeLog b/sci-chemistry/molmol/ChangeLog
index d475451ee69a..3e8eaa9df355 100644
--- a/sci-chemistry/molmol/ChangeLog
+++ b/sci-chemistry/molmol/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/molmol
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.33 2013/01/27 14:41:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.34 2013/05/02 10:17:43 jlec Exp $
+
+*molmol-2k_p2-r4 (02 May 2013)
+
+  02 May 2013; Justin Lecher <jlec@gentoo.org> +molmol-2k_p2-r4.ebuild:
+  Respect AR, #468178
 
   27 Jan 2013; Justin Lecher <jlec@gentoo.org> molmol-2k_p2-r2.ebuild,
   molmol-2k_p2-r3.ebuild, metadata.xml:
diff --git a/sci-chemistry/molmol/Manifest b/sci-chemistry/molmol/Manifest
index 92d4c4bc4377..cca44300ca89 100644
--- a/sci-chemistry/molmol/Manifest
+++ b/sci-chemistry/molmol/Manifest
@@ -11,12 +11,13 @@ DIST molmol-2k.2.0-doc.tar.gz 1062297 SHA256 07e1c3fd04ffe7c9e9d91eaefa0bf72e6d0
 DIST molmol-2k.2.0-src.tar.gz 1088805 SHA256 1104dcb1b2517581c7d6b1695ff2e92f4076ad34afc48dd896eec38e5acf2287 SHA512 6ab01a6fd3d19752634a2cf22919a20e43d195768bd4bdacd5f0bbe016c3058c94915bad4c7fa64dcd86576be39cad0ae112cb62f5e69ffb10041518101e7a9b WHIRLPOOL e258ede83ac4a8fe9b4a9274588ced7e1294415d864c909ed83e3e56d36512e1388e6f77e45da614bc19992a265d32b739c54aace7faa28971c61a01bba27541
 EBUILD molmol-2k_p2-r2.ebuild 1809 SHA256 803495e522e7c3fafa8f4c301afe651da1edbcffe3c0222605d0d44e7e27ac4c SHA512 9b6e2502331a9b66b065a66a27ae85d4f6ce4bbf0f95346085551bd6ab8d7aff59fff69b369c08ea05008393a842c32874e2cba4829bb084e8f9757d7b098a10 WHIRLPOOL 73eae76759bcb0bbc870c659dcec3f7576127b568c491b052d55795e606eb45a4483efce6871d6ddbeae9608d53dd3059e63be55d0e9e484468220b0d290774c
 EBUILD molmol-2k_p2-r3.ebuild 1933 SHA256 abd280691faf4e624e2c2e4c0460b5ec5a65d9dbd5019d0a4babedee4bc2ef6e SHA512 9abd13cd33239aa3d70ff9eef968078fe98e6ff3580f1dde8260a420c9d01deba5751703da8a82e92db2dc34e8d0bb9e63e87a0a2a263a3bf28b223603c1e9aa WHIRLPOOL 82d9d867807d8f26b9dfffe1cef066126798b6ccccbbce51bf0f015904f37b3092a91b0d0c5179ff6eb7c0cc4643b296fa42f34e86232d67ecc7982d4f5c0006
-MISC ChangeLog 4775 SHA256 f6b17f9b4654d1393523477343ee0ffc7a8aad828c861df8f9eb9bb1fa474ca2 SHA512 6f6def369f5f9070bec3611115e681a8c02ada6a01d17ab84259e9c68362824540ae31a8b70191b022179cacf4e3f4f2316c14982e729c82521911f7da540c35 WHIRLPOOL aa3df53cc87943927554ee36af89715d000cce162bd346f0a1c1eb6d815c7da317c7db866779a1713f293f515345f8ae12ce36abc56a4dc769c2879f8b1abfdb
+EBUILD molmol-2k_p2-r4.ebuild 1948 SHA256 5ed609b3d84bcf7b137de7d4f2d04ec1e34b0d1ea3beb038a8c2ad3b88dac29c SHA512 4a1adbbc89db083b9916a37a90c4b4e492843cc56bd4f20e06a418766a11ade75184c4fdbc5b6148d23eb59191c2faf56f8bc0b2564398139103646f719a31da WHIRLPOOL 3fd873c39d91c2422d457c968a5473a3288c10e2ccfe976e146844bbd8cca3e5c907ff769b1bcdd12cb697bb6eef2cf3dba628f604536b0dd5000a98eb831505
+MISC ChangeLog 4902 SHA256 e1f6c3bb02a4f237b01876b1db8213f6833029fd5efd6762045cfa0c5ee0a618 SHA512 c2e0c48e3b9420928fc1e0e49bb74c6fa0b3d48de897f7d9d6080a56948c0103d467283aa0ad0cf6c3dc9a96a0a653315c149cb3bb859ffddb97ba1d2c024f4c WHIRLPOOL 78d78814f60be49d689ef8c988dc8c7deb2184f67c367719a8b0b968be66712a0d9ca65ca07c5c0e7c14da970dea5a2d44961248206b7e84f4f32315eab4fa07
 MISC metadata.xml 168 SHA256 705462092174cd3e2e3ec1557a28108a746b7351f803d8ca6d1b925b3111c3ff SHA512 f0073fb277e20adb7781aa6ea7f8237bc2d350f0aa43f0f0cca33e02cf52b8fc117bd984c11721ac519a2637ea145976148ac1aba7335dc74c42f7b9531cbed3 WHIRLPOOL 07dd7a302e695440f5033889e5b20cada57beedf17ad33f95d45fb5c39da98bf206eaff13334c20c1c08140a9c5e6041341d29c58efc5ca59b112b60e1662318
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlEFPLAACgkQgAnW8HDreRYWmACgyRd7BbxvvNsrPvgJERYFT7os
-zzgAnAogTXb2apt/SuaCni10lMIKfn2Y
-=J6y2
+iEYEAREKAAYFAlGCPUgACgkQgAnW8HDreRaDcACgmUeSSxRUje7eEBEGgb3OeQrr
+BRUAoLDohxFQwQtoKw+H4zgfoSTlEpGe
+=6tcu
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r4.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r4.ebuild
new file mode 100644
index 000000000000..5d6c64675f3b
--- /dev/null
+++ b/sci-chemistry/molmol/molmol-2k_p2-r4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2-r4.ebuild,v 1.1 2013/05/02 10:17:43 jlec Exp $
+
+EAPI=5
+
+inherit eutils multilib prefix toolchain-funcs
+
+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="
+	|| (
+		(	media-libs/mesa
+			x11-libs/libGLw )
+		media-libs/mesa[motif] )
+	media-libs/libpng:0
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg
+	x11-libs/libXpm
+	x11-libs/motif:0
+	x11-apps/xdpyinfo"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_setup() {
+	MMDIR="/usr/$(get_libdir)/molmol"
+}
+
+src_prepare() {
+	rm -rf tiff*
+	# Patch from http://pjf.net/science/molmol.html, where src.rpm is provided
+	epatch "${FILESDIR}"/pjf_RH9_molmol2k2.diff
+
+	epatch "${FILESDIR}"/prefix.patch
+	eprefixify molmol
+
+	epatch "${FILESDIR}"/ldflags.patch
+
+	ln -s makedef.lnx "${S}"/makedef || die
+
+	sed \
+		-e "s:/bin/ksh:${EPREFIX}/bin/sh:" \
+		-e "s:^MOLMOLHOME.*:MOLMOLHOME=${EPREFIX}/${MMDIR}:" \
+		-i "${S}"/molmol || die
+	sed \
+		-e "s:^MCFLAGS.*:MCFLAGS = ${CFLAGS}:" \
+		-e "s:^CC.*:CC = $(tc-getCC):" \
+		-i "${S}"/makedef || die
+
+	epatch "${FILESDIR}"/cast.patch
+	epatch "${FILESDIR}"/libpng15.patch
+
+	# patch from fink
+	# fixes numerous bad bracings and hopefully the OGL bug 429974
+	epatch "${FILESDIR}"/${P}-fink.patch
+
+	tc-export AR
+}
+
+src_install() {
+	dobin molmol
+
+	exeinto ${MMDIR}
+	newexe src/main/molmol molmol.lnx
+	insinto ${MMDIR}
+	doins -r auxil help macros man setup tips
+
+	dodoc HISTORY README
+}