| 1 |
bicatali 13/12/05 17:34:12 |
| 2 |
|
| 3 |
Added: root-5.34.13-pythia8.patch |
| 4 |
root-5.34.13-unuran.patch |
| 5 |
root-5.34.13-desktop.patch |
| 6 |
Log: |
| 7 |
proxy-commit version bump |
| 8 |
|
| 9 |
(Portage version: 2.2.7-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 sci-physics/root/files/root-5.34.13-pythia8.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/files/root-5.34.13-pythia8.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/files/root-5.34.13-pythia8.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: root-5.34.13-pythia8.patch |
| 18 |
=================================================================== |
| 19 |
diff --git a/montecarlo/pythia8/Module.mk b/montecarlo/pythia8/Module.mk |
| 20 |
index b3d0ee4..86fb3d5 100644 |
| 21 |
--- a/montecarlo/pythia8/Module.mk |
| 22 |
+++ b/montecarlo/pythia8/Module.mk |
| 23 |
@@ -50,7 +50,7 @@ $(PYTHIA8LIB): $(PYTHIA8O) $(PYTHIA8DO) $(ORDER_) $(MAINLIBS) $(PYTHIA8LIBDEP) |
| 24 |
$(PYTHIA8DS): $(PYTHIA8H) $(PYTHIA8L) $(ROOTCINTTMPDEP) |
| 25 |
$(MAKEDIR) |
| 26 |
@echo "Generating dictionary $@..." |
| 27 |
- $(ROOTCINTTMP) -f $@ -c -I$(FPYTHIA8INCDIR) $(PYTHIA8H) $(PYTHIA8L) |
| 28 |
+ $(ROOTCINTTMP) -f $@ -c -p -I$(FPYTHIA8INCDIR) $(PYTHIA8H) $(PYTHIA8L) |
| 29 |
|
| 30 |
$(PYTHIA8MAP): $(RLIBMAP) $(MAKEFILEDEP) $(PYTHIA8L) |
| 31 |
$(RLIBMAP) -o $@ -l $(PYTHIA8LIB) \ |
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
1.1 sci-physics/root/files/root-5.34.13-unuran.patch |
| 36 |
|
| 37 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/files/root-5.34.13-unuran.patch?rev=1.1&view=markup |
| 38 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/files/root-5.34.13-unuran.patch?rev=1.1&content-type=text/plain |
| 39 |
|
| 40 |
Index: root-5.34.13-unuran.patch |
| 41 |
=================================================================== |
| 42 |
diff --git a/math/unuran/Module.mk b/math/unuran/Module.mk |
| 43 |
index 00a530b..7cd22dc 100644 |
| 44 |
--- a/math/unuran/Module.mk |
| 45 |
+++ b/math/unuran/Module.mk |
| 46 |
@@ -31,7 +31,7 @@ UNRS := $(wildcard $(UNRDIRS)/src/utils/*.c) \ |
| 47 |
$(wildcard $(UNRDIRS)/src/uniform/*.c) \ |
| 48 |
$(wildcard $(UNRDIRS)/src/urng/*.c) |
| 49 |
else |
| 50 |
-UNRTARCONTENT:=$(subst $(UNRVERS),$(UNRDIRS),$(shell mkdir -p $(UNRDIR); cd $(UNRDIR); gunzip -c $(UNRSRCS) | tar tf -)) |
| 51 |
+UNRTARCONTENT:= |
| 52 |
UNRS := $(filter %.c, \ |
| 53 |
$(filter $(UNRDIRS)/src/utils/%,$(UNRTARCONTENT)) \ |
| 54 |
$(filter $(UNRDIRS)/src/methods/%,$(UNRTARCONTENT)) \ |
| 55 |
@@ -81,10 +81,9 @@ INCLUDEFILES += $(UNURANDEP) |
| 56 |
##### local rules ##### |
| 57 |
.PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) |
| 58 |
|
| 59 |
-include/%.h: $(UNURANDIRI)/%.h $(UNURANETAG) |
| 60 |
+include/%.h: $(UNURANDIRI)/%.h |
| 61 |
cp $< $@ |
| 62 |
|
| 63 |
-$(UNURANDEP): $(UNRCFG) |
| 64 |
$(UNRS): $(UNURANETAG) |
| 65 |
|
| 66 |
$(UNURANETAG): $(UNRSRCS) |
| 67 |
@@ -137,12 +136,12 @@ $(UNRCFG): $(UNURANETAG) |
| 68 |
GNUMAKE=$(MAKE) ./configure CC="$$ACC" \ |
| 69 |
CFLAGS="$$ACFLAGS"); |
| 70 |
|
| 71 |
-$(UNURANLIB): $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \ |
| 72 |
+$(UNURANLIB): $(UNURANO) $(UNURANDO) $(ORDER_) \ |
| 73 |
$(MAINLIBS) $(UNURANLIBDEP) |
| 74 |
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ |
| 75 |
"$(SOFLAGS)" libUnuran.$(SOEXT) $@ \ |
| 76 |
"$(UNURANO) $(UNURANDO)" \ |
| 77 |
- "$(UNURANLIBEXTRA) $(UNRO)" |
| 78 |
+ "$(UNURANLIBEXTRA) -lunuran" |
| 79 |
|
| 80 |
$(UNURANDS): $(UNRINIT) $(UNURANDH1) $(UNURANL) $(ROOTCINTTMPDEP) |
| 81 |
$(MAKEDIR) |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
1.1 sci-physics/root/files/root-5.34.13-desktop.patch |
| 86 |
|
| 87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/files/root-5.34.13-desktop.patch?rev=1.1&view=markup |
| 88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/files/root-5.34.13-desktop.patch?rev=1.1&content-type=text/plain |
| 89 |
|
| 90 |
Index: root-5.34.13-desktop.patch |
| 91 |
=================================================================== |
| 92 |
diff --git a/etc/root.desktop b/etc/root.desktop |
| 93 |
index ca38211..688ecfa 100644 |
| 94 |
--- a/etc/root.desktop |
| 95 |
+++ b/etc/root.desktop |
| 96 |
@@ -8,5 +8,5 @@ Name[de]=ROOT |
| 97 |
Comment=An object-oriented data analysis framework |
| 98 |
Comment[de]=Ein objektorientiertes Framework zur Datenanalyse |
| 99 |
StartupNotify=true |
| 100 |
-MimeType=application/x-root;text/x-c++src |
| 101 |
-Categories=Science;Development;Application; |
| 102 |
+MimeType=application/x-root;text/x-c++src; |
| 103 |
+Categories=Science;Development; |
Archives