bug#26924: [PATCH 05/12] gnu: calibre: Unbundle python2-markdown

[Brendan Tildesley <brendan.tildesley@openmailbox.org>]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: 0005-gnu-calibre-Unbundle-python2-markdown.patch --]
[-- Type: text/x-patch, Size: 1649 bytes --]

From 9202987ba9aed6e7c503aca877110e0e27e3dbc0 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sat, 13 May 2017 23:24:06 +1000
Subject: [PATCH 05/12] gnu: calibre: Unbundle python2-markdown

* gnu/packages/ebook.scm (calibre):
[snippet]: Replace python references to bundled markdown with packaged. Remove
markdown from source.
[inputs]: Add python2-markdown as a dependency.
---
 gnu/packages/ebook.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 70ec9ed35..d925504a2 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -78,8 +78,11 @@
         (modules '((guix build utils)))
         (snippet
           '(begin
+            (delete-file-recursively "src/calibre/ebooks/markdown")
             (delete-file-recursively "src/unrar")
-            (delete-file "src/odf/thumbnail.py")))
+            (delete-file "src/odf/thumbnail.py")
+            (substitute* (find-files "." "\\.py")
+              (("calibre\\.ebooks\\.markdown") "markdown"))))
         (patches (search-patches "calibre-drop-unrar.patch"
                                  "calibre-use-packaged-feedparser.patch"
                                  "calibre-dont-load-remote-icons.patch"
@@ -120,6 +123,7 @@
        ("python2-dbus" ,python2-dbus)
        ("python2-feedparser" ,python2-feedparser)
        ("python2-lxml" ,python2-lxml)
+       ("python2-markdown" ,python2-markdown)
        ("python2-mechanize" ,python2-mechanize)
        ("python2-netifaces" ,python2-netifaces)
        ("python2-pillow" ,python2-pillow)
-- 
2.12.2