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

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

5 files changed, 42 insertions, 55 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/Manifest b/sci-physics/lhapdf/Manifest
index 767e01363a5e..4ff886169644 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -5,20 +5,20 @@ 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.3.tar.gz 1093889 RMD160 2b5c65f7e49b111cc9b5f019c7618cbdab3a5a3f SHA1 a95b0f793c18cf2d6d9a3d6858f7b764a27e84f6 SHA256 e9b5e72bab65adef9ef78a5e0ee526a6ee673bed142f5e3617c0a27029b84275
 DIST lhapdf-5.8.4-updates-20110126.patch.gz 6169 RMD160 30c85d0ccb1d8f2167f89a423c2503cc3b880c13 SHA1 424413c0c9d7e52f1de5e8d02d8585feeaf06665 SHA256 50bf9787c44ca4116968111f59992b19118c92f51eee5a1fbeff50cb6c169ce4
 DIST lhapdf-5.8.4.tar.gz 1165256 RMD160 c38c57fd31f09aba06aa765e542837275cd40751 SHA1 0dd8f61cef139faa846d9fcdebedc012976829dd SHA256 75a3b44bd4509bec47806fb5ad4baaa6334a2aa8f51cf2f7195d4f08bd353ca2
+DIST lhapdf-5.8.5.tar.gz 1146436 RMD160 1f08f537a4a105185d85696305b433aa29ba3835 SHA1 fc36f6c46e9d636a39f654a719adf3525a113abc SHA256 f37d87c70a65a770bb2d013c4d1d9aa5d90c0f52b9430d56bab578fd221e8e41
 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.3_p01.ebuild 2621 RMD160 0507c2c8a2136bc8ebbdea11d9c099b3b3b7f11f SHA1 eed5d2422fe9090fd18fa63dc43eb3087e7c4874 SHA256 5d54a20cc192f64fee7e4616dc51d868f87b901c07e985dbb60ddb079a95da9a
-EBUILD lhapdf-5.8.4-r1.ebuild 2316 RMD160 b7fee67fc280cf087383441839fdfd09d96ff8dc SHA1 5b1e410ff0c6c7617199d030a3bc81ceb9f6bc7b SHA256 b384288e3f09b366a999d1b64e6b8f3d6cc7da8262f46786c21041ab307ac05d
-EBUILD lhapdf-5.8.4.ebuild 2680 RMD160 e96e1b3c0ccaa0b8bf979d9cecadb5873cb05065 SHA1 986844c2b3ed0b72695e8e0b34dc477bd66a28b8 SHA256 8fe673903289d8f8952e005feea447d4018a71a443acd4df906593777fef11eb
-MISC ChangeLog 3032 RMD160 41ee987fae4506bfd5dcb752334c58a51dab96be SHA1 d82fd28c5b36984d276107686750070de97f9ad6 SHA256 e0bce35f9bc252be2b45ac6444175a88de2d743273091f617afc7ef6cbff9011
+EBUILD lhapdf-5.8.4-r1.ebuild 2183 RMD160 1ba66fd3ee8ee6cc85595cae21b07a87dfcfb178 SHA1 f33454b8ce5341c9d01049b79621c4c24a11c1ca SHA256 f42307568729870f73f00206dc394eecd8fa8a42cb08068c8fab689cc75ae509
+EBUILD lhapdf-5.8.4.ebuild 2691 RMD160 47634c36d050ba266d2a90bcb6d7a542500d80f3 SHA1 c504b743e399563fbeaec93959d6019fd83542a7 SHA256 b257330ec932283745b395d48fe4882784c19e0818ce257f90d95fb1a62023ab
+EBUILD lhapdf-5.8.5.ebuild 2068 RMD160 c001a7bb7c9ebd0c86e520845400017afa8dc151 SHA1 fe2717f5ce58bc64676b98e3be9b7259bb30db1e SHA256 6073708650281c4381192d01d2f0bd8efae14a4160172334eada9a9fc76f3cf5
+MISC ChangeLog 3317 RMD160 7bad485f7110f3d2ddc1d5fd43edd45341337a69 SHA1 3d85fac188dfa737dc50e4eaf0292611cdf9896e SHA256 f152e8de65f53723dfa13726ed3ccec7b98f2ee504c295326ad97afb4f5ed024
 MISC metadata.xml 995 RMD160 e924208f868c22ccda98eb2b462139f621c067ac SHA1 9cead1d3b35b48936f677044a3a0c6a6ebe373f0 SHA256 12afc533794a5db63bc7449d5dc07d7519a7f2c42fe6cac76aa681672f5fd693
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1HCT4ACgkQNQqtfCuFneOWDwCgj028+Fg/RJEJryfJSIZZQr7B
-BOIAnj2gpaFqOGAggYEFdX2AUweqNVso
-=vMJ2
+iEYEARECAAYFAk133TsACgkQ1ycZbhPLE2DkigCgh34loe8Z3wMYjJhBiPDEbB0L
+YlQAnj7G2Q1ulnRE6+EA+JUsVRd8yVn0
+=Pym+
 -----END PGP SIGNATURE-----
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"
 }