Removed old, LHAPATH in tests more robust

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

5 files changed, 12 insertions, 156 deletions

diff --git a/sci-physics/lhapdf/ChangeLog b/sci-physics/lhapdf/ChangeLog
index 3792e13b4eac..9d540b50cf4f 100644
--- a/sci-physics/lhapdf/ChangeLog
+++ b/sci-physics/lhapdf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/lhapdf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/ChangeLog,v 1.9 2010/03/23 02:37:22 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/ChangeLog,v 1.10 2010/04/27 16:28:04 bicatali Exp $
+
+  27 Apr 2010; Sébastien Fabbro <bicatali@gentoo.org> -lhapdf-5.8.0.ebuild,
+  -lhapdf-5.8.1.ebuild, lhapdf-5.8.2.ebuild:
+  Removed old, LHAPATH in tests more robust
 
 *lhapdf-5.8.2 (23 Mar 2010)
 
diff --git a/sci-physics/lhapdf/Manifest b/sci-physics/lhapdf/Manifest
index 0a4c93ecbca6..13e9ac16e68c 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -5,18 +5,14 @@ DIST MRST2004nlo.LHgrid 288040 RMD160 80bbeb6d1d5c78ffe3910ffb7d91ffa7685368f4 S
 DIST cteq5l.LHgrid 134797 RMD160 eae4db71b4372f17e9f3634fed61d0501ba81c26 SHA1 2316e656a86afc91fd5fb604db4d0ac1aa65d9bc SHA256 83c92bc90fd6e12be9cd76bc032eca26dcedbe90f0c11aef843bbf54734d5bba
 DIST cteq61.LHgrid 8946864 RMD160 aec29b8d79b8ab0dffe167568d9d31f442d35682 SHA1 cf0d2b5600b2a22d50789d08bf7aa4c3beb6a6af SHA256 5df10c695504f02c2c9cc1eda9ca77fa8c276554cf2cda5fbdba764bf8f47691
 DIST cteq61.LHpdf 11860 RMD160 20abcecf3eef6215c5864500b19b8ea39148f184 SHA1 bb82343e51bee2066b0594478defea829e2195b1 SHA256 0dacfd4d5518b2273ba80ae381af7d46eab4784e84312585f5f149f8fce759f0
-DIST lhapdf-5.8.0.tar.gz 1069590 RMD160 c49b6bb3fb1f114cd7a25b01557c683baf383ceb SHA1 83db0a9f19ea9d1dc5ef1cbbfcb6ad820eec57dc SHA256 8381ea5f785dde95772a2b6d5890f1cb72012e223e6861823fd81b09eedaa7a3
-DIST lhapdf-5.8.1.tar.gz 1079835 RMD160 ea3ba519aba5bca5a4bd337fad53f7939a3f91f0 SHA1 e3b3d981cf5569beccfd2caeb3b0ce13eb7f778b SHA256 e113818541e976be69a9524007c2db19059da9af7abfebf7c53d86eafa2109c9
 DIST lhapdf-5.8.2.tar.gz 1093169 RMD160 393b3ff4213d4ab8fb786685c50e59fdb9b28de3 SHA1 dd066fba8db1374f905e7e3fbadc0342cc6158a0 SHA256 c54b4153b43453426510fd8aa322de66a80a33137ad251124345309615f6a3a6
-EBUILD lhapdf-5.8.0.ebuild 1811 RMD160 ba6cb16d0ef575ed0a38446f61c4c1a04ec8e414 SHA1 b286436afa4c8270eb8bd5114837365ecd170a9f SHA256 cfde57582b5ae16154bc2b47da3fabaf085a0f9c5e0d79f9de25811d0908cd0b
-EBUILD lhapdf-5.8.1.ebuild 2149 RMD160 9e6d153d40a8cccce002a172428e922008859d51 SHA1 e141b32c624781fd6486ccedebfd1eb1bd7bbc9c SHA256 512eac0215398d77e47d81cdfaa32d663d5e1fd3aaddde30c8423406f53c2798
-EBUILD lhapdf-5.8.2.ebuild 2149 RMD160 152d540dc6e6cb5d486a6918daa84c16c200893c SHA1 14810a27fbc3252f5d64f8ca2dd94a66d6dd2d46 SHA256 57287d1a9ee00f6ee6b7daa5d03ed2e8aae74c4e1ac2949a3b38b031cfec7790
-MISC ChangeLog 1931 RMD160 0325fc415462a77ab8924767c0e00e0d023408af SHA1 c59946160b891731674ff911b69bf7019e9005d2 SHA256 2c994975f23f6535a70470ce486a96d0b661a89f2222a27d6582ae403a2b6714
+EBUILD lhapdf-5.8.2.ebuild 2153 RMD160 756d13bf43a786ce645c93de5c175082071cb7e1 SHA1 d12f96a6f519f9beb4308fcfc83c16dea6ae9c20 SHA256 814ffcd160c4b40a4e62f611806a60a13fa2a3a4359dec1c145901fc2b205906
+MISC ChangeLog 2099 RMD160 125adae72691c22ccc0389a23c5d8edefb208a0a SHA1 69e166af1ad667ee208e4e5873eb4193b1676731 SHA256 b976c38f5f39fc9d96831fedb5477d91ac93381311bd24ccb60b0d16e69cb566
 MISC metadata.xml 995 RMD160 e924208f868c22ccda98eb2b462139f621c067ac SHA1 9cead1d3b35b48936f677044a3a0c6a6ebe373f0 SHA256 12afc533794a5db63bc7449d5dc07d7519a7f2c42fe6cac76aa681672f5fd693
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuoKWwACgkQ1ycZbhPLE2B5YwCeMMnYIfjnJ5NyZHS9Y8szIs/R
-ahcAn0C4UrrEaegpM9WIVw67ZpLhR5jO
-=+in2
+iEYEARECAAYFAkvXG0MACgkQ1ycZbhPLE2DW5wCgkTU903nY9UfPO/X6etBMI83n
+mlAAoIHvbiraBdpFz9osXRhm/VHqnKi9
+=KjF7
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/lhapdf/lhapdf-5.8.0.ebuild b/sci-physics/lhapdf/lhapdf-5.8.0.ebuild
deleted file mode 100644
index 7655b322850a..000000000000
--- a/sci-physics/lhapdf/lhapdf-5.8.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.0.ebuild,v 1.1 2009/11/16 20:19:32 bicatali Exp $
-
-EAPI=2
-
-DESCRIPTION="Les Houches Parton Density Function unified library"
-HOMEPAGE="http://projects.hepforge.org/lhapdf/"
-SRC_URI="http://www.hepforge.org/archive/lhapdf/${P}.tar.gz
-	test? ( http://svn.hepforge.org/${PN}/pdfsets/tags/${PV}/cteq61.LHgrid
-	http://svn.hepforge.org/${PN}/pdfsets/tags/${PV}/cteq61.LHpdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cxx doc examples python test"
-
-DEPEND="doc? ( app-doc/doxygen[latex] )
-	python? ( dev-lang/swig )"
-RDEPEND=""
-
-src_prepare() {
-	# do not create extra latex docs
-	sed -i \
-		-e 's/GENERATE_LATEX.*=YES/GENERATE_LATEX = NO/g' \
-		ccwrap/Doxyfile || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable cxx ccwrap) \
-		$(use_enable cxx old-ccwrap ) \
-		$(use_enable python pyext) \
-		$(use_enable doc doxygen)
-}
-
-src_test() {
-	LHAPATH="${DISTDIR}" emake check || die "emake check failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README TODO AUTHORS ChangeLog
-
-	# leftover
-	rm -rf "${D}"/usr/share/${PN}/doc || die
-	if use doc && use cxx; then
-		# default doc install buggy
-		insinto /usr/share/doc/${PF}
-		doins -r ccwrap/doxy/html || die
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.{f,cc} || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To install data files, you have to run as root:"
-	elog "${ROOT}usr/bin/lhapdf-getdata --dest=${ROOT}usr/share/lhapdf --all"
-}
-
-pkg_postrm() {
-	if [ -d "${ROOT}usr/share/lhapdf" ]; then
-		ewarn "The data directory has not been removed, probably because"
-		ewarn "you still have installed data files."
-	fi
-}
diff --git a/sci-physics/lhapdf/lhapdf-5.8.1.ebuild b/sci-physics/lhapdf/lhapdf-5.8.1.ebuild
deleted file mode 100644
index 666928590cc8..000000000000
--- a/sci-physics/lhapdf/lhapdf-5.8.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.1.ebuild,v 1.1 2010/01/08 02:25:13 bicatali Exp $
-
-EAPI=2
-
-DESCRIPTION="Les Houches Parton Density Function unified library"
-HOMEPAGE="http://projects.hepforge.org/lhapdf/"
-SRC_URI="http://www.hepforge.org/archive/lhapdf/${P}.tar.gz
-	test? (
-		http://svn.hepforge.org/${PN}/pdfsets/tags/${PV}/cteq61.LHgrid
-		http://svn.hepforge.org/${PN}/pdfsets/tags/${PV}/MRST2004nlo.LHgrid
-		http://svn.hepforge.org/${PN}/pdfsets/tags/${PV}/cteq61.LHpdf
-		octave? ( http://svn.hepforge.org/${PN}/pdfsets/tags/${PV}/cteq5l.LHgrid ) )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cxx doc examples octave python test"
-
-RDEPEND="octave? ( sci-mathematics/octave )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[latex] )
-	python? ( dev-lang/swig )"
-
-src_prepare() {
-	# do not create extra latex docs
-	sed -i \
-		-e 's/GENERATE_LATEX.*=YES/GENERATE_LATEX = NO/g' \
-		ccwrap/Doxyfile || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable cxx ccwrap) \
-		$(use_enable cxx old-ccwrap ) \
-		$(use_enable python pyext) \
-		$(use_enable doc doxygen)
-}
-
-src_test() {
-	# need to make a bogus link for octave test
-	ln -s "${DISTDIR}" PDFsets
-	LHAPATH="${DISTDIR}" \
-		LD_LIBRARY_PATH="${PWD}/lib/.libs:${LD_LIBRARY_PATH}" \
-		emake check || die "emake check failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README TODO AUTHORS ChangeLog
-
-	# leftover
-	rm -rf "${D}"/usr/share/${PN}/doc || die
-	if use doc && use cxx; then
-		# default doc install buggy
-		insinto /usr/share/doc/${PF}
-		doins -r ccwrap/doxy/html || die
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.{f,cc} || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To install data files, you have to run as root:"
-	elog "${ROOT}usr/bin/lhapdf-getdata --dest=${ROOT}usr/share/lhapdf --all"
-}
-
-pkg_postrm() {
-	if [ -d "${ROOT}usr/share/lhapdf" ]; then
-		ewarn "The data directory has not been removed, probably because"
-		ewarn "you still have installed data files."
-	fi
-}
diff --git a/sci-physics/lhapdf/lhapdf-5.8.2.ebuild b/sci-physics/lhapdf/lhapdf-5.8.2.ebuild
index 140dd8b646aa..e268d4ba6e10 100644
--- a/sci-physics/lhapdf/lhapdf-5.8.2.ebuild
+++ b/sci-physics/lhapdf/lhapdf-5.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.2.ebuild,v 1.1 2010/03/23 02:37:22 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.2.ebuild,v 1.2 2010/04/27 16:28:04 bicatali Exp $
 
 EAPI=2
 
@@ -41,7 +41,7 @@ src_configure() {
 src_test() {
 	# need to make a bogus link for octave test
 	ln -s "${DISTDIR}" PDFsets
-	LHAPATH="${DISTDIR}" \
+	LHAPATH="${PWD}/PDFsets" \
 		LD_LIBRARY_PATH="${PWD}/lib/.libs:${LD_LIBRARY_PATH}" \
 		emake check || die "emake check failed"
 }