Version bump

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

3 files changed, 28 insertions, 83 deletions

diff --git a/sci-physics/lhapdf/ChangeLog b/sci-physics/lhapdf/ChangeLog
index ec58ec08b4cc..b281e90b73c6 100644
--- a/sci-physics/lhapdf/ChangeLog
+++ b/sci-physics/lhapdf/ChangeLog
@@ -1,6 +1,12 @@
 # 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.12 2010/07/05 17:14:56 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/ChangeLog,v 1.13 2010/08/12 16:40:58 bicatali Exp $
+
+*lhapdf-5.8.4 (12 Aug 2010)
+
+  12 Aug 2010; Sébastien Fabbro <bicatali@gentoo.org> -lhapdf-5.8.2.ebuild,
+  -lhapdf-5.8.3.ebuild, +lhapdf-5.8.4.ebuild:
+  Version bump
 
 *lhapdf-5.8.3_p01 (05 Jul 2010)
 
diff --git a/sci-physics/lhapdf/lhapdf-5.8.3.ebuild b/sci-physics/lhapdf/lhapdf-5.8.3.ebuild
deleted file mode 100644
index 0bc044b2086a..000000000000
--- a/sci-physics/lhapdf/lhapdf-5.8.3.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.3.ebuild,v 1.1 2010/06/07 15:21:11 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="${PWD}/PDFsets" \
-		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.4.ebuild
index e268d4ba6e10..6cddb4c41db0 100644
--- a/sci-physics/lhapdf/lhapdf-5.8.2.ebuild
+++ b/sci-physics/lhapdf/lhapdf-5.8.4.ebuild
@@ -1,17 +1,24 @@
 # 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.2 2010/04/27 16:28:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.4.ebuild,v 1.1 2010/08/12 16:40:58 bicatali Exp $
 
 EAPI=2
 
+inherit versionator
+
+MY_PV=$(get_version_component_range 1-3 ${PV})
+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/${P}.tar.gz
+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/${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 ) )"
+		http://svn.hepforge.org/${PN}/pdfsets/tags/${MY_PV}/cteq61.LHgrid
+		http://svn.hepforge.org/${PN}/pdfsets/tags/${MY_PV}/MRST2004nlo.LHgrid
+		http://svn.hepforge.org/${PN}/pdfsets/tags/${MY_PV}/cteq61.LHpdf
+		octave? ( http://svn.hepforge.org/${PN}/pdfsets/tags/${MY_PV}/cteq5l.LHgrid ) )"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,6 +30,14 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[latex] )
 	python? ( dev-lang/swig )"
 
+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 \