gentoo resync : 14.07.2018

4 files changed, 67 insertions, 0 deletions

diff --git a/app-text/dblatex/files/dblatex-0.3.10-no-inkscape-dependency.patch b/app-text/dblatex/files/dblatex-0.3.10-no-inkscape-dependency.patch
new file mode 100644
index 000000000000..c501cee63042
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-0.3.10-no-inkscape-dependency.patch
@@ -0,0 +1,12 @@
+diff -Naur dblatex-0.3.10.orig/lib/dbtexmf/core/imagedata.py dblatex-0.3.10/lib/dbtexmf/core/imagedata.py
+--- dblatex-0.3.10.orig/lib/dbtexmf/core/imagedata.py	2018-02-16 17:00:42.658484437 +0200
++++ dblatex-0.3.10/lib/dbtexmf/core/imagedata.py	2018-02-16 16:52:56.339441569 +0200
+@@ -178,7 +178,7 @@
+ class SvgConverter(ImageConverter):
+     def __init__(self, imgsrc, imgdst="", docformat="", backend=""):
+         ImageConverter.__init__(self, imgsrc="svg", imgdst=imgdst)
+-        self.add_command(["inkscape", "-z", "-D", "--export-%(dst)s=%(output)s",
++        self.add_command(["rsvg-convert", "-f", "%(dst)s", "-o","%(output)s",
+                           "%(input)s"])
+ 
+ 
diff --git a/app-text/dblatex/files/dblatex-0.3.7-no-inkscape-dependency.patch b/app-text/dblatex/files/dblatex-0.3.7-no-inkscape-dependency.patch
new file mode 100644
index 000000000000..1d032f4ac26c
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-0.3.7-no-inkscape-dependency.patch
@@ -0,0 +1,12 @@
+diff -Naur dblatex-0.3.7-orig/lib/dbtexmf/core/imagedata.py dblatex-0.3.7/lib/dbtexmf/core/imagedata.py
+--- dblatex-0.3.7-orig/lib/dbtexmf/core/imagedata.py	2015-08-07 10:47:53.000000000 +0100
++++ dblatex-0.3.7/lib/dbtexmf/core/imagedata.py	2015-11-08 22:36:41.771457222 +0000
+@@ -66,7 +66,7 @@
+ 
+ class SvgConverter(ImageConverter):
+     def convert(self, input, output, format, doexec=1):
+-        cmd = "inkscape -z -D --export-%s=%s \"%s\"" % (format, output, input)
++        cmd = "rsvg-convert -f %s -o \"%s\" \"%s\"" % (format, output, input)
+         return self.system(cmd, doexec)
+ 
+ 
diff --git a/app-text/dblatex/files/dblatex-path-logging.patch b/app-text/dblatex/files/dblatex-path-logging.patch
new file mode 100644
index 000000000000..7f0fdb6c52a6
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-path-logging.patch
@@ -0,0 +1,15 @@
+diff -Naur dblatex-0.3.7-orig/scripts/dblatex dblatex-0.3.7/scripts/dblatex
+--- dblatex-0.3.7-orig/scripts/dblatex	2015-08-07 10:47:53.000000000 +0100
++++ dblatex-0.3.7/scripts/dblatex	2015-11-08 22:30:50.362571505 +0000
+@@ -1,8 +1,10 @@
+ #! /usr/bin/env python
+ import sys
+ import os
++import logging
+ 
+-package_base = os.path.join(os.path.dirname(sys.argv[0]), "..")
++logging.basicConfig()
++package_base = "/usr/share/dblatex"
+ sys.path.append(os.path.realpath(os.path.join(package_base, "lib")))
+ 
+ from dbtexmf.dblatex import dblatex
diff --git a/app-text/dblatex/files/dblatex-setup.patch b/app-text/dblatex/files/dblatex-setup.patch
new file mode 100644
index 000000000000..f6cf4a24283e
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-setup.patch
@@ -0,0 +1,28 @@
+--- dblatex-0.3.7-orig/setup.py	2015-08-07 10:47:53.000000000 +0100
++++ dblatex-0.3.7/setup.py	2015-11-08 22:39:03.076213227 +0000
+@@ -23,7 +23,6 @@
+ from distutils import log
+ from subprocess import Popen, PIPE
+ sys.path.append("lib")
+-from contrib.debian.installer import DebianInstaller
+ 
+ #
+ # Build the command line script
+@@ -363,15 +362,12 @@
+                 status += "no"
+                 mis_stys.append(sty)
+             print status
+-            
++
+         if mis_stys:
+             raise OSError("not found: %s" % ", ".join(mis_stys))
+ 
+     def run(self):
+-        if self.install_layout == "deb":
+-            db = DebianInstaller(self)
+-        else:
+-            db = None
++        db = None
+ 
+         if not(db) and not(self.nodeps):
+             try: