diff options
| -rw-r--r-- | sci-physics/root/ChangeLog | 4 | ||||
| -rw-r--r-- | sci-physics/root/Manifest | 32 | ||||
| -rw-r--r-- | sci-physics/root/root-5.32.03-r2.ebuild | 16 | ||||
| -rw-r--r-- | sci-physics/root/root-9999.ebuild | 16 |
4 files changed, 42 insertions, 26 deletions
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index b6321017b..45c3f58b2 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $ + 30 May 2012; Andrew Savchenko <bircoph@gmail.com> root-5.32.03-r2.ebuild, + root-9999.ebuild: + Use virtualx eclass for Xvfb during htmldoc generation. + *root-5.32.03-r2 (29 May 2012) 29 May 2012; Andrew Savchenko <bircoph@gmail.com> diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index ac1137a3e..18d96c333 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -1,7 +1,31 @@ -DIST ROOTUsersGuide.pdf 9124817 SHA256 51c5ce0c7f32b83700b441a1c069e555bbb7949518858fc6189722501994f5c1 SHA512 4a4888225e0a5f97ff05079401b9e000fc71cde2916067d7ed16d2919024896149dcea9e05b46cb1bc8acf96bff445b2dcc92fb6985aee7809c1046fc84c2933 WHIRLPOOL b7cf4577fe4873ab2aeb479c1e06ac5ea524099a675e0c9a16523e1bb42a5b52bd594b37cae921f38e5ab318622d509daf2b6e604f0c992fa52cfad1f5051135 -DIST RooFit_Users_Manual_2.91-33.pdf 1330062 SHA256 101c4e4c41962238fcabf1caa86cafc51241a1800594491b2e62ef8b565a5646 SHA512 732d7dea3541b51e5f0b9b5b70dae57e1bdbb2504c4222d5e5095ec0f9b67307011c1f31c2c95be419b53dd8426f52f62f6c9370084208176a2ed3d7f25d783b WHIRLPOOL 033897bef4bdb13246a81ea6749f7895e6c4d639752e932130234ad9153bb399a4e5d416237850da27f139d3cccc53d9adb7a077abf20d257ce057157d6c3696 -DIST TMVAUsersGuide-v4.03.pdf 3913533 SHA256 0cdbb4a2d19eb7a86e2911cfa73a905932e862d6c94be10b7662a9355b0241af SHA512 d8bb2ce35ef32c4877059898f56513db0b1057924e21935a3d3a6f114748e167984c43fd2ec7e54197fccff875540543968fea9a8e75bf63f5f13521724a7ddb WHIRLPOOL 0a3e2e61e8e32f3a22757178adf033f9fbb89014aecd4df7f8bd49677d772bb3ad2c0f5526259611879f6bb20df647c01e23f53ade483d7a3e2242f8aee6c6aa +AUX olbd.confd 197 RMD160 798de1808502f3e4ecfc5f024b56a419d9824057 SHA1 f2a4385fdf9849eafb1d5457727f6fbe80af1da3 SHA256 5a34da76bbe56cd3b8128f05c0d9900f9d7f7ffdcffc5deeb816c78ea46679ba +AUX olbd.initd 714 RMD160 19a09e2264b984245f6a6b55c302a218bc41e452 SHA1 75e5d0764f00d5f9ef52966b597fa66c67bf7058 SHA256 a12efc3a4af4116558a6efd0964646b677d06879bb2114fc508324d9162bf815 +AUX proofd.confd 415 RMD160 3814aacb63d82b9d060086f9bef304d431a15b4e SHA1 31eb7af239a0042f887b5089a7c6c7ec5d6662e9 SHA256 261738817b4ba50fb07007741305d0a88e9067a45e3cbfd1d3fc8bebe70ece38 +AUX proofd.initd 717 RMD160 09157e82a659255d802a02466dca833135c7839a SHA1 47d139d8cb08e055674018b6b7f68522bf65b5ca SHA256 f60fa92173370e237e3e2cf5be7add5aa63752e3b7496cf3a0a5acc1dc927ebc +AUX root-5.28.00b-asneeded.patch 712 RMD160 0b3a3d41e309f13310fda607955ad88cc6bc176e SHA1 4fa704d2790e19933155da2587a9c6998d3c4e4f SHA256 17d1d41d8c7f78abbb7cd284af0a6aca544820db72fa72956b473c7c1817a96b +AUX root-5.28.00b-glibc212.patch 276 RMD160 02901df4c8e5e3c7d50a78916f843fde83faf1f0 SHA1 842129d6247255b5fa72778a12f08e1383247cd8 SHA256 e51e127a80e2bf1afad41c2b7ca5233c362bce017057ca489bedb2a9442efb62 +AUX root-5.28.00b-prop-ldflags.patch 433 RMD160 fd1717af9210471d7de0f06a47011e03d3f76d9a SHA1 b5dac8b013219dcfe577f2972fcc1d548f153cc3 SHA256 04f4b65a91e28386c7a857fe361f091943f4bb6fc82a9473ac7605412c199191 +AUX root-5.28.00b-unuran.patch 1531 RMD160 8083784cc831fc304f2e94fdf3b8aa8379d0bd9a SHA1 5c4537ba1922775fb63d65340a18a3c2b1d2311b SHA256 09458c60c9d38af2d204939f752ec25364d04cf66810b7cae5e88368f84c31c8 +AUX root-5.32.00-afs.patch 1322 RMD160 208adb0105edbad04f74206363f582c0a4dbcf73 SHA1 e713c26f5481755ded620d50a6dffc63eb0cba9d SHA256 a8f8d551668299516e2e091fd29ae15ceb1ba034d9df95b76f99b1dabc94a8dc +AUX root-5.32.00-cfitsio.patch 593 RMD160 c9fb2e0e57ad6c08bc26eb626772bc3ec901ac46 SHA1 9d07035b5ab27bede96033a777e3d21a26b3ae27 SHA256 9f4f244f272d75e115d8f139670fdcc0cdbcb68972689edbc78e467c3fad3e40 +AUX root-5.32.00-chklib64.patch 866 RMD160 9fada23b979e80dec76184e22895e47e689b55b4 SHA1 fde081f24090a3bb10473170a611384593072134 SHA256 5260cb5e7ab62bb19f6586cf4d9033597bcfd0132f178192be69ce515b2c7c35 +AUX root-5.32.00-dotfont.patch 2563 RMD160 7631b62e90a218ff87b80118044cba8144a669f9 SHA1 becf0e7e52bc189ab76ed7c3f972a2596414bd20 SHA256 7b4fc5da17ee8bfa71ed4cb60926a02e4b7058f8955dd54fb7f15ee4910823f6 +AUX root-5.32.00-explicit-functions.patch 610 RMD160 b8eb20aa9b6864fe138674c5991fe13aaa68981c SHA1 9f4faf15cf43cfa1e3ff4a394db5a4807bed713e SHA256 1afa92168b1f25ed457c08db85c85173613b82050b558765ba25e056f6f60abc +AUX root-5.32.00-htmldoc.patch 1506 RMD160 9e683110970dc3e5ce21b5589d3e78b0fe9d3d30 SHA1 39640bb92d4d004d918267045e53e6526d86bf81 SHA256 aa4d1e6300fd9fd038f90e1ca12f0b608c74d2fa282250b36437ccc8ff51a379 +AUX root-5.32.00-nobyte-compile.patch 5527 RMD160 61c3dfdd4b8f71f64772e20901f6ee11b8f53e12 SHA1 f914ccb7f7d88dd8d9ba4c1f4d940b14134f2c3b SHA256 82152c92efd5002f9c2b230f141cae6c8111b03bd18370030d62f0f7d7127420 +AUX root-5.34-htmldoc.patch 1821 RMD160 ae3b4d93403d0f81fefb80a1721d7d7e7a77a80c SHA1 8953302176734e3561545b9d129d8ff020b7ce82 SHA256 1eb89085d31085f2973501894e934b3d7b2182fa5e15fc7a406f87b6cb25119a +AUX rootd.confd 199 RMD160 9ca9864292e7301d3feb6c36d88ba16002b7d7fa SHA1 822983a24e219bd860124f363a1e4250a17026dd SHA256 7b69f646ce0b2546ce797ec4a05949b02302dc5f4e41d2e8896ed0bc6575ac8d +AUX rootd.initd 732 RMD160 9cce585e528e27c0fbd791be1f90fa6a1bb3164b SHA1 c15e805b0397bc8513e1c7e5631f2337c3564bbc SHA256 42b9fe01aa41965359c16d4b23f874cea65806d8c7ec11215dbba95ab80e90f3 +AUX xrootd.confd 200 RMD160 2344c73ca3c27adeb70b092850cfd292af7d58bd SHA1 f2b895f43d3537e8614a907c7c94642f01c084e4 SHA256 03c1191168ddea3bc6621e26eb56e509e6c9a4d58756ffbbd07ff6657200e57d +AUX xrootd.initd 720 RMD160 fb03f7410061e5340cb1f03c1659c553b62cb81f SHA1 a52eebc9bda2a92d0c5f3bbd20d7ea27cecc8cca SHA256 08c85596b8489fec0cea64e1fa9a092094fb05ea0f1151fd26775e4d5a024a8e +DIST ROOTUsersGuide.pdf 9124817 RMD160 52122f6f5870a12a6b701ffc4cbf428ab8382253 SHA1 dadfe5eb61a0a3f24067f73f6c6585927685701f SHA256 51c5ce0c7f32b83700b441a1c069e555bbb7949518858fc6189722501994f5c1 +DIST RooFit_Users_Manual_2.91-33.pdf 1330062 RMD160 650b616018a5493d5fd7da1dc06c6e54eaa419fb SHA1 f176782746542b00ff60320b4a41e1218db3d006 SHA256 101c4e4c41962238fcabf1caa86cafc51241a1800594491b2e62ef8b565a5646 +DIST TMVAUsersGuide-v4.03.pdf 3913533 RMD160 fbd62b90e7ad47ad69ec62d584417463ec13bf9c SHA1 84a63140cc3e01267d2cc7ffa374a7c24fbed37e SHA256 0cdbb4a2d19eb7a86e2911cfa73a905932e862d6c94be10b7662a9355b0241af DIST info.png 2060 RMD160 9e9e984337699e08d86a3352f414658d44d30480 SHA1 592745253491d94624ee68721f62ecdfb1b1b278 SHA256 51de6661250f3fb71c6c8250cbc4bdc4dc4283cc90240b4dc1ee6168e8d40279 DIST root-banner.png 132555 RMD160 d4cf5f8a60ee1df686e47a696e76c1ecdda4f1e7 SHA1 6760c589cc13f0f906cbd8598b4edffc28ad911b SHA256 d165e1cc175f654ff79af39193a6144678f600e14a53dd20e2b216b3e8951e94 -DIST root_v5.32.03.source.tar.gz 55529362 SHA256 575057c429625df69f0fa5c303287acefff185cda8cf8d1e9a6b2d21097d5ae6 SHA512 2e067eb9c6bbda5cf4df6973a3cf5307540247fb07c349f7ee74c0cf6a4abbb63f585a9ff67139cae985250fc5c5106b5ea03d7d9d2bcd20269e0ec8760ebd02 WHIRLPOOL 87dbf6f55f82001e07afc3b467e95f841f185f1f67d1dbd953f73e8aa9127ef8485db84100d6e9a08f0ae6aa5b45a565398eb6723145fff16c07e5158bb3e3ab +DIST root_v5.32.03.source.tar.gz 55529362 RMD160 90ee828638f322c169875135b51231810dada383 SHA1 cc1125660073918d0f47e209a069be2b9e849dc3 SHA256 575057c429625df69f0fa5c303287acefff185cda8cf8d1e9a6b2d21097d5ae6 DIST rootdrawing-logo.png 15051 RMD160 a10172fa5e9a9737b6b5e678af3f8426d804e275 SHA1 dd4c0e3e2ef5ebc59440677a78605b4b54fff48a SHA256 1dfd913cad53a3ebd6bf560d14df918cab5a295cc7d155944a8e27284af83a6b +EBUILD root-5.32.03-r2.ebuild 12067 RMD160 ad67e1af307ba4f7dc46a6cc81c439cc310cd70f SHA1 140a1ab0c4d0c2d3ce176da7178316c941a53eb2 SHA256 d5e30d97d8834e388ef20a865f4749ab9ec9278d2284d98bf40f6bd9ce6d3a15 +EBUILD root-9999.ebuild 12069 RMD160 5ca8253a0f70b9abf9308fda5b4730db6ae6c165 SHA1 0c58864b317aa196aa1615a1195b11278a8ed19f SHA256 2d1bab2d42704393414a8a1391233e62b502400af8c747dc852501c1b7e0aac8 +MISC ChangeLog 30174 RMD160 0ba5ae577a6d73a4f7d0270ca965de9dbc9e7590 SHA1 9c56778f07372f47c1334797560fd7f709f344f9 SHA256 bed79c2e4d650568b72b92f3b20fd91bca4967ac0bf094fd3c16d6af626bd4ba +MISC metadata.xml 1691 RMD160 b7018ff850114f62e6ffff071256f56e81d696ed SHA1 9ed29aa16332bf6d18aa7f0aa9237150a6d116ba SHA256 982f0485d0c5c5b58693e643e78b1a824050932683997b09fb9b00b58ddded52 diff --git a/sci-physics/root/root-5.32.03-r2.ebuild b/sci-physics/root/root-5.32.03-r2.ebuild index 27cad96d5..fa88aaab8 100644 --- a/sci-physics/root/root-5.32.03-r2.ebuild +++ b/sci-physics/root/root-5.32.03-r2.ebuild @@ -17,7 +17,7 @@ else KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" fi -inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs ${_SVN} +inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs virtualx ${_SVN} ROOFIT_DOC_PV=2.91-33 TMVA_DOC_PV=4.03 @@ -99,8 +99,7 @@ CDEPEND=" xrootd? ( net-libs/xrootd )" DEPEND="${CDEPEND} - virtual/pkgconfig - htmldoc? ( x11-base/xorg-server[xvfb] )" + virtual/pkgconfig" RDEPEND=" virtual/fortran @@ -112,6 +111,8 @@ REQUIRED_USE=" !X? ( !opengl !qt4 !xft ) htmldoc? ( X doc graphviz )" +VIRTUALX_REQUIRED="htmldoc" + S="${WORKDIR}/${PN}" pkg_setup() { @@ -283,20 +284,13 @@ src_compile() { elisp-compile build/misc/*.el || die "elisp-compile failed" fi if use htmldoc; then - # we need X server running, THtml uses it for GUI snapshots - Xvfb -screen 0 1280x1024x24 :50 >/dev/null 2>&1 & - local xvfb_pid=$! - ps h -C Xvfb | grep -q ${xvfb_pid} || die "Xvfb failed to start" - LD_LIBRARY_PATH=${S}/lib:${S}/cint/cint/include:${S}/cint/cint/stl \ ROOTSYS=${S} DISPLAY=":50" \ - emake html || die "html doc generation failed" + Xemake html || die "html doc generation failed" # if root.exe crashes, return code will be 0 due to gdb attach, # so we need to check if last html file was generated; # this check is volatile and can't catch crash on the last file. [[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed" - - kill ${xvfb_pid} fi } diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild index 53e785360..9f55ad400 100644 --- a/sci-physics/root/root-9999.ebuild +++ b/sci-physics/root/root-9999.ebuild @@ -17,7 +17,7 @@ else KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" fi -inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs ${_SVN} +inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs virtualx ${_SVN} ROOFIT_DOC_PV=2.91-33 TMVA_DOC_PV=4.03 @@ -101,8 +101,7 @@ CDEPEND=" xrootd? ( net-libs/xrootd )" DEPEND="${CDEPEND} - virtual/pkgconfig - htmldoc? ( x11-base/xorg-server[xvfb] )" + virtual/pkgconfig" RDEPEND=" virtual/fortran @@ -114,6 +113,8 @@ REQUIRED_USE=" !X? ( !opengl !qt4 !xft ) htmldoc? ( X doc graphviz )" +VIRTUALX_REQUIRED="htmldoc" + S="${WORKDIR}/${PN}" pkg_setup() { @@ -283,20 +284,13 @@ src_compile() { elisp-compile build/misc/*.el || die "elisp-compile failed" fi if use htmldoc; then - # we need X server running, THtml uses it for GUI snapshots - Xvfb -screen 0 1280x1024x24 :50 >/dev/null 2>&1 & - local xvfb_pid=$! - ps h -C Xvfb | grep -q ${xvfb_pid} || die "Xvfb failed to start" - LD_LIBRARY_PATH=${S}/lib:${S}/cint/cint/include:${S}/cint/cint/stl \ ROOTSYS=${S} DISPLAY=":50" \ - emake html || die "html doc generation failed" + Xemake html || die "html doc generation failed" # if root.exe crashes, return code will be 0 due to gdb attach, # so we need to check if last html file was generated; # this check is volatile and can't catch crash on the last file. [[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed" - - kill ${xvfb_pid} fi } |