| 1 |
commit: 1cf3ca83bcef5eec20424599d0fc65f832b92fff |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 3 18:05:27 2012 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 3 18:05:27 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1cf3ca83 |
| 7 |
|
| 8 |
sci-physics/root: Fix EAPI=4 usage, don't mix CFLAGS/CXXFLAGS, respect LD |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha99/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
sci-physics/root/ChangeLog | 4 ++ |
| 14 |
sci-physics/root/metadata.xml | 36 +++++++++--------- |
| 15 |
sci-physics/root/root-5.28.00h-r1.ebuild | 2 +- |
| 16 |
sci-physics/root/root-5.32.02-r1.ebuild | 58 +++++++++++++++-------------- |
| 17 |
sci-physics/root/root-9999.ebuild | 56 +++++++++++++++-------------- |
| 18 |
5 files changed, 82 insertions(+), 74 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog |
| 21 |
index d290f70..0a1a61a 100644 |
| 22 |
--- a/sci-physics/root/ChangeLog |
| 23 |
+++ b/sci-physics/root/ChangeLog |
| 24 |
@@ -2,6 +2,10 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $ |
| 27 |
|
| 28 |
+ 03 Apr 2012; Justin Lecher <jlec@g.o> root-5.28.00h-r1.ebuild, |
| 29 |
+ root-5.32.02-r1.ebuild, root-9999.ebuild, metadata.xml: |
| 30 |
+ Fix EAPI=4 usage, don't mix CFLAGS/CXXFLAGS, respect LD |
| 31 |
+ |
| 32 |
*root-5.32.02-r1 (03 Apr 2012) |
| 33 |
*root-5.28.00h-r1 (03 Apr 2012) |
| 34 |
|
| 35 |
|
| 36 |
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml |
| 37 |
index 6ce0ec4..0af5788 100644 |
| 38 |
--- a/sci-physics/root/metadata.xml |
| 39 |
+++ b/sci-physics/root/metadata.xml |
| 40 |
@@ -1,13 +1,13 @@ |
| 41 |
<?xml version="1.0" encoding="UTF-8"?> |
| 42 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 43 |
<pkgmetadata> |
| 44 |
-<maintainer> |
| 45 |
- <email>bircoph@×××××.com</email> |
| 46 |
- <name>Andrew Savchenko</name> |
| 47 |
- <description>Maintainer. Assign bugs to him</description> |
| 48 |
-</maintainer> |
| 49 |
-<herd>sci-physics</herd> |
| 50 |
-<longdescription lang="en"> |
| 51 |
+ <maintainer> |
| 52 |
+ <email>bircoph@×××××.com</email> |
| 53 |
+ <name>Andrew Savchenko</name> |
| 54 |
+ <description>Maintainer. Assign bugs to him</description> |
| 55 |
+ </maintainer> |
| 56 |
+ <herd>sci-physics</herd> |
| 57 |
+ <longdescription lang="en"> |
| 58 |
ROOT Object Oriented Technologies is an object oriented data |
| 59 |
analysis framework written in C++ by the CERN. Widely used in |
| 60 |
high energy physics, but also in other data analysis applications. It |
| 61 |
@@ -15,15 +15,15 @@ |
| 62 |
statistics, serialization, optimization, linear algebra, graphics, |
| 63 |
GUI toolkit, and a complete visualization framework. |
| 64 |
</longdescription> |
| 65 |
-<use> |
| 66 |
- <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag> |
| 67 |
- <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag> |
| 68 |
- <flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag> |
| 69 |
- <flag name="llvm">Build the new EXPERIMENTAL cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag> |
| 70 |
- <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag> |
| 71 |
- <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag> |
| 72 |
- <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag> |
| 73 |
- <flag name="reflex">Build the reflection database for the C++ interpreter</flag> |
| 74 |
- <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag> |
| 75 |
-</use> |
| 76 |
+ <use> |
| 77 |
+ <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag> |
| 78 |
+ <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag> |
| 79 |
+ <flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag> |
| 80 |
+ <flag name="llvm">Build the new EXPERIMENTAL cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag> |
| 81 |
+ <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag> |
| 82 |
+ <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag> |
| 83 |
+ <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag> |
| 84 |
+ <flag name="reflex">Build the reflection database for the C++ interpreter</flag> |
| 85 |
+ <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag> |
| 86 |
+ </use> |
| 87 |
</pkgmetadata> |
| 88 |
|
| 89 |
diff --git a/sci-physics/root/root-5.28.00h-r1.ebuild b/sci-physics/root/root-5.28.00h-r1.ebuild |
| 90 |
index 64b7966..2963ad3 100644 |
| 91 |
--- a/sci-physics/root/root-5.28.00h-r1.ebuild |
| 92 |
+++ b/sci-physics/root/root-5.28.00h-r1.ebuild |
| 93 |
@@ -45,7 +45,7 @@ CDEPEND=" |
| 94 |
x11-libs/libXft |
| 95 |
x11-libs/libXpm |
| 96 |
|| ( |
| 97 |
- >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] |
| 98 |
+ >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] |
| 99 |
>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] |
| 100 |
) |
| 101 |
afs? ( net-fs/openafs ) |
| 102 |
|
| 103 |
diff --git a/sci-physics/root/root-5.32.02-r1.ebuild b/sci-physics/root/root-5.32.02-r1.ebuild |
| 104 |
index 44ca400..12559d8 100644 |
| 105 |
--- a/sci-physics/root/root-5.32.02-r1.ebuild |
| 106 |
+++ b/sci-physics/root/root-5.32.02-r1.ebuild |
| 107 |
@@ -14,11 +14,12 @@ PATCH_PV2=5.32.00 |
| 108 |
|
| 109 |
DESCRIPTION="C++ data analysis framework and interpreter from CERN" |
| 110 |
HOMEPAGE="http://root.cern.ch/" |
| 111 |
-SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz |
| 112 |
+SRC_URI=" |
| 113 |
+ ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz |
| 114 |
doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf |
| 115 |
- math? ( |
| 116 |
- ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf |
| 117 |
- http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )" |
| 118 |
+ math? ( |
| 119 |
+ ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf |
| 120 |
+ http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )" |
| 121 |
|
| 122 |
SLOT="0" |
| 123 |
LICENSE="LGPL-2.1" |
| 124 |
@@ -45,7 +46,7 @@ CDEPEND=" |
| 125 |
x11-libs/libXext |
| 126 |
x11-libs/libXpm |
| 127 |
|| ( |
| 128 |
- >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] |
| 129 |
+ >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] |
| 130 |
>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] |
| 131 |
) |
| 132 |
opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) |
| 133 |
@@ -109,7 +110,7 @@ pkg_setup() { |
| 134 |
enewuser rootd -1 -1 /var/spool/rootd rootd |
| 135 |
|
| 136 |
if use math; then |
| 137 |
- if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then |
| 138 |
+ if use openmp && ! tc-has-openmp; then |
| 139 |
ewarn "You are using gcc and OpenMP is available with gcc >= 4.2" |
| 140 |
ewarn "If you want to build this package with OpenMP, abort now," |
| 141 |
ewarn "and set CC to an OpenMP capable compiler" |
| 142 |
@@ -134,17 +135,17 @@ src_prepare() { |
| 143 |
"${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch |
| 144 |
|
| 145 |
# make sure we use system libs and headers |
| 146 |
- rm montecarlo/eg/inc/cfortran.h README/cfortran.doc |
| 147 |
- rm -rf graf2d/asimage/src/libAfterImage |
| 148 |
- rm -rf graf3d/ftgl/{inc,src} |
| 149 |
- rm -rf graf2d/freetype/src |
| 150 |
- rm -rf graf3d/glew/{inc,src} |
| 151 |
- rm -rf core/pcre/src |
| 152 |
- rm -rf math/unuran/src/unuran-*.tar.gz |
| 153 |
- LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" | xargs rm |
| 154 |
- rm -rf core/lzma/src/*.tar.gz |
| 155 |
- rm graf3d/gl/{inc,src}/gl2ps.* |
| 156 |
- sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk |
| 157 |
+ rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die |
| 158 |
+ rm -rf graf2d/asimage/src/libAfterImage || die |
| 159 |
+ rm -rf graf3d/ftgl/{inc,src} || die |
| 160 |
+ rm -rf graf2d/freetype/src || die |
| 161 |
+ rm -rf graf3d/glew/{inc,src} || die |
| 162 |
+ rm -rf core/pcre/src || die |
| 163 |
+ rm -rf math/unuran/src/unuran-*.tar.gz || die |
| 164 |
+ LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die |
| 165 |
+ rm -rf core/lzma/src/*.tar.gz || die |
| 166 |
+ rm graf3d/gl/{inc,src}/gl2ps.* || die |
| 167 |
+ sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die |
| 168 |
|
| 169 |
# In Gentoo, libPythia6 is called libpythia6 |
| 170 |
# libungif is called libgif, |
| 171 |
@@ -178,6 +179,7 @@ src_configure() { |
| 172 |
--with-cc=$(tc-getCC) \ |
| 173 |
--with-cxx=$(tc-getCXX) \ |
| 174 |
--with-f77=$(tc-getFC) \ |
| 175 |
+ --with-ld=$(tc-getCXX) \ |
| 176 |
--with-afs-shared=yes \ |
| 177 |
--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \ |
| 178 |
--disable-builtin-afterimage \ |
| 179 |
@@ -238,7 +240,7 @@ src_configure() { |
| 180 |
} |
| 181 |
|
| 182 |
src_compile() { |
| 183 |
- emake OPT="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake failed" |
| 184 |
+ emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" |
| 185 |
if use emacs; then |
| 186 |
elisp-compile build/misc/*.el || die "elisp-compile failed" |
| 187 |
fi |
| 188 |
@@ -259,7 +261,7 @@ doc_install() { |
| 189 |
insinto /usr/share/doc/${PF}/examples/tutorials/tmva |
| 190 |
doins -r tmva/test |
| 191 |
else |
| 192 |
- rm -rf "${ED}"/usr/share/doc/${PF}/examples |
| 193 |
+ rm -rf "${ED}"/usr/share/doc/${PF}/examples || die |
| 194 |
fi |
| 195 |
} |
| 196 |
|
| 197 |
@@ -296,13 +298,13 @@ desktop_install() { |
| 198 |
} |
| 199 |
|
| 200 |
src_install() { |
| 201 |
- emake DESTDIR="${D}" install || die "emake install failed" |
| 202 |
+ emake DESTDIR="${D}" install |
| 203 |
|
| 204 |
echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root |
| 205 |
use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root |
| 206 |
use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root |
| 207 |
use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root |
| 208 |
- doenvd 99root || die "doenvd failed" |
| 209 |
+ doenvd 99root |
| 210 |
|
| 211 |
# The build system installs Emacs support unconditionally and in the wrong |
| 212 |
# directory. Remove it and call elisp-install in case of USE=emacs. |
| 213 |
@@ -316,18 +318,18 @@ src_install() { |
| 214 |
desktop_install |
| 215 |
|
| 216 |
# Cleanup of files either already distributed or unused on Gentoo |
| 217 |
- rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} |
| 218 |
- rm "${ED}"usr/share/root/fonts/LICENSE |
| 219 |
+ rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die |
| 220 |
+ rm "${ED}"usr/share/root/fonts/LICENSE || die |
| 221 |
pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null |
| 222 |
rm -f posix/mktypes dll_stl/setup \ |
| 223 |
- G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o |
| 224 |
- rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib |
| 225 |
- rm -f "${ED}"/etc/root/proof/*.sample |
| 226 |
- rm -rf "${ED}"/etc/root/daemons |
| 227 |
+ G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die |
| 228 |
+ rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die |
| 229 |
+ rm -f "${ED}"/etc/root/proof/*.sample || die |
| 230 |
+ rm -rf "${ED}"/etc/root/daemons || die |
| 231 |
popd > /dev/null |
| 232 |
# these should be in PATH |
| 233 |
mv "${ED}"etc/root/proof/utils/pq2/pq2* \ |
| 234 |
- "${ED}"usr/bin |
| 235 |
+ "${ED}"usr/bin/ || die |
| 236 |
} |
| 237 |
|
| 238 |
pkg_postinst() { |
| 239 |
|
| 240 |
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild |
| 241 |
index 3ffcc4f..6b3c224 100644 |
| 242 |
--- a/sci-physics/root/root-9999.ebuild |
| 243 |
+++ b/sci-physics/root/root-9999.ebuild |
| 244 |
@@ -27,12 +27,13 @@ DESCRIPTION="C++ data analysis framework and interpreter from CERN" |
| 245 |
HOMEPAGE="http://root.cern.ch/" |
| 246 |
SRC_URI="${SRC_URI} |
| 247 |
doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf |
| 248 |
- math? ( |
| 249 |
- ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf |
| 250 |
- http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )" |
| 251 |
+ math? ( |
| 252 |
+ ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf |
| 253 |
+ http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) )" |
| 254 |
|
| 255 |
SLOT="0" |
| 256 |
LICENSE="LGPL-2.1" |
| 257 |
+KEYWORDS="" |
| 258 |
IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap |
| 259 |
llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix |
| 260 |
pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd" |
| 261 |
@@ -55,7 +56,7 @@ CDEPEND=" |
| 262 |
x11-libs/libXext |
| 263 |
x11-libs/libXpm |
| 264 |
|| ( |
| 265 |
- >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] |
| 266 |
+ >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] |
| 267 |
>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] |
| 268 |
) |
| 269 |
opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) |
| 270 |
@@ -120,7 +121,7 @@ pkg_setup() { |
| 271 |
enewuser rootd -1 -1 /var/spool/rootd rootd |
| 272 |
|
| 273 |
if use math; then |
| 274 |
- if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then |
| 275 |
+ if use openmp && ! tc-has-openmp; then |
| 276 |
ewarn "You are using gcc and OpenMP is available with gcc >= 4.2" |
| 277 |
ewarn "If you want to build this package with OpenMP, abort now," |
| 278 |
ewarn "and set CC to an OpenMP capable compiler" |
| 279 |
@@ -144,17 +145,17 @@ src_prepare() { |
| 280 |
"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch |
| 281 |
|
| 282 |
# make sure we use system libs and headers |
| 283 |
- rm montecarlo/eg/inc/cfortran.h README/cfortran.doc |
| 284 |
- rm -rf graf2d/asimage/src/libAfterImage |
| 285 |
- rm -rf graf3d/ftgl/{inc,src} |
| 286 |
- rm -rf graf2d/freetype/src |
| 287 |
- rm -rf graf3d/glew/{inc,src} |
| 288 |
- rm -rf core/pcre/src |
| 289 |
- rm -rf math/unuran/src/unuran-*.tar.gz |
| 290 |
- LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" | xargs rm |
| 291 |
- rm -rf core/lzma/src/*.tar.gz |
| 292 |
- rm graf3d/gl/{inc,src}/gl2ps.* |
| 293 |
- sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk |
| 294 |
+ rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die |
| 295 |
+ rm -rf graf2d/asimage/src/libAfterImage || die |
| 296 |
+ rm -rf graf3d/ftgl/{inc,src} || die |
| 297 |
+ rm -rf graf2d/freetype/src || die |
| 298 |
+ rm -rf graf3d/glew/{inc,src} || die |
| 299 |
+ rm -rf core/pcre/src || die |
| 300 |
+ rm -rf math/unuran/src/unuran-*.tar.gz || die |
| 301 |
+ LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die |
| 302 |
+ rm -rf core/lzma/src/*.tar.gz || die |
| 303 |
+ rm graf3d/gl/{inc,src}/gl2ps.* || die |
| 304 |
+ sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die |
| 305 |
|
| 306 |
# In Gentoo, libPythia6 is called libpythia6 |
| 307 |
# libungif is called libgif, |
| 308 |
@@ -188,6 +189,7 @@ src_configure() { |
| 309 |
--with-cc=$(tc-getCC) \ |
| 310 |
--with-cxx=$(tc-getCXX) \ |
| 311 |
--with-f77=$(tc-getFC) \ |
| 312 |
+ --with-ld=$(tc-getCXX) \ |
| 313 |
--with-afs-shared=yes \ |
| 314 |
--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \ |
| 315 |
--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \ |
| 316 |
@@ -249,7 +251,7 @@ src_configure() { |
| 317 |
} |
| 318 |
|
| 319 |
src_compile() { |
| 320 |
- emake OPT="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake failed" |
| 321 |
+ emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" |
| 322 |
if use emacs; then |
| 323 |
elisp-compile build/misc/*.el || die "elisp-compile failed" |
| 324 |
fi |
| 325 |
@@ -270,7 +272,7 @@ doc_install() { |
| 326 |
insinto /usr/share/doc/${PF}/examples/tutorials/tmva |
| 327 |
doins -r tmva/test |
| 328 |
else |
| 329 |
- rm -rf "${ED}"/usr/share/doc/${PF}/examples |
| 330 |
+ rm -rf "${ED}"/usr/share/doc/${PF}/examples || die |
| 331 |
fi |
| 332 |
} |
| 333 |
|
| 334 |
@@ -307,13 +309,13 @@ desktop_install() { |
| 335 |
} |
| 336 |
|
| 337 |
src_install() { |
| 338 |
- emake DESTDIR="${D}" install || die "emake install failed" |
| 339 |
+ emake DESTDIR="${D}" install |
| 340 |
|
| 341 |
echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root |
| 342 |
use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root |
| 343 |
use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root |
| 344 |
use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root |
| 345 |
- doenvd 99root || die "doenvd failed" |
| 346 |
+ doenvd 99root |
| 347 |
|
| 348 |
# The build system installs Emacs support unconditionally and in the wrong |
| 349 |
# directory. Remove it and call elisp-install in case of USE=emacs. |
| 350 |
@@ -327,18 +329,18 @@ src_install() { |
| 351 |
desktop_install |
| 352 |
|
| 353 |
# Cleanup of files either already distributed or unused on Gentoo |
| 354 |
- rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} |
| 355 |
- rm "${ED}"usr/share/root/fonts/LICENSE |
| 356 |
+ rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die |
| 357 |
+ rm "${ED}"usr/share/root/fonts/LICENSE || die |
| 358 |
pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null |
| 359 |
rm -f posix/mktypes dll_stl/setup \ |
| 360 |
- G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o |
| 361 |
- rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib |
| 362 |
- rm -f "${ED}"/etc/root/proof/*.sample |
| 363 |
- rm -rf "${ED}"/etc/root/daemons |
| 364 |
+ G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die |
| 365 |
+ rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die |
| 366 |
+ rm -f "${ED}"/etc/root/proof/*.sample || die |
| 367 |
+ rm -rf "${ED}"/etc/root/daemons || die |
| 368 |
popd > /dev/null |
| 369 |
# these should be in PATH |
| 370 |
mv "${ED}"etc/root/proof/utils/pq2/pq2* \ |
| 371 |
- "${ED}"usr/bin |
| 372 |
+ "${ED}"usr/bin/ || die |
| 373 |
} |
| 374 |
|
| 375 |
pkg_postinst() { |
Archives