[gentoo-commits] proj/sci:master commit in: sci-physics/root/

[Andrew Savchenko]

commit:     9ba6913bfa97c94855dd0a0834a66ff0111298f8
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Thu Jul  3 14:15:06 2014 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Thu Jul  3 14:15:06 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9ba6913b

sci-physcis/root-9999: patch moved to upstream

---
 sci-physics/root/ChangeLog        | 3 +++
 sci-physics/root/root-9999.ebuild | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 4770753..893e1ea 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  03 Jul 2014; Andrew Savchenko <bircoph@×××××.com> root-9999.ebuild:
+  Tutorial-dirs patch is accepted upstream.
+
   02 Jul 2014; Andrew Savchenko <bircoph@×××××.com> root-6.00.01-r1.ebuild,
   root-9999.ebuild, files/root-6.00.01-tutorials-path.patch:
   Do not compress files required for .credits, .demo, .license

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 9c76fed..66f8d87 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -200,8 +200,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \
 		"${FILESDIR}"/${PN}-6.00.01-prop-flags.patch \
 		"${FILESDIR}"/${PN}-6.00.01-llvm.patch \
-		"${FILESDIR}"/${PN}-6.00.01-geocad.patch \
-		"${FILESDIR}"/${PN}-6.00.01-tutorials-path.patch
+		"${FILESDIR}"/${PN}-6.00.01-geocad.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die