Version bump

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 35 insertions, 91 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/Manifest b/sci-physics/lhapdf/Manifest
index d9d4a372a604..08a39eda116a 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -5,19 +5,18 @@ DIST MRST2004nlo.LHgrid 288040 RMD160 80bbeb6d1d5c78ffe3910ffb7d91ffa7685368f4 S
 DIST cteq5l.LHgrid 134797 RMD160 eae4db71b4372f17e9f3634fed61d0501ba81c26 SHA1 2316e656a86afc91fd5fb604db4d0ac1aa65d9bc SHA256 83c92bc90fd6e12be9cd76bc032eca26dcedbe90f0c11aef843bbf54734d5bba
 DIST cteq61.LHgrid 8946864 RMD160 aec29b8d79b8ab0dffe167568d9d31f442d35682 SHA1 cf0d2b5600b2a22d50789d08bf7aa4c3beb6a6af SHA256 5df10c695504f02c2c9cc1eda9ca77fa8c276554cf2cda5fbdba764bf8f47691
 DIST cteq61.LHpdf 11860 RMD160 20abcecf3eef6215c5864500b19b8ea39148f184 SHA1 bb82343e51bee2066b0594478defea829e2195b1 SHA256 0dacfd4d5518b2273ba80ae381af7d46eab4784e84312585f5f149f8fce759f0
-DIST lhapdf-5.8.2.tar.gz 1093169 RMD160 393b3ff4213d4ab8fb786685c50e59fdb9b28de3 SHA1 dd066fba8db1374f905e7e3fbadc0342cc6158a0 SHA256 c54b4153b43453426510fd8aa322de66a80a33137ad251124345309615f6a3a6
 DIST lhapdf-5.8.3.tar.gz 1093889 RMD160 2b5c65f7e49b111cc9b5f019c7618cbdab3a5a3f SHA1 a95b0f793c18cf2d6d9a3d6858f7b764a27e84f6 SHA256 e9b5e72bab65adef9ef78a5e0ee526a6ee673bed142f5e3617c0a27029b84275
+DIST lhapdf-5.8.4.tar.gz 1165256 RMD160 c38c57fd31f09aba06aa765e542837275cd40751 SHA1 0dd8f61cef139faa846d9fcdebedc012976829dd SHA256 75a3b44bd4509bec47806fb5ad4baaa6334a2aa8f51cf2f7195d4f08bd353ca2
 DIST wrapheragrid-lite.f 7785 RMD160 27107c563aa39239d7e686339b4bffea70b01de8 SHA1 823bee854e7af836826b8da777e22c9ae8abe060 SHA256 50e1c4113f6312b0e6131870e7739a4bfb251e20f4f5cddd69e27ceb26e47a1f
 DIST wrapheragrid.f 6931 RMD160 0215659914f9c2c91378c8d73937635d7ba67164 SHA1 a5ab5e3d60afb30497d04832d319cc35b2c3c03f SHA256 6bd1c4e19de850a2cbe8c548050c772b367f6738f9ba7bb5b6561915833bf5fd
-EBUILD lhapdf-5.8.2.ebuild 2153 RMD160 756d13bf43a786ce645c93de5c175082071cb7e1 SHA1 d12f96a6f519f9beb4308fcfc83c16dea6ae9c20 SHA256 814ffcd160c4b40a4e62f611806a60a13fa2a3a4359dec1c145901fc2b205906
-EBUILD lhapdf-5.8.3.ebuild 2153 RMD160 4b0000e37163399eb64d61aa8a57c65a0b99a834 SHA1 6e222856af3e7502907ad84bf7ecbbebd6452ab4 SHA256 79306a37bd0b185cd40eb17958e734daca0c1d79576b723de5ca13d1e881a2a8
 EBUILD lhapdf-5.8.3_p01.ebuild 2621 RMD160 0507c2c8a2136bc8ebbdea11d9c099b3b3b7f11f SHA1 eed5d2422fe9090fd18fa63dc43eb3087e7c4874 SHA256 5d54a20cc192f64fee7e4616dc51d868f87b901c07e985dbb60ddb079a95da9a
-MISC ChangeLog 2386 RMD160 ed2d1d7d418b7e4e548a98e156cefce93d7bb9ba SHA1 20483b3764e8562f2126e908e35c9dfe57070ae2 SHA256 9025e7940be5cd97f199f9d13ef66c17c44f0850810f0835da8540358df30f72
+EBUILD lhapdf-5.8.4.ebuild 2617 RMD160 fea74fa4b99924d3af2019a6f24fdddecebd7661 SHA1 a671801b89adc3d14568738b6858ba126c882fdd SHA256 bbd7f86ba652ab190ac24fde41d8d93e3f43d217d7507243e3704702b4b61754
+MISC ChangeLog 2554 RMD160 16ebc0c0b91469598870fd2cd755e3462f64536e SHA1 e2b22826d05e830d7966d9d3213f4eb3ddc4a4f2 SHA256 075790076c2735e318411be0295de9aa77cb1320671e061b98afb97f47158346
 MISC metadata.xml 995 RMD160 e924208f868c22ccda98eb2b462139f621c067ac SHA1 9cead1d3b35b48936f677044a3a0c6a6ebe373f0 SHA256 12afc533794a5db63bc7449d5dc07d7519a7f2c42fe6cac76aa681672f5fd693
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkwyExoACgkQ1ycZbhPLE2CpnACePnaTFDJUUmQKFVwN5ekwc4p4
-DRMAn1a3J5e7Tavew8HJrA/ylWbIJ9qR
-=HczV
+iEYEARECAAYFAkxkL5cACgkQ1ycZbhPLE2D7IwCeNpZtt1Q20S7dTMUsZNaINzlw
+i14An2EmYyyDwgPtnWXMqUymdMmsQ84Y
+=aWQZ
 -----END PGP SIGNATURE-----
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 \