summaryrefslogtreecommitdiff
path: root/sci-physics
diff options
context:
space:
mode:
Diffstat (limited to 'sci-physics')
-rw-r--r--sci-physics/Manifest.gzbin5874 -> 5877 bytes
-rw-r--r--sci-physics/root/Manifest3
-rw-r--r--sci-physics/root/files/root-6.12.04-no-opengl.patch23
-rw-r--r--sci-physics/root/root-6.12.06-r1.ebuild (renamed from sci-physics/root/root-6.12.06.ebuild)165
4 files changed, 110 insertions, 81 deletions
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index cbffbaeef34b..f20b6feae2bf 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
Binary files differ
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 7aa25164f859..74ea4ad021b5 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -11,11 +11,12 @@ AUX root-5.34.26-ldflags.patch 626 BLAKE2B 3c3b8bf4d173afd6024843c0e125d8b64868f
AUX root-6.00.01-dotfont.patch 2718 BLAKE2B a130dac163b92a4a91edc22d39722a47fcdb51cb681500a8f734091e2dc0edb6aed4a7e964cbc22120064ea49694e5fd4d2555931da5f89c0f514f75eb7314cf SHA512 8f01655e863d36678dea37df934e3d8d9c2bc85920497345feb8d863bdc1b7413c783b916050d1e7b476ecdf9e1e8afdcbb32e621d625305898d51947b6955c6
AUX root-6.11.02-hsimple.patch 1838 BLAKE2B e5d4a2a04580c1ebe4e1da4cf615939347bcf24003c240870252938421f189e5da3ffc4a913c2241fe93f78077373ac0614bd85d32c33ba0da2203fa906f520a SHA512 3ded889d7a79070d78824bbea059f6451c96d95ac7c45063b2328856111e3dd28677dfd9a0696d0d5cbbe200690ed3f940341966847745c4bcf2f7e235135e5b
AUX root-6.12.04-no-ocaml.patch 1631 BLAKE2B 808da46144572073e6fac54859a60a9f056e164a4f31718f2962197f162ced11a6f1e9839af50d1d9c720dc0e2811f9eabef4901dfbe0c14d055315abf9dcdad SHA512 37d78c57b05a20088794cf887d60514c932b6b11b2a918b4b2621700be281df80adf3f17d76da17a146e4e941bf472a0a1ddcbbf14406e5d49bd3b8e4dbf3c50
+AUX root-6.12.04-no-opengl.patch 763 BLAKE2B 7f93aac3941dd5906768cd07c87a421137de2d21531d24b6e9e9d6c1182bbc2c8aea20a2c8a79415633cc41018ac8e979689277e4b96923df3e0518d5abae95e SHA512 cd4dbeb8e0a253ce664b489238a84535ab4c0e96d52b995965354ba4cd0f19b2a2783dad72ab3a3d0935744acf64f1f82c804f3bebe2203cd891dda8c6b40b8f
AUX root-6.12.04-z3.patch 1155 BLAKE2B 31d099bb260a030d88fcfbe0c9c5a7953738619b216da4140e087b29fead0bfd05bd22aa75da99521689decfb54caa23e0b50a9be9c34fe2fd75596b99b13092 SHA512 ca82ed6f3a0eb9e0ae13a0c354eab0a7c9c18e93ef444418f5786decdd8600184a6c2d5deb6d54d1a852076988645a0fbd215459cd15f5569f54606d74ee3e18
AUX rootd.confd 199 BLAKE2B d7638f5ee8ccb4fcb428d07c59d776a9ab8773fa8a8911281e8f76b32fab5902e3f6f6086ad210af39480df514c947719cc5e76d29c7dbf2a8715ae58ef49880 SHA512 2ce6753d37a7f22cc3656f110f802b8e07c1469bfe4524606c1472369352f8c584c01c716760252fab40369470b72d8c77cdbb2d52126c39371faaf597bf58d8
AUX rootd.initd 622 BLAKE2B 7edeaf3cf550303642a89eb69edb65e6625215ac2daae5766904bcc14f1b30f6277c6eac6b895f46fbda01656df80cb71fdad6294a19bf581badceaa29278fdf SHA512 fde858a37b52540285d228e52845c963b18065a250aef0753f469753d541f577ac401f01438297c030e47176350bb23c3c0280c9b4ccbc1feda3313ab7c9be2e
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
EBUILD root-5.34.36.ebuild 12173 BLAKE2B 4829235ce5fae8b912afde7d28b619e98c9335cea9f614716f9222916734ef71b87df3d791f18337ddd477a854053ef690e4f4edfd43aeab7ba519686c2baa68 SHA512 52fee9354448cb8b471e28ff4ee2a552a975f36d9b6efc3af1b0e3e83a554dc406c502348ea49bbbbec82cf86cbeb9ed7d6df01645a31e4f5211c665abb27dfd
-EBUILD root-6.12.06.ebuild 9982 BLAKE2B 1f1c61774ceaca9dc1e7001a258e1fe92c0bc69b42e90d03a9673d4d75e6c589931c496b220a0b33c672746e5f1d7de594ef007736a7f3772931e7f9ecc9f303 SHA512 4e8e5e326c014c44c7b7c15951b7b63fcb0b46d4c06c4b682e7547191e996a41c1352685a4d59658f8eed872f85acc1aecba3d3f62eec0a4ed84f88817c3d2da
+EBUILD root-6.12.06-r1.ebuild 9256 BLAKE2B 8b00d0b9da290f6872afce1f8ded3dd9bc45e9958c9f90fcf1a3e9829098011e3abf3878f1a67fbcf838ed1a5dacdf539fbdeb463bae7f929afbe8723aa3ff7c SHA512 651d4fb5d2ec17e6c83d1ecd3fa3ebf8de54dd786d0bf15fca1e5c3933e9edb3e4ed3203463bf14aa69a64ad4c8da6fad65c34cd59198a4fabe902ec8e1b4a8e
MISC metadata.xml 3238 BLAKE2B 0396ebafbf0bd14c88f7ba401f12f698ccca313c0c04cab46f9fa198681b0f305f21413bab8a86c97bb65e0bbe00eb6b6f488600402784109dc13ed196d6589b SHA512 2ba887003b3dc6dc3d4de379ec9dde8a7ba8144c2bbd7be50ebcfc7b3bfb3154733edd39007fcd8c380034d028a0d3f352e4cb973d8facd9412f38f820c16b1e
diff --git a/sci-physics/root/files/root-6.12.04-no-opengl.patch b/sci-physics/root/files/root-6.12.04-no-opengl.patch
new file mode 100644
index 000000000000..319020222e53
--- /dev/null
+++ b/sci-physics/root/files/root-6.12.04-no-opengl.patch
@@ -0,0 +1,23 @@
+diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
+index a68c462eb3..1e82e57241 100644
+--- a/cmake/modules/SearchInstalledSoftware.cmake
++++ b/cmake/modules/SearchInstalledSoftware.cmake
+@@ -499,7 +499,7 @@ if(opengl)
+ endif()
+
+ #---Check for gl2ps ------------------------------------------------------------------
+-if(NOT builtin_gl2ps)
++if(gl2ps AND NOT builtin_gl2ps)
+ message(STATUS "Looking for gl2ps")
+ find_Package(gl2ps)
+ if(NOT GL2PS_FOUND)
+@@ -999,7 +999,7 @@ if(globus)
+ endif()
+
+ #---Check for ftgl if needed----------------------------------------------------------
+-if(NOT builtin_ftgl)
++if(ftgl AND NOT builtin_ftgl)
+ find_package(FTGL)
+ if(NOT FTGL_FOUND)
+ if(fail-on-missing)
+
diff --git a/sci-physics/root/root-6.12.06.ebuild b/sci-physics/root/root-6.12.06-r1.ebuild
index c875fb4bddfb..03a1a8413082 100644
--- a/sci-physics/root/root-6.12.06.ebuild
+++ b/sci-physics/root/root-6.12.06-r1.ebuild
@@ -9,14 +9,14 @@ CMAKE_MAKEFILE_GENERATOR=emake
FORTRAN_NEEDED="fortran"
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit cmake-utils elisp-common eutils fortran-2 gnome2-utils \
+inherit cmake-utils elisp-common eutils fortran-2 gnome2-utils prefix \
python-single-r1 toolchain-funcs user versionator xdg-utils
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
+IUSE="+X avahi aqua +asimage +davix emacs +examples fits fftw fortran +gdml
graphviz +gsl http jemalloc kerberos ldap libcxx +math memstat +minuit
mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt4
R +roofit root7 shadow sqlite ssl table +tbb test +threads +tiff +tmva
@@ -42,6 +42,7 @@ CDEPEND="
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=
@@ -70,6 +71,7 @@ CDEPEND="
>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
) )
avahi? ( net-dns/avahi[mdnsresponder-compat] )
+ davix? ( net-libs/davix )
fftw? ( sci-libs/fftw:3.0= )
fits? ( sci-libs/cfitsio:0= )
graphviz? ( media-gfx/graphviz:0= )
@@ -105,13 +107,9 @@ RDEPEND="${CDEPEND}
xinetd? ( sys-apps/xinetd )"
PATCHES=(
- "${FILESDIR}"/${PN}-5.28.00b-glibc212.patch
- "${FILESDIR}"/${PN}-5.32.00-afs.patch
- "${FILESDIR}"/${PN}-5.32.00-cfitsio.patch
- "${FILESDIR}"/${PN}-5.32.00-chklib64.patch
- "${FILESDIR}"/${PN}-6.00.01-dotfont.patch
"${FILESDIR}"/${PN}-6.11.02-hsimple.patch
"${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch
+ "${FILESDIR}"/${PN}-6.12.04-no-opengl.patch
"${FILESDIR}"/${PN}-6.12.04-z3.patch
)
@@ -135,17 +133,7 @@ pkg_setup() {
src_prepare() {
cmake-utils_src_prepare
- # 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/gl/src/gl2ps* || die
- rm -r graf3d/glew/{inc,src} || die
- rm -r core/pcre/src || die
- rm -r math/unuran/src/unuran-*.tar.gz || die
- rm -r core/lzma/src/*.tar.gz || die
- LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm || die
+ hprefixify build/CMakeLists.txt core/clingutils/CMakeLists.txt
# CSS should use local images
sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
@@ -160,6 +148,9 @@ src_configure() {
-DCMAKE_C_FLAGS="${CFLAGS}"
-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/${MY_PREFIX}"
+ -DDEFAULT_SYSROOT="${EPREFIX}"
+ -DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+ -DC_INCLUDE_DIRS="${EPREFIX}/usr/local/include:${EPREFIX}/include:${EPREFIX}/usr/include"
-Dexplicitlink=ON
-Dexceptions=ON
-Dfail-on-missing=ON
@@ -168,90 +159,104 @@ src_configure() {
-Dbuiltin_llvm=ON
-Dbuiltin_afterimage=OFF
-Dbuiltin_cfitsio=OFF
- -Dbuiltin_davix=$(usex davix) # not in Gentoo yet
+ -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)
- # -Dafs=$(usex afs) # option not implemented
+ -Dafdsmgrd=OFF
+ -Dafs=OFF # option not implemented
+ -Dalien=OFF
-Dasimage=$(usex asimage)
-Dastiff=$(usex tiff)
-Dbonjour=$(usex avahi)
- -Dlibcxx=$(usex libcxx) # default OFF
-Dccache=OFF # use ccache via portage
- -Dcastor=OFF # default ON
- -Dchirp=OFF # default ON
- # -Dcling=$(usex cling) # default ON
- -Dcocoa=$(usex aqua) # default *
- -Dcxx14=$(usex root7) # default OFF
- -Ddavix=$(usex davix) # default *
- -Ddcache=OFF # $(usex dcache) # default ON
- -Dfftw3=$(usex fftw) # default ON
- -Dfitsio=$(usex fits) # default ON
- -Dfortran=$(usex fortran) # default *
- -Dgdml=$(usex gdml) # default *
+ -Dcastor=OFF
+ -Dchirp=OFF
+ # -Dcling=ON # cling=OFF is broken
+ -Dcocoa=$(usex aqua)
+ -Dcxx14=$(usex root7)
+ # -Dcxxmodules=OFF # use clang C++ modules
+ -Ddavix=$(usex davix)
+ -Ddcache=OFF # not in Gentoo
+ -Dfftw3=$(usex fftw)
+ -Dfitsio=$(usex fits)
+ -Dfortran=$(usex fortran)
+ -Dftgl=$(usex opengl)
+ -Dgdml=$(usex gdml)
+ -Dgl2ps=$(usex opengl)
-Dgeocad=OFF # default OFF
-Dgenvector=$(usex math) # default ON
- -Dgfal=OFF # $(usex gfal) # default ON
- -Dglite=OFF #$(usex glite) # default ON (unimplemented option)
- -Dglobus=OFF #$(usex globus) # default OFF
- -Dgminimal=OFF # default OFF
- -Dgnuinstall=OFF # default OFF
- -Dgsl_shared=$(usex gsl) # default OFF
- -Dgviz=$(usex graphviz) # default ON
- -Dhdfs=OFF # $(usex hdfs) # default ON
- -Dhttp=$(usex http) # default *
- -Dimt=$(usex tbb) # default OFF
- -Djemalloc=$(usex jemalloc) # default OFF
- -Dkrb5=$(usex kerberos) # default ON
- -Dldap=$(usex ldap) # default ON
- -Dmathmore=$(usex math) # default ON
- -Dmemstat=$(usex memstat) # default *
+ -Dgfal=OFF # not in Gentoo
+ -Dglite=OFF # option not implemented
+ -Dglobus=OFF
+ -Dgminimal=OFF
+ -Dgnuinstall=OFF
+ -Dgsl_shared=$(usex gsl)
+ -Dgviz=$(usex graphviz)
+ -Dhdfs=OFF # deps not in Gentoo
+ -Dhttp=$(usex http)
+ -Dimt=$(usex tbb)
+ -Djemalloc=$(usex jemalloc)
+ -Dkrb5=$(usex kerberos)
+ -Dldap=$(usex ldap)
+ -Dlibcxx=$(usex libcxx)
+ -Dmathmore=$(usex math)
+ -Dmemstat=$(usex memstat)
#-Dminimal=$(usex minimal) # default OFF
-Dminuit=$(usex minuit)
- -Dminuit2=$(usex minuit) # default * (broken)
- -Dmonalisa=OFF # default ON
- -Dmysql=$(usex mysql) # default ON
- -Dodbc=$(usex odbc) # default ON
- -Dopengl=$(usex opengl) # default ON
- -Doracle=$(usex oracle) # default ON
- -Dpgsql=$(usex postgres) # default ON
- -Dpythia6=$(usex pythia6) # default ON
- -Dpythia8=$(usex pythia8) # default ON
- -Dpython=$(usex python) # default ON
- -Dqt=$(usex qt4) # default Qt
- -Dqtgsi=$(usex qt4) # default *
- -Droofit=$(usex roofit) # default *
- -Droot7=$(usex root7) # default OFF
- -Droottest=OFF # default OFF
- -Druby=OFF # default OFF
- -Dr=$(usex R) # default OFF
- -Drfio=OFF # default ON
- -Drpath=$(usex prefix) # default OFF
- -Dsapdb=OFF # default ON
- -Dshadowpw=$(usex shadow) # default ON
- -Dsqlite=$(usex sqlite) # default ON
- -Dsrp=OFF # default ON (unimplemented option)
- -Dssl=$(usex ssl) # default ON
- -Dtbb=$(usex tbb) # default OFF
- -Dtable=$(usex table) # default *
- -Dtcmalloc=OFF # $(usex tcmalloc) # default OFF
- -Dtesting=$(usex test) # default OFF
- -Dthread=$(usex threads) # default ON
- -Dtmva=$(usex tmva) # default ON
- -Dunuran=$(usex unuran) # default *
- -Dvc=$(usex vc) # default *
- -Dvdt=OFF # $(usex math) # default ON
+ -Dminuit2=$(usex minuit)
+ -Dmonalisa=OFF # not in Gentoo
+ -Dmysql=$(usex mysql)
+ -Dodbc=$(usex odbc)
+ -Dopengl=$(usex opengl)
+ -Doracle=$(usex oracle)
+ # -Dpch=$(usex pch) # needs cling
+ -Dpgsql=$(usex postgres)
+ -Dpythia6=$(usex pythia6)
+ -Dpythia8=$(usex pythia8)
+ -Dpython=$(usex python)
+ -Dqt=$(usex qt4)
+ -Dqtgsi=$(usex qt4)
+ -Dr=$(usex R) # requires Rcpp and RInside
+ -Drfio=OFF
+ -Droofit=$(usex roofit)
+ -Droot7=$(usex root7) # requires C++14
+ -Droottest=OFF # requires network
+ -Drpath=$(usex prefix)
+ -Druby=OFF # unmantained upstream
+ # -Druntime_cxxmodules=OFF # use clang C++ modules
+ -Dsapdb=OFF # option not implemented
+ -Dshadowpw=$(usex shadow)
+ -Dsqlite=$(usex sqlite)
+ -Dsrp=OFF # option not implemented
+ -Dssl=$(usex ssl)
+ -Dtable=$(usex table)
+ -Dtbb=$(usex tbb)
+ -Dtcmalloc=OFF
+ -Dtesting=$(usex test)
+ -Dthread=$(usex threads)
+ -Dtmva=$(usex tmva)
+ -Dunuran=$(usex unuran)
+ -Dvc=$(usex vc)
+ -Dvdt=OFF # not in Gentoo
+ # -Dveccore=OFF # not in Gentoo
-Dxml=$(usex xml) # default ON
-Dxrootd=$(usex xrootd) # default ON
${EXTRA_ECONF}