public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sci-chemistry/molmol: ChangeLog molmol-2k_p2-r5.ebuild
@ 2014-07-22 16:49 Justin Lecher (jlec)
  0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2014-07-22 16:49 UTC (permalink / raw
  To: gentoo-commits

jlec        14/07/22 16:49:36

  Modified:             ChangeLog
  Added:                molmol-2k_p2-r5.ebuild
  Log:
  sci-chemistry/molmol: Importing latest changes from sf.net molmol for mac project
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.35                 sci-chemistry/molmol/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molmol/ChangeLog?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molmol/ChangeLog?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molmol/ChangeLog?r1=1.34&r2=1.35

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog	2 May 2013 10:17:43 -0000	1.34
+++ ChangeLog	22 Jul 2014 16:49:36 -0000	1.35
@@ -1,6 +1,12 @@
 # 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.34 2013/05/02 10:17:43 jlec Exp $
+# 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 $
+
+*molmol-2k_p2-r5 (22 Jul 2014)
+
+  22 Jul 2014; Justin Lecher <jlec@gentoo.org> +molmol-2k_p2-r5.ebuild,
+  +files/opengl.patch, +files/wild.patch:
+  Importing latest changes from sf.net molmol for mac project
 
 *molmol-2k_p2-r4 (02 May 2013)
 



1.1                  sci-chemistry/molmol/molmol-2k_p2-r5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild?rev=1.1&content-type=text/plain

Index: molmol-2k_p2-r5.ebuild
===================================================================
# 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 $

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
	epatch "${FILESDIR}"/opengl.patch

	ln -s makedef.lnx "${S}"/makedef || die

	sed \
		-e "s:ksh:sh:" \
		-e "s:^MOLMOLHOME.*:MOLMOLHOME=${EPREFIX}/${MMDIR};MOLMOLDEV=\"Motif/OpenGL\":" \
		-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

	epatch "${FILESDIR}"/wild.patch
	tc-export AR
}

src_install() {
	dobin molmol

	exeinto ${MMDIR}
	doexe src/main/molmol
	insinto ${MMDIR}
	doins -r auxil help macros man setup tips

	dodoc HISTORY README
}





^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-chemistry/molmol: ChangeLog molmol-2k_p2-r5.ebuild
@ 2014-07-23  9:03 Justin Lecher (jlec)
  0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2014-07-23  9:03 UTC (permalink / raw
  To: gentoo-commits

jlec        14/07/23 09:03:00

  Modified:             ChangeLog molmol-2k_p2-r5.ebuild
  Log:
  sci-chemistry/molmol: Fix for prefix
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.36                 sci-chemistry/molmol/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molmol/ChangeLog?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molmol/ChangeLog?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molmol/ChangeLog?r1=1.35&r2=1.36

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ChangeLog	22 Jul 2014 16:49:36 -0000	1.35
+++ ChangeLog	23 Jul 2014 09:03:00 -0000	1.36
@@ -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)
 



1.2                  sci-chemistry/molmol/molmol-2k_p2-r5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild?r1=1.1&r2=1.2

Index: molmol-2k_p2-r5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- molmol-2k_p2-r5.ebuild	22 Jul 2014 16:49:36 -0000	1.1
+++ molmol-2k_p2-r5.ebuild	23 Jul 2014 09:03:00 -0000	1.2
@@ -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 @@
 	# 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
 





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-07-24 22:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-23  9:03 [gentoo-commits] gentoo-x86 commit in sci-chemistry/molmol: ChangeLog molmol-2k_p2-r5.ebuild Justin Lecher (jlec)
  -- strict thread matches above, loose matches on Subject: below --
2014-07-22 16:49 Justin Lecher (jlec)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox