gentoo resync : 14.07.2018

8 files changed, 196 insertions, 0 deletions

diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
new file mode 100644
index 000000000000..b0360aa73431
--- /dev/null
+++ b/app-text/dblatex/Manifest
@@ -0,0 +1,9 @@
+AUX dblatex-0.3.10-no-inkscape-dependency.patch 682 BLAKE2B b9dd747b3e0440f9e255f09e0a5b80e9218066a09cceb63fad5b2ea4507d4d11975f610726db3efb0f14a1701a4c2f2afd89dacceba2ba6299805b6d21eb334a SHA512 e469066dad4dfeaa92ee0fc12e0fb0de0eda83f503a22227b9714b282f7b8ad697726d2c69f623b5c77c9f31d3d182f4c144a660521b8865808e6260fcd5f4da
+AUX dblatex-0.3.7-no-inkscape-dependency.patch 595 BLAKE2B 6937bc2cebd42193c5a1414330445162b09954e80db39b3221ca6fd6ba1320bd44e41e2f896a7b11e4334dd729b4167dbfd70c5d21b55719737ce9bb93e0d8fd SHA512 69cb27f3548a55ae2d34e1b9c05f963a05e5b810e5338e7adb5f4739c03f3bd6bb650e9a6a63edfc75554b45a835c1cb596681dd3e440ea1acb0d2b661d25c6c
+AUX dblatex-path-logging.patch 537 BLAKE2B 1ed23e355e64946ac0bd8839edd26688fbbfbbd56e090470c07ffb8b2cc91ebe32500002468c1f4333adcf786722b5af8623581ae4a4ca5af53be4a5e80959c3 SHA512 04a1f26e59a7c45eed758f8e8fa1f5e1469e3ea71fa65c836d038397c0d8bbc0ca658c05697dcb32371dde33cf3d20be3f987d7b68f194f2d254071cf2836213
+AUX dblatex-setup.patch 773 BLAKE2B d32b842e52caddd1587fe2fe0a005b148bb1a231b0b4bf4cc6c62cdced6a47048639ed9b5f98bc42a72f19a8e4e9dfd1bc4bf1eff62fb032bdb52bfe396335da SHA512 c9ca96db18f81ffd999d3b2fd274d2fbf29f869d199d954fac562938a8475510278f0d3bb7cb948414f13c84c6f94dbec196c7bd04f3abe3400c3fdfe36941fb
+DIST dblatex-0.3.10.tar.bz2 1668202 BLAKE2B 2cc7e33ddc1b4732ae880d3443e65e40b16fc21fa31dfc52ef2250433f4c99bb5b590961095e044b2972b1ac9b4e38358e356b7bdcfb607d6f863720feea7cf4 SHA512 33a5ee3d23d3b9a1576be248a312ca741ea7cb629334a98fb6cb49e0f0f932334506ea934312de04ec645c86ec52699687bd2574b1802d3c23815b44c8514b7b
+DIST dblatex-0.3.7.tar.bz2 1513975 BLAKE2B de523640eacc058eaffc2e53407d6faed0969b1485110dca7669c6fb2323d4ecb91c8d73d9a8fdf3ae9d0803f5e5a371af011c0a241f97f08ae4d73ee57e7d89 SHA512 7f7111dfe7d880a93679422a43700787755ebee7f17483b4bc5a8ce55c521d7fe0baeb4890a910b9007141d63a3e3b8f50347e68001ad7c1a14916920e11a40c
+EBUILD dblatex-0.3.10-r1.ebuild 1316 BLAKE2B 9771dfb0dac508f8b16bb6ae5e7f69e71e7d1449034451562d58eba884baf3a7dcf4230dcabe38c70c63ce22cf14c85fcf2b97491167534404fa5d4a3cd138e7 SHA512 c8b267c0e6ae576e2655d4cd9424a2692521ecfe8f847e851b8424670ead8e15f4a9200723656d49cefb118d2a4b31880ac7af054f49871c4cfbbed7d3bc2ca3
+EBUILD dblatex-0.3.7.ebuild 1120 BLAKE2B 1776f6e8414636dfb040fda86c7ed1a75cfe38fe80f337c57960ec6409e0e9973d7c55857609c935b96221c75f5e18190bd36e5e0d1ebb9c1ab4a018d5ced76e SHA512 ed640e2d8f4d92d3abfbe91cb6a328666fc33ffbbf9d67f72c3ca9710bff904cce7d4c6482eeccbaac6fe009591de80047c8791165846a49086ee255da3491cf
+MISC metadata.xml 866 BLAKE2B 3776cf07848836c14fd82031a49284f982b04b573fd28080c0fa9c7cbe6155fa63c89b897461dc996842a0d66be38fbde2326cdce8aeddebbfcfd777677e2011 SHA512 9806f0804fc5b14a222974a9e2c2cc8a13a7378b99deca9cd9ac5f7cbdb776b3c240b521a6077cb80d1685574ca47a372712526ec994c6bf228b2c784568cf93
diff --git a/app-text/dblatex/dblatex-0.3.10-r1.ebuild b/app-text/dblatex/dblatex-0.3.10-r1.ebuild
new file mode 100644
index 000000000000..0f9f0a65e4f1
--- /dev/null
+++ b/app-text/dblatex/dblatex-0.3.10-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Transform DocBook using TeX macros"
+HOMEPAGE="http://dblatex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="inkscape"
+
+RDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	dev-libs/kpathsea
+	dev-libs/libxslt
+	dev-libs/libxslt
+	dev-texlive/texlive-fontutils
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+	dev-texlive/texlive-latexrecommended
+	dev-texlive/texlive-mathscience
+	dev-texlive/texlive-pictures
+	dev-texlive/texlive-xetex
+	gnome-base/librsvg
+	media-gfx/imagemagick
+	media-gfx/transfig
+	inkscape? ( media-gfx/inkscape )
+"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	use inkscape || eapply "${FILESDIR}/${P}-no-inkscape-dependency.patch"
+	eapply "${FILESDIR}/${PN}-path-logging.patch"
+	eapply "${FILESDIR}/${PN}-setup.patch"
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_doscript "${S}"/scripts/dblatex
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# move package documentation to a folder name containing version number
+	mv "${D%/}"/usr/share/doc/${PN} "${D%/}"/usr/share/doc/${PF} || die
+}
diff --git a/app-text/dblatex/dblatex-0.3.7.ebuild b/app-text/dblatex/dblatex-0.3.7.ebuild
new file mode 100644
index 000000000000..eecbe631b196
--- /dev/null
+++ b/app-text/dblatex/dblatex-0.3.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Transform DocBook using TeX macros"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://dblatex.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+RDEPEND="
+	app-text/texlive
+	dev-texlive/texlive-latexextra
+	dev-texlive/texlive-latexrecommended
+	dev-texlive/texlive-mathscience
+	dev-texlive/texlive-pictures
+	dev-texlive/texlive-xetex
+	dev-libs/libxslt
+	app-text/docbook-xml-dtd:4.5
+	gnome-base/librsvg
+"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	epatch "${FILESDIR}/${P}-no-inkscape-dependency.patch"
+	epatch "${FILESDIR}/${PN}-path-logging.patch"
+	epatch "${FILESDIR}/${PN}-setup.patch"
+}
+
+python_install_all() {
+	python_doscript "${S}"/scripts/dblatex
+	python_optimize
+	distutils-r1_python_install_all
+	# move package documentation to a folder name containing version number
+	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die "mv doc"
+}
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:
diff --git a/app-text/dblatex/metadata.xml b/app-text/dblatex/metadata.xml
new file mode 100644
index 000000000000..609cf12fd1ec
--- /dev/null
+++ b/app-text/dblatex/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>zoltan@sinustrom.info</email>
+        <name>Zoltan Puskas</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <use>
+        <flag name="inkscape">Use inkscape to convert SVG. Disable to use gnome-base/librsvg instead.</flag>
+    </use>
+    <longdescription>
+               dbaltex is an opensource DocBook to LaTeX publishing software 
+               that originally started as DB2LaTeX clone, but now is more
+               feature rich and easier to use.
+    </longdescription>
+    <upstream>
+        <remote-id type="sourceforge">dblatex</remote-id>
+    </upstream>
+</pkgmetadata>