Bump, thanks Ben Bannier bug #293331. Re-manifest 5.7.1, close #291598. Removed old.

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

3 files changed, 33 insertions, 74 deletions

diff --git a/sci-physics/lhapdf/ChangeLog b/sci-physics/lhapdf/ChangeLog
index 35f3daf17940..4b73c9429328 100644
--- a/sci-physics/lhapdf/ChangeLog
+++ b/sci-physics/lhapdf/ChangeLog
@@ -1,6 +1,13 @@
 # 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.6 2009/07/24 23:08:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/ChangeLog,v 1.7 2009/11/16 20:19:32 bicatali Exp $
+
+*lhapdf-5.8.0 (16 Nov 2009)
+
+  16 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org> -lhapdf-5.6.0.ebuild,
+  -lhapdf-5.7.0.ebuild, +lhapdf-5.8.0.ebuild:
+  Bump, thanks Ben Bannier bug #293331. Re-manifest 5.7.1, close #291598.
+  Removed old.
 
 *lhapdf-5.7.1 (24 Jul 2009)
 
diff --git a/sci-physics/lhapdf/lhapdf-5.6.0.ebuild b/sci-physics/lhapdf/lhapdf-5.6.0.ebuild
deleted file mode 100644
index d0d70b50e76a..000000000000
--- a/sci-physics/lhapdf/lhapdf-5.6.0.ebuild
+++ /dev/null
@@ -1,61 +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.6.0.ebuild,v 1.2 2009/02/20 13:29:32 flameeyes Exp $
-
-inherit eutils fortran
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples python"
-
-DEPEND="doc? ( app-doc/doxygen )
-	python? ( dev-lang/swig )"
-RDEPEND=""
-
-pkg_setup() {
-	local err
-	# this is needed for formulas even with html output only
-	if use doc && ! built_with_use app-doc/doxygen latex; then
-		eerror "You need USE=latex in app-doc/doxygen for docs."
-		err="${err} latex"
-	fi
-
-	[ -z "${err}" ] || die "Unsatisfied dependencies -- needs manual fix"
-
-	FORTRAN="gfortran ifc"
-	fortran_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# do not create extra latex docs
-	sed -i \
-		-e 's/GENERATE_LATEX.*=YES/GENERATE_LATEX = NO/g' \
-		ccwrap/Doxyfile || die
-}
-
-src_compile() {
-	econf \
-		$(use_enable python pyext) \
-		$(use_enable doc doxygen) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README TODO AUTHORS ChangeLog
-
-	use doc && mv "${D}"/usr/share/${PN}/doc/html "${D}"/usr/share/doc/${PF}
-	rm -rf "${D}"/usr/share/${PN}/doc
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die
-	fi
-}
diff --git a/sci-physics/lhapdf/lhapdf-5.7.0.ebuild b/sci-physics/lhapdf/lhapdf-5.8.0.ebuild
index 1243cf98d471..7655b322850a 100644
--- a/sci-physics/lhapdf/lhapdf-5.7.0.ebuild
+++ b/sci-physics/lhapdf/lhapdf-5.8.0.ebuild
@@ -1,30 +1,25 @@
 # 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.0.ebuild,v 1.1 2009/02/24 13:16:12 bicatali Exp $
+# $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
-inherit eutils fortran
 
 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"
+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="doc examples python"
+IUSE="cxx doc examples python test"
 
 DEPEND="doc? ( app-doc/doxygen[latex] )
 	python? ( dev-lang/swig )"
 RDEPEND=""
 
-FORTRAN="gfortran ifc"
-
 src_prepare() {
-	# respect destdir
-	sed -i \
-		-e 's/$(prefix)/$(DESTDIR)$(prefix)/' \
-		pyext/Makefile.in || die
 	# do not create extra latex docs
 	sed -i \
 		-e 's/GENERATE_LATEX.*=YES/GENERATE_LATEX = NO/g' \
@@ -33,17 +28,23 @@ src_prepare() {
 
 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
-	if use doc; then
+	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
@@ -53,3 +54,15 @@ src_install() {
 		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
+}