summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2014-07-23 09:03:00 +0000
committerJustin Lecher <jlec@gentoo.org>2014-07-23 09:03:00 +0000
commitfd077bf6a1d8d26ffe85ed6afa860d948b6d1ccf (patch)
treeb78f34c7f6c19118879397d45c4376a2ca47cace /sci-chemistry
parentUse mpi wrapper when compiling with parallel hdf5. Tests with USE=mpi are com... (diff)
downloadgentoo-2-fd077bf6a1d8d26ffe85ed6afa860d948b6d1ccf.tar.gz
gentoo-2-fd077bf6a1d8d26ffe85ed6afa860d948b6d1ccf.tar.bz2
gentoo-2-fd077bf6a1d8d26ffe85ed6afa860d948b6d1ccf.zip
sci-chemistry/molmol: Fix for prefix
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/molmol/ChangeLog6
-rw-r--r--sci-chemistry/molmol/files/opengl.patch2
-rw-r--r--sci-chemistry/molmol/molmol-2k_p2-r5.ebuild5
3 files changed, 7 insertions, 6 deletions
diff --git a/sci-chemistry/molmol/ChangeLog b/sci-chemistry/molmol/ChangeLog
index 330f9695b3ec..e4d3af8e6438 100644
--- a/sci-chemistry/molmol/ChangeLog
+++ b/sci-chemistry/molmol/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-chemistry/molmol
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.35 2014/07/22 16:49:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.36 2014/07/23 09:03:00 jlec Exp $
+
+ 23 Jul 2014; Justin Lecher <jlec@gentoo.org> molmol-2k_p2-r5.ebuild,
+ files/opengl.patch:
+ Fix for prefix
*molmol-2k_p2-r5 (22 Jul 2014)
diff --git a/sci-chemistry/molmol/files/opengl.patch b/sci-chemistry/molmol/files/opengl.patch
index 940858f62d50..c1db35d9013d 100644
--- a/sci-chemistry/molmol/files/opengl.patch
+++ b/sci-chemistry/molmol/files/opengl.patch
@@ -55,7 +55,7 @@ index 7863225..b6c75ce 100755
-elif [ $ostype = "HP-UX" ]; then
- xdpy=/usr/contrib/bin/X11/xdpyinfo
-else
-- xdpy=/usr/bin/xdpyinfo
+- xdpy=/usr/bin/X11/xdpyinfo
-fi
-
+localdev=Motif/OpenGL
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
index eff1d99fd425..fd8da66a8805 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild,v 1.1 2014/07/22 16:49:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild,v 1.2 2014/07/23 09:03:00 jlec Exp $
EAPI=5
@@ -48,9 +48,6 @@ src_prepare() {
# 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
epatch "${FILESDIR}"/opengl.patch