Ldflags fix and prefix fix

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

5 files changed, 126 insertions, 5 deletions

diff --git a/sci-chemistry/molmol/ChangeLog b/sci-chemistry/molmol/ChangeLog
index 97ef0cc90dde..457597cafeb4 100644
--- a/sci-chemistry/molmol/ChangeLog
+++ b/sci-chemistry/molmol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/molmol
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.19 2010/03/30 19:55:26 jlec Exp $
+
+*molmol-2k_p2-r2 (30 Mar 2010)
+
+  30 Mar 2010; Justin Lecher <jlec@gentoo.org> molmol-2k_p2-r1.ebuild,
+  +molmol-2k_p2-r2.ebuild, +files/ldflags.patch, +files/prefix.patch:
+  Respecting LDFLAGS and fixes for prefix
 
 *molmol-2k_p2-r1 (07 Mar 2010)
 
diff --git a/sci-chemistry/molmol/Manifest b/sci-chemistry/molmol/Manifest
index 638794addaaa..d2b2ba60bcc8 100644
--- a/sci-chemistry/molmol/Manifest
+++ b/sci-chemistry/molmol/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ldflags.patch 435 RMD160 17c6cfc1539c0d774531c950d82f1fb28f366aea SHA1 e9e736664e773b32f2ae861f65fc0670d3625998 SHA256 cbae8934e2be43ceac0f541ed14e843ed76baf86219e0f669eab0af6d5714c64
 AUX pjf_RH9_molmol2k2.diff 3138 RMD160 1792aa433a21c2f64880b244d11b6bbd2552c95b SHA1 e654f3105d496538af42a8282f1d55c272ff3d4d SHA256 5b7c3ede5714b123824cc0b8533f679d22d1c5219bf88e8d6a4cebe8e245aeb9
+AUX prefix.patch 513 RMD160 23239041256a23c6223daab56e1aa59b5e911afa SHA1 5f3707fec532b15579020b5f21112d3fa2d41924 SHA256 efcb5d3fa7258cf88f02b63d1df3100eb0b73848c0ebabb59c84cb9ea082d8e7
 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-r2.ebuild 2053 RMD160 0bbd282f0a53c27a015793dfebf323c81d1bddd2 SHA1 2fe41689ac5ca8d55900d446d2bf10bf98437cf0 SHA256 3e91f513df391e5588ef9d7cc82389758610f1ea1b1f27de33db6824f1b55222
 EBUILD molmol-2k_p2.ebuild 1866 RMD160 db4e7aee4a4877160716fd2563d3c9e2f5a96a1a SHA1 d303302cd6c9dfd87cafb9b32ad1d7bd6a48a31c SHA256 9fe0415aed3b93c6548b896fb96a8e77e8e97d29d8e71db57976729dc8c535e6
-MISC ChangeLog 2486 RMD160 fd1d2bbc27bbd2ac636de3230ac0495626d34136 SHA1 be7674b75c6e25f03f4f941903561fd6d9c49c2f SHA256 e8e5a782b593c455f74dfaa87cd51fad63fe62097945733004e804c9f2f594ca
+MISC ChangeLog 2702 RMD160 8c0cd9ec09518f1a36e276ba0daa271d59264d8c SHA1 bdd52812ec7acfa1af31b4d3ac60c19e99e2ce72 SHA256 2be753a09811c02c8eee9125bd3e485cb5c73b8374326df59e24f49d214da92e
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuTi60ACgkQgAnW8HDreRZUFACfboUD7nGue4jCgCXUgxcY2Acy
-lRQAoK3ez8pBFVPpwYMlsQ+EFrRsDHwZ
-=HLLP
+iEYEARECAAYFAkuyVzkACgkQgAnW8HDreRbOmACfZ+XJ9Knn/irnlClgePIq2Fn0
+FOwAoKipip2pCbZXvh2DP8m7N4qMQvJb
+=ju59
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/molmol/files/ldflags.patch b/sci-chemistry/molmol/files/ldflags.patch
new file mode 100644
index 000000000000..ff6e06ef490c
--- /dev/null
+++ b/sci-chemistry/molmol/files/ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/src/main/Makefile b/src/main/Makefile
+index 74530fa..102d1b7 100644
+--- a/src/main/Makefile
++++ b/src/main/Makefile
+@@ -22,7 +22,7 @@ SRC = $(OBJ:.o=.c)
+ default: $(PROGRAM)
+ 
+ $(PROGRAM): $(OBJ) $(LIBS) $(SGLIB) $(TOOLSLIB)
+-	$(CC) -o $@ $(CFLAGS) $(OBJ) $(LIBS) $(SGLIB) $(TOOLSLIB) $(SYSLIB)
++	$(CC) $(CFLAGS) ${LDFLAGS} -o $@ $(OBJ) $(LIBS) $(SGLIB) $(TOOLSLIB) $(SYSLIB)
+ 
+ clean:
+ 	rm -f $(OBJ) $(PROGRAM) core *.ps
diff --git a/sci-chemistry/molmol/files/prefix.patch b/sci-chemistry/molmol/files/prefix.patch
new file mode 100644
index 000000000000..89f17b2e984e
--- /dev/null
+++ b/sci-chemistry/molmol/files/prefix.patch
@@ -0,0 +1,22 @@
+diff --git a/molmol b/molmol
+index e774abf..9f10558 100755
+--- a/molmol
++++ b/molmol
+@@ -57,7 +57,7 @@ if [ $ostype = "SunOS" ]; then
+ elif [ $ostype = "HP-UX" ]; then
+   xdpy=/usr/contrib/bin/X11/xdpyinfo
+ else
+-  xdpy=/usr/bin/X11/xdpyinfo
++  xdpy=@GENTOO_PORTAGE_EPREFIX@/usr/bin/xdpyinfo
+ fi
+ 
+ printUsage () {
+@@ -119,7 +119,7 @@ while [ -n "$*" ]; do
+   esac
+ done
+ 
+-magictmp=/tmp/molmol_magic$$
++magictmp=@GENTOO_PORTAGE_EPREFIX@/tmp/molmol_magic$$
+ 
+ if [ ! -d $HOME/molmol ]; then
+   mkdir $HOME/molmol
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild
new file mode 100644
index 000000000000..5e6d3ba2cae3
--- /dev/null
+++ b/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild
@@ -0,0 +1,77 @@
+# 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-r2.ebuild,v 1.1 2010/03/30 19:55:26 jlec Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs multilib prefix
+
+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[motif]
+	media-libs/jpeg
+	media-libs/tiff
+	media-libs/libpng
+	sys-libs/zlib
+	x11-apps/xdpyinfo
+	x11-libs/openmotif
+	x11-libs/libXpm"
+# 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() {
+	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
+
+	# 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
+}