From 0706fc6986773f4e4d391deff4ad5143c464ea4e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 24 Mar 2019 17:44:59 +0000 Subject: Revert "gentoo resync : 24.03.2019" This reverts commit aa3411e241a201d53a2689766fe419f2756819f3. --- sci-physics/Manifest.gz | Bin 6026 -> 6028 bytes sci-physics/root/Manifest | 2 - .../files/root-6.16.00-disable-header-search.patch | 38 --- sci-physics/root/root-6.16.00-r1.ebuild | 323 --------------------- 4 files changed, 363 deletions(-) delete mode 100644 sci-physics/root/files/root-6.16.00-disable-header-search.patch delete mode 100644 sci-physics/root/root-6.16.00-r1.ebuild (limited to 'sci-physics') diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz index 8520716f06bb..ee1d685e4880 100644 Binary files a/sci-physics/Manifest.gz and b/sci-physics/Manifest.gz differ diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index 704f0661bb12..19c4753bf425 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -4,13 +4,11 @@ AUX root-6.12.04-no-opengl.patch 763 BLAKE2B 7f93aac3941dd5906768cd07c87a421137d AUX root-6.12.04-z3.patch 1155 BLAKE2B 31d099bb260a030d88fcfbe0c9c5a7953738619b216da4140e087b29fead0bfd05bd22aa75da99521689decfb54caa23e0b50a9be9c34fe2fd75596b99b13092 SHA512 ca82ed6f3a0eb9e0ae13a0c354eab0a7c9c18e93ef444418f5786decdd8600184a6c2d5deb6d54d1a852076988645a0fbd215459cd15f5569f54606d74ee3e18 AUX root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a03ba26c3969069b291a6a22188879dbedbf0c3c496149f79f671d0eb51d81d0ee36565660d136b4741f5d018c2b05325ff08381f0 SHA512 c96dee9843da1051c54bd6870ef0a04714944ffe1f86800c9a51b8eb8ef84107d3315d3a708dcc0b651248af4bec362c7f31695514505045aeda9c793d40dc58 AUX root-6.14.06-oracle.patch 666 BLAKE2B 8ca54fa3d6d836805a88f3ff713e34c1d5db8ffabe4eab7d213d4e0d6a3750cbe0bc8fd14e40ff98f3a4a225b641ebfc6abcf0d34034f90718b0567935bb0209 SHA512 095678f4b3e277cf9b3cd64e0811e20d9c486f2ed524792e55b087441e652ea7b9ee9c2358319ae2be6e4b35828873669d5b9c89f61d68aaa76db62abc4c5a46 -AUX root-6.16.00-disable-header-search.patch 1670 BLAKE2B cc9fda55bc867585432d9acb7dcde6cefa022226c84034bd5c4ba6e286d083ac330ac16ae0f119b5aaf3763cc93ada8c6592096333f55b6ff374ccdd09592e33 SHA512 99e8998c18e70ea9e352abf9839252319e3d8a53bac3a0f777d81e48b88bfd235a6e8386eceb1b50e1202b53088a82cbe6e1576e9137e0e5db59da7cb1761bae 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 7754 BLAKE2B 312e1b90cffa62547d03ea7274b5812df3a690539a03464c89c681c9589b3895a075bc83fe056a7507f5afd25b3744200ad0b90cb617debb59bffd3a280efcf8 SHA512 3016c0308adf200ab1b4a06752bb40d04df4de63bbe846b0afb89c1555af7779677711a4e78ce6ee90c6d27e4c471ab3c46bd46812b46b6f40c0d6ba024cfe11 EBUILD root-6.14.08-r2.ebuild 8018 BLAKE2B 3553813ada68f33a841265dfdf5c81c1243e06cc9881739d600d2c7ae35c99fe56b882f11e8a23680b77e5b39d9465b2d7bdf5c84ba0daf5fddcc672980d2dd4 SHA512 437ae540021e46f02fba66a816c860180da6b7fd30d780697b67e81492faf239932219c0799acea367e164ccb4e32fcf781c3f071ad340bb5fd1791b82478d22 -EBUILD root-6.16.00-r1.ebuild 8104 BLAKE2B b6669f9dec7cdb59eba38a282a3d9e4c9fe55e10e8c3782cc593b6e925d1d9a5c0b6872000a8f0587356c111b5a2fa9bbbda7b2f12a83e67449b4d9d8fe7ca83 SHA512 ca85f4a383d2fe8abd68bc9d3ec606ef5d7d8bb47216ad3a5272185370a8497c9b1f3668a9135900fa64b7c7897b4b12c0d4d910001667047aa564f6089e9e17 EBUILD root-6.16.00.ebuild 8047 BLAKE2B ee28bae5ee066baa9ab753927ca9e30331955238e22bc3cce402a1a2dfd29ee29579dc504128467e2b5aae2cefe30e0fdc359b760caf388618f5d3fd201c2a38 SHA512 4e6aef4125629df5e1a3a2cf8b394155fe63fc0c6afd94155329fd443cfaad392aacd6eea903f489dbb16be2b1925a6a9a011e11a478e182f728eff3b74e5608 EBUILD root-9999.ebuild 8307 BLAKE2B 1932ca3501767e729fab5658681c75d75ea7b839fda2f43777f5ff76d9cfbdd589793378cda3119f5e1457d48ffe42d116d628ccc36148c270b67e56af407068 SHA512 b6ee00de46d9ced77e54182b750810bd7548de48ce8aa63f4a898b5df7604fe06685cfc7015b2a61556ae1c8284f93ccd5492559285ef232b14881ac9c461aa5 MISC metadata.xml 3079 BLAKE2B a67a71c5dcde9c3d05420b7edefeee32a8e623e10d03f75169a02044377106641ed6dc96c65aa71f42c94c4b29777c0267e9163870cbb392e1dc7715b8ccc542 SHA512 24bb9b7d0d0263f363639f4861a071bfb7f1bdd5e15ec4b166c44114b25343edb008f7ac896dd899cbcdd068abd762aa84924a6e50384ee214de28beb08cfd2a diff --git a/sci-physics/root/files/root-6.16.00-disable-header-search.patch b/sci-physics/root/files/root-6.16.00-disable-header-search.patch deleted file mode 100644 index 06748eb64312..000000000000 --- a/sci-physics/root/files/root-6.16.00-disable-header-search.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Benda Xu -Date: 2019-03-23 -Subject: Remove header expansion logic from module cmake helper. - -Description: ROOT module cmake helper by default expands header inclusion to -absolute path. In Gentoo, that will capture PORTAGE_TMPDIR resulting in various -runtime bugs. By removing this convolved logic, headers are untouched and become -more predictible for rootcling at runtime. - -Typical bug it solves: - - Error in cling::AutoloadingVisitor::InsertIntoAutoloadingState: - Missing FileEntry for /var/tmp/portage/sci-physics/JSAP-479/work/JSAP-479/DataType/JPSimOutput.hh - requested to autoload type JPSimTruthTree_t - Error in cling::AutoloadingVisitor::InsertIntoAutoloadingState: - Missing FileEntry for /var/tmp/portage/sci-physics/JSAP-479/work/JSAP-479/DataType/JPSimOutput.hh - requested to autoload type JPSimTriggerInfoTree_t - -Forwarded: No need. Gentoo specific. - ---- a/cmake/modules/RootNewMacros.cmake 2019-01-23 16:23:37.000000000 +0800 -+++ b/cmake/modules/RootNewMacros.cmake 2019-02-25 00:18:04.000000000 +0800 -@@ -250,14 +250,7 @@ function(ROOT_GENERATE_DICTIONARY dictio - list(APPEND headerfiles ${fp}) - list(APPEND _list_of_header_dependencies ${fp}) - else() -- find_file(headerFile ${fp} HINTS ${localinclude} ${incdirs} NO_DEFAULT_PATH) -- find_file(headerFile ${fp} NO_SYSTEM_ENVIRONMENT_PATH) -- if(headerFile) -- list(APPEND headerfiles ${headerFile}) -- list(APPEND _list_of_header_dependencies ${headerFile}) -- else() -- list(APPEND headerfiles ${fp}) -- endif() -+ list(APPEND headerfiles ${fp}) - unset(headerFile CACHE) - endif() - endforeach() diff --git a/sci-physics/root/root-6.16.00-r1.ebuild b/sci-physics/root/root-6.16.00-r1.ebuild deleted file mode 100644 index b6b7b6b7a011..000000000000 --- a/sci-physics/root/root-6.16.00-r1.ebuild +++ /dev/null @@ -1,323 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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,7} ) - -inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \ - llvm 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 aqua +asimage +c++11 c++14 c++17 cuda +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 qt5 R +roofit root7 shadow sqlite +ssl - table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd - zeroconf" - -SLOT="$(ver_cut 1-2)/$(ver_cut 3)" -LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" -KEYWORDS="~amd64 ~x86" - -REQUIRED_USE=" - ^^ ( c++11 c++14 c++17 ) - cuda? ( tmva !c++17 ) - !X? ( !asimage !opengl !qt5 !tiff ) - davix? ( ssl xml ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( root7 ) - root7? ( || ( c++14 c++17 ) ) - tmva? ( gsl ) -" - -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-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 - opengl? ( - media-libs/ftgl:0= - media-libs/glew:0= - virtual/opengl - virtual/glu - x11-libs/gl2ps:0= - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwebengine:5[widgets] - ) - ) - asimage? ( || ( - media-libs/libafterimage[gif,jpeg,png,tiff?] - >=x11-wm/afterstep-2.2.11[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 ) - 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? ( dev-db/mysql-connector-c ) - 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-2018 ) - tmva? ( dev-python/numpy[${PYTHON_USEDEP}] ) - 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.06_cling-runtime-sysroot.patch - "${FILESDIR}"/${PN}-6.16.00-disable-header-search.patch -) - -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 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() { - 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" - - 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 -# really belong there, we install it into another directory to avoid -# making /etc too big. - -src_configure() { - local mycmakeargs=( - -DCMAKE_C_FLAGS="${CFLAGS}" - -DCMAKE_CXX_FLAGS="${CXXFLAGS}" - -DPYTHON_EXECUTABLE="${PYTHON}" - -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}" - -DCLING_BUILD_PLUGINS=OFF - -Dexplicitlink=ON - -Dexceptions=ON - -Dfail-on-missing=ON - -Dgnuinstall=OFF - -Dshared=ON - -Dsoversion=ON - -Dbuiltin_llvm=OFF - -Dbuiltin_clang=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 zeroconf) - -Dlibcxx=$(usex libcxx) - -Dccache=OFF # use ccache via portage - -Dcastor=OFF - -Dchirp=OFF - -Dclad=OFF - -Dcling=ON # cling=OFF is broken - -Dcocoa=$(usex aqua) - -Dcuda=$(usex cuda) - -Dcxx11=$(usex c++11) - -Dcxx14=$(usex c++14) - -Dcxx17=$(usex c++17) - -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 - -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=OFF - -Dqt=OFF - -Drfio=OFF - -Droofit=$(usex roofit) - -Droot7=$(usex root7) - -Drootbench=OFF - -Droottest=OFF - -Drpath=OFF - -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) - -Dtcmalloc=OFF - -Dtesting=$(usex test) - -Dthread=$(usex threads) - -Dtmva=$(usex tmva) - -Dtmva-cpu=$(usex tmva) - -Dtmva-gpu=$(usex cuda) - -Dunuran=$(usex unuran) - -Dvc=$(usex vc) - -Dvdt=OFF - -Dveccore=OFF - -Dxml=$(usex xml) - -Dxrootd=$(usex xrootd) - ${EXTRA_ECONF} - ) - - cmake-utils_src_configure -} - -src_compile() { - # needed for hsimple.root - addwrite /dev/random - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2) - ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2) - - cat > ${ROOTENV} <<- EOF || die - MANPATH="${ROOTSYS}/share/man" - PATH="${ROOTSYS}/bin" - ROOTPATH="${ROOTSYS}/bin" - LDPATH="${ROOTSYS}/lib" - EOF - - if use python; then - echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die - fi - - doenvd ${ROOTENV} - - if use emacs; then - elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el - fi - - pushd "${D}/${ROOTSYS}" > /dev/null - - rm -r test emacs bin/*.{csh,sh,fish} || die - - if ! use examples; then - rm -r tutorials || die - fi - - # create versioned symlinks for binaries - cd bin; - for exe in *; do - dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)" - done -} -- cgit v1.2.3