diff options
author | Justin Lecher <jlec@gentoo.org> | 2010-09-18 15:53:18 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2010-09-18 15:53:18 +0000 |
commit | dd875ed27058d55bb204e747b445d769feee169f (patch) | |
tree | 6776b2cc8d1ead5cf13b5def7efe02195374165b | |
parent | alpha/arm/ia64/s390/sh/sparc stable wrt #336806 (diff) | |
download | gentoo-2-dd875ed27058d55bb204e747b445d769feee169f.tar.gz gentoo-2-dd875ed27058d55bb204e747b445d769feee169f.tar.bz2 gentoo-2-dd875ed27058d55bb204e747b445d769feee169f.zip |
Respecting LDFLAGS, 337557; using python.eclass, QA fixes, prefix fixes, keyworded for ~amd64
(Portage version: 2.2_rc83/cvs/Linux x86_64)
-rw-r--r-- | sci-chemistry/eden/ChangeLog | 9 | ||||
-rw-r--r-- | sci-chemistry/eden/eden-5.3-r1.ebuild | 95 | ||||
-rw-r--r-- | sci-chemistry/eden/files/5.3-makefile-fixes.patch | 57 |
3 files changed, 160 insertions, 1 deletions
diff --git a/sci-chemistry/eden/ChangeLog b/sci-chemistry/eden/ChangeLog index 051b91347feb..cc43cc92355e 100644 --- a/sci-chemistry/eden/ChangeLog +++ b/sci-chemistry/eden/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-chemistry/eden # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/eden/ChangeLog,v 1.12 2010/06/23 20:22:00 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/eden/ChangeLog,v 1.13 2010/09/18 15:53:18 jlec Exp $ + +*eden-5.3-r1 (18 Sep 2010) + + 18 Sep 2010; Justin Lecher <jlec@gentoo.org> + +files/5.3-makefile-fixes.patch, +eden-5.3-r1.ebuild: + Respecting LDFLAGS, 337557; using python.eclass, QA fixes, prefix fixes, + keyworded for ~amd64 23 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org> eden-5.3.ebuild: Removed bindist flag, should be compatible GPL-3 anyway diff --git a/sci-chemistry/eden/eden-5.3-r1.ebuild b/sci-chemistry/eden/eden-5.3-r1.ebuild new file mode 100644 index 000000000000..46af00db9dd2 --- /dev/null +++ b/sci-chemistry/eden/eden-5.3-r1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/eden/eden-5.3-r1.ebuild,v 1.1 2010/09/18 15:53:18 jlec Exp $ + +EAPI="3" + +PYTHON_DEPEND="2" + +inherit eutils multilib python toolchain-funcs + +MY_P="${PN}_V${PV}" +DESCRIPTION="A crystallographic real-space electron-density refinement and optimization program" +HOMEPAGE="http://www.gromacs.org/pipermail/eden-users" +SRC_URI="mirror://gentoo/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="double-precision" + +RDEPEND=" + sci-libs/fftw:2.1 + sci-libs/gsl" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${PN}" + +SRC="${S}/source" +EDENHOME="${EPREFIX}/usr/$(get_libdir)/eden" + +pkg_setup() { + python_set_active_version 2 +} + +src_prepare() { + epatch "${FILESDIR}"/${PV}-makefile-fixes.patch + + sed -i \ + -e "s:^\(FFTW.*=\).*:\1 ${EPREFIX}/usr:g" \ + -e "s:^\(LIB.*=.*\$(FFTW)/\).*:\1$(get_libdir):g" \ + -e "s:^\(BIN.*=\).*:\1 ${D}usr/bin:g" \ + -e "s:^\(CFLAGS.*=\).*:\1 ${CFLAGS}:g" \ + ${SRC}/Makefile || die + + if ! use double-precision; then + sed -i -e "s:^\(DOUBLESWITCH.*=\).*:\1 OFF:g" ${SRC}/Makefile + EXE="seden" + else + EXE="deden" + fi +} + +src_compile() { + cd ${SRC} + emake CC=$(tc-getCC) || die "emake failed" +} + +src_install() { + emake -C ${SRC} install || die "install failed" + + exeinto ${EDENHOME}/python + doexe python/* || die + + insinto ${EDENHOME}/help + doins help/* || die + + insinto ${EDENHOME}/tools + doins tools/* || die + + dodoc manual/UserManual.pdf || die + + cat >> "${T}"/eden <<- EOF + #!/bin/bash + export EDENHOME="${EDENHOME}" + ${EXE} \$* + EOF + + dobin "${T}"/eden || die + + cat >> "${T}"/ieden <<- EOF + #!/bin/bash + export EDENHOME="${EDENHOME}" + $(PYTHON) -O \${EDENHOME}/python/eden.py + EOF + + dobin "${T}"/ieden || die +} + +pkg_postinst() { + python_mod_optimize ${EDENHOME}/python +} + +pkg_postrm() { + python_mod_cleanup ${EDENHOME}/python +} diff --git a/sci-chemistry/eden/files/5.3-makefile-fixes.patch b/sci-chemistry/eden/files/5.3-makefile-fixes.patch new file mode 100644 index 000000000000..e42cbb48a9aa --- /dev/null +++ b/sci-chemistry/eden/files/5.3-makefile-fixes.patch @@ -0,0 +1,57 @@ +diff --git a/source/Makefile b/source/Makefile +index 46d89cc..56c09a7 100644 +--- a/source/Makefile ++++ b/source/Makefile +@@ -78,8 +78,10 @@ CFLAGS = -Wall -pipe -g3 + #CFLAGS = -Wall -pipe -marchi686 -pedantic -gdwarf-2 -g3 + #CFLAGS = -Wall -O3 -march=i686 + ifneq ($(FFTW),/usr/local) ++ifneq ($(FFTW),/usr) + CFLAGS += -I$(INC) + endif ++endif + + # NOTE: + # DOUBLESWITCH = ON for double precision; +@@ -91,15 +93,15 @@ endif + DOUBLESWITCH = ON + + ifeq ($(DOUBLESWITCH),ON) +-LDFLAGS = -L$(LIB) -ldfftw -lm ++LIBS = -L$(LIB) -ldfftw -lm + CFLAGS += -DDOUBLE + TARGET = deden + else +-LDFLAGS = -L$(LIB) -lsfftw -lm ++LIBS = -L$(LIB) -lsfftw -lm + TARGET = seden + endif + +-LDFLAGS += -g -lgsl -lgslcblas ++LIBS += -lgsl -lgslcblas + + # GSL_PREFIX:= /sw/lib + # LDFLAGS += -l$(GSL_PREFIX)/libgsl.a -l$(GSL_PREFIX)/libgslcblas.a +@@ -120,17 +122,18 @@ OBJ = addmaps.o apodfc.o apodfo.o back.o cadhkl.o \ + all: eden fbyteswap + + eden: eden.o $(OBJ) +- $(CC) $^ $(LDFLAGS) -o $@ ++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + + fbyteswap: fbyteswap.c +- $(CC) -o $@ $^ ++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + + install: all ++ mkdir -p $(BIN) + mv fbyteswap $(BIN) + mv eden $(BIN)/$(TARGET) + chmod 751 $(BIN)/$(TARGET) +- chmod +x mkeden.csh +- ./mkeden.csh $(BIN) $(BIN)/$(TARGET) ++# chmod +x mkeden.csh ++# ./mkeden.csh $(BIN) $(BIN)/$(TARGET) + + dist: clean + cd ../..; tar -cvf eden_$(VERSION).tar --exclude CVS --exclude \#\*\# --exclude \*~ --exclude Misc --exclude .\* eden; gzip -f eden_$(VERSION).tar |