Version bump, simplified the EAPI4 and a small change in the elog to install data, bug #358109.

(Portage version: 2.1.9.42/cvs/Linux x86_64)

4 files changed, 33 insertions, 46 deletions

diff --git a/sci-physics/lhapdf/ChangeLog b/sci-physics/lhapdf/ChangeLog
index d330af01bc57..489357793a9a 100644
--- a/sci-physics/lhapdf/ChangeLog
+++ b/sci-physics/lhapdf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-physics/lhapdf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/ChangeLog,v 1.16 2011/01/31 19:10:41 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/ChangeLog,v 1.17 2011/03/09 20:03:41 bicatali Exp $
+
+*lhapdf-5.8.5 (09 Mar 2011)
+
+  09 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  -lhapdf-5.8.3_p01.ebuild, lhapdf-5.8.4.ebuild, lhapdf-5.8.4-r1.ebuild,
+  +lhapdf-5.8.5.ebuild:
+  Version bump, simplified the EAPI4 and a small change in the elog to install
+  data, bug #358109.
 
   31 Jan 2011; Christian Faulhammer <fauli@gentoo.org> lhapdf-5.8.4.ebuild:
   stable x86, bug 352055
diff --git a/sci-physics/lhapdf/lhapdf-5.8.4-r1.ebuild b/sci-physics/lhapdf/lhapdf-5.8.4-r1.ebuild
index aa4a5c0eef95..eafcb8a673ca 100644
--- a/sci-physics/lhapdf/lhapdf-5.8.4-r1.ebuild
+++ b/sci-physics/lhapdf/lhapdf-5.8.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.4-r1.ebuild,v 1.1 2011/01/30 21:00:20 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.4-r1.ebuild,v 1.2 2011/03/09 20:03:41 bicatali Exp $
 
 EAPI=4
 
@@ -55,27 +55,23 @@ src_test() {
 	ln -s "${DISTDIR}" PDFsets
 	LHAPATH="${PWD}/PDFsets" \
 		LD_LIBRARY_PATH="${PWD}/lib/.libs:${LD_LIBRARY_PATH}" \
-		emake check || die "emake check failed"
+		emake check
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 	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
+	rm -rf "${ED}"/usr/share/${PN}/doc || die
+	use doc && use cxx && dohtml -r ccwrap/doxy/html/*
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.{f,cc} || die
+		doins examples/*.{f,cc}
 	fi
 }
 
 pkg_postinst() {
 	elog "To install data files, you have to run as root:"
-	elog "lhapdf-getdata --dest=${EROOT}usr/share/lhapdf --all"
+	elog "lhapdf-getdata --dest=${EROOT}usr/share/lhapdf/PDFsets --all"
 }
diff --git a/sci-physics/lhapdf/lhapdf-5.8.4.ebuild b/sci-physics/lhapdf/lhapdf-5.8.4.ebuild
index 830e2f29f82c..8716b62492c5 100644
--- a/sci-physics/lhapdf/lhapdf-5.8.4.ebuild
+++ b/sci-physics/lhapdf/lhapdf-5.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.4.ebuild,v 1.4 2011/01/31 19:10:41 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.4.ebuild,v 1.5 2011/03/09 20:03:41 bicatali Exp $
 
 EAPI=2
 
@@ -83,7 +83,7 @@ src_install() {
 
 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"
+	elog "${ROOT}usr/bin/lhapdf-getdata --dest=${ROOT}usr/share/lhapdf/PDFsets --all"
 }
 
 pkg_postrm() {
diff --git a/sci-physics/lhapdf/lhapdf-5.8.3_p01.ebuild b/sci-physics/lhapdf/lhapdf-5.8.5.ebuild
index 9d563a68adf4..8e5a31954804 100644
--- a/sci-physics/lhapdf/lhapdf-5.8.3_p01.ebuild
+++ b/sci-physics/lhapdf/lhapdf-5.8.5.ebuild
@@ -1,10 +1,10 @@
-# 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-physics/lhapdf/lhapdf-5.8.3_p01.ebuild,v 1.1 2010/07/05 17:14:56 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.5.ebuild,v 1.1 2011/03/09 20:03:41 bicatali Exp $
 
-EAPI=2
+EAPI=4
 
-inherit versionator
+inherit versionator eutils
 
 MY_PV=$(get_version_component_range 1-3 ${PV})
 MY_PF=${PN}-${MY_PV}
@@ -12,8 +12,6 @@ MY_PF=${PN}-${MY_PV}
 DESCRIPTION="Les Houches Parton Density Function unified library"
 HOMEPAGE="http://projects.hepforge.org/lhapdf/"
 SRC_URI="http://www.hepforge.org/archive/lhapdf/${MY_PF}.tar.gz
-	http://projects.hepforge.org/${PN}/updates-5.8.3/wrapheragrid.f
-	http://projects.hepforge.org/${PN}/updates-5.8.3/wrapheragrid-lite.f
 	test? (
 		http://svn.hepforge.org/${PN}/pdfsets/tags/${MY_PV}/cteq61.LHgrid
 		http://svn.hepforge.org/${PN}/pdfsets/tags/${MY_PV}/MRST2004nlo.LHgrid
@@ -23,8 +21,8 @@ SRC_URI="http://www.hepforge.org/archive/lhapdf/${MY_PF}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cxx doc examples octave python test"
-
+IUSE="cxx doc examples octave python static-libs test"
+REQUIRED_USE="octave? ( cxx )"
 RDEPEND="octave? ( sci-mathematics/octave )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[latex] )
@@ -32,12 +30,6 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_PF}"
 
-src_unpack() {
-	unpack ${MY_PF}.tar.gz
-	mv "${DISTDIR}"/wrapheragrid.f "${WORKDIR}/${MY_PF}"/src/wrapheragrid.f
-	mv "${DISTDIR}"/wrapheragrid-lite.f "${WORKDIR}/${MY_PF}"/src/wrapheragrid-lite.f
-}
-
 src_prepare() {
 	# do not create extra latex docs
 	sed -i \
@@ -49,8 +41,10 @@ src_configure() {
 	econf \
 		$(use_enable cxx ccwrap) \
 		$(use_enable cxx old-ccwrap ) \
+		$(use_enable doc doxygen) \
+		$(use_enable octave) \
 		$(use_enable python pyext) \
-		$(use_enable doc doxygen)
+		$(use_enable static-libs static)
 }
 
 src_test() {
@@ -58,34 +52,23 @@ src_test() {
 	ln -s "${DISTDIR}" PDFsets
 	LHAPATH="${PWD}/PDFsets" \
 		LD_LIBRARY_PATH="${PWD}/lib/.libs:${LD_LIBRARY_PATH}" \
-		emake check || die "emake check failed"
+		emake check
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 	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
+	rm -rf "${ED}"/usr/share/${PN}/doc || die
+	use doc && use cxx && dohtml -r ccwrap/doxy/html/*
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.{f,cc} || die
+		doins examples/*.{f,cc}
 	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
+	elog "lhapdf-getdata --dest=${EROOT}usr/share/lhapdf/PDFsets --all"
 }