From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B61A61383E0 for ; Thu, 1 Oct 2015 06:06:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71B6421C017; Thu, 1 Oct 2015 06:06:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47CE3E0878 for ; Thu, 1 Oct 2015 06:06:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0CECB341087 for ; Thu, 1 Oct 2015 06:06:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 630492C3 for ; Thu, 1 Oct 2015 06:06:37 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1443382595.bc44947211bd480f0d44e86a2a77761ee8b6ae83.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/root/ChangeLog sci-physics/root/files/root-6.00.01-geocad.patch sci-physics/root/root-9999.ebuild X-VCS-Directories: sci-physics/root/files/ sci-physics/root/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: bc44947211bd480f0d44e86a2a77761ee8b6ae83 X-VCS-Branch: master Date: Thu, 1 Oct 2015 06:06:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bdad5058-b0a2-4103-b6ad-fb51f668db1e X-Archives-Hash: 4f45f5cf500778b8b1e6778575ec9c36 commit: bc44947211bd480f0d44e86a2a77761ee8b6ae83 Author: Oliver Freyermuth googlemail com> AuthorDate: Sun Sep 27 19:36:35 2015 +0000 Commit: Justin Lecher gentoo 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 + -files/root-6.00.01-geocad.patch, root-9999.ebuild: + sci-physics/root: Remove geocad-patch, is now upstream. + 27 Sep 2015; Oliver Freyermuth 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 - #include -+#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