diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2013-01-22 17:19:01 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2013-01-22 17:19:01 +0000 |
commit | 3d33fc01bedebe08e97ae16d0c8eb43d4e895e76 (patch) | |
tree | f4f248b253b0fb577346d5757a6bba9ab9836954 /sci-physics | |
parent | Forced dependency of dev-perl/OpenGL, thanks tove, bug #453504 (diff) | |
download | historical-3d33fc01bedebe08e97ae16d0c8eb43d4e895e76.tar.gz historical-3d33fc01bedebe08e97ae16d0c8eb43d4e895e76.tar.bz2 historical-3d33fc01bedebe08e97ae16d0c8eb43d4e895e76.zip |
Honour system CFLAGS, closing bug #452806, thanks Andrew Savchenko
Package-Manager: portage-2.2.01.21580-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360
Diffstat (limited to 'sci-physics')
-rw-r--r-- | sci-physics/root/ChangeLog | 11 | ||||
-rw-r--r-- | sci-physics/root/Manifest | 14 | ||||
-rw-r--r-- | sci-physics/root/files/root-5.28.00b-nobyte-compile.patch | 138 | ||||
-rw-r--r-- | sci-physics/root/files/root-5.28.00h-explicit-functions.patch | 12 | ||||
-rw-r--r-- | sci-physics/root/files/root-5.32.00-prop-flags.patch | 15 | ||||
-rw-r--r-- | sci-physics/root/files/root-5.34.01-glibc216.patch | 35 | ||||
-rw-r--r-- | sci-physics/root/root-5.34.03.ebuild | 6 |
7 files changed, 33 insertions, 198 deletions
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index 534b6d9111ef..03b346607223 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -1,6 +1,13 @@ # 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.111 2012/11/22 00:03:20 bicatali Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.112 2013/01/22 17:18:55 bicatali Exp $ + + 22 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org> + +files/root-5.32.00-prop-flags.patch, + -files/root-5.28.00b-nobyte-compile.patch, + -files/root-5.28.00h-explicit-functions.patch, + -files/root-5.34.01-glibc216.patch, root-5.34.03.ebuild: + Honour system CFLAGS, closing bug #452806, thanks Andrew Savchenko 22 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org> -root-5.34.01.ebuild: Re-manifesting for new tar ball and remove old diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index a610dc7652f0..68e6e2833028 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -5,10 +5,8 @@ AUX proofd.confd 415 SHA256 261738817b4ba50fb07007741305d0a88e9067a45e3cbfd1d3fc AUX proofd.initd 717 SHA256 f60fa92173370e237e3e2cf5be7add5aa63752e3b7496cf3a0a5acc1dc927ebc SHA512 73db660c9a3ab8e9a1e1794c7a54ffff3c9c25b9aa0b8273e24c7dcdcb6ac60824a8782087529834d1c4316c1166178ac39daa0feda2971784cc3115bba2a30f WHIRLPOOL 491ccca22cf08d9dc2f61fc6e4cf1fa00c8ad995ce20e7e94cd3b1ea5438568dc23e31a01ae98ea4431aa351c4983c77b26baa3052b42a9747e84c5413cb2be9 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 AUX root-5.28.00b-prop-ldflags.patch 433 SHA256 04f4b65a91e28386c7a857fe361f091943f4bb6fc82a9473ac7605412c199191 SHA512 ae1f5dbb9f973c71426d448d1d28e74c4134ca38464fb9deb35fad5e056525c1b1d23630472eea2d796e15d03b102d97b6a6d4802a7ff884f008c90adece0168 WHIRLPOOL 72eac221f1e5fb471900123c44d27df0a7af4203e3c566d7440ce4f77506ef93e66d87730a3ec06da164651255c2ed3f532685eb4dbf2ad8a9660158c600bf25 AUX root-5.28.00b-unuran.patch 1531 SHA256 09458c60c9d38af2d204939f752ec25364d04cf66810b7cae5e88368f84c31c8 SHA512 10605b6b2cd8cf895995b8d2afccbac40506ad11f35d6405db558a86b1a84d6a31db36dfa5cc7a76e86506b60443f0c1464dd92d6c3932722dc22d985af894fd WHIRLPOOL c45307d021f61390d125f126f72c1384dde39cfb207c81e6f659a5c34da452c837a8143178db392256054e3c323aa12a5ff857dd62daccf038ab7d4b0c2a5189 -AUX root-5.28.00h-explicit-functions.patch 427 SHA256 ef1a3bb5c89ebbd6baba2a27e6504822cca1b65893c910709974119a7e650ff8 SHA512 96ec67e9af19dec9f9a17c3431cba91300b40ee6632f147fd6ae293d2bf87e01a2b96b8a4ce3a3c86da5bde13952b95ab5e9360906ec6343714fa799da165f16 WHIRLPOOL 87645ce79d0def92629b55dcbec766eff7f18694ecf6da4374e0e8a39b3eb7d02214c2b2bbd3c00fd84f7c909e9e3e5d1ee2a3ef51f2a0732458d4f900c9e1a8 AUX root-5.32.00-afs.patch 1322 SHA256 a8f8d551668299516e2e091fd29ae15ceb1ba034d9df95b76f99b1dabc94a8dc SHA512 4c021dadf266d58cc6ba3906ba3cd3ca2e2051f69266a7c3b32931ef8c0f40af2d79cb640aaf9c93b3302f9f17a3361683f616c18db2f25d86ca21d37f7b0bf8 WHIRLPOOL b35195e89b86ec6b7fef4927f97180ef3a6860c822e684b89fa76d53b595ede4c4eabe9948f067b1c1de91dce1f57011404c6534909e3b33a2b7451db5ae76a8 AUX root-5.32.00-cfitsio.patch 593 SHA256 9f4f244f272d75e115d8f139670fdcc0cdbcb68972689edbc78e467c3fad3e40 SHA512 1e9b1de637aeb667718e7e262615126626f951acefd2e1c4a3f53cfb13fb4dbde0186c301ffcc175cbab701825f340cffdb26cf741b244fba84cb8938ccb89e8 WHIRLPOOL 2231b4b349ad3a97aca94b21337981cc7477592a8aad4d604ac6d7aee98d9e5d66d90a0155c47ce53244b550f1c5b1d5b7581208d1c16a57a2e8fe6de3fbdc32 AUX root-5.32.00-chklib64.patch 866 SHA256 5260cb5e7ab62bb19f6586cf4d9033597bcfd0132f178192be69ce515b2c7c35 SHA512 79d37e0e6c84fc36d712bf12e35ae51affa05696c78bfe8d88455bbac24a475cf5432d8fa4fa9c4140007179eaafee40f081ebbd898d104948c4cd226e967799 WHIRLPOOL 6a5182de8eace74276aec5560eac5f61683645b629975ddbfd251876590c959f4cfc193624e3c57cdf3070c24e41cccf43da4edb1813a06d5dc8d41e4e1d3f50 @@ -16,7 +14,7 @@ AUX root-5.32.00-dotfont.patch 2563 SHA256 7b4fc5da17ee8bfa71ed4cb60926a02e4b705 AUX root-5.32.00-explicit-functions.patch 610 SHA256 1afa92168b1f25ed457c08db85c85173613b82050b558765ba25e056f6f60abc SHA512 04f64a15ab5a714b09b7ec8e6a442e63080857bfd2a895ca0aafda1bbeb60c347d19b1f37e35e0b3ff5da256e33408ab11b935118af9cfbb079cfa54368ebbbb WHIRLPOOL a89ea3c0a8a62ba1247bb9b11f19702c96017f3085f48ba6c3d7978d533eeeaa4ead2508780c5a19ba0193b28a792f9aa5071374d60ec2416280918910187936 AUX root-5.32.00-htmldoc.patch 485 SHA256 96674266856275b0ef83feefebc2fd5cd3edf73f207b2349b9c44e81e6ac7b98 SHA512 924f3d1cad1a5db0785e5741eb508fccc48bdd5750b938210b4c810b60c081b4855001cf30643dc2c2450364865a724f619fe9043123be8bad9bac03811c26c5 WHIRLPOOL 054018d8f85f4f0be177fc733c1509f15a8326a86be31dc59b764bb21304a4ac80dec23467780812322194174e472df5254307ce3d1870f0d4b26b293ba061d9 AUX root-5.32.00-nobyte-compile.patch 5527 SHA256 82152c92efd5002f9c2b230f141cae6c8111b03bd18370030d62f0f7d7127420 SHA512 582a43ff07609189c5ef8627b7e0739c9c917a7316c37bda8a3f5d7132de6f3f038edc6599bf43da959a15ce630e96014bb8fa1b175555a94bd7d8d748476d5c WHIRLPOOL e3753dbd7b9df54dce4941f041aed94628350615bbee23fd4a3fc571a890e9c1fe352ab04b298f84cd51c52bedfdf730434ea6c57142ea7165e4530508a34942 -AUX root-5.34.01-glibc216.patch 1389 SHA256 191db0de52bebf8be9fed61f975e809147f79b061f93e8023d29190cfc0ff880 SHA512 2cf2d67e0aca6e49d3755255025a7278123b4a42bfa0bb6c735ee9888eaea46c772b47297c0fca8614e68db49d5d84022b787141968ed3fd826ff644c41ce6f3 WHIRLPOOL 710d78093bcd98b497db6dc49fa652ab5a0ff4cf5619d0f4df321f6c4b64e24ea2f627e6a8dce3c06596912dca911fec4ac97e6cac55b90f3b59e325852e7a73 +AUX root-5.32.00-prop-flags.patch 530 SHA256 1f23c4980213117d449e8b8e53463331740b73c8a18bef695ab5938d7dc78433 SHA512 210ae2b80ee745f0f615b18132126ff824c4f5f68c19be23fd875861b895f395e40ee9e1f75c59b7656d484177e31fdc79488a6e838551a6947a895dac0a3308 WHIRLPOOL 12c8e5a457bb65dd9a1839ac98c6a1a6c16386ddb711bcd47e5535f180af3bf0aa8de14fdd3e783864f2ab0a2ce7208d0ce8a52a40048d84d40a487b9b3badcd AUX rootd.confd 199 SHA256 7b69f646ce0b2546ce797ec4a05949b02302dc5f4e41d2e8896ed0bc6575ac8d SHA512 2ce6753d37a7f22cc3656f110f802b8e07c1469bfe4524606c1472369352f8c584c01c716760252fab40369470b72d8c77cdbb2d52126c39371faaf597bf58d8 WHIRLPOOL b4c65e5026d6583775cda7b13fdbc5ae48c82c36710efbdd6b112243310090c05b5726d6e76d1ae25d585ecaa4aec4a5059336bf54135bafd0e4a921db468742 AUX rootd.initd 732 SHA256 42b9fe01aa41965359c16d4b23f874cea65806d8c7ec11215dbba95ab80e90f3 SHA512 65152830554ed509db7e5545bffb4976a608ee576d62ac648fc5520ff96ea5062c9b20c195dad2cf8dc2b34079e6beb252d427030825e14dc867ae4599bc64b8 WHIRLPOOL ec03db863e079b3f910ec0f86b036a828b2a5804f6bd6e0398e5207000f1ca10b6b1e71504d6c6b3a2d216b20d7db27d2425070f9d6bb0696ef384dfe8526fc0 DIST ROOTUsersGuide-5.34.03.pdf 9137216 SHA256 b69908af895804e824470078fa32974974a492d8e5db81c2f4b67c68b091c98d SHA512 874316975b28a820badd3c116238005870d4bf559b0c86349293ee9bdc2d0fedc763658ff5f03b8ef4565ecbee9a014de55472c126c4b94b97cb3b103b9c5968 WHIRLPOOL ffc66e18396334e44566be1609177b9e9dab5ea7c72be0ac0ec1fb9aea528a53ce3a8be397ada15e805a43d8edc2293e5f1b1ef551ed3dc2a1619fdf0227e4f0 @@ -31,13 +29,13 @@ DIST root_v5.34.03.source.tar.gz 56290003 SHA256 4ce18154f507fcdd8d580b776568d4b DIST rootdrawing-logo.png 15051 SHA256 1dfd913cad53a3ebd6bf560d14df918cab5a295cc7d155944a8e27284af83a6b SHA512 14aa13ebfed3c9412d7d7d04c250740b25fe3af6bcb07e618045a5cec2dc23698a251fd7df2db1a6c37331084db99b029b387ea81c25ac825fc7ae10ad164a68 WHIRLPOOL 877a959a5aead73ba69dbb805c9869cbd6a047ea476bd4e7fef80781563a61d20dad49dd4d8b0005bfc58e8f7c7d38efbb3e085a95974feb81dfc9e339c18741 EBUILD root-5.32.03-r2.ebuild 11368 SHA256 c00bd590bff55cb70ab8b922f51bdfcd00ed5fb97970df5255f756189f483c7f SHA512 b24583dc180f1295d20e407eb5836e699e526427016f058e694ff5436543ac06727c41ab35ff41674c70ea74a92b0b67681cbf7a1a5b856e7c4da549d072173f WHIRLPOOL 5e7591ac079a23d878346fedf68ac421a7eea3303123210bbd8d4422a86c3b82ba5a000b5efbf909e9d253f70c44eba6321637c7e51b891eb66caf96aa0393ce EBUILD root-5.32.04.ebuild 11371 SHA256 aa5a0971b848714eb06e19f8615d477e1ebeb77e060fb967bff63809ce763406 SHA512 4fb22152b81bc28033771f74d7bfc631bcb35fb30882d0165d6066ccd1da39e56ed491f548bc596254071ecdecb45ac9d32c93f84af6b177e98c007ecb7a069f WHIRLPOOL 9ad124856f92f68ccf0871cb84f0f10f52a0de63889e2842855fec3e2708782f4f72c2842f5db2c8c3117a563ef70b4d59100921804e838e1b356000dc370501 -EBUILD root-5.34.03.ebuild 11397 SHA256 0bebf28380a2598d152d1ece792ec1761e96c1950ce8081ec68c27eac7853b8c SHA512 034396ff149e113a399f23a04e4b8b34c09582c6d23df26f1bea0f829f1ae40bd33dc3ff2b3c120fca03cccb2fbbcf47546db1b0ed703ec2cd3003d5136093ff WHIRLPOOL 830c82ad3f72afd2b381b21d0df04e7827a9d6bff665b8e7f1b262cdd2434d99fe9b5fc90245dfa332095d96d9e2f7096356214025eeb5713253719bbb06e8e0 -MISC ChangeLog 34171 SHA256 841613b0c46dc975c32243d4ce2ebde18dd316c4651e1a5d96caf30e40ea4a59 SHA512 d88aa2d5fe07d3158a48464c17916a263ba98d529aaf9b73149da42c228bf434dc0a4a024f3dee748104bba729ba1904581c3ad39e84482fa489f8b02d15744c WHIRLPOOL 22dbbf93217456a642ea5ab4a0be5ea41d07dcf161d16a2b8440c5adc9558a39b5b5b417c50490afa97b1c44fb8e65dcc70ad6956b733df1dfd873c6a56f9cbc +EBUILD root-5.34.03.ebuild 11396 SHA256 d1eb7697767c386489e3f046c89a1a8bbf0c22b4ebeb4d8b45b53befc393fa7b SHA512 6054bb2a761a6f7559d5ccf53ae67e4b8b352fac7c154933b8cd2f9d01742dd53691bdf5876034f43c93d81bb7c0b1d4e8845ff4bcc6324851d5532edc0af143 WHIRLPOOL 38f63d0442c114d6943bc7fe72cfae5b6882cd8776b4e09b633de6ed1d25ce3908a9e71995051602d9926094c0e89079a6be06430203f676a90c01f1218e2d9a +MISC ChangeLog 34489 SHA256 d0d066d0fa9b789788a4be7ac73529b89093f6f3438e8fb92da1b5898c438acd SHA512 357dc977a25a6478731e035b6c4b94b266c4cb9140e9002400e22f0d136eb5a662aefa03eb8371e26416f767e64d6fee33878458b4668488f088f3c37abbb4c4 WHIRLPOOL a7c915b34b639aa3bbf19923e79302273ee57b00da478a1ab59885f28db06c8992b9bd0d41a6026a56ed0d4cb30f8ca6b35aa6f974df1c91439bf01d5a19588a MISC metadata.xml 1617 SHA256 3d1e4a4d14b0062964bcf9700c30c95ae5fda2f913d9b224d2163a986ac75ba3 SHA512 42e85b73ba585295f5dccef5ccad39445db4a1ebf20db8e4e799a45a54c34afca559a0a9592cf1a9eee94376acd8a289258e4e0bf816d490b7b6ecc2af5d64f3 WHIRLPOOL 32d37ecad572e72553adf10975bf40bbabb7a77887d4abc56b4b8a3636ddd98291cf62039cde767dfc9b8d7be2ba40b4cd5719bab1190806da0a70a10dd034a8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlCta8oACgkQ1ycZbhPLE2Cs9wCfYIaG0lEhdeJ4ZAakumlIsZkO -nPEAn36sujq4WW2T98OWadTrdMRGk3Bn -=ZrWt +iEYEAREIAAYFAlD+ygAACgkQ1ycZbhPLE2DX4ACgoDug2/kZc977/fouNhr9j4d+ +a7wAnRtrr47Q79U1ro9ErJJqsPRITwm9 +=36fP -----END PGP SIGNATURE----- diff --git a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch b/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch deleted file mode 100644 index 7029bf169091..000000000000 --- a/sci-physics/root/files/root-5.28.00b-nobyte-compile.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff -Naur root.orig/Makefile root/Makefile ---- root.orig/Makefile 2010-12-17 22:48:40.577775091 +0300 -+++ root/Makefile 2010-12-17 22:49:27.902497903 +0300 -@@ -1148,10 +1148,7 @@ - if test "x$(RFLX_GRFLXPY)" != "x"; then \ - rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \ - fi; \ -- if test "x$(RFLX_GRFLXPYC)" != "x"; then \ -- rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \ -- fi; \ -- if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \ -+ if test "x$(RFLX_GRFLXPY)" != "x"; then \ - dir=$(RFLX_GRFLXDD:lib/=); \ - while test "x$${dir}" != "x" && \ - test -d $(DESTDIR)$(LIBDIR)/$${dir} && \ -diff -Naur root.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk ---- root.orig/bindings/pyroot/Module.mk 2010-12-17 22:48:39.941179413 +0300 -+++ root/bindings/pyroot/Module.mk 2010-12-17 22:49:27.899164943 +0300 -@@ -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.orig/build/package/debian/rules root/build/package/debian/rules ---- root.orig/build/package/debian/rules 2010-12-17 22:48:40.197817461 +0300 -+++ root/build/package/debian/rules 2010-12-17 22:49:27.902497903 +0300 -@@ -623,10 +623,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 - # $(foreach i, \ - # $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \ - # -X$(i:$(DTMP)/%=%) ) -diff -Naur root.orig/cint/cintex/Module.mk root/cint/cintex/Module.mk ---- root.orig/cint/cintex/Module.mk 2010-12-17 22:48:40.057833071 +0300 -+++ root/cint/cintex/Module.mk 2010-12-17 22:49:27.902497903 +0300 -@@ -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.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk ---- root.orig/cint/reflex/Module.mk 2010-12-17 22:48:40.037835301 +0300 -+++ root/cint/reflex/Module.mk 2010-12-17 22:51:36.871451359 +0300 -@@ -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.orig/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt ---- root.orig/cint/reflex/python/CMakeLists.txt 2010-12-17 22:48:40.037835301 +0300 -+++ root/cint/reflex/python/CMakeLists.txt 2010-12-17 22:49:27.902497903 +0300 -@@ -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.28.00h-explicit-functions.patch b/sci-physics/root/files/root-5.28.00h-explicit-functions.patch deleted file mode 100644 index 918b696cbcfe..000000000000 --- a/sci-physics/root/files/root-5.28.00h-explicit-functions.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- root/io/io/Module.mk.orig 2011-11-24 20:12:56.000000000 +0400 -+++ root/io/io/Module.mk 2012-03-09 03:45:42.850549826 +0400 -@@ -67,9 +67,4 @@ - distclean:: distclean-$(MODNAME) - - ##### extra rules ###### --#ifeq ($(GCC_VERS_FULL),gcc-4.4.0) --ifeq ($(GCC_VERS),gcc-4.4) --ifneq ($(filter -O%,$(OPT)),) - $(call stripsrc,$(IODIRS)/TStreamerInfoReadBuffer.o): CXXFLAGS += -DR__EXPLICIT_FUNCTION_INSTANTIATION --endif --endif diff --git a/sci-physics/root/files/root-5.32.00-prop-flags.patch b/sci-physics/root/files/root-5.32.00-prop-flags.patch new file mode 100644 index 000000000000..7dfeb1cc3440 --- /dev/null +++ b/sci-physics/root/files/root-5.32.00-prop-flags.patch @@ -0,0 +1,15 @@ +--- root/config/Makefile.in.orig 2013-01-21 22:04:43.011452938 +0400 ++++ root/config/Makefile.in 2013-01-21 22:04:18.027352209 +0400 +@@ -25,9 +25,9 @@ + USECONFIG := @useconfig@ + MKLIBOPTIONS := @mkliboption@ + +-EXTRA_CFLAGS := -Iinclude @cflags@ +-EXTRA_CXXFLAGS := -Iinclude @cflags@ +-EXTRA_LDFLAGS := @ldflags@ ++EXTRA_CFLAGS := -Iinclude @cflags@ $(CFLAGS) ++EXTRA_CXXFLAGS := -Iinclude @cflags@ $(CXXFLAGS) ++EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS) + WINRTDEBUG := @winrtdebug@ + + GLBPATCHFLAGS := @glbpatchcflags@ diff --git a/sci-physics/root/files/root-5.34.01-glibc216.patch b/sci-physics/root/files/root-5.34.01-glibc216.patch deleted file mode 100644 index b2da15970ea7..000000000000 --- a/sci-physics/root/files/root-5.34.01-glibc216.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ur root-5.34.00.orig/build/rmkdepend/main.c root-5.34.00/build/rmkdepend/main.c ---- root-5.34.00.orig/build/rmkdepend/main.c 2012-06-05 15:31:46.000000000 +0200 -+++ root-5.34.00/build/rmkdepend/main.c 2012-07-05 20:42:58.938953353 +0200 -@@ -60,7 +60,7 @@ - # endif - # elif defined(__CYGWIN__) - extern int fchmod(int, mode_t); --#else -+# elif !defined(__GLIBC__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 16) - extern int fchmod(int, int); - # endif - #endif -diff -ur root-5.34.00.orig/cint/tool/rmkdepend/main.c root-5.34.00/cint/tool/rmkdepend/main.c ---- root-5.34.00.orig/cint/tool/rmkdepend/main.c 2012-06-05 15:31:30.000000000 +0200 -+++ root-5.34.00/cint/tool/rmkdepend/main.c 2012-07-05 20:42:58.492949104 +0200 -@@ -58,7 +58,7 @@ - #if !defined(MAC_OS_X_VERSION_10_4) - extern int fchmod(); - #endif --#else -+#elif !defined(__GLIBC__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 16) - extern int fchmod(); - #endif - #endif -diff -ur root-5.34.00.orig/core/unix/src/TUnixSystem.cxx root-5.34.00/core/unix/src/TUnixSystem.cxx ---- root-5.34.00.orig/core/unix/src/TUnixSystem.cxx 2012-06-05 15:31:17.000000000 +0200 -+++ root-5.34.00/core/unix/src/TUnixSystem.cxx 2012-07-05 20:29:29.969242837 +0200 -@@ -98,6 +98,7 @@ - #include <pwd.h> - #include <grp.h> - #include <errno.h> -+#include <sys/resource.h> - #include <sys/wait.h> - #include <time.h> - #include <sys/time.h> diff --git a/sci-physics/root/root-5.34.03.ebuild b/sci-physics/root/root-5.34.03.ebuild index 7291781ccd6b..6965ae7cacc2 100644 --- a/sci-physics/root/root-5.34.03.ebuild +++ b/sci-physics/root/root-5.34.03.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.03.ebuild,v 1.1 2012/10/26 15:40:47 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.03.ebuild,v 1.2 2013/01/22 17:18:55 bicatali Exp $ EAPI=4 @@ -148,7 +148,7 @@ pkg_setup() { src_prepare() { epatch \ - "${FILESDIR}"/${PN}-${PATCH_PV}-prop-ldflags.patch \ + "${FILESDIR}"/${PN}-${PATCH_PV2}-prop-flags.patch \ "${FILESDIR}"/${PN}-${PATCH_PV2}-nobyte-compile.patch \ "${FILESDIR}"/${PN}-${PATCH_PV}-glibc212.patch \ "${FILESDIR}"/${PN}-${PATCH_PV}-unuran.patch \ |