From a2810985afabcc31d3eace5e61d8ea25b852ba17 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 7 May 2019 11:18:59 +0100 Subject: gentoo resync : 07.05.2019 --- sci-physics/root/Manifest | 10 +-- sci-physics/root/root-6.12.06-r9.ebuild | 5 +- sci-physics/root/root-6.14.08-r2.ebuild | 5 +- sci-physics/root/root-6.16.00-r1.ebuild | 5 +- sci-physics/root/root-6.16.00.ebuild | 5 +- sci-physics/root/root-9999.ebuild | 111 +++++++++++++++++--------------- 6 files changed, 68 insertions(+), 73 deletions(-) (limited to 'sci-physics/root') diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index 5edd01a20c18..21baa6ba9235 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -8,9 +8,9 @@ AUX root-6.16.00-disable-header-search.patch 1670 BLAKE2B cc9fda55bc867585432d9a DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff08cfa470e63be9a02b948a49ae088e8da72ce433a5071d9196bfd98f71e6861b1bda285354012620eee6c61cffcee71a0c8 SHA512 3d44749ccfc3d40a2f516ae53ef40fb244ed785eee0dbc18ff822bbb811a15b943039d30282ef5358a283d485e62531880c877ec77a86089503b06d6f37e42e1 DIST root_v6.14.08.source.tar.gz 162474562 BLAKE2B f8bfdabb4d91bbdfbab0b17626fff1f8aa265292996d857025cbd1543306f3ec540a1afb080788bfc7149ea835932b59d7c54dcd802354e31294ba2e5e9d2366 SHA512 827e39efbf3c69429a0a256127ca9f87550d9084c34c715bddccbf87a8c111c367b9a0ac6882aac747c9b48f4a3effb3747b4df567429910c93ee64dfe35df5b DIST root_v6.16.00.source.tar.gz 164836293 BLAKE2B 9d8f02631bdc1fa1775cbdaf50dd1feacd9b3c86b81d679ba6f0ca3c5787cd1d22ef7c33358b608361a01ad4f0aff3e8c749649d24773a35c52ce87f808d08f5 SHA512 17e5b9815973773e30ff83c2f4028e9e93691c1ecb824c162c8b3e02d1f6666fb8e0b72a5d0652a90032af146d92d271cbffcd634fb6fe6a63bdf46d672789bf -EBUILD root-6.12.06-r9.ebuild 7752 BLAKE2B 616fcd3595d016979ff19330f58b9f665e6af79796595dd1019462825ee4888ed6eaba221f369944a068bef30ef92d040a09d856075df20177139b51d816581b SHA512 cc207541ef5ea1233cde7943bc8b5caafbf807daf62f5ea3a286939fec0c9163f3331322863da415e0d79cb75f4a1c040bf0d51758ed7023d18dbc3b142c61fb -EBUILD root-6.14.08-r2.ebuild 8016 BLAKE2B 5d18343d10ce6a4534fd9d1c1b1439180d750ad5bdf23c3bc9a22318549c7aa8afeb044bdfba38f6a711bdbd21164067ed03ba8917927799ea5a8ad7d5c4db53 SHA512 e91d0aeb6114d86addba4e4d77ce834fc2089ae730dc473db4c4f20ccc1cae38d432191bf26a5c36e1bff34d86aa6039f3ace88329d46a0fbddbd77db6f08aed -EBUILD root-6.16.00-r1.ebuild 8102 BLAKE2B 68b5e07b167857792101b283fdf45d218f95934bda86221b35aae183d767b7e5d4d217897b8ca143c1596df5e852b7693260af2dd328b127f3982bbd3ad83cea SHA512 1157f9767b2bd3433e9ebacffc7c71ac6158f9ef4dbb6e7266b4413d16a46534b30716229867595a98e30cdd728f3168cfcb5936f1d4e84f42d52d79df38f9b1 -EBUILD root-6.16.00.ebuild 8045 BLAKE2B c00122033d9bd6932c2ff8afc052e195f3c3bf18a5f0c437540b73e52c7a14b24b1a6de6b02e60be09f405a846f35b9529caa92ee5945b6b64587ca7536d18a1 SHA512 eb0259590ed867cda9fe7942a1891c8a5306dcc4e1afcf2c617d83cacf2f91fc73d84279d399c244f6cc43f425f218bbf4bb3349c2d82985e6af4cdc2937a915 -EBUILD root-9999.ebuild 8305 BLAKE2B 7fe159b5cf2c09f07ec3ec2a3770ff922c34c238e2f24f6b945b5e30f511c5dad712c195c67e7a1aada1ae7f567830bd37aab8157f323e9263e20c6878edb5f3 SHA512 1d2a34738f1712650f1a9e7c3f8022a97984d675f4313fe722eab44edf65d8f5487f60bff132db42bc550a1070702ea3dd402d1d9d40d719c2b8b22863c1ce89 +EBUILD root-6.12.06-r9.ebuild 7694 BLAKE2B fb1fdf4f36493df97893a9181fd9a64feba98bb39b89943d2fd162244e4e25b71e381bd21be23c922416bd1ceb1c2621020ff23debc3dc33e2a2c604b01f2cbe SHA512 300e9f8ae90c29ef7a214d4a4d898c25128e00c1ee61900478ff802fa8280617dadfd05061e25428c7de38dfb93156dd09dc93b9ada93afd200641800d624245 +EBUILD root-6.14.08-r2.ebuild 7958 BLAKE2B 3d97b689b73e3dca32dd092730afb963d643aafc6a5948d7e378f1fe930555d6f71916773f57cd24c06b79e4e6a6de5aeb2d554ff762ef7d2813f5d5a111bd48 SHA512 da86353beb076717afaa692f798adba69629a38ac391a809a51b26bc99861158170ea1dc7beee4f592b5e3d5a92e7b265b3cc883390b2590d51f4fe6b5bbf251 +EBUILD root-6.16.00-r1.ebuild 8044 BLAKE2B d247bce9342e6612d53cc75992e7a5195a7d10b6b60f4b6ddde05c230d6df36f24d2142a9baffb006699bd5230470d118241af917b2d7fdc075e9ba6c453bf7a SHA512 c466be0558379c97ac5b685b392b6539d845eeb69cf0e980a9eea5637cf29dc7a57b288f3b361343e48c2100c8acf46cc5d858dbae4294d89534b8cded4cab7e +EBUILD root-6.16.00.ebuild 7987 BLAKE2B b01e5e5069219006dee484a15b24f0ebcc350140522f9f99d8ef8eb32e2e2c2fe39d4243eaa3a1733c7dde04d6fba9a633c061f8f233fb291635917962fc4407 SHA512 77737611ce737357cb94b2c289baf7c1c29ed3de1dae0249cd805cb432f0b51e9b9103e2235065c6c72dd0a063ef9cba6f92e3eb10be152a022ca642f29f7bc8 +EBUILD root-9999.ebuild 8328 BLAKE2B 627bb2f349f7ed1960d993ad3cc8feac267f8f9d6946f6507ef55ea8e5c094d29a89d36e233d6e4807ff0e3d1acaf41b6df8c21d4cd16ef77c5d19872c03e589 SHA512 3580e2c14a474f74f9781d17f8fc5ea7ffdab0cd7d8089d977ed71ac393648fff32f5f70a606b8cadde08ae2505324d0f1510fbe08ee3da284adce6077d808e9 MISC metadata.xml 3079 BLAKE2B a67a71c5dcde9c3d05420b7edefeee32a8e623e10d03f75169a02044377106641ed6dc96c65aa71f42c94c4b29777c0267e9163870cbb392e1dc7715b8ccc542 SHA512 24bb9b7d0d0263f363639f4861a071bfb7f1bdd5e15ec4b166c44114b25343edb008f7ac896dd899cbcdd068abd762aa84924a6e50384ee214de28beb08cfd2a diff --git a/sci-physics/root/root-6.12.06-r9.ebuild b/sci-physics/root/root-6.12.06-r9.ebuild index eecef68d7cb9..7797664bc1d8 100644 --- a/sci-physics/root/root-6.12.06-r9.ebuild +++ b/sci-physics/root/root-6.12.06-r9.ebuild @@ -63,10 +63,7 @@ CDEPEND=" dev-qt/qtwebengine:5[widgets] ) ) - asimage? ( || ( - media-libs/libafterimage[gif,jpeg,png,tiff?] - >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?] - ) ) + asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) diff --git a/sci-physics/root/root-6.14.08-r2.ebuild b/sci-physics/root/root-6.14.08-r2.ebuild index 9bdd6bbf7eb4..36f4c068c94f 100644 --- a/sci-physics/root/root-6.14.08-r2.ebuild +++ b/sci-physics/root/root-6.14.08-r2.ebuild @@ -67,10 +67,7 @@ CDEPEND=" dev-qt/qtwebengine:5[widgets] ) ) - asimage? ( || ( - media-libs/libafterimage[gif,jpeg,png,tiff?] - >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?] - ) ) + asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) diff --git a/sci-physics/root/root-6.16.00-r1.ebuild b/sci-physics/root/root-6.16.00-r1.ebuild index ca7b8a8c5fd4..7d0884db5536 100644 --- a/sci-physics/root/root-6.16.00-r1.ebuild +++ b/sci-physics/root/root-6.16.00-r1.ebuild @@ -68,10 +68,7 @@ CDEPEND=" dev-qt/qtwebengine:5[widgets] ) ) - asimage? ( || ( - media-libs/libafterimage[gif,jpeg,png,tiff?] - >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?] - ) ) + asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) diff --git a/sci-physics/root/root-6.16.00.ebuild b/sci-physics/root/root-6.16.00.ebuild index ddd708c69aea..c6952c5f4198 100644 --- a/sci-physics/root/root-6.16.00.ebuild +++ b/sci-physics/root/root-6.16.00.ebuild @@ -68,10 +68,7 @@ CDEPEND=" dev-qt/qtwebengine:5[widgets] ) ) - asimage? ( || ( - media-libs/libafterimage[gif,jpeg,png,tiff?] - >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?] - ) ) + asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild index df57dd82e74a..77c8e057cd0c 100644 --- a/sci-physics/root/root-9999.ebuild +++ b/sci-physics/root/root-9999.ebuild @@ -10,18 +10,7 @@ FORTRAN_NEEDED="fortran" PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \ - prefix python-single-r1 toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - KEYWORDS="" - EGIT_REPO_URI="http://root.cern/git/root.git" - SLOT=0 -else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz" - SLOT="$(ver_cut 1-2)/$(ver_cut 3)" -fi + llvm prefix python-single-r1 toolchain-funcs DESCRIPTION="C++ data analysis framework and interpreter from CERN" HOMEPAGE="https://root.cern" @@ -33,10 +22,26 @@ IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix emacs +examples table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd zeroconf" +if [[ ${PV} =~ "9999" ]] ; then + inherit git-r3 + KEYWORDS="" + EGIT_REPO_URI="http://root.cern/git/root.git" + if [[ ${PV} == "9999" ]]; then + SLOT="0" + else + SLOT="$(ver_cut 1-2)/$(ver_cut 3)" + EGIT_BRANCH="v$(ver_cut 1)-$(ver_cut 2)-00-patches" + fi +else + KEYWORDS="~amd64 ~x86" + SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz" +fi + LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" REQUIRED_USE=" ^^ ( c++11 c++14 c++17 ) + cuda? ( tmva !c++17 ) !X? ( !asimage !opengl !qt5 !tiff ) davix? ( ssl xml ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -49,19 +54,19 @@ CDEPEND=" app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) - dev-libs/libpcre:3= + dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu - media-libs/freetype:2= + media-libs/freetype:2 media-libs/libpng:0= sys-devel/llvm:5= sys-libs/ncurses:= sys-libs/zlib X? ( - x11-libs/libX11:0= - x11-libs/libXext:0= - x11-libs/libXft:0= - x11-libs/libXpm:0= + 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= @@ -75,18 +80,15 @@ CDEPEND=" dev-qt/qtwebengine:5[widgets] ) ) - asimage? ( || ( - media-libs/libafterimage[gif,jpeg,png,tiff?] - >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?] - ) ) + asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) 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 ) + graphviz? ( media-gfx/graphviz ) + gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) kerberos? ( virtual/krb5 ) @@ -98,8 +100,8 @@ CDEPEND=" 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= ) + pythia6? ( sci-physics/pythia:6 ) + pythia8? ( sci-physics/pythia:8 ) python? ( ${PYTHON_DEPS} ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) @@ -107,7 +109,7 @@ CDEPEND=" ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[${PYTHON_USEDEP}] ) - vc? ( dev-libs/vc ) + vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) " @@ -123,15 +125,15 @@ PATCHES=( ) pkg_setup() { + LLVM_MAX_SLOT=5 llvm_pkg_setup + use fortran && fortran-2_pkg_setup use python && python-single-r1_pkg_setup - 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 environment variable EXTRA_ECONF for this." - elog "For example, for Chirp, you would set: " - elog "EXTRA_ECONF=\"-Dchirp=ON\"" + elog "There are extra options on packages not available in Gentoo." + elog "You can use the environment variable EXTRA_ECONF to enable" + elog "these packages. For example, for Vdt you would set:" + elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\"" } src_prepare() { @@ -141,11 +143,13 @@ src_prepare() { # CSS should use local images sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed" + + hprefixify core/clingutils/CMakeLists.txt } # 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 files into /etc (~100MB in total) that don't +# Since ROOT installs many files into /etc (>100MB in total) that don't # really belong there, we install it into another directory to avoid # making /etc too big. @@ -154,11 +158,11 @@ src_configure() { -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" -DPYTHON_EXECUTABLE="${PYTHON}" - -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" - -DCMAKE_INSTALL_LIBDIR=$(get_libdir) + -DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")" + -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)" + -DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man" + -DCMAKE_INSTALL_LIBDIR="lib" -DDEFAULT_SYSROOT="${EPREFIX}" - -DLLVM_CONFIG="${EPREFIX%/}/usr/lib/llvm/5/bin/llvm-config" -DCLING_BUILD_PLUGINS=OFF -Dexplicitlink=ON -Dexceptions=ON @@ -291,41 +295,44 @@ src_compile() { src_install() { cmake-utils_src_install - ROOTSYS=${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2) - ROOTENV=9900${PN}-$(ver_cut 1-2) + ROOTSYS=${EPREFIX%/}/usr/lib/${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 + if [[ ${PV} == "9999" ]]; then + ROOTENV="9900${PN}-git" + else + ROOTENV="$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)-git" fi cat > ${ROOTENV} <<- EOF || die MANPATH="${ROOTSYS}/share/man" PATH="${ROOTSYS}/bin" ROOTPATH="${ROOTSYS}/bin" - LDPATH="${ROOTSYS}/$(get_libdir)" + LDPATH="${ROOTSYS}/lib" EOF if use python; then - echo "PYTHONPATH=${ROOTSYS}/$(get_libdir)" >> ${ROOTENV} || die + echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${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 + pushd "${D}/${ROOTSYS}" > /dev/null + + rm -r emacs bin/*.{csh,sh,fish} || die + if ! use examples; then rm -r tutorials || die fi - if ! use tmva; then - rm -r tmva || die + # create versioned symlinks for binaries + if [[ ! ${PV} == "9999" ]]; then + cd bin; + for exe in *; do + dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)" + done fi - - # clean up unnecessary files from installation - rm -r emacs test || die } -- cgit v1.2.3