| 1 |
commit: bc44947211bd480f0d44e86a2a77761ee8b6ae83 |
| 2 |
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com> |
| 3 |
AuthorDate: Sun Sep 27 19:36:35 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 27 19:36:35 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=bc449472 |
| 7 |
|
| 8 |
sci-physics/root: |
| 9 |
Remove geocad-patch, is now upstream. |
| 10 |
|
| 11 |
Package-Manager: portage-2.2.22 |
| 12 |
|
| 13 |
sci-physics/root/ChangeLog | 4 ++++ |
| 14 |
sci-physics/root/files/root-6.00.01-geocad.patch | 15 --------------- |
| 15 |
sci-physics/root/root-9999.ebuild | 3 +-- |
| 16 |
3 files changed, 5 insertions(+), 17 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog |
| 19 |
index 77f4c1f..accb1de 100644 |
| 20 |
--- a/sci-physics/root/ChangeLog |
| 21 |
+++ b/sci-physics/root/ChangeLog |
| 22 |
@@ -2,6 +2,10 @@ |
| 23 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Id$ |
| 25 |
|
| 26 |
+ 27 Sep 2015; Oliver Freyermuth <o.freyermuth@××××××××××.com> |
| 27 |
+ -files/root-6.00.01-geocad.patch, root-9999.ebuild: |
| 28 |
+ sci-physics/root: Remove geocad-patch, is now upstream. |
| 29 |
+ |
| 30 |
27 Sep 2015; Oliver Freyermuth <o.freyermuth@××××××××××.com> root-9999.ebuild: |
| 31 |
sci-physics/root: Drop desktop-patch (upstreamed), |
| 32 |
add http-useflag enabling THttpServer. |
| 33 |
|
| 34 |
diff --git a/sci-physics/root/files/root-6.00.01-geocad.patch b/sci-physics/root/files/root-6.00.01-geocad.patch |
| 35 |
deleted file mode 100644 |
| 36 |
index 2742a74..0000000 |
| 37 |
--- a/sci-physics/root/files/root-6.00.01-geocad.patch |
| 38 |
+++ /dev/null |
| 39 |
@@ -1,15 +0,0 @@ |
| 40 |
-diff --git a/geom/geocad/inc/TGeoToOCC.h b/geom/geocad/inc/TGeoToOCC.h |
| 41 |
-index 892f225..86eb9e1 100644 |
| 42 |
---- a/geom/geocad/inc/TGeoToOCC.h |
| 43 |
-+++ b/geom/geocad/inc/TGeoToOCC.h |
| 44 |
-@@ -13,8 +13,10 @@ |
| 45 |
- #define ROOT_TGeoToOCC |
| 46 |
- |
| 47 |
- //Cascade |
| 48 |
-+#define Printf Printf_opencascade |
| 49 |
- #include <TopoDS_Shape.hxx> |
| 50 |
- #include <TopoDS_Wire.hxx> |
| 51 |
-+#undef Printf |
| 52 |
- |
| 53 |
- //Root |
| 54 |
- #ifndef ROOT_TGeoXtru |
| 55 |
|
| 56 |
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild |
| 57 |
index 3ff5618..1b3ed72 100644 |
| 58 |
--- a/sci-physics/root/root-9999.ebuild |
| 59 |
+++ b/sci-physics/root/root-9999.ebuild |
| 60 |
@@ -197,8 +197,7 @@ src_prepare() { |
| 61 |
"${FILESDIR}"/${PN}-5.34.13-unuran.patch \ |
| 62 |
"${FILESDIR}"/${PN}-6.00.01-dotfont.patch \ |
| 63 |
"${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \ |
| 64 |
- "${FILESDIR}"/${PN}-6.00.01-llvm.patch \ |
| 65 |
- "${FILESDIR}"/${PN}-6.00.01-geocad.patch |
| 66 |
+ "${FILESDIR}"/${PN}-6.00.01-llvm.patch |
| 67 |
|
| 68 |
# make sure we use system libs and headers |
| 69 |
rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die |
Archives