| 1 |
bicatali 11/01/30 21:00:20 |
| 2 |
|
| 3 |
Modified: ChangeLog lhapdf-5.8.4.ebuild |
| 4 |
Added: lhapdf-5.8.4-r1.ebuild |
| 5 |
Log: |
| 6 |
Added more upstream fixes. Switched to EAPI=4. Added static-libs flag, force octave flag to depend on C++ wrappers (bug #352055). |
| 7 |
|
| 8 |
(Portage version: 2.1.9.35/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.15 sci-physics/lhapdf/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lhapdf/ChangeLog?rev=1.15&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lhapdf/ChangeLog?rev=1.15&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lhapdf/ChangeLog?r1=1.14&r2=1.15 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/ChangeLog,v |
| 20 |
retrieving revision 1.14 |
| 21 |
retrieving revision 1.15 |
| 22 |
diff -u -r1.14 -r1.15 |
| 23 |
--- ChangeLog 20 Jan 2011 12:16:39 -0000 1.14 |
| 24 |
+++ ChangeLog 30 Jan 2011 21:00:20 -0000 1.15 |
| 25 |
@@ -1,6 +1,13 @@ |
| 26 |
# ChangeLog for sci-physics/lhapdf |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/ChangeLog,v 1.14 2011/01/20 12:16:39 hwoarang Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/ChangeLog,v 1.15 2011/01/30 21:00:20 bicatali Exp $ |
| 30 |
+ |
| 31 |
+*lhapdf-5.8.4-r1 (30 Jan 2011) |
| 32 |
+ |
| 33 |
+ 30 Jan 2011; Sébastien Fabbro <bicatali@g.o> lhapdf-5.8.4.ebuild, |
| 34 |
+ +lhapdf-5.8.4-r1.ebuild: |
| 35 |
+ Added more upstream fixes. Switched to EAPI=4. Added static-libs flag, force |
| 36 |
+ octave flag to depend on C++ wrappers (bug #352055). |
| 37 |
|
| 38 |
20 Jan 2011; Markos Chandras <hwoarang@g.o> lhapdf-5.8.4.ebuild: |
| 39 |
Stable on amd64 wrt bug #352055 |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.3 sci-physics/lhapdf/lhapdf-5.8.4.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.4.ebuild?rev=1.3&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.4.ebuild?rev=1.3&content-type=text/plain |
| 47 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.4.ebuild?r1=1.2&r2=1.3 |
| 48 |
|
| 49 |
Index: lhapdf-5.8.4.ebuild |
| 50 |
=================================================================== |
| 51 |
RCS file: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.4.ebuild,v |
| 52 |
retrieving revision 1.2 |
| 53 |
retrieving revision 1.3 |
| 54 |
diff -u -r1.2 -r1.3 |
| 55 |
--- lhapdf-5.8.4.ebuild 20 Jan 2011 12:16:39 -0000 1.2 |
| 56 |
+++ lhapdf-5.8.4.ebuild 30 Jan 2011 21:00:20 -0000 1.3 |
| 57 |
@@ -1,6 +1,6 @@ |
| 58 |
# Copyright 1999-2011 Gentoo Foundation |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.4.ebuild,v 1.2 2011/01/20 12:16:39 hwoarang Exp $ |
| 61 |
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.4.ebuild,v 1.3 2011/01/30 21:00:20 bicatali Exp $ |
| 62 |
|
| 63 |
EAPI=2 |
| 64 |
|
| 65 |
@@ -34,8 +34,8 @@ |
| 66 |
|
| 67 |
src_unpack() { |
| 68 |
unpack ${MY_PF}.tar.gz |
| 69 |
- mv "${DISTDIR}"/wrapheragrid.f "${WORKDIR}/${MY_PF}"/src/wrapheragrid.f |
| 70 |
- mv "${DISTDIR}"/wrapheragrid-lite.f "${WORKDIR}/${MY_PF}"/src/wrapheragrid-lite.f |
| 71 |
+ cp "${DISTDIR}"/wrapheragrid.f "${S}"/src/wrapheragrid.f |
| 72 |
+ cp "${DISTDIR}"/wrapheragrid-lite.f "${S}"/src/wrapheragrid-lite.f |
| 73 |
} |
| 74 |
|
| 75 |
src_prepare() { |
| 76 |
@@ -46,11 +46,14 @@ |
| 77 |
} |
| 78 |
|
| 79 |
src_configure() { |
| 80 |
+ local myconf="--enable-ccwrap" |
| 81 |
+ ! use octave && ! use cxx && myconf="--disable-ccwrap" |
| 82 |
econf \ |
| 83 |
- $(use_enable cxx ccwrap) \ |
| 84 |
$(use_enable cxx old-ccwrap ) \ |
| 85 |
+ $(use_enable octave) \ |
| 86 |
$(use_enable python pyext) \ |
| 87 |
- $(use_enable doc doxygen) |
| 88 |
+ $(use_enable doc doxygen) \ |
| 89 |
+ ${myconf} |
| 90 |
} |
| 91 |
|
| 92 |
src_test() { |
| 93 |
|
| 94 |
|
| 95 |
|
| 96 |
1.1 sci-physics/lhapdf/lhapdf-5.8.4-r1.ebuild |
| 97 |
|
| 98 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.4-r1.ebuild?rev=1.1&view=markup |
| 99 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/lhapdf/lhapdf-5.8.4-r1.ebuild?rev=1.1&content-type=text/plain |
| 100 |
|
| 101 |
Index: lhapdf-5.8.4-r1.ebuild |
| 102 |
=================================================================== |
| 103 |
# Copyright 1999-2011 Gentoo Foundation |
| 104 |
# Distributed under the terms of the GNU General Public License v2 |
| 105 |
# $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 $ |
| 106 |
|
| 107 |
EAPI=4 |
| 108 |
|
| 109 |
inherit versionator eutils |
| 110 |
|
| 111 |
MY_PV=$(get_version_component_range 1-3 ${PV}) |
| 112 |
MY_PF=${PN}-${MY_PV} |
| 113 |
MY_UV=20110126 |
| 114 |
|
| 115 |
DESCRIPTION="Les Houches Parton Density Function unified library" |
| 116 |
HOMEPAGE="http://projects.hepforge.org/lhapdf/" |
| 117 |
SRC_URI="http://www.hepforge.org/archive/lhapdf/${MY_PF}.tar.gz |
| 118 |
mirror://gentoo/${P}-updates-${MY_UV}.patch.gz |
| 119 |
test? ( |
| 120 |
http://svn.hepforge.org/${PN}/pdfsets/tags/${MY_PV}/cteq61.LHgrid |
| 121 |
http://svn.hepforge.org/${PN}/pdfsets/tags/${MY_PV}/MRST2004nlo.LHgrid |
| 122 |
http://svn.hepforge.org/${PN}/pdfsets/tags/${MY_PV}/cteq61.LHpdf |
| 123 |
octave? ( http://svn.hepforge.org/${PN}/pdfsets/tags/${MY_PV}/cteq5l.LHgrid ) )" |
| 124 |
|
| 125 |
LICENSE="GPL-2" |
| 126 |
SLOT="0" |
| 127 |
KEYWORDS="~amd64 ~x86" |
| 128 |
IUSE="cxx doc examples octave python static-libs test" |
| 129 |
REQUIRED_USE="octave? ( cxx )" |
| 130 |
RDEPEND="octave? ( sci-mathematics/octave )" |
| 131 |
DEPEND="${RDEPEND} |
| 132 |
doc? ( app-doc/doxygen[latex] ) |
| 133 |
python? ( dev-lang/swig )" |
| 134 |
|
| 135 |
S="${WORKDIR}/${MY_PF}" |
| 136 |
|
| 137 |
src_prepare() { |
| 138 |
epatch "${WORKDIR}"/${P}-updates-${MY_UV}.patch |
| 139 |
# do not create extra latex docs |
| 140 |
sed -i \ |
| 141 |
-e 's/GENERATE_LATEX.*=YES/GENERATE_LATEX = NO/g' \ |
| 142 |
ccwrap/Doxyfile || die |
| 143 |
} |
| 144 |
|
| 145 |
src_configure() { |
| 146 |
econf \ |
| 147 |
$(use_enable cxx ccwrap) \ |
| 148 |
$(use_enable cxx old-ccwrap ) \ |
| 149 |
$(use_enable doc doxygen) \ |
| 150 |
$(use_enable octave) \ |
| 151 |
$(use_enable python pyext) \ |
| 152 |
$(use_enable static-libs static) |
| 153 |
} |
| 154 |
|
| 155 |
src_test() { |
| 156 |
# need to make a bogus link for octave test |
| 157 |
ln -s "${DISTDIR}" PDFsets |
| 158 |
LHAPATH="${PWD}/PDFsets" \ |
| 159 |
LD_LIBRARY_PATH="${PWD}/lib/.libs:${LD_LIBRARY_PATH}" \ |
| 160 |
emake check || die "emake check failed" |
| 161 |
} |
| 162 |
|
| 163 |
src_install() { |
| 164 |
emake DESTDIR="${D}" install || die "emake install failed" |
| 165 |
dodoc README TODO AUTHORS ChangeLog |
| 166 |
|
| 167 |
# leftover |
| 168 |
rm -rf "${D}"/usr/share/${PN}/doc || die |
| 169 |
if use doc && use cxx; then |
| 170 |
# default doc install buggy |
| 171 |
insinto /usr/share/doc/${PF} |
| 172 |
doins -r ccwrap/doxy/html || die |
| 173 |
fi |
| 174 |
if use examples; then |
| 175 |
insinto /usr/share/doc/${PF}/examples |
| 176 |
doins examples/*.{f,cc} || die |
| 177 |
fi |
| 178 |
} |
| 179 |
|
| 180 |
pkg_postinst() { |
| 181 |
elog "To install data files, you have to run as root:" |
| 182 |
elog "lhapdf-getdata --dest=${EROOT}usr/share/lhapdf --all" |
| 183 |
} |
Archives