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

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

4 files changed, 41 insertions, 84 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/Manifest b/sci-physics/lhapdf/Manifest
index edcd63ed269d..3124cc73465a 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -3,19 +3,17 @@ Hash: SHA1
 
 DIST cteq61.LHgrid 8946864 RMD160 aec29b8d79b8ab0dffe167568d9d31f442d35682 SHA1 cf0d2b5600b2a22d50789d08bf7aa4c3beb6a6af SHA256 5df10c695504f02c2c9cc1eda9ca77fa8c276554cf2cda5fbdba764bf8f47691
 DIST cteq61.LHpdf 11860 RMD160 20abcecf3eef6215c5864500b19b8ea39148f184 SHA1 bb82343e51bee2066b0594478defea829e2195b1 SHA256 0dacfd4d5518b2273ba80ae381af7d46eab4784e84312585f5f149f8fce759f0
-DIST lhapdf-5.6.0.tar.gz 87459542 RMD160 0c946135139a538e8311c48394932a9e156fdc66 SHA1 e8ad6fae3d101555fb8571559cea9b7bae939062 SHA256 0510ebead2bda1708f07b330ac05d8d86f5e51b3ebfeaea913743557299dc272
-DIST lhapdf-5.7.0.tar.gz 112090890 RMD160 4ca29a53ffe9a137ace1fd32b0947a4785926009 SHA1 f1e58e3319c6c06e3391ee233c747b8025a88f0c SHA256 bf15e09e56434262a3678e5be81057e2a2a9d02a3cbd11e70d64230a3980f0dd
-DIST lhapdf-5.7.1-pdf.tar.bz2 400475886 RMD160 1ec7708bba3e0fd9998873132c0ad601810ecc88 SHA1 469173e19f6741532ad8e614c3ff82aee6a21544 SHA256 51c8c89aa190a20e5d89adb090d784f475f924fab6715b73a17eabcd1de61476
+DIST lhapdf-5.7.1-pdf.tar.bz2 400514192 RMD160 ef835e0f3a8b6d9e1e194ad3d7f55d1e8db92b63 SHA1 c243efe6c08544f542b13635b3f6a35c8589ba87 SHA256 895355772bbf3f97866382f90308b346aa302fcee517f34294a6eccc190a9cdd
 DIST lhapdf-5.7.1.tar.gz 1069770 RMD160 88b0211d9d7bc3dbc6c309b87cd1e59ba13c1e25 SHA1 24b641e94add21021e4999112f597345af2cb389 SHA256 40529629351598317fbf7b5905661e51b23778019d50451eee78d7b1118e2559
-EBUILD lhapdf-5.6.0.ebuild 1536 RMD160 d2f148887af11f86cbf1d8724cff8faf0e367ffa SHA1 c8fc1cc95f960148b5c18617bcd16b48f9ace34e SHA256 0ee016fefba400d3eaa741ff516ccd3dd2827d7827b0880078ff99851af06295
-EBUILD lhapdf-5.7.0.ebuild 1320 RMD160 09c10b2b2f3888f2045286d127ebe4608222b5d9 SHA1 7dea7e1ffa015a396fbd9510156689bc1b1eb840 SHA256 5696d31e87f5af3840c2b71b76a8612c4965fd4627a51e3178c792ff83c1542a
+DIST lhapdf-5.8.0.tar.gz 1069590 RMD160 c49b6bb3fb1f114cd7a25b01557c683baf383ceb SHA1 83db0a9f19ea9d1dc5ef1cbbfcb6ad820eec57dc SHA256 8381ea5f785dde95772a2b6d5890f1cb72012e223e6861823fd81b09eedaa7a3
 EBUILD lhapdf-5.7.1.ebuild 1873 RMD160 b850ab197ae85ef0c4cc743b859708f61d3c00ac SHA1 8cd029995e7261dfb4ce6214bd6c5f1fb16fd096 SHA256 b72e85e6e559f7eb41b1788445e2a8845102769a5745b0acb18ee70f785664b1
-MISC ChangeLog 1389 RMD160 74d88f2cb17ed142455ac68a63ea7dfce7f5f0a0 SHA1 462947c91d5c71600214ef13908a11bd30df0d89 SHA256 eb2d4f076bf343ba62fad6a86b0fad9ee104a2aeffc13043b6170e0308bcf4d7
+EBUILD lhapdf-5.8.0.ebuild 1811 RMD160 ba6cb16d0ef575ed0a38446f61c4c1a04ec8e414 SHA1 b286436afa4c8270eb8bd5114837365ecd170a9f SHA256 cfde57582b5ae16154bc2b47da3fabaf085a0f9c5e0d79f9de25811d0908cd0b
+MISC ChangeLog 1631 RMD160 449cdb20095409b7c3ed7f9109d12613e9b333ee SHA1 7f5d69a197ab8390807aba1f55578bd14ec25dc4 SHA256 5eace9d4e0ec58e881415e29ed3846d89ebfa417f10f9aab6c53bd1558bc346b
 MISC metadata.xml 999 RMD160 1cb72f222c50adcc7a305847744943def2917d7d SHA1 3fe4602d8265530489638c7d68c3646c48c684bd SHA256 7d9af1df4ef7007fe54aae1d2fd14a9395bc968223829ced4502c9d51f9904e3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkpqPvwACgkQ1ycZbhPLE2B4pgCgs5LObTEjHQDnmmq6IrR9GOTV
-W/QAnjFHw1HlmqaCA6gNIAHpsc9URTIF
-=JX0w
+iEYEARECAAYFAksBvZoACgkQ1ycZbhPLE2BFEACgkuLL6PnO4L8/wi5WjqKdk+Ly
+iV8AnA/LHuTl4Yvc+KQzXo36P7orQ3lR
+=JJuD
 -----END PGP SIGNATURE-----
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
+}