diff options
author | Justin Lecher <jlec@gentoo.org> | 2012-07-15 09:35:44 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2012-07-15 09:35:44 +0000 |
commit | c6bf491c0356b1eef669efdbcf102f5d793a9c89 (patch) | |
tree | fb2dcc5ec16c8f8d85b8d7ad698373acfbb51988 /sci-physics | |
parent | app-office/texstudio: Fix compilation with gg-4.6 whichw as broken by gcc-4.7... (diff) | |
download | historical-c6bf491c0356b1eef669efdbcf102f5d793a9c89.tar.gz historical-c6bf491c0356b1eef669efdbcf102f5d793a9c89.tar.bz2 historical-c6bf491c0356b1eef669efdbcf102f5d793a9c89.zip |
sci-physics/root: Cleaned old
Package-Manager: portage-2.2.0_alpha118/cvs/Linux x86_64
Diffstat (limited to 'sci-physics')
-rw-r--r-- | sci-physics/root/ChangeLog | 8 | ||||
-rw-r--r-- | sci-physics/root/Manifest | 27 | ||||
-rw-r--r-- | sci-physics/root/files/root-5.26.00-make-3.82.patch | 36 | ||||
-rw-r--r-- | sci-physics/root/files/root-5.26.00e-libpng15.patch | 33 | ||||
-rw-r--r-- | sci-physics/root/files/root-5.26.00g-explicit-functions.patch | 12 | ||||
-rw-r--r-- | sci-physics/root/metadata.xml | 1 | ||||
-rw-r--r-- | sci-physics/root/root-5.26.00e-r1.ebuild | 316 |
7 files changed, 15 insertions, 418 deletions
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index 84c0ed6d4321..0161ba6b3ab7 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-physics/root # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.106 2012/07/14 18:46:46 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.107 2012/07/15 09:35:43 jlec Exp $ + + 15 Jul 2012; Justin Lecher <jlec@gentoo.org> + -files/root-5.26.00-make-3.82.patch, -root-5.26.00e-r1.ebuild, + -files/root-5.26.00e-libpng15.patch, + -files/root-5.26.00g-explicit-functions.patch, metadata.xml: + Cleaned old 14 Jul 2012; Jeff Horelick <jdhore@gentoo.org> root-5.32.03-r2.ebuild: marked x86 per bug 424745 diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index cc87f2948cc8..fc544504ab6f 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -1,13 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX olbd.confd 197 SHA256 5a34da76bbe56cd3b8128f05c0d9900f9d7f7ffdcffc5deeb816c78ea46679ba SHA512 4cb53a93a89bb219943abd861fbca7cf17f6b6f63e31a58c08dff0641c46a391e0113523f1745a8df7996857d962d16d4a9538322c50ef03fbaa2cdedbeecc89 WHIRLPOOL fb348b4ee18e28e84078e360701bb08bed5eeb0175f625a626969189bd8228566c1a4209b8a44f66dda741cd442e70dc07e0138234956e9e59d94ad32792a6d8 AUX olbd.initd 714 SHA256 7ddb98aebcd4ef0009b1fed7946ba5aaa8c806ee97df9e94ecb28e6b803e9300 SHA512 60c8012b6e076f789c6290a8aeb84346129b00144959cfeb2cb5195706b9dd088f7afa05b3273369af8548be0f5259aa042848dacc9f1b934a4913eb9145ef82 WHIRLPOOL 4d010296ad2db78190f0cf3e447651b8d60d613fd706b8c98b4e9b7d30d9760039bac562f2df359a411aaa037dba4cf6de9cb664ab8fd6af3ca7450625e7fb62 AUX proofd.confd 415 SHA256 261738817b4ba50fb07007741305d0a88e9067a45e3cbfd1d3fc8bebe70ece38 SHA512 5aa6e6313cf159d2b407286a15f7f959d966a7e9b74bd2a74f13bd3fe01c04d99b46b5fb55f4a7434ebe911cd8b6469657d96591d624a7bfc7d39d49ab62b900 WHIRLPOOL 4a0604d8827cd733a2f5b34183bfd9458aff94f036f9177f2de3283da7722cf2e6dbf6acae93fe3ccd8144ad646c283458550f97f357148cc9f903c7469c57ca AUX proofd.initd 717 SHA256 f60fa92173370e237e3e2cf5be7add5aa63752e3b7496cf3a0a5acc1dc927ebc SHA512 73db660c9a3ab8e9a1e1794c7a54ffff3c9c25b9aa0b8273e24c7dcdcb6ac60824a8782087529834d1c4316c1166178ac39daa0feda2971784cc3115bba2a30f WHIRLPOOL 491ccca22cf08d9dc2f61fc6e4cf1fa00c8ad995ce20e7e94cd3b1ea5438568dc23e31a01ae98ea4431aa351c4983c77b26baa3052b42a9747e84c5413cb2be9 -AUX root-5.26.00-make-3.82.patch 1638 SHA256 0c94fc3f8bb8eb009465913f2ee20eefc510468643c04d2aad8cc40341fde457 SHA512 2190bfbe506c733b98d9f727b576c9cd20b999362fd17a7bddc847c2af284400f05cff92f4044c30171ed9bc8e8817599d651087ddae669a8e9533bb5726ca13 WHIRLPOOL 3452588b2e80dbc91029e3c452fa8ba61268537117675c1c303215b53d6f51af55414a1c9d9e3d5af13aecb14af2d3645edc40411c3428a105efb85f6ba9e7cc -AUX root-5.26.00e-libpng15.patch 1261 SHA256 94fd93a4e9081ef8070e2bcaeb09f169ae4475689fe4987c3a9acfec879a45f2 SHA512 cb9a3628dc0125cf7bdc512ca8dba7ada3f7ab902859caf69409ddabdead531eae7e2f9b336c77b7e91b1bcf3a592a642bc6c6115eaafff7a55ac0875272fddf WHIRLPOOL 8be8bb3ac8231b6d6d29e92a3bbdb6195b515e1715349021eaad178e0ad68121fab32dfcae6fdc81f962ac6535ce8ec45dee00ca6286410d53b42523dd6b8a88 -AUX root-5.26.00g-explicit-functions.patch 410 SHA256 e1799d5c8ad4e8af3161c4b3ed8e457eee48fe94e092ef8f3fb73b13d72e0c92 SHA512 709dfa9a8103cd72059b0337562e8c78edcb927a71ca82e479b70c84ab62bd1381427d220d241a9271e24aa9a541e88a7eafa86f284eb39ab34c38fa48e9d045 WHIRLPOOL 74cf511e56abd92cd63acf96f47bb179835baebaaa9b1677eac973d4f6b21788101dd3212a5f0f36465e88dfb1fe6f1c5d52789a69c11ed1a4e5e1ab2580d7dd AUX root-5.28.00b-asneeded.patch 712 SHA256 17d1d41d8c7f78abbb7cd284af0a6aca544820db72fa72956b473c7c1817a96b SHA512 6523b0e9610d38f1b65bd0c2af122069abbaa209939073ab0f5f7c279fcc1458663255e5cbcf01787b43519d40496019a9eb4c38d5df26122674bc2435a5aabb WHIRLPOOL 3ed8f327051c118a3d1a2bc23220a89e14fc2efbf88f6ace37d2194462fa3792ac4a32a9cb52bfc94063e5d180e759d12bd85953c52415df4154c186b7864d77 AUX root-5.28.00b-glibc212.patch 276 SHA256 e51e127a80e2bf1afad41c2b7ca5233c362bce017057ca489bedb2a9442efb62 SHA512 26138c8d14f319248d2b33395a57767c8d9bbf552244c2c55a7d6c0a1526de4c84313e020dc6c7483866cb3a927ba047d60f9b4dc8bd8291dd451a847b7e7379 WHIRLPOOL 0226880ce82aa5ba6e552f9bd2042842250694105734186a2185436ba8e2a13131f7e6263a99a1c228df724178453962f89ab74d90b62521e6db42be792c1fa9 AUX root-5.28.00b-nobyte-compile.patch 5483 SHA256 81b015dd6c122176fbc3103c75f62b7b1c3db569ad6d461ca544248f4e017b5c SHA512 a28d5d5e5b4feada81a316946a79fff5f5276661807a2d62a0ba3852571c9fac7dcccb0425ee151a8dc92e8e2530dab4ad0bc9e86d94f8fb38f026f347c5de78 WHIRLPOOL be7d17c9f9cbfccb4c3df147e6e75e4f4d0a13f982b31a392ab01577b8d227e9b3b4a781b9497c8b22289e9bccf9e5ca2f44611388d469fbc0188079e69a8cf1 @@ -28,28 +25,20 @@ AUX xrootd.initd 720 SHA256 88112617e0ff9dff557ec800835dd93f1e1e4316e4c137034af4 DIST ROOTUsersGuide.pdf 9124822 SHA256 70a96c4a2573dc0d320142f86993ecfda24caa755e910340a3014120f2997c8b SHA512 c3b4c18ef2e13968afdf67c6003249d4cfe6ea661fa32ce25127361bae7e3376a25cd3b11591292f3975bcd8105291aca52f2f6214c9fe45f4bd6e7e44d54b25 WHIRLPOOL 11256ba7837d17e5795cf71ac32db43d7d8f797bfbddf5f71612fe2f8fb2e01354372c0ea8f0bc22868881eb0bfdc8a3e3f1b05293d2750d293aa4d59217b2e6 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 -DIST TMVAUsersGuide-v4.pdf 2355827 SHA256 bbc6563fd14a6a4a88efca55fa75e74d9b5c2a9f5d3044239f3f83dc2967ad62 -DIST Users_Guide_5_26.pdf 9914765 SHA256 d0887800de7ffe7d6c0957891d44a4b34bf9d0eeb3da7e34b735ef998770bf39 DIST info.png 2060 SHA256 51de6661250f3fb71c6c8250cbc4bdc4dc4283cc90240b4dc1ee6168e8d40279 SHA512 81a730eefbe7a7e15d5840491402c7644bf7ed5d5f8f3830ed9457b343cc7882480e993ea84aef93500742cd0fe8469859cd2c925e5582b91ef56406804ae276 WHIRLPOOL 02ea6daf9e3d21947ebf5dd01c455a13f2fcbf9981be34a150056a3510122ca49e3d137d4f242c7218d4d06ace09566d513a04f09071723ac244f5a38e982bac -DIST root-5.26.00e-patches.tar.bz2 7102 SHA256 f29bf8251b8c7e1809993c4f5ae0f990d5c6e6721e77eb62107d27fa55b9bf47 DIST root-banner.png 132555 SHA256 d165e1cc175f654ff79af39193a6144678f600e14a53dd20e2b216b3e8951e94 SHA512 139347f396e88c8062d847d612949204cb80e551a826d926950ca8ab967f0d496487fed17a227fc796ae4db23fca758d91a0af7943142adbed358e98d7667b1f WHIRLPOOL dd23e26acf9303b404cda8135d6946af3b1abba3dfdff8d80e56096f810d50a01ebfb52dc1e6ee1d1b99fbb5859dc850e0e368155339b5007294d95ce8909857 -DIST root_v5.26.00e.source.tar.gz 28922785 SHA256 7f2604954775653825b9897da131278c9b349f12d77b1fc087004c1b838f4a80 DIST root_v5.32.03.source.tar.gz 55529362 SHA256 575057c429625df69f0fa5c303287acefff185cda8cf8d1e9a6b2d21097d5ae6 SHA512 2e067eb9c6bbda5cf4df6973a3cf5307540247fb07c349f7ee74c0cf6a4abbb63f585a9ff67139cae985250fc5c5106b5ea03d7d9d2bcd20269e0ec8760ebd02 WHIRLPOOL 87dbf6f55f82001e07afc3b467e95f841f185f1f67d1dbd953f73e8aa9127ef8485db84100d6e9a08f0ae6aa5b45a565398eb6723145fff16c07e5158bb3e3ab -DIST root_v5.34.00.source.tar.gz 56214534 SHA256 808e04876dbc9cfbfea54ee11ba35e90382e8ff4219dbdbe2d2236a9dadf7df1 +DIST root_v5.34.00.source.tar.gz 56214534 SHA256 808e04876dbc9cfbfea54ee11ba35e90382e8ff4219dbdbe2d2236a9dadf7df1 SHA512 2502281b8b5de5771d5a135080d2aba7797a477e0a769c8e6b2801959896bb4b0ce8f2e0c6a64459ffb28e46d681cad0b8af5430c0648654b57a9a3d744a499d WHIRLPOOL e7db950b5460ec8871b4b2b191d33850b23951b0de3285aad602d380f3935f3ab7ac86cd6fb8ab6534d188bf31a80c0e3d7972f931f7d9588274d9b76bea7861 DIST rootdrawing-logo.png 15051 SHA256 1dfd913cad53a3ebd6bf560d14df918cab5a295cc7d155944a8e27284af83a6b SHA512 14aa13ebfed3c9412d7d7d04c250740b25fe3af6bcb07e618045a5cec2dc23698a251fd7df2db1a6c37331084db99b029b387ea81c25ac825fc7ae10ad164a68 WHIRLPOOL 877a959a5aead73ba69dbb805c9869cbd6a047ea476bd4e7fef80781563a61d20dad49dd4d8b0005bfc58e8f7c7d38efbb3e085a95974feb81dfc9e339c18741 -EBUILD root-5.26.00e-r1.ebuild 9308 SHA256 12f6316dbb79dc6849941d82774004d1329775ac83f9e3201ab21271588b6313 SHA512 69799a2b821db4faecd635c902faee5f9d3346ca7953a0042cf936769bc1f4cffcae1a7673256cd0c7c4f0f93ecb3733311e815299736c8bab45ce35dd47de47 WHIRLPOOL 05d3f00b55104fa60a5c054587c611f37a6f38f97befe1c138b3b9d20754a72e24aaa9a9f0cdd6610199098d0ec2262870f7979aa6eed15c9b8693f9a11d479a EBUILD root-5.32.03-r2.ebuild 11389 SHA256 1843dc212b6a92d543a4c95457a2cba0a8c68896bb876065e6228cbe894caa48 SHA512 4b497fd0d46761ba433a0f7f18705365f3f0cadd7f79307b99861c8ce4040b0d02b65d91718df324b8a7a53465020fcf9e2f4751ff24ed3f3718712ae63d3a4c WHIRLPOOL e71db9ec1b215a8086e8ea25fa4d8b9cc42e5a905f9021c7de9c42a5736cbe62563bb25d5dc8456b5122f9c0e68e43fde99b4f89640767ab444090efc0410e87 EBUILD root-5.34.00.ebuild 11497 SHA256 b51564a3a922cf67ced4c3c4757e5f909bc565c9323737a567bf70ad4209f627 SHA512 808ae7d8e5a8bd10cdec0d2b893e6deb8c9b413840f2641df93843dd9cfa0ad8e164d33d5fab482542576742d7d0d44cb25bc21d68c833d5165ebe4484622544 WHIRLPOOL 4a5b373f1f3a75c3c203eca0caa3096af6c03d1f781802bb8290dfe2e47bbf2df59abcda8db4a656541415f3ccc11f8ee56fa8301e3d97358220d7620cd4aaad -MISC ChangeLog 32227 SHA256 4342352c6223cb8bfe3959f5096d78e981f4dbc487df6ab40bd6dd72ced642df SHA512 4ff28f92bb4d63909b506893e31e5d4ff29a31e09edce79d9c871a2876a5203f2e55ed2d805189a2dd85bba85175750c3a9d115b2e6dc86aad297d6d6b9acc5e WHIRLPOOL d0bede22b97b9516a5b05575a23aa9a34aa20d5ab1baba780a485532c0629c73e09566a7e38378f92e02d8a8a12e8f38d8f1058fa6a583668cc68fe255782a55 -MISC metadata.xml 1697 SHA256 7d5d3753cf42d355babfb35e9e3f23094f4156d1dbcb5abe722df69bbdefb9c2 SHA512 b59e33f69316f081975908905db9d0a6671a9a298d225d44fdecd4787df3054bdff42117d6b307ea6337dd06c00d59ae56a0b1dcf60ffb21c15fd98ed2c16a5a WHIRLPOOL 4b5969241742a67c51ce41c546cfe289575f9f076a8d32d7ad37670b2536483329991591e800107ae00b81acfe07b1052bca5d84ac3037101a4a4462f59a1979 +MISC ChangeLog 32454 SHA256 7235e8a6a583580c6c919b30a48be701eafb340f52a9cd2831d8bb314784bf12 SHA512 01489250583ba16a93e5073598eec2991f2bafc64a83757c5d328378ef0a4ad168a0f04974a80d753a576fcc523102d7898902febeb1993dce37f18185dcd4f3 WHIRLPOOL c16b0ab6baa328a64a8f312b017a3fbf5adf6a8bce8f2b9afcf46f0c6fe28012aebe89324fb4cce2de2adea03032d2c64f7b16bacd8c6dfce9c850bf4028e2a5 +MISC metadata.xml 1617 SHA256 3d1e4a4d14b0062964bcf9700c30c95ae5fda2f913d9b224d2163a986ac75ba3 SHA512 42e85b73ba585295f5dccef5ccad39445db4a1ebf20db8e4e799a45a54c34afca559a0a9592cf1a9eee94376acd8a289258e4e0bf816d490b7b6ecc2af5d64f3 WHIRLPOOL 32d37ecad572e72553adf10975bf40bbabb7a77887d4abc56b4b8a3636ddd98291cf62039cde767dfc9b8d7be2ba40b4cd5719bab1190806da0a70a10dd034a8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) +Comment: GPGTools - http://gpgtools.org -iQEcBAEBCgAGBQJQAb6cAAoJEPUd7O0j6ekAhrEIAI6Ct6b6iuKe2Ux3ITNI3JAO -+lIXr05FC03k7idBws3rX6Ch0yj4Mw2aEFeSA+c34POtELzG93kznm0tPkL5vo8g -wWRtpYHZtHQStuKf5QN5YHt6W6lduc57eMocQWrrILlwPcAngz9GcJVTHYwVguS6 -AYCZ0btFXoim8ZSDDPSvWqx6mzc7LoTBPihIm38j887G7QJvwBZHBWMyFgmQM7Gd -u8QXt70YM/Lmvht54UlAKxWUHcd4zTP0H5MozyoYpqjuXWRo7GsxZ6epU36OtazB -tccG5K61hMqRDh1iLvKkbMFo8uSQ7Q3FsNQQvq52plVUIdEAjkBCONgPW0/dnQY= -=E7YY +iEYEAREIAAYFAlACjvgACgkQgAnW8HDreRbvmACgmraZHmzSstrLVUr5r8qIW/WE +0CUAn27uezC9kWZjYegoGSo5PIwNylkK +=ERQ7 -----END PGP SIGNATURE----- diff --git a/sci-physics/root/files/root-5.26.00-make-3.82.patch b/sci-physics/root/files/root-5.26.00-make-3.82.patch deleted file mode 100644 index dc6d8a0189e3..000000000000 --- a/sci-physics/root/files/root-5.26.00-make-3.82.patch +++ /dev/null @@ -1,36 +0,0 @@ -http://root.cern.ch/viewcvs?view=rev&revision=35096 -https://savannah.cern.ch/bugs/?func=detailitem&item_id=72166 - ---- root-5.26.00d/Makefile -+++ root-5.26.00d/Makefile -@@ -544,6 +544,30 @@ - .PRECIOUS: include/%.h - - # special rules (need to be defined before generic ones) -+cint/cint/lib/dll_stl/G__%.o: cint/cint/lib/dll_stl/G__%.cxx -+ $(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \ -+ $(CXXFLAGS) $(DICTFLAGS) -D__cplusplus -I$(CINTDIR)/lib/prec_stl \ -+ -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $< -+ $(CXX) $(NOOPT) $(CXXFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc $(CXXOUT)$@ -c $< -+ -+cint/cint/lib/dll_stl/G__c_%.o: cint/cint/lib/dll_stl/G__c_%.c -+ $(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \ -+ $(CFLAGS) $(DICTFLAGS) -I$(CINTDIR)/lib/prec_stl \ -+ -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $< -+ $(CC) $(NOOPT) $(CFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc $(CXXOUT)$@ -c $< -+ -+cint/cint/lib/G__%.o: cint/cint/lib/G__%.cxx -+ $(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \ -+ $(CXXFLAGS) $(DICTFLAGS) -D__cplusplus -I$(CINTDIR)/lib/prec_stl \ -+ -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $< -+ $(CXX) $(NOOPT) $(CXXFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc $(CXXOUT)$@ -c $< -+ -+cint/cint/lib/G__c_%.o: cint/cint/lib/G__c_%.c -+ $(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \ -+ $(CFLAGS) $(DICTFLAGS) -I$(CINTDIR)/lib/prec_stl \ -+ -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $< -+ $(CC) $(NOOPT) $(CFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc $(CXXOUT)$@ -c $< -+ - G__%.o: G__%.cxx - $(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \ - $(CXXFLAGS) $(DICTFLAGS) -D__cplusplus -I$(CINTDIR)/lib/prec_stl \ diff --git a/sci-physics/root/files/root-5.26.00e-libpng15.patch b/sci-physics/root/files/root-5.26.00e-libpng15.patch deleted file mode 100644 index 91ed9c428ef1..000000000000 --- a/sci-physics/root/files/root-5.26.00e-libpng15.patch +++ /dev/null @@ -1,33 +0,0 @@ -This patch is a copy from media-libs/libafterimage. - ---- graf2d/asimage/src/libAfterImage/export.c -+++ graf2d/asimage/src/libAfterImage/export.c -@@ -496,7 +496,7 @@ - png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL ); - if ( png_ptr != NULL ) - if( (info_ptr = png_create_info_struct(png_ptr)) != NULL ) -- if( setjmp(png_ptr->jmpbuf) ) -+ if( setjmp(png_jmpbuf(png_ptr)) ) - { - png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr); - info_ptr = NULL ; ---- graf2d/asimage/src/libAfterImage/import.c -+++ graf2d/asimage/src/libAfterImage/import.c -@@ -1251,7 +1251,7 @@ - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in the png_create_read_struct() earlier. - */ -- if ( !setjmp (png_ptr->jmpbuf)) -+ if ( !setjmp (png_jmpbuf(png_ptr))) - { - ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ; - -@@ -1468,7 +1468,7 @@ - - static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length) - { -- ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr; -+ ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr); - memcpy(data, buf->buffer, length); - buf->buffer += length; - } diff --git a/sci-physics/root/files/root-5.26.00g-explicit-functions.patch b/sci-physics/root/files/root-5.26.00g-explicit-functions.patch deleted file mode 100644 index 16a720696fbf..000000000000 --- a/sci-physics/root/files/root-5.26.00g-explicit-functions.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- root/io/io/Module.mk.orig 2011-09-29 13:49:50.000000000 +0400 -+++ root/io/io/Module.mk 2012-03-09 02:57:20.518370595 +0400 -@@ -66,9 +66,4 @@ - distclean:: distclean-$(MODNAME) - - ##### extra rules ###### --#ifeq ($(GCC_VERS_FULL),gcc-4.4.0) --ifeq ($(GCC_VERS),gcc-4.4) --ifneq ($(filter -O%,$(OPT)),) - $(IODIRS)/TStreamerInfoReadBuffer.o: CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION --endif --endif diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml index c232a33b09a5..0b213c6b10b9 100644 --- a/sci-physics/root/metadata.xml +++ b/sci-physics/root/metadata.xml @@ -19,7 +19,6 @@ <flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>>=4.7.0</flag> <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag> <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag> - <flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag> <flag name="htmldoc">Generate html documentation</flag> <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag> <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag> diff --git a/sci-physics/root/root-5.26.00e-r1.ebuild b/sci-physics/root/root-5.26.00e-r1.ebuild deleted file mode 100644 index 0ae336a73d78..000000000000 --- a/sci-physics/root/root-5.26.00e-r1.ebuild +++ /dev/null @@ -1,316 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.26.00e-r1.ebuild,v 1.15 2012/06/28 17:02:39 jlec Exp $ - -EAPI=3 - -PYTHON_DEPEND="python? 2" - -inherit versionator eutils fortran-2 elisp-common fdo-mime python toolchain-funcs user - -DOC_PV=$(get_major_version)_$(get_version_component_range 2) -ROOFIT_DOC_PV=2.91-33 -TMVA_DOC_PV=4 - -DESCRIPTION="C++ data analysis framework and interpreter from CERN" -HOMEPAGE="http://root.cern.ch/" -SRC_URI=" - ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz - mirror://gentoo/${P}-patches.tar.bz2 - doc? ( - ftp://root.cern.ch/root/doc/Users_Guide_${DOC_PV}.pdf - ftp://root.cern.ch/root/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf - http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf )" - -SLOT="0" -LICENSE="LGPL-2.1" -KEYWORDS="amd64 x86" -IUSE="afs clarens doc emacs examples fftw geant4 graphviz kerberos ldap - +math mysql odbc +opengl openmp oracle postgres pythia6 pythia8 python - +reflex ruby qt4 ssl xft xml xinetd xrootd" - -# libafterimage ignored, to check every version -# see https://savannah.cern.ch/bugs/?func=detailitem&item_id=30944 -# || ( >=media-libs/libafterimage-1.18 x11-wm/afterstep ) -CDEPEND=" - >=dev-lang/cfortran-4.4-r2 - dev-libs/libpcre - >=media-libs/ftgl-2.1.3_rc5 - media-libs/giflib - media-libs/glew - media-libs/libpng:0 - media-libs/tiff:0 - virtual/jpeg - virtual/shadow - x11-libs/libXft - x11-libs/libXpm - afs? ( >=net-fs/openafs-1.4.7 ) - clarens? ( dev-libs/xmlrpc-c ) - emacs? ( virtual/emacs ) - fftw? ( sci-libs/fftw:3.0 ) - geant4? ( sci-physics/geant:4 ) - graphviz? ( media-gfx/graphviz ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - math? ( sci-libs/gsl ) - mysql? ( virtual/mysql ) - odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) - opengl? ( virtual/opengl virtual/glu ) - oracle? ( dev-db/oracle-instantclient-basic ) - postgres? ( dev-db/postgresql-base ) - pythia6? ( sci-physics/pythia:6 ) - pythia8? ( sci-physics/pythia:8 ) - qt4? ( - x11-libs/qt-gui:4 - x11-libs/qt-opengl:4 - x11-libs/qt-qt3support:4 - x11-libs/qt-xmlpatterns:4 ) - ruby? ( - dev-lang/ruby - dev-ruby/rubygems ) - ssl? ( dev-libs/openssl ) - xml? ( dev-libs/libxml2:2 )" - -DEPEND="${CDEPEND} - virtual/pkgconfig" - -RDEPEND=" - virtual/fortran - ${CDEPEND} - xinetd? ( sys-apps/xinetd )" - -S="${WORKDIR}/${PN}" - -pkg_setup() { - fortran-2_pkg_setup - echo - elog "You may want to build ROOT with these non Gentoo extra packages:" - elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus," - elog "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=/usr/$(get_libdir)\"" - echo - enewgroup rootd - enewuser rootd -1 -1 /var/spool/rootd rootd - - if use openmp && \ - [[ $(tc-getCC)$ == *gcc* ]] && \ - ( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || \ - ! has_version sys-devel/gcc[openmp] ); then - ewarn "You are using gcc and OpenMP is available with gcc >= 4.2" - ewarn "If you want to build this package with OpenMP, abort now," - ewarn "and set CC to an OpenMP capable compiler" - elif use openmp; then - export USE_OPENMP=1 - use math && export USE_PARALLEL_MINUIT2=1 - fi - use python && python_set_active_version 2 -} - -src_prepare() { - epatch \ - "${WORKDIR}"/${P}-make-3.82.patch \ - "${WORKDIR}"/${P}-prop-ldflags.patch \ - "${WORKDIR}"/${P}-configure-paths.patch \ - "${WORKDIR}"/${P}-nobyte-compile.patch \ - "${WORKDIR}"/${P}-glibc212.patch \ - "${WORKDIR}"/${P}-xrootd-prop-flags.patch \ - "${FILESDIR}"/${P}-libpng15.patch - - # use system cfortran - rm montecarlo/eg/inc/cfortran.h README/cfortran.doc - - # take a more descriptive name for ruby libs - sed -i \ - -e 's/libRuby/libRubyROOT/g' \ - bindings/ruby/Module.mk bindings/ruby/src/drr.cxx \ - || die "ajusting ruby libname failed" - - # in gentoo, libPythia6 is called libpythia6 - # libungif is called libgif - sed -i \ - -e 's/libPythia6/libpythia6/g' \ - -e 's/ungif/gif/g' \ - configure || die "adjusting library names failed" - - # libafterimage flags are hardcoded - sed -i \ - -e 's/CFLAGS="-O3"//' \ - -e 's/CFLAGS=$$ACFLAGS//' \ - graf2d/asimage/Module.mk graf2d/asimage/src/libAfterImage/configure \ - || die "flag propagation in libafterimage failed" - # QTDIR only used for qt3 in gentoo, and configure looks for it. - unset QTDIR -} - -src_configure() { - # the configure script is not the standard autotools - ./configure \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \ - --testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \ - --with-cc=$(tc-getCC) \ - --with-cxx=$(tc-getCXX) \ - --with-f77=$(tc-getFC) \ - --with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \ - --disable-builtin-freetype \ - --disable-builtin-ftgl \ - --disable-builtin-glew \ - --disable-builtin-pcre \ - --disable-builtin-zlib \ - --disable-rpath \ - --enable-asimage \ - --enable-astiff \ - --enable-exceptions \ - --enable-explicitlink \ - --enable-gdml \ - --enable-memstat \ - --enable-shadowpw \ - --enable-shared \ - --enable-soversion \ - --enable-table \ - --fail-on-missing \ - --with-afs-shared=yes \ - $(use_enable afs) \ - $(use_enable clarens) \ - $(use_enable clarens peac) \ - $(use_enable fftw fftw3) \ - $(use_enable geant4 g4root) \ - $(use_enable graphviz gviz) \ - $(use_enable kerberos krb5) \ - $(use_enable ldap) \ - $(use_enable math gsl-shared) \ - $(use_enable math genvector) \ - $(use_enable math mathmore) \ - $(use_enable math minuit2) \ - $(use_enable math roofit) \ - $(use_enable math unuran) \ - $(use_enable mysql) \ - $(use_enable odbc) \ - $(use_enable opengl) \ - $(use_enable postgres pgsql) \ - $(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 ssl) \ - $(use_enable xft) \ - $(use_enable xml) \ - $(use_enable xrootd) \ - ${EXTRA_ECONF} \ - || die "configure failed" -} - -src_compile() { - emake OPT="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake failed" - if use emacs; then - elisp-compile build/misc/*.el || die "elisp-compile failed" - fi -} - -doc_install() { - cd "${S}" - if use doc; then - einfo "Installing user's guides" - insinto /usr/share/doc/${PF} - doins \ - "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf \ - "${DISTDIR}"/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf \ - || die "pdf install failed" - if use math; then - doins "${DISTDIR}"/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf \ - || die "math doc install failed" - fi - fi - - if use examples; then - # these should really be taken care of by the root make install - insinto /usr/share/doc/${PF}/examples/tutorials/tmva - doins -r tmva/test || die - else - rm -rf "${D}"/usr/share/doc/${PF}/examples - fi -} - -daemon_install() { - cd "${S}" - 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} - - use xrootd && daemons="${daemons} xrootd olbd" - for i in ${daemons}; do - newinitd "${FILESDIR}"/${i}.initd ${i} - newconfd "${FILESDIR}"/${i}.confd ${i} - done - if use xinetd; then - insinto /etc/xinetd - doins etc/daemons/{rootd,proofd}.xinetd || die - fi -} - -desktop_install() { - cd "${S}" - sed -e 's,@prefix@,/usr,' \ - build/package/debian/root-system-bin.desktop.in > root.desktop - domenu root.desktop - doicon "${S}"/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 -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root - use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root - use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root - use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root - doenvd 99root || die "doenvd failed" - - # The build system installs Emacs support unconditionally and in the wrong - # directory. Remove it and call elisp-install in case of USE=emacs. - rm -rf "${D}"/usr/share/emacs - if use emacs; then - elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed" - fi - - doc_install - daemon_install - desktop_install - - # Cleanup of files either already distributed or unused on Gentoo - rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} - rm "${ED}"usr/share/root/fonts/LICENSE - pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null - rm -f posix/mktypes dll_stl/setup \ - G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o - rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib - rm -f "${ED}"/etc/root/proof/*.sample - rm -rf "${ED}"/etc/root/daemons - popd > /dev/null -} - -pkg_postinst() { - use ruby && elog "ROOT Ruby module is available as libRubyROOT" - fdo-mime_desktop_database_update - use python && python_mod_optimize /usr/$(get_libdir)/root -} - -pkg_postrm() { - fdo-mime_desktop_database_update - use python && python_mod_cleanup /usr/$(get_libdir)/root -} |