Patch bump and removed useless gsl flag
authorSebastien Fabbro <bicatali@gentoo.org>
Fri, 25 Jun 2010 20:38:40 +0000 (20:38 +0000)
committerSebastien Fabbro <bicatali@gentoo.org>
Fri, 25 Jun 2010 20:38:40 +0000 (20:38 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

sci-physics/root/ChangeLog
sci-physics/root/Manifest
sci-physics/root/files/root-5.26.00-nobyte-compile.patch [deleted file]
sci-physics/root/root-5.22.00-r3.ebuild [deleted file]
sci-physics/root/root-5.24.00-r1.ebuild [deleted file]
sci-physics/root/root-5.26.00-r3.ebuild [deleted file]
sci-physics/root/root-5.26.00-r4.ebuild

index af52d14d19a412c1afca1aed707b1a864fb8b14d..3784818b92fb9e96fca9a36b69eef8f89d93e0b9 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.69 2010/06/25 17:12:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.70 2010/06/25 20:38:40 bicatali Exp $
+
+  25 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -root-5.22.00-r3.ebuild, -root-5.24.00-r1.ebuild, -root-5.26.00-r3.ebuild,
+  root-5.26.00-r4.ebuild, -files/root-5.26.00-nobyte-compile.patch:
+  Patch bump and removed useless gsl flag
 
 *root-5.26.00-r4 (25 Jun 2010)
 
index 3dafc353c4b67ecb2bd0ea690c3ef93017f742b5..c6e518d212aef4339737b107912643184d1eb4fd 100644 (file)
@@ -5,7 +5,6 @@ AUX olbd.confd 197 RMD160 798de1808502f3e4ecfc5f024b56a419d9824057 SHA1 f2a4385f
 AUX olbd.initd 714 RMD160 e2cc28474a280345f6962f890f5ddb3884d7f69f SHA1 4dcdf7ba35a834db2ac5a5bdfe4d2c31938f0552 SHA256 5d6c1b6e7b40d6842df6a6f7314fa2f49329b820ff86592d2f8d2662a414ec39
 AUX proofd.confd 415 RMD160 3814aacb63d82b9d060086f9bef304d431a15b4e SHA1 31eb7af239a0042f887b5089a7c6c7ec5d6662e9 SHA256 261738817b4ba50fb07007741305d0a88e9067a45e3cbfd1d3fc8bebe70ece38
 AUX proofd.initd 717 RMD160 2ff4ca04e838b171b1a60941ba3aded645a67147 SHA1 80cd4f6fd1e818edf27368b1175ed504e2c619a6 SHA256 341d1b4cd09731c506e97278959e6b669d63d65efb036070ecd4f31b01f34305
-AUX root-5.26.00-nobyte-compile.patch 7116 RMD160 0770c6024d9a4e8fcee89026417315b92b95e824 SHA1 49b674628ebeeb45bc8fe4a7a06245c68b8c8bf1 SHA256 ab8f4a3df5c3719859db1503a7548cff8254a39d603e2e2ee812a28c8edff905
 AUX rootd.confd 199 RMD160 9ca9864292e7301d3feb6c36d88ba16002b7d7fa SHA1 822983a24e219bd860124f363a1e4250a17026dd SHA256 7b69f646ce0b2546ce797ec4a05949b02302dc5f4e41d2e8896ed0bc6575ac8d
 AUX rootd.initd 732 RMD160 05b31561a32bc52e223b46fae6ef897ec33e3c9c SHA1 b1dfb6a0a50f151c51f4742ff2206f9430fdbba5 SHA256 7b745b606cab0212d07c9f1079d3f55c85ffc65e9da3a235d1a3c95945d28eb5
 AUX xrootd.confd 200 RMD160 2344c73ca3c27adeb70b092850cfd292af7d58bd SHA1 f2b895f43d3537e8614a907c7c94642f01c084e4 SHA256 03c1191168ddea3bc6621e26eb56e509e6c9a4d58756ffbbd07ff6657200e57d
@@ -13,29 +12,21 @@ AUX xrootd.initd 720 RMD160 6aedf0a620930b3076b42cf75b2bfd063fb381ab SHA1 1649b7
 DIST RooFit_Users_Manual_2.91-33.pdf 1330062 RMD160 650b616018a5493d5fd7da1dc06c6e54eaa419fb SHA1 f176782746542b00ff60320b4a41e1218db3d006 SHA256 101c4e4c41962238fcabf1caa86cafc51241a1800594491b2e62ef8b565a5646
 DIST TMVAUsersGuide-v4.pdf 2355827 RMD160 0624a6ed7e006581eacdaa69e82bbdca91aa42a9 SHA1 98016f0ccfa6c54234e22b46032bb0b2f5d7ac20 SHA256 bbc6563fd14a6a4a88efca55fa75e74d9b5c2a9f5d3044239f3f83dc2967ad62
 DIST Users_Guide_5_21.pdf 9158092 RMD160 7be83566dea5e9d57ebc96cd54aa6697485c0060 SHA1 68b76412dde018bea20c91312369adc8d302f4a2 SHA256 1dd28c2ceb8acd0cc7a84110367b9091a58ea5ae8d73d1ae85750b5ddaaee385
-DIST Users_Guide_5_22.pdf 10649953 RMD160 ef81cc7791fbc9cd50dbc693538aa3c3cad0f819 SHA1 47f1714271e378bb1ba1c661fdd4be241cb247e5 SHA256 99b4c34a9a533f89ffd13d4e8d328072541cce30bd3b75dc0a7198a499e16972
-DIST Users_Guide_5_24.pdf 10955895 RMD160 a17ed2ca247154dee5a2e89029305c4791458362 SHA1 01873a1a052cac6a2d9bd3e6085ef7ffc2885695 SHA256 5fe3b03dc869013414941e4359fa60bbf572d903d27d478acf8f4318bbc74332
 DIST Users_Guide_5_26.pdf 11197843 RMD160 0560efd109ee45148d4918eecba76736b583ea00 SHA1 3da4ea7e463825a20514deeb7e3b392b32b08178 SHA256 9d19277da5ac6b20e825a8d1d000dc90c595e1c042e5caca9ffb3271a6347bfe
 DIST root-5.22.00-patches-p03.tar.bz2 83157 RMD160 be7229e25854c46feac225905e73bc0c1e641c1c SHA1 aeb51dd4e3ed15608b3187ab1ff79e88c035a2e4 SHA256 f838cfeec5020defda888a483d8de63efea64fb2e7a389e8f4a5539f8ce3825f
-DIST root-5.22.00-patches-p04.tar.bz2 92875 RMD160 c87aa60cf1a68a13705df3da123cb0e7153297db SHA1 c46b0d7c9ba6093870640f349376bb049074c402 SHA256 30578a1bf11769bd47589fae11d3c135fb716c3351093764e722625154723076
-DIST root-5.24.00-patches-p02.tar.bz2 65768 RMD160 9ea486b13a1a749cd2dc01cbbdb3fac70a9c7930 SHA1 65d14bc4ea880d44d1e640d53f2393f3c3b4d8f7 SHA256 f242e0bfa3446e7bdd4669f281653068f87a56234184b29551a5a1f7b13caffa
 DIST root-5.26.00-patches-p03.tar.bz2 164854 RMD160 5fbcfe152b944323a7c172f429d553e0c0a3d0fd SHA1 e48a8c61434e71c4aee5c3a2a4a342029228c4a3 SHA256 c0c19d663a7e71040612763028f4fdfb85793a0897cf1eb0842ac930861ab2e8
-DIST root-5.26.00-patches-p04.tar.bz2 229786 RMD160 be14d1b09e81730b234186810df354e6a8fa1a38 SHA1 287a2551a078468faea16212239bfbdae61bf3eb SHA256 ecfc4a867b61307b4fa70b7f70066c229c3b03f06ec057779a5130a689fac0e5
+DIST root-5.26.00-patches-p05.tar.bz2 232546 RMD160 68f3cb6f62953b839fdc91b6b0a042fea71d2d7e SHA1 1e3ec93c3826a0fda3398739837a48c865f2cd41 SHA256 eda78f9e280d0eafb7d0daa933cf6b5e91d0af6bf5325ef9f4839926a91230aa
 DIST root_v5.22.00.source.tar.gz 26320334 RMD160 0fba2518802ce1f737b8cededbf518f0e475ba19 SHA1 b63e09d90ffef973fd487fdc7fc1ed3b26cf6d48 SHA256 9445351905e2b1b546bd6fea9d7397054aa1622a91bbc388014f3706b0843fe2
-DIST root_v5.24.00.source.tar.gz 27387383 RMD160 2f400d69dad1db2cd1e5f96fe4208a5a7b156689 SHA1 8a7d73c069798bb0e075cf31c54dd7feb475cefe SHA256 d4df055276a1a96599e553166efbd11f1f7eb0a2dcf0d892959771705bd1914e
 DIST root_v5.26.00.source.tar.gz 29209345 RMD160 bf7f91abd76ec86f69eb80506291cb8d4f87614e SHA1 318c5adf7f54f8206d9173d2fb0dc196a0e87192 SHA256 5ec86599bf7ef0fe3db11e5dd2d01183484cb199ab3a1c28d68f10b804e93e76
 EBUILD root-5.22.00-r2.ebuild 9198 RMD160 cc250272c572503dfc4679281b42ecd555b36eda SHA1 235d81242c672098543276f66f2ed1ddbe443892 SHA256 9ae90ba1a8526f417dd661a04988b99edfcef5af18515b94c9899d6297032398
-EBUILD root-5.22.00-r3.ebuild 9561 RMD160 5efdbda913f2091f316ad06cafb6e5d371768b7a SHA1 584441078ffa5c6a98d9b1c8eaa1ff38125bb2af SHA256 d296d8b1d9de1ebd827da818c2fe2bf512ac7b68b8835f8f1bedc55dc4661ef9
-EBUILD root-5.24.00-r1.ebuild 9087 RMD160 de3a2f61443630b69f2182be7ba06749e47da484 SHA1 e55773b0973bf6549225603371e30341cf209733 SHA256 367de614e268c99ab953d21e97054bdfa584599b85ef7ddeef560e3e653a44d0
 EBUILD root-5.26.00-r2.ebuild 8948 RMD160 2503834aee34a248c8d7110002d846b9b2782dd0 SHA1 042e84f5b2fa1d663282185167d8ecd1eab3f80e SHA256 61eeb55a31a23b6311772c35e205bcd2cc1b0d908e6e20741ff88df59abd333d
-EBUILD root-5.26.00-r3.ebuild 8864 RMD160 20ada8519be05071d41e11304ef6eb8f398c9a22 SHA1 b850af775d32d17460c60dbbf239eb74041428f4 SHA256 8d72d3cd97a456b10ce482e479c5b5b23a515bbb9e469db5b24f7db2f82f8ccd
-EBUILD root-5.26.00-r4.ebuild 9207 RMD160 27eddd40d3a298fe4882d5a843c9279dffc8a5b7 SHA1 d4f17ee3581d6cd95f6435cf47f5cad0fbea90d9 SHA256 d0171c525bb365566a3e1b7dcd9387231a1a3bbf21e3660f07dae51c2a510aa7
-MISC ChangeLog 19898 RMD160 1dcd8702816cee14f1060e2f8939afedfa43005d SHA1 f8460e10190d06dc4d64e50a6692fa7986190bbf SHA256 fb599bc320bc80867a25b9fc7ebe790bed0b41808657da0f8882cec9da5eccdf
+EBUILD root-5.26.00-r4.ebuild 9208 RMD160 bb2337c019cc2371cf071080a72dfacf133eb111 SHA1 5c499580e4aba687f95e44286a087838c9b8eb16 SHA256 c68b5b6602c3b4d3a7cd594d8410102f038d782969a219a698bdac610b36c59b
+MISC ChangeLog 20145 RMD160 e2e955b15504b9e346e666110b1cfcd55521a37e SHA1 8ecc27aea22b61bd72b2f7a0c39fccd3f1f58be8 SHA256 514d49600a3ad88e56b340dffc9088228610e19ce62003f78742014ae552da8d
 MISC metadata.xml 1570 RMD160 00e3660230a42e727d95f3533eccea61f2d88aff SHA1 dcefe31ff920ec459f68f77ffdea04264dbe4c0c SHA256 09ff2a9ee5791c9bfe4fc3c7242f8d635d0b41019e3b767cfefc41a5399855ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwk44sACgkQgAnW8HDreRZsvgCgrs3uLJ33Q3SSYILcjqm1PoZ+
-Q/sAoIRaAnqpfb7KaMXp6STRIzEaE7h2
-=zpH6
+iEYEARECAAYFAkwlE9kACgkQ1ycZbhPLE2ASyQCgrCxDwv6YSIcXupLXQGUbR6kZ
+tC4An0b19BBNIVNccsGl4xqqh7n5LJvx
+=Debd
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/root/files/root-5.26.00-nobyte-compile.patch b/sci-physics/root/files/root-5.26.00-nobyte-compile.patch
deleted file mode 100644 (file)
index 98deb97..0000000
+++ /dev/null
@@ -1,181 +0,0 @@
-diff --git a/Makefile b/Makefile
-index c352a18..ca938d2 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1080,10 +1080,7 @@ uninstall:
-          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 --git a/bindings/pyroot/Module.mk b/bindings/pyroot/Module.mk
-index 1b5b602..7028df2 100644
---- a/bindings/pyroot/Module.mk
-+++ b/bindings/pyroot/Module.mk
-@@ -48,8 +48,6 @@ else
- 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 @@ INCLUDEFILES += $(PYROOTDEP)
- 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) $@ \
-@@ -112,7 +108,7 @@ clean::         clean-$(MODNAME)
- 
- distclean-$(MODNAME): clean-$(MODNAME)
-               @rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
--                 $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+                 $(ROOTPY) $(PYROOTMAP) \
-                  $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
- 
- distclean::     distclean-$(MODNAME)
-diff --git a/build/package/debian/rules b/build/package/debian/rules
-index c999032..75b51c3 100644
---- a/build/package/debian/rules
-+++ b/build/package/debian/rules
-@@ -624,10 +624,6 @@ install-arch:
-               -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 --git a/cint/cintex/Module.mk b/cint/cintex/Module.mk
-index 556b37b..547b53a 100644
---- a/cint/cintex/Module.mk
-+++ b/cint/cintex/Module.mk
-@@ -31,10 +31,6 @@ else
- 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 @@ include/Cintex/%.h: $(CINTEXDIRI)/Cintex/%.h
-               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 --git a/cint/cintexcompat/Module.mk b/cint/cintexcompat/Module.mk
-index 03423b7..e7f2a3a 100644
---- a/cint/cintexcompat/Module.mk
-+++ b/cint/cintexcompat/Module.mk
-@@ -31,10 +31,6 @@ else
- 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,12 +82,10 @@ include/Cintex/%.h: $(CINTEXDIRI)/Cintex/%.h
-               fi)
-               cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
- ifeq ($(findstring $(MAKECMDGOALS),distclean maintainer-clean),)
- # Avoid conflict with cintex/Module.mk
--$(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
-+$(CINTEXLIB):   $(CINTEXO) $(CINTEXPY)  \
-                 $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
-               @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)"      \
-               "$(SOFLAGS)" libCintex.$(SOEXT) $@ "$(CINTEXO)" \
-@@ -113,7 +107,7 @@ clean-check-$(MODNAME):
- clean::         clean-$(MODNAME)
- 
- distclean-$(MODNAME): clean-$(MODNAME)
--              @rm -f $(CINTEXDEP) $(CINTEXLIB) $(CINTEXMAP) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO)
-+              @rm -f $(CINTEXDEP) $(CINTEXLIB) $(CINTEXMAP) $(CINTEXPY)
-               @rm -rf include/Cintex
- 
- distclean::     distclean-$(MODNAME)
-diff --git a/cint/reflex/Module.mk b/cint/reflex/Module.mk
-index 71a4abc..27f3065 100644
---- a/cint/reflex/Module.mk
-+++ b/cint/reflex/Module.mk
-@@ -48,9 +48,6 @@ RFLX_GCCXMLPATHPY := $(RFLX_GRFLXDD)/gccxmlpath.py
- 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)
- 
-@@ -97,7 +94,7 @@ ALLEXECS += $(RFLX_GENMAPX)
- .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
-                 clean-check-$(MODNAME) check-$(MODNAME) clean-genreflex
- 
--POSTBIN += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+POSTBIN += $(RFLX_GRFLXPY)
- 
- include/Reflex/%.h: $(REFLEXDIRI)/Reflex/%.h
-               @(if [ ! -d "include/Reflex" ]; then          \
-@@ -123,8 +120,6 @@ $(RFLX_GRFLXDD)/%.py: $(RFLX_GRFLXSD)/%.py $(RFLX_GCCXMLPATHPY)
-                 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 @@ $(REFLEXDICTMAP): bin/rlibmap$(EXEEXT) $(MAKEFILEDEP) $(REFLEXL)
-               $(RLIBMAP) -o $(REFLEXDICTMAP) -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 --git a/cint/reflex/python/CMakeLists.txt b/cint/reflex/python/CMakeLists.txt
-index b1faf57..55062b8 100644
---- a/cint/reflex/python/CMakeLists.txt
-+++ b/cint/reflex/python/CMakeLists.txt
-@@ -15,7 +15,7 @@ ENDIF (NOT PYTHONINTERP_FOUND)
- #####################   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/root-5.22.00-r3.ebuild b/sci-physics/root/root-5.22.00-r3.ebuild
deleted file mode 100644 (file)
index 724d2d2..0000000
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.22.00-r3.ebuild,v 1.4 2010/06/17 21:09:16 patrick Exp $
-
-EAPI=2
-inherit versionator eutils qt4 elisp-common fdo-mime toolchain-funcs
-
-DOC_PV=$(get_major_version)_$(get_version_component_range 2)
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4
-PATCH_PV=p04
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
-       mirror://gentoo/${P}-patches-${PATCH_PV}.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 )"
-
-HOMEPAGE="http://root.cern.ch/"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-
-IUSE="afs cern cint7 clarens doc emacs examples fftw geant4 kerberos ldap
-       +math mysql     odbc openmp oracle postgres pythia6 pythia8 python +reflex
-       ruby qt4 ssl 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/libpng
-       media-libs/jpeg
-       media-libs/giflib
-       media-libs/tiff
-       sys-apps/shadow
-       virtual/opengl
-       virtual/glu
-       x11-libs/libXpm
-       x11-libs/libXft
-       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 )
-       kerberos? ( virtual/krb5 )
-       ldap? ( net-nds/openldap )
-       math? ( >=sci-libs/gsl-1.8 )
-       mysql? ( virtual/mysql )
-       odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-       oracle? ( dev-db/oracle-instantclient-basic )
-       postgres? ( dev-db/postgresql-base )
-       pythia6? ( sci-physics/pythia:6 )
-       pythia8? ( sci-physics/pythia:8 )
-       python? ( dev-lang/python )
-       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 )"
-
-DEPEND="${CDEPEND}
-       dev-util/pkgconfig"
-
-RDEPEND="${CDEPEND}
-       xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-       elog
-       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)\""
-       elog
-       enewgroup rootd
-       enewuser rootd -1 -1 /var/spool/rootd rootd
-
-       if use openmp && \
-               [[ $(tc-getCC)$ == *gcc* ]] && \
-               ( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || \
-                       ! built_with_use 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"
-               epause 5
-       elif use openmp; then
-               export USE_OPENMP=1
-               use math && export USE_PARALLEL_MINUIT2=1
-       fi
-       if use cint7 && \
-               [[ $(tc-getCXX)$ == *g++* ]] && \
-               [[ $(gcc-major-version)$(gcc-minor-version) -ge 44 ]]; then
-               ewarn "cint7 cannot be compiled with g++ >= 4.4."
-               ewarn "If you want to build this package with CINT7"
-               ewarn "switch to an older gcc version or another compiler"
-               die "cint7 incompatible with gcc>4"
-       fi
-       # bug #287178
-       append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-       epatch "${WORKDIR}"/${P}-gcc44.patch
-       epatch "${WORKDIR}"/${P}-kerberos-1.7.patch
-       epatch "${WORKDIR}"/${P}-svn29990.patch
-       epatch "${WORKDIR}"/${P}-cint7-libdir.patch
-       epatch "${WORKDIR}"/${P}-prop-flags.patch
-       epatch "${WORKDIR}"/${P}-as-needed.patch
-       epatch "${WORKDIR}"/${P}-xrootd-shared.patch
-       epatch "${WORKDIR}"/${P}-xrootd-prop-flags.patch
-       epatch "${WORKDIR}"/${P}-configure-paths.patch
-       epatch "${WORKDIR}"/${P}-configure-sandbox.patch
-       epatch "${WORKDIR}"/${P}-g4root-flags.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, and libftgl_pic is libftgl
-       sed -i \
-               -e 's/libPythia6/libpythia6/g' \
-               -e 's/ungif/gif/g' \
-               -e 's/ftgl_pic/ftgl/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 \
-               --with-cc=$(tc-getCC) \
-               --with-cxx=$(tc-getCXX) \
-               --with-f77=$(tc-getF77) \
-               --fail-on-missing \
-               --prefix=/usr \
-               --libdir=/usr/$(get_libdir)/${PN} \
-               --docdir=/usr/share/doc/${PF} \
-               --tutdir=/usr/share/doc/${PF}/examples/tutorials \
-               --testdir=/usr/share/doc/${PF}/examples/tests \
-               --with-sys-iconpath=/usr/share/pixmaps \
-               --disable-builtin-afterimage \
-               --disable-builtin-freetype \
-               --disable-builtin-ftgl \
-               --disable-builtin-pcre \
-               --disable-builtin-zlib \
-               --disable-rpath \
-               --enable-asimage \
-               --enable-astiff \
-               --enable-exceptions     \
-               --enable-explicitlink \
-               --enable-gdml \
-               --enable-memstat \
-               --enable-opengl \
-               --enable-shadowpw \
-               --enable-shared \
-               --enable-soversion \
-               --enable-table \
-               --enable-xft \
-               $(use_enable afs) \
-               $(use_enable cint7) \
-               $(use_enable clarens) \
-               $(use_enable clarens peac) \
-               $(use_enable fftw fftw3) \
-               $(use_enable geant4 g4root) \
-               $(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 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 xml) \
-               $(use_enable xrootd) \
-               ${EXTRA_ECONF} \
-               || die "configure failed"
-}
-
-src_compile() {
-       emake OPT="" || die "emake failed"
-       emake cintdlls || die "emake cintdlls 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=/usr/$(get_libdir)/root" > 99root
-       use pythia8 && echo "PYTHIA8=/usr" >> 99root
-       use python && echo "PYTHONPATH=/usr/$(get_libdir)/root" >> 99root
-       use ruby && echo "RUBYLIB=/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 "${D}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
-       rm "${D}"usr/share/root/fonts/LICENSE
-       pushd "${D}"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 "${D}"usr/$(get_libdir)/root/cint/cint/include/makehpib
-       rm -f "${D}"/etc/root/proof/*.sample
-       rm -rf "${D}"/etc/root/daemons
-       popd > /dev/null
-}
-
-pkg_postinst() {
-       use ruby && elog "ROOT Ruby  module is available as libRubyROOT"
-       fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-       fdo-mime_desktop_database_update
-}
diff --git a/sci-physics/root/root-5.24.00-r1.ebuild b/sci-physics/root/root-5.24.00-r1.ebuild
deleted file mode 100644 (file)
index bb80a17..0000000
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.24.00-r1.ebuild,v 1.3 2010/06/17 21:09:16 patrick Exp $
-
-EAPI=2
-inherit versionator eutils qt4 elisp-common fdo-mime toolchain-funcs flag-o-matic
-
-DOC_PV=$(get_major_version)_$(get_version_component_range 2)
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4
-PATCH_PV=p02
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
-       mirror://gentoo/${P}-patches-${PATCH_PV}.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 )"
-
-HOMEPAGE="http://root.cern.ch/"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-
-IUSE="afs cern cint7 clarens doc emacs examples fftw geant4 kerberos ldap
-       +math mysql     odbc openmp oracle postgres pythia6 pythia8 python +reflex
-       ruby qt4 ssl 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/libpng
-       media-libs/jpeg
-       media-libs/giflib
-       media-libs/tiff
-       sys-apps/shadow
-       virtual/opengl
-       virtual/glu
-       x11-libs/libXpm
-       x11-libs/libXft
-       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 )
-       kerberos? ( virtual/krb5 )
-       ldap? ( net-nds/openldap )
-       math? ( >=sci-libs/gsl-1.8 )
-       mysql? ( virtual/mysql )
-       odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-       oracle? ( dev-db/oracle-instantclient-basic )
-       postgres? ( dev-db/postgresql-base )
-       pythia6? ( sci-physics/pythia:6 )
-       pythia8? ( sci-physics/pythia:8 )
-       python? ( dev-lang/python )
-       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 )"
-
-DEPEND="${CDEPEND}
-       dev-util/pkgconfig"
-
-RDEPEND="${CDEPEND}
-       xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-       elog
-       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)\""
-       elog
-       enewgroup rootd
-       enewuser rootd -1 -1 /var/spool/rootd rootd
-
-       if use openmp && \
-               [[ $(tc-getCC)$ == *gcc* ]] && \
-               ( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || \
-                       ! built_with_use 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"
-               epause 5
-       elif use openmp; then
-               export USE_OPENMP=1
-               use math && export USE_PARALLEL_MINUIT2=1
-       fi
-       # bug #287178
-       append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-       epatch "${WORKDIR}"/${P}-svn31303.patch
-       epatch "${WORKDIR}"/${P}-gcc44.patch
-       epatch "${WORKDIR}"/${P}-prop-flags.patch
-       epatch "${WORKDIR}"/${P}-xrootd-prop-flags.patch
-       epatch "${WORKDIR}"/${P}-as-needed.patch
-       epatch "${WORKDIR}"/${P}-configure-paths.patch
-       epatch "${WORKDIR}"/${P}-g4root-flags.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, and libftgl_pic is libftgl
-       sed -i \
-               -e 's/libPythia6/libpythia6/g' \
-               -e 's/ungif/gif/g' \
-               -e 's/ftgl_pic/ftgl/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 \
-               --with-cc=$(tc-getCC) \
-               --with-cxx=$(tc-getCXX) \
-               --with-f77=$(tc-getF77) \
-               --fail-on-missing \
-               --prefix=/usr \
-               --libdir=/usr/$(get_libdir)/${PN} \
-               --docdir=/usr/share/doc/${PF} \
-               --tutdir=/usr/share/doc/${PF}/examples/tutorials \
-               --testdir=/usr/share/doc/${PF}/examples/tests \
-               --with-sys-iconpath=/usr/share/pixmaps \
-               --disable-builtin-afterimage \
-               --disable-builtin-freetype \
-               --disable-builtin-ftgl \
-               --disable-builtin-pcre \
-               --disable-builtin-zlib \
-               --disable-rpath \
-               --enable-asimage \
-               --enable-astiff \
-               --enable-exceptions     \
-               --enable-explicitlink \
-               --enable-gdml \
-               --enable-memstat \
-               --enable-opengl \
-               --enable-shadowpw \
-               --enable-shared \
-               --enable-soversion \
-               --enable-table \
-               --enable-xft \
-               --with-afs-shared=yes \
-               $(use_enable afs) \
-               $(use_enable cint7) \
-               $(use_enable clarens) \
-               $(use_enable clarens peac) \
-               $(use_enable fftw fftw3) \
-               $(use_enable geant4 g4root) \
-               $(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 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 xml) \
-               $(use_enable xrootd) \
-               ${EXTRA_ECONF} \
-               || die "configure failed"
-}
-
-src_compile() {
-       emake OPT="" || die "emake failed"
-       emake cintdlls || die "emake cintdlls 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=/usr/$(get_libdir)/root" > 99root
-       use pythia8 && echo "PYTHIA8=/usr" >> 99root
-       use python && echo "PYTHONPATH=/usr/$(get_libdir)/root" >> 99root
-       use ruby && echo "RUBYLIB=/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 "${D}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
-       rm "${D}"usr/share/root/fonts/LICENSE
-       pushd "${D}"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 "${D}"usr/$(get_libdir)/root/cint/cint/include/makehpib
-       rm -f "${D}"/etc/root/proof/*.sample
-       rm -rf "${D}"/etc/root/daemons
-       popd > /dev/null
-}
-
-pkg_postinst() {
-       use ruby && elog "ROOT Ruby  module is available as libRubyROOT"
-       fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-       fdo-mime_desktop_database_update
-}
diff --git a/sci-physics/root/root-5.26.00-r3.ebuild b/sci-physics/root/root-5.26.00-r3.ebuild
deleted file mode 100644 (file)
index 826b646..0000000
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.26.00-r3.ebuild,v 1.3 2010/06/22 16:07:52 bicatali Exp $
-
-EAPI=2
-inherit versionator eutils qt4 elisp-common fdo-mime toolchain-funcs
-
-DOC_PV=$(get_major_version)_$(get_version_component_range 2)
-ROOFIT_DOC_PV=2.91-33
-TMVA_DOC_PV=4
-PATCH_PV=p04
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
-       mirror://gentoo/${P}-patches-${PATCH_PV}.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 )"
-
-HOMEPAGE="http://root.cern.ch/"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-
-IUSE="afs clarens doc emacs examples fftw geant4 gsl 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/libpng
-       media-libs/jpeg
-       media-libs/giflib
-       media-libs/glew
-       media-libs/tiff
-       sys-apps/shadow
-       x11-libs/libXpm
-       x11-libs/libXft
-       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 )
-       gsl? ( >=sci-libs/gsl-1.8 )
-       kerberos? ( virtual/krb5 )
-       ldap? ( net-nds/openldap )
-       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 )
-       python? ( dev-lang/python )
-       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 )"
-
-DEPEND="${CDEPEND}
-       dev-util/pkgconfig"
-
-RDEPEND="${CDEPEND}
-       xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-       elog
-       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)\""
-       elog
-       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"
-               epause 5
-       elif use openmp; then
-               export USE_OPENMP=1
-               use math && export USE_PARALLEL_MINUIT2=1
-       fi
-}
-
-src_prepare() {
-       epatch "${WORKDIR}"/${P}-svn33855.patch
-       epatch "${WORKDIR}"/${P}-prop-ldflags.patch
-       epatch "${WORKDIR}"/${P}-xrootd-prop-flags.patch
-       epatch "${WORKDIR}"/${P}-configure-paths.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, and libftgl_pic is libftgl
-       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 \
-               --with-cc=$(tc-getCC) \
-               --with-cxx=$(tc-getCXX) \
-               --with-f77=$(tc-getFC) \
-               --fail-on-missing \
-               --prefix=/usr \
-               --libdir=/usr/$(get_libdir)/${PN} \
-               --docdir=/usr/share/doc/${PF} \
-               --tutdir=/usr/share/doc/${PF}/examples/tutorials \
-               --testdir=/usr/share/doc/${PF}/examples/tests \
-               --with-sys-iconpath=/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 \
-               --with-afs-shared=yes \
-               $(use_enable afs) \
-               $(use_enable clarens) \
-               $(use_enable clarens peac) \
-               $(use_enable fftw fftw3) \
-               $(use_enable geant4 g4root) \
-               $(use_enable kerberos krb5) \
-               $(use_enable ldap) \
-               $(use_enable gsl 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=/usr/$(get_libdir)/root" > 99root
-       use pythia8 && echo "PYTHIA8=/usr" >> 99root
-       use python && echo "PYTHONPATH=/usr/$(get_libdir)/root" >> 99root
-       use ruby && echo "RUBYLIB=/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 "${D}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT}
-       rm "${D}"usr/share/root/fonts/LICENSE
-       pushd "${D}"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 "${D}"usr/$(get_libdir)/root/cint/cint/include/makehpib
-       rm -f "${D}"/etc/root/proof/*.sample
-       rm -rf "${D}"/etc/root/daemons
-       popd > /dev/null
-}
-
-pkg_postinst() {
-       use ruby && elog "ROOT Ruby module is available as libRubyROOT"
-       fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-       fdo-mime_desktop_database_update
-}
index 5a0969677b19e5c2d8ab688f9a69551b49b2fcb1..acab83ca68148182bb8b588979d2ea2c5ae34d0a 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.26.00-r4.ebuild,v 1.1 2010/06/25 17:12:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.26.00-r4.ebuild,v 1.2 2010/06/25 20:38:40 bicatali Exp $
 
 EAPI=3
 
@@ -11,7 +11,7 @@ inherit versionator eutils qt4 elisp-common fdo-mime python toolchain-funcs
 DOC_PV=$(get_major_version)_$(get_version_component_range 2)
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4
-PATCH_PV=p04
+PATCH_PV=p05
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
@@ -26,7 +26,7 @@ SRC_URI="
 SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE="afs clarens doc emacs examples fftw geant4 gsl kerberos ldap
+IUSE="afs clarens doc emacs examples fftw geant4 kerberos ldap
        +math mysql     odbc +opengl openmp oracle postgres pythia6 pythia8 python
        +reflex ruby qt4 ssl xft xml xinetd xrootd"
 
@@ -49,9 +49,9 @@ CDEPEND=">=dev-lang/cfortran-4.4-r2
        emacs? ( virtual/emacs )
        fftw? ( sci-libs/fftw:3.0 )
        geant4? ( sci-physics/geant:4 )
-       gsl? ( >=sci-libs/gsl-1.8 )
        kerberos? ( virtual/krb5 )
        ldap? ( net-nds/openldap )
+       math? ( >=sci-libs/gsl-1.8 )
        mysql? ( virtual/mysql )
        odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
        opengl? ( virtual/opengl virtual/glu )
@@ -104,11 +104,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-       epatch "${WORKDIR}"/${P}-svn33855.patch
+       epatch "${WORKDIR}"/${P}-svn34137.patch
        epatch "${WORKDIR}"/${P}-prop-ldflags.patch
        epatch "${WORKDIR}"/${P}-xrootd-prop-flags.patch
        epatch "${WORKDIR}"/${P}-configure-paths.patch
-       epatch "${FILESDIR}"/${P}-nobyte-compile.patch
+       epatch "${WORKDIR}"/${P}-nobyte-compile.patch
 
        # use system cfortran
        rm montecarlo/eg/inc/cfortran.h README/cfortran.doc
@@ -173,7 +173,7 @@ src_configure() {
                $(use_enable geant4 g4root) \
                $(use_enable kerberos krb5) \
                $(use_enable ldap) \
-               $(use_enable gsl gsl-shared) \
+               $(use_enable math gsl-shared) \
                $(use_enable math genvector) \
                $(use_enable math mathmore) \
                $(use_enable math minuit2) \