Added more upstream fixes. Switched to EAPI=4. Added static-libs flag, force octave flag to depend on C++ wrappers (bug #352055).

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

4 files changed, 104 insertions, 11 deletions

diff --git a/sci-physics/lhapdf/ChangeLog b/sci-physics/lhapdf/ChangeLog
index c42b0614e2a4..98755fe72e98 100644
--- a/sci-physics/lhapdf/ChangeLog
+++ b/sci-physics/lhapdf/ChangeLog
@@ -1,6 +1,13 @@
 # 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.14 2011/01/20 12:16:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/ChangeLog,v 1.15 2011/01/30 21:00:20 bicatali Exp $
+
+*lhapdf-5.8.4-r1 (30 Jan 2011)
+
+  30 Jan 2011; Sébastien Fabbro <bicatali@gentoo.org> lhapdf-5.8.4.ebuild,
+  +lhapdf-5.8.4-r1.ebuild:
+  Added more upstream fixes. Switched to EAPI=4. Added static-libs flag, force
+  octave flag to depend on C++ wrappers (bug #352055).
 
   20 Jan 2011; Markos Chandras <hwoarang@gentoo.org> lhapdf-5.8.4.ebuild:
   Stable on amd64 wrt bug #352055
diff --git a/sci-physics/lhapdf/Manifest b/sci-physics/lhapdf/Manifest
index 78825e1f9b19..7fe598f8b953 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -6,17 +6,19 @@ DIST cteq5l.LHgrid 134797 RMD160 eae4db71b4372f17e9f3634fed61d0501ba81c26 SHA1 2
 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 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.ebuild 2616 RMD160 1c260c3005cd7b25c2c855e068f9ba7ab1b82fb3 SHA1 a5c582990afce200025f94cb5ba36b3ca82603b8 SHA256 fa3a8736482e82d0a1be02099f8c6211d6ff1589549265d5782a3f7caf7c80e4
-MISC ChangeLog 2663 RMD160 5fa565acf0bb3ed24dd751368de6abb41fc635d6 SHA1 717f4ee5e1555167dcb060a52b53441f6b382f52 SHA256 ab9032f9b42fe6ba22a0800d7b978cab283ac905c0a5d42bb38c43cd9e55ecca
+EBUILD lhapdf-5.8.4-r1.ebuild 2316 RMD160 b7fee67fc280cf087383441839fdfd09d96ff8dc SHA1 5b1e410ff0c6c7617199d030a3bc81ceb9f6bc7b SHA256 b384288e3f09b366a999d1b64e6b8f3d6cc7da8262f46786c21041ab307ac05d
+EBUILD lhapdf-5.8.4.ebuild 2684 RMD160 eb2aa0b21d9ec48a7e75f8951eea8767a40d641f SHA1 b19c01e594b7fae7c8e510d7c64d4d73ae3fed54 SHA256 3b7c57d9af9181c8b16b26377c62aecb8e2a6f2798f0dcb7f8d560e1128f008d
+MISC ChangeLog 2933 RMD160 a576a74a5b54ac70d18c1f214355cebb0a581d06 SHA1 f47ff9e0fe4f0597e2c77d177a411fd7bf7d8095 SHA256 8f84433ed07bc4961023282332c1db10c3897e2ace75299840e34046caa6048a
 MISC metadata.xml 995 RMD160 e924208f868c22ccda98eb2b462139f621c067ac SHA1 9cead1d3b35b48936f677044a3a0c6a6ebe373f0 SHA256 12afc533794a5db63bc7449d5dc07d7519a7f2c42fe6cac76aa681672f5fd693
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk04J1wACgkQ9/cejkQaxBC5jgCffJMoYK1p60IMQ2DP65ecKOfM
-AZ0An0ebotvJDLGi/5wJR331++yxzHE1
-=rl0/
+iEYEARECAAYFAk1F0W0ACgkQ1ycZbhPLE2CNbwCgj65cK8oJFaOatJcojaA8K/Xs
+8NQAmwX6mQKt4jf+tg2aaTrr/rjPyONG
+=43T/
 -----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
new file mode 100644
index 000000000000..aa4a5c0eef95
--- /dev/null
+++ b/sci-physics/lhapdf/lhapdf-5.8.4-r1.ebuild
@@ -0,0 +1,81 @@
+# 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 $
+
+EAPI=4
+
+inherit versionator eutils
+
+MY_PV=$(get_version_component_range 1-3 ${PV})
+MY_PF=${PN}-${MY_PV}
+MY_UV=20110126
+
+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
+	mirror://gentoo/${P}-updates-${MY_UV}.patch.gz
+	test? (
+		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"
+KEYWORDS="~amd64 ~x86"
+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] )
+	python? ( dev-lang/swig )"
+
+S="${WORKDIR}/${MY_PF}"
+
+src_prepare() {
+	epatch "${WORKDIR}"/${P}-updates-${MY_UV}.patch
+	# 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 doc doxygen) \
+		$(use_enable octave) \
+		$(use_enable python pyext) \
+		$(use_enable static-libs static)
+}
+
+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 "lhapdf-getdata --dest=${EROOT}usr/share/lhapdf --all"
+}
diff --git a/sci-physics/lhapdf/lhapdf-5.8.4.ebuild b/sci-physics/lhapdf/lhapdf-5.8.4.ebuild
index fde6c21fe6e2..85f10406f6e1 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.2 2011/01/20 12:16:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.4.ebuild,v 1.3 2011/01/30 21:00:20 bicatali Exp $
 
 EAPI=2
 
@@ -34,8 +34,8 @@ 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
+	cp "${DISTDIR}"/wrapheragrid.f "${S}"/src/wrapheragrid.f
+	cp "${DISTDIR}"/wrapheragrid-lite.f "${S}"/src/wrapheragrid-lite.f
 }
 
 src_prepare() {
@@ -46,11 +46,14 @@ src_prepare() {
 }
 
 src_configure() {
+	local myconf="--enable-ccwrap"
+	! use octave && ! use cxx && myconf="--disable-ccwrap"
 	econf \
-		$(use_enable cxx ccwrap) \
 		$(use_enable cxx old-ccwrap ) \
+		$(use_enable octave) \
 		$(use_enable python pyext) \
-		$(use_enable doc doxygen)
+		$(use_enable doc doxygen) \
+		${myconf}
 }
 
 src_test() {