Version bump and added missing file for test

(Portage version: 2.2_rc61/cvs/Linux x86_64)

4 files changed, 87 insertions, 77 deletions

diff --git a/sci-physics/lhapdf/ChangeLog b/sci-physics/lhapdf/ChangeLog
index 4b73c9429328..0c8dc9999a7b 100644
--- a/sci-physics/lhapdf/ChangeLog
+++ b/sci-physics/lhapdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/lhapdf
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/ChangeLog,v 1.7 2009/11/16 20:19:32 bicatali Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/ChangeLog,v 1.8 2010/01/08 02:25:13 bicatali Exp $
+
+*lhapdf-5.8.1 (08 Jan 2010)
+
+  08 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org> -lhapdf-5.7.1.ebuild,
+  +lhapdf-5.8.1.ebuild:
+  Version bump and added missing file for test
 
 *lhapdf-5.8.0 (16 Nov 2009)
 
diff --git a/sci-physics/lhapdf/lhapdf-5.7.1.ebuild b/sci-physics/lhapdf/lhapdf-5.7.1.ebuild
deleted file mode 100644
index 0c53ab712b66..000000000000
--- a/sci-physics/lhapdf/lhapdf-5.7.1.ebuild
+++ /dev/null
@@ -1,74 +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.7.1.ebuild,v 1.1 2009/07/24 23:08:26 bicatali Exp $
-
-EAPI=2
-inherit check-reqs
-
-DESCRIPTION="Les Houches Parton Density Function unified library"
-HOMEPAGE="http://projects.hepforge.org/lhapdf/"
-
-# data built with svn export http://svn.hepforge.org/${PN}/pdfsets/tags/${PV}
-SRC_URI="http://www.hepforge.org/archive/lhapdf/${P}.tar.gz
-	http://svn.hepforge.org/${PN}/pdfsets/tags/${PV}/cteq61.LHgrid
-	http://svn.hepforge.org/${PN}/pdfsets/tags/${PV}/cteq61.LHpdf
-	data? ( mirror://gentoo/${P}-pdf.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cxx -data doc examples python test"
-
-DEPEND="doc? ( app-doc/doxygen[latex] )
-	python? ( dev-lang/swig )"
-RDEPEND=""
-
-pkg_setup() {
-	if use data; then
-	# Check if we have enough free diskspace to install
-		CHECKREQS_DISK_BUILD="1800"
-		check_reqs
-	fi
-}
-
-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
-
-	if use data; then
-		elog "Installing data files"
-		insinto /usr/share/lhapdf/PDFSets
-		doins "${S}-pdf"/* || die
-	fi
-
-	# 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
-}
diff --git a/sci-physics/lhapdf/lhapdf-5.8.1.ebuild b/sci-physics/lhapdf/lhapdf-5.8.1.ebuild
new file mode 100644
index 000000000000..666928590cc8
--- /dev/null
+++ b/sci-physics/lhapdf/lhapdf-5.8.1.ebuild
@@ -0,0 +1,76 @@
+# 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/metadata.xml b/sci-physics/lhapdf/metadata.xml
index c5a1839b31c4..3aac2c864625 100644
--- a/sci-physics/lhapdf/metadata.xml
+++ b/sci-physics/lhapdf/metadata.xml
@@ -16,6 +16,8 @@
   installation of LHAPDF.
 </longdescription>
 <use>
-  <flag name='data'>Install all Parton Density Function data sets system-wide</flag>
+  <flag name='data'>Install all Parton Density Function data sets
+  system-wide</flag>
+  <flag name='octave'>Add bindings for <pkg>sci-mathematics/octave</pkg></flag> 
 </use>
 </pkgmetadata>