Respecting LDFLAGS, 337557; using python.eclass, QA fixes, prefix fixes, keyworded for ~amd64

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

4 files changed, 173 insertions, 2 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/Manifest b/sci-chemistry/eden/Manifest
index 8f94bb44005c..fd1e3d071649 100644
--- a/sci-chemistry/eden/Manifest
+++ b/sci-chemistry/eden/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 5.3-makefile-fixes.patch 1543 RMD160 80f21634650d3bc75744977d8059178e40fb8058 SHA1 97a3fe303a0376ca371030e8db272f4f0783620e SHA256 92a86bd9b942d12138a89ab863daf0d95ad413a82c88a09d21e3ee04c5b5e55d
 AUX makefile-fixes.patch 837 RMD160 c63c95b89f5d2fce1610a0abf6c6c25121d5e3b6 SHA1 b4fee6c94d2f6e3827dc47dea3f493944948bf3d SHA256 6f7612404cccd9e40de19df3f86eb86be9a17fa105eac21e615c0d464f92cc31
 DIST eden_V5.3.tar.gz 1139981 RMD160 2cf8eca5e0ba90f558eeab9c72cd98c8cbb8f3ac SHA1 ceefd810044dfa33063fe35d3de80d0c454dd3be SHA256 249447f507ace3e188ce0d76796c6e307c043592405db1f6c24f3e90917ec524
+EBUILD eden-5.3-r1.ebuild 1915 RMD160 86133104b0a54c3249928f532fbb13adbfdd3b28 SHA1 d5abaf6606e1a3d47e452bc57763cd0bea832b6b SHA256 ac42502937f971f104f34980f90f84975a1bba267466bf2f8332b1d0937afa5c
 EBUILD eden-5.3.ebuild 1641 RMD160 c57295292c87236bc5bba32e5e4ffbb8ab404b3e SHA1 d48339376944143c3b1bc74a89801b9b5e15607b SHA256 909805cfebadf7de5fd3624f8fb2a41446e3e77f264094cebc90b3527ca9a8d4
-MISC ChangeLog 1782 RMD160 c1a359a4af8eb1894d02d3b725c43fbd5c150de7 SHA1 154deb0f9906acc697df3b37712ec9146b96d4b7 SHA256 01a441c2341eee40df2797e2f740b2f3a4105459f26f6dad6f68a10609ac3a89
+MISC ChangeLog 2008 RMD160 3df004fb0cce8759a09875a1a23fd40f574019f5 SHA1 13dc0a73ad6499aff7eeafb2de663af261b6d7c0 SHA256 ad30595e955e700e28c64cae60455cb186c49f2ac32e38fc95316ba73411d33d
 MISC metadata.xml 272 RMD160 fe1b9485c16c778c9af6759a25de99a0f290812d SHA1 b95bdac297f6704d6c9bfcfdbb17b27280567792 SHA256 32b8b0a739fa026bbfebf578484ee84f6e14b137aa54308256427d779f0f9501
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyU4HQACgkQgAnW8HDreRahDACcCo3zqRG6+PquFXozQgMNt5dB
+rW4AoM39AQrB/t6hMHc+5efBvSBbEplA
+=vQOV
+-----END PGP SIGNATURE-----
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