Version bump, removed old version.

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

2 files changed, 26 insertions, 26 deletions

diff --git a/sci-physics/lhapdf/ChangeLog b/sci-physics/lhapdf/ChangeLog
index 38aee0980d1e..89c32a4169bb 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.4 2009/02/20 13:29:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/ChangeLog,v 1.5 2009/02/24 13:16:12 bicatali Exp $
+
+*lhapdf-5.7.0 (23 Feb 2009)
+
+  23 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org> -lhapdf-5.5.1.ebuild,
+  +lhapdf-5.7.0.ebuild:
+  Version bump, removed older version
 
   20 Feb 2009; Diego E. Pettenò <flameeyes@gentoo.org> lhapdf-5.5.1.ebuild,
   lhapdf-5.6.0.ebuild:
diff --git a/sci-physics/lhapdf/lhapdf-5.5.1.ebuild b/sci-physics/lhapdf/lhapdf-5.7.0.ebuild
index a5df913eaa79..1243cf98d471 100644
--- a/sci-physics/lhapdf/lhapdf-5.5.1.ebuild
+++ b/sci-physics/lhapdf/lhapdf-5.7.0.ebuild
@@ -1,7 +1,8 @@
 # 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.5.1.ebuild,v 1.2 2009/02/20 13:29:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/lhapdf-5.7.0.ebuild,v 1.1 2009/02/24 13:16:12 bicatali Exp $
 
+EAPI=2
 inherit eutils fortran
 
 DESCRIPTION="Les Houches Parton Density Function unified library"
@@ -13,49 +14,42 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples python"
 
-DEPEND="doc? ( app-doc/doxygen )
+DEPEND="doc? ( app-doc/doxygen[latex] )
 	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
-}
+FORTRAN="gfortran ifc"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+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' \
 		ccwrap/Doxyfile || die
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable python pyext) \
-		$(use_enable doc doxygen) \
-		|| die "econf failed"
-	emake || die "emake failed"
+		$(use_enable doc doxygen)
 }
 
 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}
+	# leftover
 	rm -rf "${D}"/usr/share/${PN}/doc
-	if use examples; then
+	if use doc; then
+		# default doc install buggy
 		insinto /usr/share/doc/${PF}
-		doins -r examples || die
+		doins -r ccwrap/doxy/html || die
+	fi
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.{f,cc} || die
 	fi
 }