Add missing die, use pkg-config for gsl detection.

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

3 files changed, 21 insertions, 16 deletions

diff --git a/sci-chemistry/eden/ChangeLog b/sci-chemistry/eden/ChangeLog
index cc43cc92355e..7c7e7245a986 100644
--- a/sci-chemistry/eden/ChangeLog
+++ b/sci-chemistry/eden/ChangeLog
@@ -1,6 +1,9 @@
 # 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.13 2010/09/18 15:53:18 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/eden/ChangeLog,v 1.14 2011/12/16 12:59:33 jlec Exp $
+
+  16 Dec 2011; Justin Lecher <jlec@gentoo.org> eden-5.3-r1.ebuild:
+  Add missing die, use pkg-config for gsl detection.
 
 *eden-5.3-r1 (18 Sep 2010)
 
diff --git a/sci-chemistry/eden/Manifest b/sci-chemistry/eden/Manifest
index fd1e3d071649..697e182a1730 100644
--- a/sci-chemistry/eden/Manifest
+++ b/sci-chemistry/eden/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 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-r1.ebuild 1998 RMD160 247ed1fd4b148dd6eac364e09f9ca555a377e22e SHA1 0ca20d69ac86ecc74e25008a75825e67e084cd3d SHA256 1d906e36ef01ca1be44112fc11d1e1eb48ebdda345056327f5202b64f01dfe0a
 EBUILD eden-5.3.ebuild 1641 RMD160 c57295292c87236bc5bba32e5e4ffbb8ab404b3e SHA1 d48339376944143c3b1bc74a89801b9b5e15607b SHA256 909805cfebadf7de5fd3624f8fb2a41446e3e77f264094cebc90b3527ca9a8d4
-MISC ChangeLog 2008 RMD160 3df004fb0cce8759a09875a1a23fd40f574019f5 SHA1 13dc0a73ad6499aff7eeafb2de663af261b6d7c0 SHA256 ad30595e955e700e28c64cae60455cb186c49f2ac32e38fc95316ba73411d33d
+MISC ChangeLog 2129 RMD160 9cf0e195b80b12b590e60f283870db59a31e5f82 SHA1 fbfbd99b956cbfff7c0da6ab453c6c19ce19e384 SHA256 13e5ee126e1476ed61e536250a4cd88273fc2c49e7efe2c05e9f086ffdc61189
 MISC metadata.xml 272 RMD160 fe1b9485c16c778c9af6759a25de99a0f290812d SHA1 b95bdac297f6704d6c9bfcfdbb17b27280567792 SHA256 32b8b0a739fa026bbfebf578484ee84f6e14b137aa54308256427d779f0f9501
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkyU4HQACgkQgAnW8HDreRahDACcCo3zqRG6+PquFXozQgMNt5dB
-rW4AoM39AQrB/t6hMHc+5efBvSBbEplA
-=vQOV
+iEYEAREKAAYFAk7rQL4ACgkQgAnW8HDreRbfawCgtw2uQtDdMvWqMlPM2DXLI5Qy
+x+YAn27bP1mnFozi2iWBImhrscpz5091
+=Lsrs
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/eden/eden-5.3-r1.ebuild b/sci-chemistry/eden/eden-5.3-r1.ebuild
index 46af00db9dd2..d63a2f1d2a19 100644
--- a/sci-chemistry/eden/eden-5.3-r1.ebuild
+++ b/sci-chemistry/eden/eden-5.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/eden/eden-5.3-r1.ebuild,v 1.2 2011/12/16 12:59:33 jlec Exp $
 
 EAPI="3"
 
@@ -9,8 +9,9 @@ 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"
+HOMEPAGE="http://www.gromacs.org/pipermail/eden-users/"
 SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -21,7 +22,8 @@ IUSE="double-precision"
 RDEPEND="
 	sci-libs/fftw:2.1
 	sci-libs/gsl"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 S="${WORKDIR}/${PN}"
 
@@ -40,10 +42,11 @@ src_prepare() {
 		-e "s:^\(LIB.*=.*\$(FFTW)/\).*:\1$(get_libdir):g" \
 		-e "s:^\(BIN.*=\).*:\1 ${D}usr/bin:g" \
 		-e "s:^\(CFLAGS.*=\).*:\1 ${CFLAGS}:g" \
+		-e "s:-lgsl -lgslcblas:$(pkg-config --libs gsl):g" \
 		${SRC}/Makefile || die
 
 	if ! use double-precision; then
-		sed -i -e "s:^\(DOUBLESWITCH.*=\).*:\1 OFF:g" ${SRC}/Makefile
+		sed -i -e "s:^\(DOUBLESWITCH.*=\).*:\1 OFF:g" ${SRC}/Makefile || die
 		EXE="seden"
 	else
 		EXE="deden"
@@ -51,8 +54,7 @@ src_prepare() {
 }
 
 src_compile() {
-	cd ${SRC}
-	emake CC=$(tc-getCC) || die "emake failed"
+	emake CC=$(tc-getCC) -C ${SRC} || die "emake failed"
 }
 
 src_install() {