commit: bc44947211bd480f0d44e86a2a77761ee8b6ae83
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun Sep 27 19:36:35 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 19:36:35 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=bc449472
sci-physics/root:
Remove geocad-patch, is now upstream.
Package-Manager: portage-2.2.22
sci-physics/root/ChangeLog | 4 ++++
sci-physics/root/files/root-6.00.01-geocad.patch | 15 ---------------
sci-physics/root/root-9999.ebuild | 3 +--
3 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 77f4c1f..accb1de 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 27 Sep 2015; Oliver Freyermuth <o.freyerm...@googlemail.com>
+ -files/root-6.00.01-geocad.patch, root-9999.ebuild:
+ sci-physics/root: Remove geocad-patch, is now upstream.
+
27 Sep 2015; Oliver Freyermuth <o.freyerm...@googlemail.com>
root-9999.ebuild:
sci-physics/root: Drop desktop-patch (upstreamed),
add http-useflag enabling THttpServer.
diff --git a/sci-physics/root/files/root-6.00.01-geocad.patch
b/sci-physics/root/files/root-6.00.01-geocad.patch
deleted file mode 100644
index 2742a74..0000000
--- a/sci-physics/root/files/root-6.00.01-geocad.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/geom/geocad/inc/TGeoToOCC.h b/geom/geocad/inc/TGeoToOCC.h
-index 892f225..86eb9e1 100644
---- a/geom/geocad/inc/TGeoToOCC.h
-+++ b/geom/geocad/inc/TGeoToOCC.h
-@@ -13,8 +13,10 @@
- #define ROOT_TGeoToOCC
-
- //Cascade
-+#define Printf Printf_opencascade
- #include <TopoDS_Shape.hxx>
- #include <TopoDS_Wire.hxx>
-+#undef Printf
-
- //Root
- #ifndef ROOT_TGeoXtru
diff --git a/sci-physics/root/root-9999.ebuild
b/sci-physics/root/root-9999.ebuild
index 3ff5618..1b3ed72 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -197,8 +197,7 @@ src_prepare() {
"${FILESDIR}"/${PN}-5.34.13-unuran.patch \
"${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
"${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \
- "${FILESDIR}"/${PN}-6.00.01-llvm.patch \
- "${FILESDIR}"/${PN}-6.00.01-geocad.patch
+ "${FILESDIR}"/${PN}-6.00.01-llvm.patch
# make sure we use system libs and headers
rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
