[gentoo-commits] proj/sci:master commit in: dev-python/nbconvert/files/, dev-python/nbconvert/

[Marius Brehler]

commit:     50f0eb0d541e4ff09bdc008e4ed54674ab8998a0
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Nov 28 18:01:09 2015 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Sat Nov 28 18:01:09 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=50f0eb0d

dev-python/nbconvert: Drop old patch

Package-Manager: portage-2.2.20.1

 dev-python/nbconvert/ChangeLog                     |  4 +++
 .../nbconvert-4.0.0-pandoc-highlighting.patch      | 37 ----------------------
 2 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/dev-python/nbconvert/ChangeLog b/dev-python/nbconvert/ChangeLog
index b03b909..5893b22 100644
--- a/dev-python/nbconvert/ChangeLog
+++ b/dev-python/nbconvert/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  28 Nov 2015; Marius Brehler <marbre@××××××××××××××.de>
+  -files/nbconvert-4.0.0-pandoc-highlighting.patch:
+  dev-python/nbconvert: Drop old patch
+
   28 Nov 2015; Marius Brehler <marbre@××××××××××××××.de> -Manifest,
   -nbconvert-4.0.0-r1.ebuild, -nbconvert-4.1.0.ebuild:
   dev-python/nbconvert: Moved to tree

diff --git a/dev-python/nbconvert/files/nbconvert-4.0.0-pandoc-highlighting.patch b/dev-python/nbconvert/files/nbconvert-4.0.0-pandoc-highlighting.patch
deleted file mode 100644
index 793856a..0000000
--- a/dev-python/nbconvert/files/nbconvert-4.0.0-pandoc-highlighting.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 983473d2e5f71ebef07dab51ae497596af5bc9ac
-Author: James Hetherington <jamespjh@××××××××××.com>
-Date:   Mon Aug 31 18:06:46 2015 +0100
-
-    Add highlighting commands from more recent pandoc
-
-diff --git a/nbconvert/templates/latex/base.tplx b/nbconvert/templates/latex/base.tplx
-index 7d45c5d..a1568c5 100644
---- a/nbconvert/templates/latex/base.tplx
-+++ b/nbconvert/templates/latex/base.tplx
-@@ -84,6 +84,26 @@ This template does not define a docclass, the inheriting class must define this.
-     \newcommand{\ErrorTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{{#1}}}}
-     \newcommand{\NormalTok}[1]{{#1}}
-     
-+    % Additional commands for more recent versions of Pandoc
-+    \newcommand{\ConstantTok}[1]{\textcolor[rgb]{0.53,0.00,0.00}{{#1}}}
-+    \newcommand{\SpecialCharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{{#1}}}
-+    \newcommand{\VerbatimStringTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{{#1}}}
-+    \newcommand{\SpecialStringTok}[1]{\textcolor[rgb]{0.73,0.40,0.53}{{#1}}}
-+    \newcommand{\ImportTok}[1]{{#1}}
-+    \newcommand{\DocumentationTok}[1]{\textcolor[rgb]{0.73,0.13,0.13}{\textit{{#1}}}}
-+    \newcommand{\AnnotationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{{#1}}}}}
-+    \newcommand{\CommentVarTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{{#1}}}}}
-+    \newcommand{\VariableTok}[1]{\textcolor[rgb]{0.10,0.09,0.49}{{#1}}}
-+    \newcommand{\ControlFlowTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{{#1}}}}
-+    \newcommand{\OperatorTok}[1]{\textcolor[rgb]{0.40,0.40,0.40}{{#1}}}
-+    \newcommand{\BuiltInTok}[1]{{#1}}
-+    \newcommand{\ExtensionTok}[1]{{#1}}
-+    \newcommand{\PreprocessorTok}[1]{\textcolor[rgb]{0.74,0.48,0.00}{{#1}}}
-+    \newcommand{\AttributeTok}[1]{\textcolor[rgb]{0.49,0.56,0.16}{{#1}}}
-+    \newcommand{\InformationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{{#1}}}}}
-+    \newcommand{\WarningTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{{#1}}}}}
-+    
-+    
-     % Define a nice break command that doesn't care if a line doesn't already
-     % exist.
-     \def\br{\hspace*{\fill} \\* }