From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 945E0138247 for ; Sun, 29 Dec 2013 00:31:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6DAF9E0AD5; Sun, 29 Dec 2013 00:31:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DD72DE0AC6 for ; Sun, 29 Dec 2013 00:31:22 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B8BB333F674 for ; Sun, 29 Dec 2013 00:31:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3AC32E54FB for ; Sun, 29 Dec 2013 00:31:20 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1388274705.632aa3b7301d190f7831def9cff67ccde65b67bd.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/root/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/root/ChangeLog sci-physics/root/root-5.32.03-r2.ebuild sci-physics/root/root-5.34.13.ebuild sci-physics/root/root-9999.ebuild X-VCS-Directories: sci-physics/root/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 632aa3b7301d190f7831def9cff67ccde65b67bd X-VCS-Branch: master Date: Sun, 29 Dec 2013 00:31:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ce40b953-3c4a-41db-b3cd-c5e38ad40544 X-Archives-Hash: ed8ef14dcd7e1531134be720da5e9376 commit: 632aa3b7301d190f7831def9cff67ccde65b67bd Author: Justin Lecher gentoo org> AuthorDate: Sat Dec 28 23:51:45 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Dec 28 23:51:45 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=632aa3b7 sci-physics/root: Import tree changes, drop old Package-Manager: portage-2.2.7 --- sci-physics/root/ChangeLog | 4 + sci-physics/root/root-5.32.03-r2.ebuild | 383 ---------------------------- sci-physics/root/root-5.34.13.ebuild | 425 -------------------------------- sci-physics/root/root-9999.ebuild | 17 +- 4 files changed, 14 insertions(+), 815 deletions(-) diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index 848c446..c7010f7 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $ + 28 Dec 2013; Justin Lecher -root-5.32.03-r2.ebuild, + -root-5.34.13.ebuild, root-9999.ebuild: + Import tree changes, drop old + 22 Dec 2013; Andrew Savchenko +root-5.32.03-r2.ebuild, +files/root-5.28.00b-asneeded.patch, +files/root-5.28.00b-prop-ldflags.patch, +files/root-5.28.00b-unuran.patch, diff --git a/sci-physics/root/root-5.32.03-r2.ebuild b/sci-physics/root/root-5.32.03-r2.ebuild deleted file mode 100644 index 979b753..0000000 --- a/sci-physics/root/root-5.32.03-r2.ebuild +++ /dev/null @@ -1,383 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.03-r2.ebuild,v 1.6 2013/03/02 23:27:01 hwoarang Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python2_{6,7} ) - -if [[ ${PV} == "9999" ]] ; then - _SVN=subversion - ESVN_REPO_URI="https://root.cern.ch/svn/root/trunk" - ESVN_OPTIONS="--non-interactive --trust-server-cert" - SRC_URI="" - KEYWORDS="" -else - SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz" - KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -fi - -inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_SVN} - -ROOFIT_DOC_PV=2.91-33 -TMVA_DOC_PV=4.03 -PATCH_PV=5.28.00b -PATCH_PV2=5.32.00 - -DESCRIPTION="C++ data analysis framework and interpreter from CERN" -HOMEPAGE="http://root.cern.ch/" -SRC_URI="${SRC_URI} - doc? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuide.pdf - math? ( - ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf - http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) - htmldoc? ( - http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png - http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png - http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )" - -SLOT="0" -LICENSE="LGPL-2.1" -IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz htmldoc kerberos - ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix pythia6 - pythia8 python qt4 +reflex ruby ssl xinetd xml xrootd" - -CDEPEND=" - app-arch/xz-utils - >=dev-lang/cfortran-4.4-r2 - dev-libs/libpcre - media-fonts/dejavu - media-libs/freetype - media-libs/giflib - media-libs/libpng:0 - media-libs/tiff:0 - sys-libs/zlib - virtual/jpeg - virtual/shadow - X? ( - media-libs/ftgl - media-libs/glew - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXpm - || ( - >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] - >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] - ) - opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) - qt4? ( - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - dev-qt/qt3support:4 - dev-qt/qtsvg:4 - dev-qt/qtwebkit:4 - dev-qt/qtxmlpatterns:4 ) - x11-libs/libXft - ) - afs? ( net-fs/openafs ) - avahi? ( net-dns/avahi ) - clarens? ( dev-libs/xmlrpc-c[curl] ) - emacs? ( virtual/emacs ) - fits? ( sci-libs/cfitsio ) - fftw? ( sci-libs/fftw:3.0 ) - graphviz? ( media-gfx/graphviz ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) ) - mysql? ( virtual/mysql ) - odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) - oracle? ( dev-db/oracle-instantclient-basic ) - postgres? ( dev-db/postgresql-base ) - pythia6? ( sci-physics/pythia:6 ) - pythia8? ( root.desktop - domenu root.desktop - doicon "${S}"/build/package/debian/root-system-bin.png - - insinto /usr/share/icons/hicolor/48x48/mimetypes - doins build/package/debian/application-x-root.png - - insinto /usr/share/icons/hicolor/48x48/apps - doicon build/package/debian/root-system-bin.xpm -} - -src_install() { - emake DESTDIR="${D}" install - - echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root - use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root - if use python; then - echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root - python_optimize "${D}/usr/$(get_libdir)/root" - fi - use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root - doenvd 99root - - # The build system installs Emacs support unconditionally and in the wrong - # directory. Remove it and call elisp-install in case of USE=emacs. - rm -rf "${ED}"/usr/share/emacs - if use emacs; then - elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed" - fi - - doc_install - daemon_install - desktop_install - - # Cleanup of files either already distributed or unused on Gentoo - rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die - rm "${ED}"usr/share/root/fonts/LICENSE || die - pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null - rm -f posix/mktypes dll_stl/setup \ - G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die - rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die - rm -f "${ED}"/etc/root/proof/*.sample || die - rm -rf "${ED}"/etc/root/daemons || die - popd > /dev/null - # these should be in PATH - mv "${ED}"etc/root/proof/utils/pq2/pq2* \ - "${ED}"usr/bin/ || die -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/sci-physics/root/root-5.34.13.ebuild b/sci-physics/root/root-5.34.13.ebuild deleted file mode 100644 index f8e0f1a..0000000 --- a/sci-physics/root/root-5.34.13.ebuild +++ /dev/null @@ -1,425 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.10-r2.ebuild,v 1.1 2013/10/29 17:00:37 bicatali Exp $ - -EAPI=5 - -if [[ ${PV} == "9999" ]] ; then - _GIT=git-2 - EGIT_REPO_URI="http://root.cern.ch/git/root.git" - SRC_URI="" - KEYWORDS="" -else - SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -fi - -PYTHON_COMPAT=( python2_{6,7} ) -inherit elisp-common eutils fdo-mime fortran-2 ${_GIT} multilib python-single-r1 toolchain-funcs user versionator - -ROOFIT_DOC_PV=2.91-33 -TMVA_DOC_PV=4.03 -PATCH_PV=5.28.00b -PATCH_PV2=5.32.00 -PATCH_PV3=5.34.05 -PATCH_PV4=5.34.13 - -DESCRIPTION="C++ data analysis framework and interpreter from CERN" -HOMEPAGE="http://root.cern.ch/" -SRC_URI="${SRC_URI} - !minimal? ( doc? ( - math? ( - ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf - http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf - metric? ( ftp://root.cern.ch/root/doc/spectrum/Spectrum.pdf -> Spectrum-${PV}.pdf ) - !metric? ( ftp://root.cern.ch/root/doc/spectrum/SpectrumLetter.pdf -> SpectrumLetter-${PV}.pdf ) - ) - metric? ( - ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf - ftp://root.cern.ch/root/doc/primer/ROOTPrimer.pdf -> ROOTPrimer-${PV}.pdf ) - !metric? ( - ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf - ftp://root.cern.ch/root/doc/primer/ROOTPrimerLetter.pdf -> ROOTPrimerLetter-${PV}.pdf ) - htmldoc? ( - http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png - http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png - http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) - ) )" - -SLOT="0" -LICENSE="LGPL-2.1" -IUSE="+X afs avahi c++0x doc emacs examples fits fftw graphviz htmldoc - kerberos ldap +math +metric minimal mpi mysql odbc +opengl openmp oracle postgres - prefix pythia6 pythia8 python qt4 +reflex ruby sqlite ssl xinetd xml xrootd" - -REQUIRED_USE=" - !X? ( !opengl !qt4 ) - htmldoc? ( doc ) - mpi? ( math !openmp ) - openmp? ( math !mpi ) - python? ( ${PYTHON_REQUIRED_USE} )" - -CDEPEND=" - app-arch/xz-utils - >=dev-lang/cfortran-4.4-r2 - dev-libs/libpcre - media-fonts/dejavu - media-libs/freetype - media-libs/giflib - media-libs/libpng:0 - media-libs/tiff:0 - sys-libs/zlib - virtual/jpeg - virtual/shadow - X? ( - media-libs/ftgl - media-libs/glew - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXpm - !minimal? ( - || ( - >=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] - >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] - ) - opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) - qt4? ( - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - dev-qt/qt3support:4 - dev-qt/qtsvg:4 - dev-qt/qtwebkit:4 - dev-qt/qtxmlpatterns:4 - ) - x11-libs/libXft - ) - ) - !minimal? ( - afs? ( net-fs/openafs ) - avahi? ( net-dns/avahi ) - emacs? ( virtual/emacs ) - fits? ( sci-libs/cfitsio ) - fftw? ( sci-libs/fftw:3.0 ) - graphviz? ( media-gfx/graphviz ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) ) - mysql? ( virtual/mysql ) - odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) - oracle? ( dev-db/oracle-instantclient-basic ) - postgres? ( dev-db/postgresql-base ) - pythia6? ( sci-physics/pythia:6 ) - pythia8? ( >=sci-physics/pythia-8.1.80:8 ) - python? ( ${PYTHON_DEPS} ) - ruby? ( - dev-lang/ruby - dev-ruby/rubygems ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl ) - xml? ( dev-libs/libxml2 ) - xrootd? ( >=net-libs/xrootd-3.2.0 ) - )" - -DEPEND="${CDEPEND} - virtual/pkgconfig" - -RDEPEND="${CDEPEND} - reflex? ( dev-cpp/gccxml ) - xinetd? ( sys-apps/xinetd )" - -PDEPEND="htmldoc? ( ~app-doc/root-docs-${PV} )" - -S="${WORKDIR}/${PN}" - -pkg_setup() { - fortran-2_pkg_setup - use python && python-single-r1_pkg_setup - echo - elog "There are extra options on packages not yet in Gentoo:" - elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite," - elog "HDFS, Monalisa, MaxDB/SapDB, SRP." - elog "You can use the env variable EXTRA_ECONF variable for this." - elog "For example, for SRP, you would set: " - elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\"" - echo - enewgroup rootd - enewuser rootd -1 -1 /var/spool/rootd rootd - use minimal && return - - if use math; then - if use openmp; then - if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then - ewarn "You are using a g++ without OpenMP capabilities" - die "Need an OpenMP capable compiler" - else - export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1 - fi - elif use mpi; then - export USE_MPI=1 USE_PARALLEL_MINUIT2=1 - fi - fi - if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \ - ! version_is_at_least "4.7" "$(gcc-version)"; then - eerror "You are using a g++ without C++0x capabilities" - die "Need an C++0x capable compiler" - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV3}-nobyte-compile.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV4}-unuran.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV4}-pythia8.patch \ - "${FILESDIR}"/${PN}-${PATCH_PV4}-desktop.patch - - # make sure we use system libs and headers - rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die - rm -r graf2d/asimage/src/libAfterImage || die - rm -r graf3d/ftgl/{inc,src} || die - rm -r graf2d/freetype/src || die - rm -r graf3d/glew/{inc,src} || die - rm -r core/pcre/src || die - rm -r math/unuran/src/unuran-*.tar.gz || die - LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die - rm -r core/lzma/src/*.tar.gz || die - rm graf3d/gl/{inc,src}/gl2ps.* || die - sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die - - # In Gentoo, libPythia6 is called libpythia6 - # libungif is called libgif, - # iodbc is in /usr/include/iodbc - # pg_config.h is checked instead of libpq-fe.h - sed -i \ - -e 's:libPythia6:libpythia6:g' \ - -e 's:ungif:gif:g' \ - -e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \ - -e 's:libpq-fe.h:pg_config.h:' \ - configure || die "adjusting configure for Gentoo failed" - - # prefixify the configure script - sed -i \ - -e 's:/usr:${EPREFIX}/usr:g' \ - configure || die "prefixify configure failed" - - # QTDIR only used for qt3 in gentoo, and configure looks for it. - unset QTDIR - - # Make html docs self-consistent for offline work (based on Fedora spec) - if use htmldoc && ! use minimal; then - epatch "${FILESDIR}"/${PN}-${PATCH_PV2}-htmldoc.patch - # make images local - sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/!!' \ - -i etc/html/ROOT.css || die "htmldoc sed failed" - sed 's!http://root.cern.ch/drupal/sites/all/themes/newsflash/images/!!' \ - -i etc/html/ROOT.css || die "htmldoc sed failed" - sed 's!http://root.cern.ch/drupal/sites/default/files/!!' \ - -i etc/html/header.html || die "htmldoc sed failed" - - cp "${DISTDIR}"/{rootdrawing-logo.png,root-banner.png,info.png} etc/html || - die "htmldoc preparation failed" - fi -} - -src_configure() { - # the configure script is not the standard autotools - local mycommonconf=" - --prefix="${EPREFIX}"/usr \ - --etcdir="${EPREFIX}"/etc/root \ - --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \ - --testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \ - --with-cc=$(tc-getCC) \ - --with-cxx=$(tc-getCXX) \ - --with-f77=$(tc-getFC) \ - --with-ld=$(tc-getCXX) \ - --nohowto - " - if use minimal; then - ./configure \ - ${mycommonconf} \ - $(usex X --gminimal --minimal) \ - || die "configure failed" - return - fi - # cling is disabled because in requires live llvm and clang - ./configure \ - ${mycommonconf} \ - --with-afs-shared=yes \ - --with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \ - --disable-builtin-afterimage \ - --disable-builtin-ftgl \ - --disable-builtin-freetype \ - --disable-builtin-glew \ - --disable-builtin-pcre \ - --disable-builtin-zlib \ - --disable-builtin-lzma \ - --disable-cling \ - --enable-astiff \ - --enable-explicitlink \ - --enable-gdml \ - --enable-memstat \ - --enable-shadowpw \ - --enable-shared \ - --enable-soversion \ - --enable-table \ - --fail-on-missing \ - $(use_enable X x11) \ - $(use_enable X asimage) \ - $(use_enable X xft) \ - $(use_enable afs) \ - $(use_enable avahi bonjour) \ - $(use_enable c++0x cxx11) \ - $(use_enable fits fitsio) \ - $(use_enable fftw fftw3) \ - $(use_enable graphviz gviz) \ - $(use_enable kerberos krb5) \ - $(use_enable ldap) \ - $(use_enable math gsl-shared) \ - $(use_enable math genvector) \ - $(use_enable math mathmore) \ - $(use_enable math minuit2) \ - $(use_enable math roofit) \ - $(use_enable math tmva) \ - $(use_enable math unuran) \ - $(use_enable mysql) \ - $(use_enable odbc) \ - $(use_enable opengl) \ - $(use_enable oracle) \ - $(use_enable postgres pgsql) \ - $(usex postgres "--with-pgsql-incdir=$(pg_config --includedir)" "") \ - $(use_enable prefix rpath) \ - $(use_enable pythia6) \ - $(use_enable pythia8) \ - $(use_enable python) \ - $(use_enable qt4 qt) \ - $(use_enable qt4 qtgsi) \ - $(use_enable reflex cintex) \ - $(use_enable reflex) \ - $(use_enable ruby) \ - $(use_enable sqlite) \ - $(use_enable ssl) \ - $(use_enable xml) \ - $(use_enable xrootd) \ - ${EXTRA_ECONF} \ - || die "configure failed" -} - -src_compile() { - emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS="${S}" LD_LIBRARY_PATH="${S}/lib" - if use emacs && ! use minimal; then - elisp-compile build/misc/*.el || die "elisp-compile failed" - fi -} - -doc_install() { - cd "${S}" - if use doc && ! use minimal; then - einfo "Installing user's guides" - if use metric; then - dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf - dodoc "${DISTDIR}"/ROOTPrimer-${PV}.pdf - use math && dodoc "${DISTDIR}"/Spectrum-${PV}.pdf - else - dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf - dodoc "${DISTDIR}"/ROOTPrimerLetter-${PV}.pdf - use math && dodoc "${DISTDIR}"/SpectrumLetter-${PV}.pdf - fi - use math && dodoc \ - "${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \ - "${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf - fi - - if use examples && ! use minimal; then - # these should really be taken care of by the root make install - insinto /usr/share/doc/${PF}/examples/tutorials/tmva - doins -r tmva/test - else - rm -r "${ED}"/usr/share/doc/${PF}/examples || die - fi -} - -daemon_install() { - cd "${S}" - local daemons="rootd proofd" - dodir /var/spool/rootd - fowners rootd:rootd /var/spool/rootd - dodir /var/spool/rootd/{pub,tmp} - fperms 1777 /var/spool/rootd/{pub,tmp} - - for i in ${daemons}; do - newinitd "${FILESDIR}"/${i}.initd ${i} - newconfd "${FILESDIR}"/${i}.confd ${i} - done - if use xinetd; then - insinto /etc/xinetd - doins etc/daemons/{rootd,proofd}.xinetd - fi -} - -desktop_install() { - cd "${S}" - echo "Icon=root-system-bin" >> etc/root.desktop - domenu etc/root.desktop - doicon build/package/debian/root-system-bin.png - - insinto /usr/share/icons/hicolor/48x48/mimetypes - doins build/package/debian/application-x-root.png - - insinto /usr/share/icons/hicolor/48x48/apps - doicon build/package/debian/root-system-bin.xpm -} - -src_install() { - emake DESTDIR="${D}" install - - echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root - if ! use minimal; then - use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root - if use python; then - echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root - python_optimize "${D}/usr/$(get_libdir)/root" - fi - use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root - fi - doenvd 99root - - # The build system installs Emacs support unconditionally and in the wrong - # directory. Remove it and call elisp-install in case of USE=emacs. - rm -r "${ED}"/usr/share/emacs - if use emacs && ! use minimal; then - elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed" - fi - - doc_install - daemon_install - desktop_install - - # Cleanup of files either already distributed or unused on Gentoo - rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die - rm "${ED}"usr/share/root/fonts/LICENSE || die - pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null - rm posix/mktypes dll_stl/setup \ - G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die - rm "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die - rm "${ED}"/etc/root/proof/*.sample || die - rm -r "${ED}"/etc/root/daemons || die - popd > /dev/null - # these should be in PATH - mv "${ED}"etc/root/proof/utils/pq2/pq2* \ - "${ED}"usr/bin/ || die -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild index 4c6ffdb..05b899c 100644 --- a/sci-physics/root/root-9999.ebuild +++ b/sci-physics/root/root-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.09.ebuild,v 1.2 2013/09/05 19:44:52 mgorny Exp $ +# $Header: $ EAPI=5 @@ -32,7 +32,7 @@ SRC_URI="${SRC_URI} ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf ) metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-${PV}.pdf ) - !metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf ) + !metric? ( ftp://root.cern.ch/${PN}/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-${PV}.pdf ) htmldoc? ( http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png @@ -103,7 +103,7 @@ CDEPEND=" oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql-base ) pythia6? ( sci-physics/pythia:6 ) - pythia8? ( sci-physics/pythia:8 ) + pythia8? ( >=sci-physics/pythia-8.1.80:8 ) python? ( ${PYTHON_DEPS} ) ruby? ( dev-lang/ruby @@ -126,19 +126,19 @@ S="${WORKDIR}/${PN}" pkg_setup() { fortran-2_pkg_setup + use python && python-single-r1_pkg_setup echo elog "There are extra options on packages not yet in Gentoo:" elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite," elog "HDFS, Monalisa, MaxDB/SapDB, SRP." elog "You can use the env variable EXTRA_ECONF variable for this." elog "For example, for SRP, you would set: " - elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\"" + elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\"" echo enewgroup rootd enewuser rootd -1 -1 /var/spool/rootd rootd use minimal && return - use python && python-single-r1_pkg_setup if use math; then if use openmp; then if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then @@ -311,8 +311,11 @@ doc_install() { cd "${S}" if use doc && ! use minimal; then einfo "Installing user's guides" - use metric && dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf || \ + if use metric; then + dodoc "${DISTDIR}"/ROOTUsersGuideA4-${PV}.pdf + else dodoc "${DISTDIR}"/ROOTUsersGuideLetter-${PV}.pdf + fi use math && dodoc \ "${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \ "${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf @@ -366,7 +369,7 @@ src_install() { use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root if use python; then echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root - python_optimize /usr/$(get_libdir)/root + python_optimize "${ED}/usr/$(get_libdir)/root" fi use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root fi