From f70601e0934acd62f6c5d06c5ede4cc607179514 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Jul 2018 11:42:03 +0100 Subject: gentoo resync : 07.07.2018 --- sci-physics/root/Manifest | 17 +- .../root/files/root-5.28.00b-glibc212.patch | 11 - sci-physics/root/files/root-5.32.00-cfitsio.patch | 13 - sci-physics/root/files/root-5.32.00-chklib64.patch | 24 -- sci-physics/root/files/root-5.32.00-dotfont.patch | 58 --- .../root/files/root-5.34.05-nobyte-compile.patch | 137 ------- sci-physics/root/files/root-5.34.13-unuran.patch | 40 -- sci-physics/root/files/root-5.34.26-ldflags.patch | 19 - 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/metadata.xml | 3 - sci-physics/root/root-5.34.36.ebuild | 441 --------------------- sci-physics/root/root-6.12.06-r4.ebuild | 314 +++++++++++++++ sci-physics/root/root-6.14.00-r1.ebuild | 316 +++++++++++++++ sci-physics/root/root-9999.ebuild | 325 +++++++++++++++ 15 files changed, 1021 insertions(+), 756 deletions(-) delete mode 100644 sci-physics/root/files/root-5.28.00b-glibc212.patch delete mode 100644 sci-physics/root/files/root-5.32.00-cfitsio.patch delete mode 100644 sci-physics/root/files/root-5.32.00-chklib64.patch delete mode 100644 sci-physics/root/files/root-5.32.00-dotfont.patch delete mode 100644 sci-physics/root/files/root-5.34.05-nobyte-compile.patch delete mode 100644 sci-physics/root/files/root-5.34.13-unuran.patch delete mode 100644 sci-physics/root/files/root-5.34.26-ldflags.patch create mode 100644 sci-physics/root/files/root-6.13.02-hsimple.patch create mode 100644 sci-physics/root/files/root-6.14.00-http.patch delete mode 100644 sci-physics/root/root-5.34.36.ebuild create mode 100644 sci-physics/root/root-6.12.06-r4.ebuild create mode 100644 sci-physics/root/root-6.14.00-r1.ebuild create mode 100644 sci-physics/root/root-9999.ebuild (limited to 'sci-physics/root') diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index f87b70a50d81..c10762e52892 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -1,21 +1,18 @@ AUX proofd.confd 415 BLAKE2B ca38b3d9cf27cd3c4a57f595741abf40691a300585d35a6c1bfbad936476ec4cc633edbb4b1c3e6ea37b4bc2f8744c977d02142078faed83e89ae645e6ee9624 SHA512 5aa6e6313cf159d2b407286a15f7f959d966a7e9b74bd2a74f13bd3fe01c04d99b46b5fb55f4a7434ebe911cd8b6469657d96591d624a7bfc7d39d49ab62b900 AUX proofd.initd 606 BLAKE2B 60c7ec90b68b8b1add38c81f7730859a8bc9528ac60ed41713309c3a4931af193cc9f90ab1265f8f174e5a73fbcbfc3855cc3fdb253ce2d09a75f4032efbb8c8 SHA512 de72ea4ea106ab6ec4cc892c2eaf1b17f85db3de9dbfe85d34678678268c943868e4698a1a046e51b5694f03109cb06484b90aea83cf2728229a065f35c3d165 -AUX root-5.28.00b-glibc212.patch 276 BLAKE2B 04ae90704b3d9186f85ef95e5a97d0864ea8f298ba81d7c854e3cc9c42791a2d5ac0f8b9a4110a1704f2880a5676949b7814f2148d237374b9af03faccfce22c SHA512 26138c8d14f319248d2b33395a57767c8d9bbf552244c2c55a7d6c0a1526de4c84313e020dc6c7483866cb3a927ba047d60f9b4dc8bd8291dd451a847b7e7379 -AUX root-5.32.00-cfitsio.patch 592 BLAKE2B c9f5c1efc61cec663fe1627fbaa4d312686b52e6dbddbf367219aac8ebbdff81a211895383b90bccec671a67366ca0aed2261f327cbf3e0a16e7ff022e9211e1 SHA512 d7a1b893968899fe54ad101d4622899e0be488446687692a4cbd3f4d008a03681a9f0c9f21318a47c572d3687196026abe7886ebc755f46194f4708702eb47c8 -AUX root-5.32.00-chklib64.patch 885 BLAKE2B 4ae23e3fae0fc82e01ecbdace05615ee9e18dad21dc14ce414a0a6431d75dbc01664ea25ffc32dc2c94fb912f39b581e00ca6ab06503dca78fc2d238d022d5f9 SHA512 82f6a895879ef808fb9d2bfbc04099b48bcdd52d0af1899f8925d8a9d69b39a5177e369a002f8d9f25a203053f3507a5b048c8cf96e73fbdabb534477bae5f93 -AUX root-5.32.00-dotfont.patch 2563 BLAKE2B 77ac953642b1093b5cc868746a6f76f13252665da0b52ad6e46065416fc579aa06b1ef1c00480a7885e2e2811e70bf65485cc11104e1db9bf63ae46c7bc09fff SHA512 332ffe0ac6d1249ef1643b6a1df77ef23c1af1c4547f248295c1ae9c284384446a84a374b2b117b1157e770ac65a404be1c4cc17a497c43e2c34bcbf51619441 -AUX root-5.34.05-nobyte-compile.patch 5504 BLAKE2B 052cc5ebd1fae7d439244ccf9f343a2161d383b9d68dce5548654f23751cc97ad20cd5be56c2049522641036a8c60a0a5cf49a528437b9a52a71d27e8a8cb774 SHA512 ef1405b2cd67393402ac365d66f7eb2846a62ff8a492649cbaf3bc004f5c98592c9b926458055912217ca7f755bcfa5d3b741f61e6648dfaf05fa2b62f62b27d -AUX root-5.34.13-unuran.patch 1555 BLAKE2B b476c0f00dd0bfc1f6a6fc63957794cc932fc1e747b5900a0e4b5e2142b3a71b0fe3076591134b46df724b8f9ff5820064bc9cf1e1af4be2a77fb0414f28722c SHA512 571d6bd56d2419e4b96f7ca95d14d291768cc98024f871ca35bfae1a7d1e010a7c101f927c66ece4c006ca89401aeaea89945b8502f1ae2b2068f535d0bc95f3 -AUX root-5.34.26-ldflags.patch 626 BLAKE2B 3c3b8bf4d173afd6024843c0e125d8b64868f367de96775e23ae21ee6adc7fb294700372eb4a3743178728ef947fbaa18e1f3c18ca5731931ed0c1a7b1ab580c SHA512 fa38441a472b8b811c293aecbf1e233ea619cb4a2c9bfb8dda1706c0ac34bf5c3dcf23a43a517a72aab5faa63e733eee74515cbf70b6f15e3cfba46e3e5c4ccc 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 root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a03ba26c3969069b291a6a22188879dbedbf0c3c496149f79f671d0eb51d81d0ee36565660d136b4741f5d018c2b05325ff08381f0 SHA512 c96dee9843da1051c54bd6870ef0a04714944ffe1f86800c9a51b8eb8ef84107d3315d3a708dcc0b651248af4bec362c7f31695514505045aeda9c793d40dc58 +AUX root-6.13.02-hsimple.patch 1694 BLAKE2B 877304f0c51c34645d1c6fb1814e9914539351775c3de6dc621080e469047cd634a95095c083a633ee2c793f79bcb90e0966e607a9f620cb34d807dea9be4c14 SHA512 6533ed9f7402da534d76a39e9536c97245430148ffea0634937e16e483919532f8810049a1358d3268ba9f7a7ee71ddc7d96772b390db582a6342508dd4e3e1d +AUX root-6.14.00-http.patch 1130 BLAKE2B b2967a7e2a56d3989ebbcc84d82aa0395708ff8988bb866fb1e2e277383f82ef037fc7df1c84bda1cb2c25eb02f8f15fb0e130d378202718b20d3bb1e634b512 SHA512 e7e78f3fb54f5bd7dedc8371d3120ba178cad16880a77239ae1504f0e502f1464f36fa4c2668a99891d8ff63b14cb18318e361b61a9948ce3d0950a123f0976b 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 +DIST root_v6.14.00.source.tar.gz 162436586 BLAKE2B 6047fe9fb898be9d4f00f2e6eb378d213996b49b9677f61ccc0250bb6d0801d8410850a39e0983534da2c6a307bd64b0ed6c03ab873a6c8b844500a96444a455 SHA512 2d4e754e3054018a53af28408b218bc52c0c60bea69a3c9e48f0d3feadbfebb559087fb453505b281fe01043f723e4b766cda8fca1e68dbf9e202c67d417e5b3 EBUILD root-6.12.06-r1.ebuild 9188 BLAKE2B 3a23869ac2344c4949eb1cdaec9fd4763ad84641defbe928b2c940f2a3db4bf7f00d16f60abf2284b647f169fdb234ee9155215346f878fcc12a2bf073f1e8ad SHA512 ed545ac2493b7ebddaf71d438d71b2b6f58cb562ec3017311d185084a7e0838aa8c253a320392cab1a3ca7b46655f95a786c55fd3b3ab18c06dfcc7edc02f543 -MISC metadata.xml 3238 BLAKE2B 0396ebafbf0bd14c88f7ba401f12f698ccca313c0c04cab46f9fa198681b0f305f21413bab8a86c97bb65e0bbe00eb6b6f488600402784109dc13ed196d6589b SHA512 2ba887003b3dc6dc3d4de379ec9dde8a7ba8144c2bbd7be50ebcfc7b3bfb3154733edd39007fcd8c380034d028a0d3f352e4cb973d8facd9412f38f820c16b1e +EBUILD root-6.12.06-r4.ebuild 7914 BLAKE2B fbe59c55e9ff7f257c5f9861eeabb5b76d2c1fd1236057879c108da63bf65fe1aeb0f3eff846e6f57175cce019a1aee786420d7fc7549bd8cf1d0dc8c043ba81 SHA512 5c094fd843a68ac5591a4fbf45ae4ef6073d10ed4f3b10613fab39e5017ed3c28c99bfc5a3841151a6aae228e2477a820ec5edba4b7225d361f00d960cc81aad +EBUILD root-6.14.00-r1.ebuild 7942 BLAKE2B 0f3ea03b7f8236adadda68c6a54b7b41277c1af4a98f04215c2c120b8d3cc2a5618f03bd30f1d224804329ed254d05d58ea7064a561e89e21a5ce3c46f67a19a SHA512 d35525b285b6ef8700b60f2d36012398fa2f3c7cca4cf42802de2c0876ca5681ab01c616a1cf1f94aa74929357706bf961bafbb3f9662be703a713ce954bf51c +EBUILD root-9999.ebuild 8103 BLAKE2B c23d1d152ce67fbdc52b1eb9163b40b827471198eb6456f96ce38c36e463a4138e0db377c4a316e5c028cf3971cf73fa849b71c12542809efdc3d37b769f5444 SHA512 f0acc7909028c63f49ff0507199e89acdfe207d3c121ee110aa7ccd1beee0fe618b3741763f893da4621c8cb82e733534a363ae1bcdcceb421908241c66884bd +MISC metadata.xml 3019 BLAKE2B 2d09d1b38ea45967ac74fd23265070df4393b66757dd3fee20541115b564dbbd017152b7f28d3e73ce19e44eeacd7be491c6b6d1d920216942586c5169a6695f SHA512 a51afe372f4aa84e622ff58bf89cee5665c0daf900c7ed7647a25167c58bbe3c45ebb0df342c30dea446b4c171d787b445136dec8eeaa32a2a5e0aecc04d737f diff --git a/sci-physics/root/files/root-5.28.00b-glibc212.patch b/sci-physics/root/files/root-5.28.00b-glibc212.patch deleted file mode 100644 index a365431396f5..000000000000 --- a/sci-physics/root/files/root-5.28.00b-glibc212.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- root.orig/net/auth/src/TAFS.cxx 2010-09-14 03:22:22.647915854 +0400 -+++ root/net/auth/src/TAFS.cxx 2010-09-14 03:22:39.034599899 +0400 -@@ -11,6 +11,7 @@ - - #ifndef WIN32 - # include -+# include - #else - # define ssize_t int - # include - diff --git a/sci-physics/root/files/root-5.32.00-cfitsio.patch b/sci-physics/root/files/root-5.32.00-cfitsio.patch deleted file mode 100644 index 156667f8fee4..000000000000 --- a/sci-physics/root/files/root-5.32.00-cfitsio.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/configure 2012-01-19 23:44:44.127607638 +0100 -+++ b/configure 2012-01-20 00:19:20.420652913 +0100 -@@ -3435,9 +3435,7 @@ - cfitsioinc=$found_hdr - cfitsioincdir=$found_dir - -- # At this time, libcfitsio.a should always be prefered over .so, -- # to avoid forcing users to install cfitsio. -- check_library "libcfitsio cfitsio" "no" "$cfitsiolibdir" \ -+ check_library "libcfitsio cfitsio" "yes" "$cfitsiolibdir" \ - $CFITSIO ${CFITSIO:+$CFITSIO/lib} ${CFITSIO:+$CFITSIO/.libs} \ - ${finkdir:+$finkdir/lib} \ - /usr/local/lib /usr/lib /opt/cfitsio/lib diff --git a/sci-physics/root/files/root-5.32.00-chklib64.patch b/sci-physics/root/files/root-5.32.00-chklib64.patch deleted file mode 100644 index 23f20d54f0cc..000000000000 --- a/sci-physics/root/files/root-5.32.00-chklib64.patch +++ /dev/null @@ -1,24 +0,0 @@ -bug fix for #406817 ---- a/configure 2012-02-29 19:46:41.000000000 +0400 -+++ b/configure 2012-03-22 03:28:43.458968696 +0400 -@@ -441,14 +441,13 @@ - fi - else - if file $filearg $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then -- check_link $chklib64 -- ret=$link_result -- else -- logmsg " file $filearg $chklib64 | grep '64-bit'" -- if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then -- ret=1 -- fi -+ # get real binary .so name from .so ld script -+ chklib64=$(gawk '($1 == "GROUP") { print $3 }' $chklib64) - fi -+ logmsg " file $filearg $chklib64 | grep '64-bit'" -+ if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then -+ ret=1 -+ fi - fi - logmsg " result: $ret" - if test $ret -eq 1 ; then diff --git a/sci-physics/root/files/root-5.32.00-dotfont.patch b/sci-physics/root/files/root-5.32.00-dotfont.patch deleted file mode 100644 index 85d6dea7655e..000000000000 --- a/sci-physics/root/files/root-5.32.00-dotfont.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- root/html/src/TClassDocOutput.cxx.orig 2012-05-25 16:18:10.000000000 +0400 -+++ root/html/src/TClassDocOutput.cxx 2012-05-29 21:36:53.813593012 +0400 -@@ -625,7 +625,7 @@ - << "size=\"8,10\";" << endl - << "ratio=auto;" << endl - << "margin=0;" << endl -- << "node [shape=plaintext,fontsize=40,width=4,height=0.75];" << endl -+ << "node [shape=plaintext,fontsize=40,width=4,height=0.75,fontname=\"DejaVu Serif\"];" << endl - << "\"" << fCurrentClass->GetName() << "\" [shape=ellipse];" << endl; - - std::stringstream ssDep; -@@ -704,7 +704,7 @@ - outdot << ";" << endl; - } else if (writeAndMoreFor) { - outdot << " \"...andmore" << writeAndMoreFor->GetName() -- << "\" [label=\"...and more\",fontname=\"Times-Italic\",fillcolor=lightgrey,style=filled];" << endl; -+ << "\" [label=\"...and more\",fontname=\"DejaVu Serif Italic\",fillcolor=lightgrey,style=filled];" << endl; - } - } - if (!levelExists) break; -@@ -733,7 +733,7 @@ - << "ranksep=0.1;" << endl - << "nodesep=0;" << endl - << "margin=0;" << endl; -- outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];" << endl; -+ outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10,fontname=\"DejaVu Serif\"];" << endl; - - std::stringstream ssDep; - const int numColumns = 3; -@@ -939,7 +939,7 @@ - << "ranksep=0;" << endl - << "nodesep=0;" << endl - << "size=\"8,10\";" << endl -- << "node [fontsize=20,shape=plaintext];" << endl; -+ << "node [fontsize=20,shape=plaintext,fontname=\"DejaVu Serif\"];" << endl; - - for (std::list::iterator iFile = listFilesToParse.begin(); - iFile != listFilesToParse.end(); ++iFile) { -@@ -999,7 +999,8 @@ - << "ranksep=0.7;" << endl - << "nodesep=0.3;" << endl - << "size=\"8,8\";" << endl -- << "ratio=compress;" << endl; -+ << "ratio=compress;" << endl -+ << "node [fontname=\"DejaVu Serif\"];" << endl; - - TString libs(fCurrentClass->GetSharedLibs()); - outdot << "\"All Libraries\" [URL=\"LibraryDependencies.html\",shape=box,rank=max,fillcolor=lightgray,style=filled];" << endl; -@@ -1109,7 +1110,8 @@ - - dotout << "digraph G {" << endl - << "ratio=auto;" << endl -- << "rankdir=RL;" << endl; -+ << "rankdir=RL;" << endl -+ << "node [fontname=\"DejaVu Serif\"];" << endl; - - // loop on all classes - TClassDocInfo* cdi = 0; diff --git a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch b/sci-physics/root/files/root-5.34.05-nobyte-compile.patch deleted file mode 100644 index ec67a15887f6..000000000000 --- a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -Naur root.as-needed/Makefile root/Makefile ---- a/Makefile.orig 2013-02-15 02:27:56.000000000 +0400 -+++ b/Makefile 2013-02-23 02:22:14.556465852 +0400 -@@ -1258,10 +1258,7 @@ - for lib in $(RFLX_GRFLXPY); do \ - rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \ - done; \ -- for lib in $(RFLX_GRFLXPYC); do \ -- rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \ -- done; \ -- if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \ -+ if test "x$(RFLX_GRFLXPY)" != "x"; then \ - dir=$(subst lib/,,$(RFLX_GRFLXDD)); \ - while test "x$${dir}" != "x" && \ - test -d $(DESTDIR)$(LIBDIR)/$${dir} && \ -diff -Naur root.as-needed/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk ---- root.as-needed/bindings/pyroot/Module.mk 2011-07-10 10:42:48.991561304 +0400 -+++ root/bindings/pyroot/Module.mk 2011-07-10 10:43:21.493339703 +0400 -@@ -48,8 +48,6 @@ - ROOTPY := $(subst $(MODDIR),$(LPATH),$(ROOTPYS)) - $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@ - endif --ROOTPYC := $(ROOTPY:.py=.pyc) --ROOTPYO := $(ROOTPY:.py=.pyo) - - # used in the main Makefile - ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH)) -@@ -68,10 +66,8 @@ - include/%.h: $(PYROOTDIRI)/%.h - cp $< $@ - --%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' --%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' - --$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \ -+$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) \ - $(ROOTLIBSDEP) $(PYTHONLIBDEP) - @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ - "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \ -@@ -113,7 +109,7 @@ - - distclean-$(MODNAME): clean-$(MODNAME) - @rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \ -- $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \ -+ $(ROOTPY) $(PYROOTMAP) \ - $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64) - - distclean:: distclean-$(MODNAME) -diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules ---- root.as-needed/build/package/debian/rules 2011-07-10 10:42:49.241549346 +0400 -+++ root/build/package/debian/rules 2011-07-10 10:48:06.989670589 +0400 -@@ -691,10 +691,6 @@ - -X$(SYSCONFDIR)/root/system.rootauthrc \ - -X$(SYSCONFDIR)/root/system.rootdaemonrc \ - -X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a \ -- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc \ -- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo \ -- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc \ -- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo \ - -X$(PREFIX)/lib/root/$(SOVERS)/cint7 \ - -X$(PREFIX)/include/root/Minuit2 - # $(foreach i, \ -diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk ---- root.as-needed/cint/cintex/Module.mk 2011-07-10 10:42:49.104889217 +0400 -+++ root/cint/cintex/Module.mk 2011-07-10 10:43:21.496672876 +0400 -@@ -31,10 +31,6 @@ - CINTEXPY := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS)) - $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@ - endif --ifneq ($(BUILDPYTHON),no) --CINTEXPYC := $(CINTEXPY:.py=.pyc) --CINTEXPYO := $(CINTEXPY:.py=.pyo) --endif - - # used in the main Makefile - ALLHDRS += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH)) -@@ -86,8 +82,6 @@ - fi) - cp $< $@ - --%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' --%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' - - $(CINTEXLIB): $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \ - $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP) -diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk ---- root.as-needed/cint/reflex/Module.mk 2011-07-10 10:42:49.074890651 +0400 -+++ root/cint/reflex/Module.mk 2011-07-10 10:43:21.496672876 +0400 -@@ -48,9 +48,6 @@ - RFLX_GRFLXS := $(wildcard $(RFLX_GRFLXSD)/*.py) - RFLX_GRFLXPY := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS)) - RFLX_GRFLXPY += $(RFLX_GCCXMLPATHPY) --ifneq ($(BUILDPYTHON),no) --RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY)) --endif - - RFLX_LIBDIR = $(LIBDIR) - -@@ -92,7 +89,7 @@ - - ALLEXECS += $(RFLX_GENMAPX) - --POSTBIN += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) -+POSTBIN += $(RFLX_GRFLXPY) - - ##### local rules ##### - .PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \ -@@ -122,8 +119,6 @@ - mkdir -p lib/python/genreflex; fi ) - cp $< $@ - --$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py -- @python -c 'import py_compile; py_compile.compile( "$<" )' - - $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap - -@@ -149,7 +144,7 @@ - $(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \ - -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL) - --all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) -+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY) - - clean-genreflex: - @rm -rf lib/python/genreflex -diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt ---- root.as-needed/cint/reflex/python/CMakeLists.txt 2011-07-10 10:42:49.074890651 +0400 -+++ root/cint/reflex/python/CMakeLists.txt 2011-07-10 10:43:21.496672876 +0400 -@@ -15,7 +15,7 @@ - ##################### sources #################### - - FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py) --SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE) -+SET(GENREFLEX_SCRIPT PARENT_SCOPE) - - ##################### gccxmlpath #################### - diff --git a/sci-physics/root/files/root-5.34.13-unuran.patch b/sci-physics/root/files/root-5.34.13-unuran.patch deleted file mode 100644 index 8262313184b5..000000000000 --- a/sci-physics/root/files/root-5.34.13-unuran.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/math/unuran/Module.mk b/math/unuran/Module.mk -index 00a530b..7cd22dc 100644 ---- a/math/unuran/Module.mk -+++ b/math/unuran/Module.mk -@@ -31,7 +31,7 @@ UNRS := $(wildcard $(UNRDIRS)/src/utils/*.c) \ - $(wildcard $(UNRDIRS)/src/uniform/*.c) \ - $(wildcard $(UNRDIRS)/src/urng/*.c) - else --UNRTARCONTENT:=$(subst $(UNRVERS),$(UNRDIRS),$(shell mkdir -p $(UNRDIR); cd $(UNRDIR); gunzip -c $(UNRSRCS) | tar tf -)) -+UNRTARCONTENT:= - UNRS := $(filter %.c, \ - $(filter $(UNRDIRS)/src/utils/%,$(UNRTARCONTENT)) \ - $(filter $(UNRDIRS)/src/methods/%,$(UNRTARCONTENT)) \ -@@ -81,10 +81,9 @@ INCLUDEFILES += $(UNURANDEP) - ##### local rules ##### - .PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) - --include/%.h: $(UNURANDIRI)/%.h $(UNURANETAG) -+include/%.h: $(UNURANDIRI)/%.h - cp $< $@ - --$(UNURANDEP): $(UNRCFG) - $(UNRS): $(UNURANETAG) - - $(UNURANETAG): $(UNRSRCS) -@@ -137,12 +136,12 @@ $(UNRCFG): $(UNURANETAG) - GNUMAKE=$(MAKE) ./configure CC="$$ACC" \ - CFLAGS="$$ACFLAGS"); - --$(UNURANLIB): $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \ -+$(UNURANLIB): $(UNURANO) $(UNURANDO) $(ORDER_) \ - $(MAINLIBS) $(UNURANLIBDEP) - @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ - "$(SOFLAGS)" libUnuran.$(SOEXT) $@ \ - "$(UNURANO) $(UNURANDO)" \ -- "$(UNURANLIBEXTRA) $(UNRO)" -+ "$(UNURANLIBEXTRA) -lunuran" - - $(UNURANDS): $(UNRINIT) $(UNURANDH1) $(UNURANL) $(ROOTCINTTMPDEP) - $(MAKEDIR) diff --git a/sci-physics/root/files/root-5.34.26-ldflags.patch b/sci-physics/root/files/root-5.34.26-ldflags.patch deleted file mode 100644 index b81dbb5edb00..000000000000 --- a/sci-physics/root/files/root-5.34.26-ldflags.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 3c8bc686abf57e7e2037c4c191cb63a1a5172b5b -Author: Andrew Savchenko -Date: Sun Feb 22 03:45:21 2015 +0300 - - root-5.32.00-prop-flags.patch -> root-5.34.26-prop-flags.patch - -diff --git a/config/Makefile.in b/config/Makefile.in -index 89674e7..91d25b9 100644 ---- a/config/Makefile.in -+++ b/config/Makefile.in -@@ -29,7 +29,7 @@ EXTRA_CFLAGS := -Iinclude @cflags@ - USERCONF_CFLAGS:= @usercflags@ - EXTRA_CXXFLAGS := -Iinclude @cflags@ - USERCONF_CXXFLAGS:= @usercxxflags@ --EXTRA_LDFLAGS := @ldflags@ -+EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS) - WERROR := @werror@ - WINRTDEBUG := @winrtdebug@ - 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 000000000000..cab8a40afa7a --- /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 000000000000..04ec4bea567b --- /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/metadata.xml b/sci-physics/root/metadata.xml index b57d99b68fc0..da893cfc0e6c 100644 --- a/sci-physics/root/metadata.xml +++ b/sci-physics/root/metadata.xml @@ -20,8 +20,6 @@ graphics, GUI toolkit, and a complete visualization framework. - Build ROOT using the C++11 standard - Build ROOT using the C++14 standard Enable support for media-libs/libafterimage Enable support for DAVIX Data Management Client (https://cern.ch/davix) Enable support for images and data from FITS files with sci-libs/cfitsio @@ -36,7 +34,6 @@ Build the interface for sci-physics/pythia version 6.x Build the interface for sci-physics/pythia version 8.x Enable support for dev-lang/R - Build the reflection database for the C++ interpreter Build RooFit function fitting package Build experimental features to be released with ROOT 7 Enable shadow authentication in rootd and proofd diff --git a/sci-physics/root/root-5.34.36.ebuild b/sci-physics/root/root-5.34.36.ebuild deleted file mode 100644 index 3651637f2f53..000000000000 --- a/sci-physics/root/root-5.34.36.ebuild +++ /dev/null @@ -1,441 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="http://root.cern.ch/git/root.git" -else - SRC_URI="https://root.cern.ch/download/${PN}_v${PV}.source.tar.gz" - KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -fi - -PYTHON_COMPAT=( python2_7 ) - -inherit elisp-common eutils fortran-2 multilib prefix python-single-r1 \ - toolchain-funcs user versionator xdg-utils - -DESCRIPTION="C++ data analysis framework and interpreter from CERN" -HOMEPAGE="https://root.cern.ch" - -SLOT="0/$(get_version_component_range 1-3 ${PV})" -LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" -IUSE="+X afs c++11 c++14 doc emacs examples fits fftw gdml - graphviz http kerberos ldap +math +memstat mpi mysql odbc - +opengl openmp oracle postgres prefix pythia6 pythia8 - python qt4 +reflex ruby shadow sqlite ssl table +tiff xinetd - xml xrootd zeroconf" - -# TODO: add support for: davix -# TODO: unbundle: vdt - -REQUIRED_USE=" - !X? ( !opengl !qt4 !tiff ) - mpi? ( math !openmp ) - openmp? ( math !mpi ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -CDEPEND=" - app-arch/xz-utils:0= - >=dev-lang/cfortran-4.4-r2 - dev-libs/libpcre:3= - media-fonts/dejavu - media-libs/freetype:2= - media-libs/libpng:0= - sys-libs/zlib:0= - X? ( - media-libs/ftgl:0= - media-libs/glew:0= - x11-libs/libX11:0= - x11-libs/libXext:0= - x11-libs/libXpm:0= - || ( - media-libs/libafterimage[gif,jpeg,png,tiff?] - >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?] - ) - opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= ) - 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:0= - ) - afs? ( net-fs/openafs ) - emacs? ( virtual/emacs ) - fits? ( sci-libs/cfitsio:0= ) - fftw? ( sci-libs/fftw:3.0= ) - graphviz? ( media-gfx/graphviz:0= ) - http? ( dev-libs/fcgi:0= ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap:0= ) - math? ( - sci-libs/gsl:0= - sci-mathematics/unuran:0= - mpi? ( virtual/mpi ) - ) - mysql? ( virtual/mysql ) - odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) - oracle? ( dev-db/oracle-instantclient-basic:0= ) - postgres? ( dev-db/postgresql:= ) - pythia6? ( sci-physics/pythia:6= ) - pythia8? ( >=sci-physics/pythia-8.1.80:8= =net-libs/xrootd-3.3.5:0= ) - zeroconf? ( net-dns/avahi:0= ) -" - -DEPEND="${CDEPEND} - virtual/pkgconfig" - -RDEPEND="${CDEPEND} - reflex? ( dev-cpp/gccxml ) - xinetd? ( sys-apps/xinetd )" - -PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )" - -S="${WORKDIR}/${PN}" - -# install stuff in ${P} and not ${PF} for easier tracking in root-docs -DOC_DIR="/usr/share/doc/${P}" - -die_compiler() { - eerror "You are using a $(tc-getCXX)-$5 without C++$1 capabilities" - die "Need one of the following C++$1 capable compilers:\n"\ - " >=sys-devel/gcc[cxx]-$2\n"\ - " >=sys-devel/clang-$3\n"\ - " >=dev-lang/icc-$4" -} - -# check compiler to satisfy minimal versions -# $1 - std version -# $2 - g++ -# $3 - clang++ -# $4 - icc/icpc -check_compiler() { - local cur ver - case "$(tc-getCXX)" in - *clang++*) - ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')" - cur="$3" - ;; - *g++*) - ver="$(gcc-version)" - cur="$2" - ;; - *icc*|*icpc*) - ver="$(best_version dev-lang/icc | sed 's:dev-lang/icc-::')" - cur="$4" - ;; - *) - ewarn "You are using an unsupported compiler." - ewarn "Please report any issues upstream." - return 0 - ;; - esac - version_is_at_least "${cur}" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}" -} - -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 - - if use math; then - if use openmp; then - if [[ "$(tc-getCXX)" == *g++* && "$(tc-getCXX)" != *clang++* ]] && ! 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 - - use c++11 && check_compiler "11" "4.8" "3.3" "13" - use c++14 && check_compiler "14" "4.9" "3.4" "15" -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \ - "${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \ - "${FILESDIR}"/${PN}-5.32.00-chklib64.patch \ - "${FILESDIR}"/${PN}-5.32.00-dotfont.patch \ - "${FILESDIR}"/${PN}-5.34.05-nobyte-compile.patch \ - "${FILESDIR}"/${PN}-5.34.13-unuran.patch \ - "${FILESDIR}"/${PN}-5.34.26-ldflags.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 || 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 - # 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:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \ - -e 's:libpq-fe.h:pg_config.h:' \ - configure || die "adjusting configure for Gentoo failed" - - hprefixify configure - hprefixify -e "s,I/usr/include,I${EPREFIX}/usr/include," config/Makefile.in - - # CSS should use local images - sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed" - - # fix reflex path (bug #497280) - sed -i -e 's|${ROOTSYS}/lib|@libdir@|' config/genreflex.in || die - - # QTDIR only used for qt3 in gentoo, and configure looks for it. - unset QTDIR -} - -src_configure() { - local -a myconf - # Some compilers need special care - case "$(tc-getCXX)" in - *clang++*) - myconf=( - --with-clang - --with-f77="$(tc-getFC)" - ) - ;; - *icc*|*icpc*) - # For icc we need to provide architecture manually - # and not to tamper with tc-get* - use x86 && myconf=( linuxicc ) - use amd64 && myconf=( linuxx8664icc ) - ;; - *) # gcc goes here too - myconf=( - --with-cc="$(tc-getCC)" - --with-cxx="$(tc-getCXX)" - --with-f77="$(tc-getFC)" - --with-ld="$(tc-getCXX)" - ) - ;; - esac - - # the configure script is not the standard autotools - myconf+=( - --prefix="${EPREFIX}/usr" - --etcdir="${EPREFIX}/etc/root" - --libdir="${EPREFIX}/usr/$(get_libdir)/${PN}" - --docdir="${EPREFIX}${DOC_DIR}" - --tutdir="${EPREFIX}${DOC_DIR}/examples/tutorials" - --testdir="${EPREFIX}${DOC_DIR}/examples/tests" - --cflags='${CFLAGS}' - --cxxflags='${CXXFLAGS}' - --disable-builtin-afterimage - --disable-builtin-ftgl - --disable-builtin-freetype - --disable-builtin-glew - --disable-builtin-lzma - --disable-builtin-pcre - --disable-builtin-zlib - --disable-cling - --disable-werror - --enable-explicitlink - --enable-shared - --enable-soversion - --fail-on-missing - --nohowto - --with-afs-shared=yes - --with-sys-iconpath="${EPREFIX}/usr/share/pixmaps" - $(use_enable X x11) - $(use_enable X asimage) - $(use_enable X xft) - $(use_enable afs) - $(use_enable c++11 cxx11) - $(use_enable c++14 cxx14) - $(use_enable fits fitsio) - $(use_enable fftw fftw3) - $(use_enable gdml) - $(use_enable graphviz gviz) - $(use_enable http) - $(use_enable kerberos krb5) - $(use_enable ldap) - $(use_enable math genvector) - $(use_enable math gsl-shared) - $(use_enable math mathmore) - $(use_enable math minuit2) - $(use_enable math roofit) - $(use_enable math tmva) - $(use_enable math vc) - $(use_enable math vdt) - $(use_enable math unuran) - $(use_enable memstat) - $(use_enable mysql) - $(usex mysql "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "") - $(use_enable odbc) - $(use_enable opengl) - $(use_enable oracle) - $(use_enable postgres pgsql) - $(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 shadow shadowpw) - $(use_enable sqlite) - $(use_enable ssl) - $(use_enable table) - $(use_enable tiff astiff) - $(use_enable xml) - $(use_enable xrootd) - $(use_enable zeroconf bonjour) - ${EXTRA_ECONF} - ) - - # usex can't be used here, because pg_config may be not - # installed with USE="-postgres" - use postgres && myconf+=( --with-pgsql-incdir=$(pg_config --includedir) ) - - ./configure ${myconf[@]} || die "configure failed" -} - -src_compile() { - # The build system does not handle the dependency of bin/rmkdepend correctly, - # preventing it to be called in parallel. Build bin/rmkdepend explicitly - # first to circumvent the problem. - emake bin/rmkdepend - emake \ - OPT="${CXXFLAGS}" \ - F77OPT="${FFLAGS}" \ - ROOTSYS="${S}" \ - LD_LIBRARY_PATH="${S}/lib" - use emacs && elisp-compile build/misc/*.el -} - -daemon_install() { - 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} - - local i - for i in ${daemons}; do - newinitd "${FILESDIR}"/${i}.initd ${i} - newconfd "${FILESDIR}"/${i}.confd ${i} - done - if use xinetd; then - insinto /etc/xinetd - doins "${S}"/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 -} - -cleanup_install() { - # Cleanup of files either already distributed or unused on Gentoo - pushd "${ED}" > /dev/null - rm usr/share/root/fonts/LICENSE || die - rm etc/root/proof/*.sample || die - rm -r etc/root/daemons || die - # these should be in PATH - mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die - rm ${DOC_DIR#/}/{INSTALL,LICENSE,COPYING.CINT} || die - use examples || rm -r ${DOC_DIR#/}/examples || die - cd usr/$(get_libdir)/root/cint/cint - rm lib/posix/mktypes lib/dll_stl/setup lib/G__* || die - rm lib/dll_stl/G__* lib/dll_stl/rootcint_* lib/posix/exten.o || die - rm include/makehpib || die - popd > /dev/null -} - -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" - use reflex && python_optimize "${D}/usr/$(get_libdir)/root/python/genreflex/" - fi - use ruby && \ - echo "RUBYLIB=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root - use emacs && elisp-install ${PN} build/misc/*.{el,elc} - if use examples; then - # these should really be taken care of by the root make install - insinto ${DOC_DIR}/examples/tutorials/tmva - doins -r tmva/test - fi - doenvd 99root - - # The build system installs Emacs support unconditionally in the wrong - # directory. Remove it and call elisp-install in case of USE=emacs. - rm -r "${ED}"/usr/share/emacs || die - - daemon_install - desktop_install - cleanup_install - - # do not copress files used by ROOT's CLI (.credit, .demo, .license) - docompress -x "${DOC_DIR}"/{CREDITS,examples/tutorials} - # needed for .license command to work - dosym "${ED}"usr/portage/licenses/LGPL-2.1 "${DOC_DIR}/LICENSE" -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/sci-physics/root/root-6.12.06-r4.ebuild b/sci-physics/root/root-6.12.06-r4.ebuild new file mode 100644 index 000000000000..151a9f60739f --- /dev/null +++ b/sci-physics/root/root-6.12.06-r4.ebuild @@ -0,0 +1,314 @@ +# 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 ) + 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.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 +) + +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}" + -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=$(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 || die +} diff --git a/sci-physics/root/root-6.14.00-r1.ebuild b/sci-physics/root/root-6.14.00-r1.ebuild new file mode 100644 index 000000000000..124bdd2658fb --- /dev/null +++ b/sci-physics/root/root-6.14.00-r1.ebuild @@ -0,0 +1,316 @@ +# 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 ) + 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.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 || die +} diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild new file mode 100644 index 000000000000..9231a3e5261a --- /dev/null +++ b/sci-physics/root/root-9999.ebuild @@ -0,0 +1,325 @@ +# 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 + +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 + +DESCRIPTION="C++ data analysis framework and interpreter from CERN" +HOMEPAGE="https://root.cern" + +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" + +LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" + +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-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= + ) + 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 ) + 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.04-no-ocaml.patch + "${FILESDIR}"/${PN}-6.13.02-hsimple.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}" + -DLLVM_CONFIG="${EPREFIX%/}/usr/lib/llvm/5/bin/llvm-config" + -DCLING_BUILD_PLUGINS=OFF + -Dexplicitlink=ON + -Dexceptions=ON + -Dfail-on-missing=ON + -Dshared=ON + -Dsoversion=ON + -Dbuiltin_llvm=OFF + -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${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 bin/clang* config emacs etc/vmc || die +} -- cgit v1.2.3