From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 55F98138334 for ; Thu, 5 Jul 2018 11:15:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4908E093B; Thu, 5 Jul 2018 11:15:33 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96B41E0928 for ; Thu, 5 Jul 2018 11:15:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A416335C9B for ; Thu, 5 Jul 2018 11:15:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1EAA7358 for ; Thu, 5 Jul 2018 11:15:29 +0000 (UTC) From: "Guilherme Amadio" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Guilherme Amadio" Message-ID: <1530788698.63bf6109fdc6cc6426ffbb1bed2f35e5d59cdeef.amadio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-physics/root/Manifest sci-physics/root/files/root-6.13.02-hsimple.patch sci-physics/root/files/root-6.14.00-http.patch sci-physics/root/root-6.14.00.ebuild X-VCS-Directories: sci-physics/root/ sci-physics/root/files/ X-VCS-Committer: amadio X-VCS-Committer-Name: Guilherme Amadio X-VCS-Revision: 63bf6109fdc6cc6426ffbb1bed2f35e5d59cdeef X-VCS-Branch: master Date: Thu, 5 Jul 2018 11:15:29 +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: c6516e91-2267-4d71-a1d8-374894163e50 X-Archives-Hash: 675dfcfb8079fdf4a0fd511417dd092b commit: 63bf6109fdc6cc6426ffbb1bed2f35e5d59cdeef Author: Guilherme Amadio gentoo org> AuthorDate: Thu Jul 5 09:08:32 2018 +0000 Commit: Guilherme Amadio gentoo org> CommitDate: Thu Jul 5 11:04:58 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63bf6109 sci-physics/root: version bump to 6.14/00 Package-Manager: Portage-2.3.41, Repoman-2.3.9 sci-physics/root/Manifest | 1 + sci-physics/root/files/root-6.13.02-hsimple.patch | 31 +++ sci-physics/root/files/root-6.14.00-http.patch | 28 ++ sci-physics/root/root-6.14.00.ebuild | 315 ++++++++++++++++++++++ 4 files changed, 375 insertions(+) diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index 9587434290a..3337509776a 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -1,2 +1,3 @@ DIST root_v5.34.36.source.tar.gz 75427331 BLAKE2B 203af03e1459c7fe079fcb1b30da145b3262f90c074abb7ff8fb3b1b2b90ac24391ce51aa8afbd10e0db8d69549207f15176207bc30a13720e0ae94342a38dfa SHA512 2cc0c8f8b63b2a3ce01c49c41704483548a7324d92c21a63e3e36a00f4d6f5656a7844fdf48cb71a6f2a2c974112527300ffd3bb5502d8365ffaf138e6ae4c7a DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff08cfa470e63be9a02b948a49ae088e8da72ce433a5071d9196bfd98f71e6861b1bda285354012620eee6c61cffcee71a0c8 SHA512 3d44749ccfc3d40a2f516ae53ef40fb244ed785eee0dbc18ff822bbb811a15b943039d30282ef5358a283d485e62531880c877ec77a86089503b06d6f37e42e1 +DIST root_v6.14.00.source.tar.gz 162436586 BLAKE2B 6047fe9fb898be9d4f00f2e6eb378d213996b49b9677f61ccc0250bb6d0801d8410850a39e0983534da2c6a307bd64b0ed6c03ab873a6c8b844500a96444a455 SHA512 2d4e754e3054018a53af28408b218bc52c0c60bea69a3c9e48f0d3feadbfebb559087fb453505b281fe01043f723e4b766cda8fca1e68dbf9e202c67d417e5b3 diff --git a/sci-physics/root/files/root-6.13.02-hsimple.patch b/sci-physics/root/files/root-6.13.02-hsimple.patch new file mode 100644 index 00000000000..cab8a40afa7 --- /dev/null +++ b/sci-physics/root/files/root-6.13.02-hsimple.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 03af62fcd3..8ec5330773 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -367,26 +367,6 @@ else() + install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}) + endif() + +-#---hsimple.root---------(use the executable for clearer dependencies and proper return code)--- +-add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root) +-add_dependencies(hsimple onepcm) +-if(WIN32) +- add_custom_command(OUTPUT tutorials/hsimple.root +- COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} && +- set ROOTIGNOREPREFIX=1 && +- $ -l -q -b -n -x hsimple.C -e return +- WORKING_DIRECTORY tutorials +- DEPENDS $ Cling Hist Tree Gpad Graf HistPainter move_artifacts) +-else() +- add_custom_command(OUTPUT tutorials/hsimple.root +- COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}} +- ROOTIGNOREPREFIX=1 +- $ -l -q -b -n -x hsimple.C -e return +- WORKING_DIRECTORY tutorials +- DEPENDS $ Cling Hist Tree Gpad Graf HistPainter move_artifacts) +-endif() +-install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests) +- + #---version-------------------------------------------------------------------------------------- + if(NOT WIN32) + add_custom_target(version COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh ${CMAKE_BINARY_DIR} diff --git a/sci-physics/root/files/root-6.14.00-http.patch b/sci-physics/root/files/root-6.14.00-http.patch new file mode 100644 index 00000000000..04ec4bea567 --- /dev/null +++ b/sci-physics/root/files/root-6.14.00-http.patch @@ -0,0 +1,28 @@ +From bed1568548d7a47785d8fe24ec7a9ce5799040ff Mon Sep 17 00:00:00 2001 +From: Guilherme Amadio +Date: Wed, 27 Jun 2018 15:08:07 +0200 +Subject: [PATCH] Do not exclude etc/http directory from installation + +This was an unintended side-effect of a previous commit: +9b4d0d8dccbd48d21b0f7c79b6eaf94428f691b1. +--- + CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4c760d0fdb..a3a0f59925 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -426,8 +426,7 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX) + PATTERN "rootd.xinetd" EXCLUDE + PATTERN "proofd.xinetd" EXCLUDE + PATTERN "root.mimes" EXCLUDE +- PATTERN "cmake" EXCLUDE +- PATTERN "http" EXCLUDE ) ++ PATTERN "cmake" EXCLUDE ) + install(DIRECTORY fonts/ DESTINATION ${CMAKE_INSTALL_FONTDIR}) + install(DIRECTORY icons/ DESTINATION ${CMAKE_INSTALL_ICONDIR}) + install(DIRECTORY macros/ DESTINATION ${CMAKE_INSTALL_MACRODIR}) +-- +2.18.0 + diff --git a/sci-physics/root/root-6.14.00.ebuild b/sci-physics/root/root-6.14.00.ebuild new file mode 100644 index 00000000000..d7fcd557dcc --- /dev/null +++ b/sci-physics/root/root-6.14.00.ebuild @@ -0,0 +1,315 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +CMAKE_BUILD_TYPE=Release +# ninja does not work due to fortran +CMAKE_MAKEFILE_GENERATOR=emake +FORTRAN_NEEDED="fortran" +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) + +inherit cmake-utils eapi7-ver elisp-common eutils fortran-2 \ + prefix python-single-r1 toolchain-funcs + +DESCRIPTION="C++ data analysis framework and interpreter from CERN" +HOMEPAGE="https://root.cern" +SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz" + +IUSE="+X avahi aqua +asimage +davix emacs +examples fits fftw fortran + +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat + +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8 + +python qt4 qt5 R +roofit root7 shadow sqlite +ssl table +tbb test + +threads +tiff +tmva +unuran vc xinetd +xml xrootd" + +SLOT="$(ver_cut 1-2)/$(ver_cut 3)" +LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" +KEYWORDS="~amd64 ~x86" + +REQUIRED_USE=" + !X? ( !asimage !opengl !qt4 !qt5 !tiff ) + python? ( ${PYTHON_REQUIRED_USE} ) + tmva? ( gsl ) + davix? ( ssl xml ) +" + +CDEPEND=" + app-arch/lz4 + app-arch/xz-utils + fortran? ( dev-lang/cfortran ) + dev-libs/libpcre:3= + dev-libs/xxhash + media-fonts/dejavu + media-libs/freetype:2= + media-libs/libpng:0= + sys-libs/ncurses:= + sys-libs/zlib + X? ( + x11-libs/libX11:0= + x11-libs/libXext:0= + x11-libs/libXft:0= + x11-libs/libXpm:0= + opengl? ( + media-libs/ftgl:0= + media-libs/glew:0= + virtual/opengl + virtual/glu + x11-libs/gl2ps:0= + ) + qt4? ( + dev-qt/qtcore:4= + dev-qt/qtgui:4= + ) + qt5? ( + dev-qt/qtcore:5= + dev-qt/qtgui:5= + dev-qt/qtwebengine:5= + ) + ) + asimage? ( || ( + media-libs/libafterimage[gif,jpeg,png,tiff?] + >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?] + ) ) + avahi? ( net-dns/avahi[mdnsresponder-compat] ) + davix? ( net-libs/davix ) + emacs? ( virtual/emacs ) + fftw? ( sci-libs/fftw:3.0= ) + fits? ( sci-libs/cfitsio:0= ) + graphviz? ( media-gfx/graphviz:0= ) + gsl? ( sci-libs/gsl ) + http? ( dev-libs/fcgi:0= ) + jemalloc? ( dev-libs/jemalloc ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap:0= ) + libcxx? ( sys-libs/libcxx ) + unuran? ( sci-mathematics/unuran:0= ) + minuit? ( !sci-libs/minuit ) + mysql? ( virtual/mysql ) + odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) + oracle? ( dev-db/oracle-instantclient-basic ) + postgres? ( dev-db/postgresql:= ) + pythia6? ( sci-physics/pythia:6= ) + pythia8? ( sci-physics/pythia:8= ) + python? ( ${PYTHON_DEPS} ) + R? ( dev-lang/R ) + shadow? ( virtual/shadow ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( dev-libs/openssl:0= ) + tbb? ( dev-cpp/tbb ) + vc? ( dev-libs/vc ) + xml? ( dev-libs/libxml2:2= ) + xrootd? ( net-libs/xrootd:0= ) +" + +DEPEND="${CDEPEND} + virtual/pkgconfig" + +RDEPEND="${CDEPEND} + xinetd? ( sys-apps/xinetd )" + +PATCHES=( + "${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch + "${FILESDIR}"/${PN}-6.13.02-hsimple.patch + "${FILESDIR}"/${PN}-6.14.00-http.patch +) + +pkg_setup() { + use fortran && 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, VecCore." + elog "You can use the env variable EXTRA_ECONF variable for this." + elog "For example, for Chirp, you would set: " + elog "EXTRA_ECONF=\"-Dchirp=ON\"" + echo +} + +src_prepare() { + cmake-utils_src_prepare + + sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die + + # CSS should use local images + sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed" +} + +# Note: ROOT uses bundled clang because it is patched and API-incompatible +# with vanilla clang. The patches enable the C++ interpreter to work. +# Since ROOT installs many small files into /etc (~100MB in total), +# we install it into another directory to avoid making /etc too big. + +src_configure() { + local mycmakeargs=( + -DCMAKE_C_FLAGS="${CFLAGS}" + -DCMAKE_CXX_FLAGS="${CXXFLAGS}" + -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)" + -DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/share/man" + -DMCAKE_INSTALL_LIBDIR=$(get_libdir) + -DDEFAULT_SYSROOT="${EPREFIX}" + -DCLING_BUILD_PLUGINS=OFF + -Dexplicitlink=ON + -Dexceptions=ON + -Dfail-on-missing=ON + -Dshared=ON + -Dsoversion=ON + -Dbuiltin_llvm=ON + -Dbuiltin_afterimage=OFF + -Dbuiltin_cfitsio=OFF + -Dbuiltin_davix=OFF + -Dbuiltin_fftw3=OFF + -Dbuiltin_freetype=OFF + -Dbuiltin_ftgl=OFF + -Dbuiltin_gl2ps=OFF + -Dbuiltin_glew=OFF + -Dbuiltin_gsl=OFF + -Dbuiltin_lz4=OFF + -Dbuiltin_lzma=OFF + -Dbuiltin_openssl=OFF + -Dbuiltin_pcre=OFF + -Dbuiltin_tbb=OFF + -Dbuiltin_unuran=OFF + -Dbuiltin_vc=OFF + -Dbuiltin_vdt=OFF + -Dbuiltin_veccore=OFF + -Dbuiltin_xrootd=OFF + -Dbuiltin_xxhash=OFF + -Dbuiltin_zlib=OFF + -Dx11=$(usex X) + -Dxft=$(usex X) + -Dafdsmgrd=OFF + -Dafs=OFF # not implemented + -Dalien=OFF + -Dasimage=$(usex asimage) + -Dastiff=$(usex tiff) + -Dbonjour=$(usex avahi) + -Dlibcxx=$(usex libcxx) + -Dccache=OFF # use ccache via portage + -Dcastor=OFF + -Dchirp=OFF + -Dcling=ON # cling=OFF is broken + -Dcocoa=$(usex aqua) + -Dcxx14=$(usex root7) + -Dcxxmodules=OFF # requires clang, unstable + -Ddavix=$(usex davix) + -Ddcache=OFF + -Dfftw3=$(usex fftw) + -Dfitsio=$(usex fits) + -Dfortran=$(usex fortran) + -Dftgl=$(usex opengl) + -Dgdml=$(usex gdml) + -Dgenvector=ON # genvector=OFF ignored + -Dgeocad=OFF + -Dgfal=OFF + -Dgl2ps=$(usex opengl) + -Dglite=OFF # not implemented + -Dglobus=OFF + -Dgminimal=OFF + -Dgnuinstall=OFF + -Dgsl_shared=$(usex gsl) + -Dgviz=$(usex graphviz) + -Dhdfs=OFF + -Dhttp=$(usex http) + -Dimt=$(usex tbb) + -Djemalloc=$(usex jemalloc) + -Dkrb5=$(usex kerberos) + -Dldap=$(usex ldap) + -Dmathmore=$(usex gsl) + -Dmemstat=$(usex memstat) + -Dminimal=OFF + -Dminuit2=$(usex minuit) + -Dminuit=$(usex minuit) + -Dmonalisa=OFF + -Dmysql=$(usex mysql) + -Dodbc=$(usex odbc) + -Dopengl=$(usex opengl) + -Doracle=$(usex oracle) + -Dpch=ON # pch=OFF is broken + -Dpgsql=$(usex postgres) + -Dpythia6=$(usex pythia6) + -Dpythia8=$(usex pythia8) + -Dpython=$(usex python) + -Dqt5web=$(usex qt5) + -Dqtgsi=$(usex qt4) + -Dqt=$(usex qt4) + -Drfio=OFF + -Droofit=$(usex roofit) + -Droot7=$(usex root7) + -Drootbench=OFF + -Droottest=$(usex test) + -Drpath=ON # needed for multi-slot to work + -Druby=OFF # deprecated and broken + -Druntime_cxxmodules=OFF # does not work yet + -Dr=$(usex R) + -Dsapdb=OFF # not implemented + -Dshadowpw=$(usex shadow) + -Dsqlite=$(usex sqlite) + -Dsrp=OFF # not implemented + -Dssl=$(usex ssl) + -Dtable=$(usex table) + -Dtbb=$(usex tbb) + -Dtcmalloc=OFF + -Dtesting=$(usex test) + -Dthread=$(usex threads) + -Dtmva-cpu=$(usex tmva) + -Dtmva-gpu=OFF + -Dtmva=$(usex tmva) + -Dunuran=$(usex unuran) + -Dvc=$(usex vc) + -Dvdt=OFF + -Dveccore=OFF + -Dxml=$(usex xml) + -Dxrootd=$(usex xrootd) + ${EXTRA_ECONF} + ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + ROOTSYS=${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2) + ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2) + + # ROOT fails without this symlink because it only looks in lib + if [[ ! -d ${D}/${ROOTSYS}/lib ]]; then + dosym $(get_libdir) /usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/lib + fi + + cat > ${ROOTENV} <<- EOF || die + MANPATH="${ROOTSYS}/share/man" + PATH="${ROOTSYS}/bin" + ROOTPATH="${ROOTSYS}/bin" + LDPATH="${ROOTSYS}/$(get_libdir)" + EOF + + if use python; then + echo "PYTHONPATH=${ROOTSYS}/$(get_libdir)" >> ${ROOTENV} || die + fi + + doenvd ${ROOTENV} + + pushd "${D}/${ROOTSYS}" > /dev/null + + if use emacs; then + elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el + fi + + if ! use gdml; then + rm -r geom || die + fi + + if ! use examples; then + rm -r test tutorials || die + fi + + if use tmva; then + rm -r tmva || die + fi + + # clean up unnecessary files from installation + rm -r config emacs etc/vmc fonts || die +}