gentoo resync : 13.10.2017

6 files changed, 79 insertions, 4 deletions

diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index 8234e78b45a9..ecd1f6b2c644 100644
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@@ -1,7 +1,10 @@
-AUX dblatex-no-inkscape-dependency.patch 595 SHA256 0cd23f2c9b5af88b4ec29d32d43d3b8c2dafce902a00873c5780a021b8b2094b SHA512 69cb27f3548a55ae2d34e1b9c05f963a05e5b810e5338e7adb5f4739c03f3bd6bb650e9a6a63edfc75554b45a835c1cb596681dd3e440ea1acb0d2b661d25c6c WHIRLPOOL c89ba1927f6f47b27a787bdb3e201c30567cc446abf59fcc6a594df442c15587e5a022dd200e99db8ffed760ce3e43474d31d07b6e6bd392d1f46aea72d408a4
+AUX dblatex-0.3.10-no-inkscape-dependency.patch 751 SHA256 635ef8a3c1ded3fa256f9349915f18859db68e1f635b9e98d86a41403399ef0a SHA512 47cfbd6a63a9649b25c1eba7d334bd8d6a818bbe33e84f3696ea06a6cb9fd91266c9a148dc7e1d2b3d99795ab88d4a4bb7d7de9779ea471d6e7ead48987dcce5 WHIRLPOOL 9c9e9eada75044d7cf3c400435f78e6b4bc5ed989f62b0ab2a90d3b5c7cf2756a9f234ecef843beb91ba2497cffd1216e7603f575b663c25334e981e7e285d9d
+AUX dblatex-0.3.7-no-inkscape-dependency.patch 595 SHA256 0cd23f2c9b5af88b4ec29d32d43d3b8c2dafce902a00873c5780a021b8b2094b SHA512 69cb27f3548a55ae2d34e1b9c05f963a05e5b810e5338e7adb5f4739c03f3bd6bb650e9a6a63edfc75554b45a835c1cb596681dd3e440ea1acb0d2b661d25c6c WHIRLPOOL c89ba1927f6f47b27a787bdb3e201c30567cc446abf59fcc6a594df442c15587e5a022dd200e99db8ffed760ce3e43474d31d07b6e6bd392d1f46aea72d408a4
 AUX dblatex-path-logging.patch 537 SHA256 04ec91eb38cb970d85b7299f41335cb833de82aed6b68dd28defaa20ed7114ad SHA512 04a1f26e59a7c45eed758f8e8fa1f5e1469e3ea71fa65c836d038397c0d8bbc0ca658c05697dcb32371dde33cf3d20be3f987d7b68f194f2d254071cf2836213 WHIRLPOOL ba95dcb5d78546d6ff200c7e038cb6ca6f1db1cb9a64ac48573ea5904915520330abf8dd7ddaef8a903a98bb2d024764467505c75b13f9a2041be97e371dbadd
 AUX dblatex-setup.patch 773 SHA256 94b4b1d27c18458c9b2cc2ef412cddfb7fbec4a02bf1a5fc6736016c8df90bb3 SHA512 c9ca96db18f81ffd999d3b2fd274d2fbf29f869d199d954fac562938a8475510278f0d3bb7cb948414f13c84c6f94dbec196c7bd04f3abe3400c3fdfe36941fb WHIRLPOOL 92598c59d2be617cc042d32b016b558a5f391a3102efcde9b6576264d5323080d374abce8bb47d096f9709b67690489d61692f17e9ee3a3a76fe36a63c6a1f30
+DIST dblatex-0.3.10.tar.bz2 1668202 SHA256 6fd696b740e0044ae1caf843d225d98c01b6ed916550384544e7e31c0c6a2cfa SHA512 33a5ee3d23d3b9a1576be248a312ca741ea7cb629334a98fb6cb49e0f0f932334506ea934312de04ec645c86ec52699687bd2574b1802d3c23815b44c8514b7b WHIRLPOOL e0d1743f9b37fb4c05b03f38fc7af79605c19c3271e302dc492f089476f79403ad9b17d6cd5bac9ef3cba67fa4c07002bfdb92fe143e4c1aea2c6768835f346c
 DIST dblatex-0.3.7.tar.bz2 1513975 SHA256 59ce3fdfd4d6cf44beb8705d9267b7be7cb32d4f826834c861c5b7016c7e722e SHA512 7f7111dfe7d880a93679422a43700787755ebee7f17483b4bc5a8ce55c521d7fe0baeb4890a910b9007141d63a3e3b8f50347e68001ad7c1a14916920e11a40c WHIRLPOOL df27896ecf5f2f194fb51f9e6a566c324495c9fb9c1217514af97b5c30fc2dc0dd5a7aa9bb71daf36a4329101a90f7743d9c5962b8a2fbe994773320d3cf937e
-EBUILD dblatex-0.3.7.ebuild 1087 SHA256 8fdd0a33325ad8fd114a4eeee95af0a950308efe51901dd1d362378573c5aada SHA512 a30bc61ff7495b9743d0bd9c99b98b56eefa75bf9aefe3f1b3d3d9bfb5b4df2d6919fa156d8d7a512d14b9fb0c556c1083533f4e36968fc0153f55e92d03d310 WHIRLPOOL 6c1f43864aeec5a692fc048c540643e1ad537846076423f3ccb9f1a4d532f9065c4389e85b1e97b24437a2bee9b82515b2e53ac902bed09b7da6b2ef791d02ac
+EBUILD dblatex-0.3.10.ebuild 1355 SHA256 4463effdfb5427e518cb99b5cf42541e9c546ad245d4ab21bb6a1f56a7fb6219 SHA512 afe1773b9555d56db5bff8cd90eb36217c386b6fe783aa7625353bb7da7b5d519ee5fa53417905efcdf8895b2a8b502f70dc0a2a63670cbec1b2125861a597a6 WHIRLPOOL a41334146c999252c05ef7c3f177b58e5c4ef02d3f4c86ec482762db47866aaa948c82f58e7d2ad39ed43ab618e0833625a57ba06a45b264ddc449708c32559d
+EBUILD dblatex-0.3.7.ebuild 1153 SHA256 27efe7699604e1e253ee3ce6a612bbe7242483cc258df5a3571786ac26bc76bc SHA512 7e25af474e0d806aa210c8cb33732cb72cbaccccdce73286b0347c7ad74394870cb0c1e47552f749a4003ea4459d766c82e1e52e2ab1a80dac96084752929ba3 WHIRLPOOL 7c484ab2e73388a7442033c5fd9c6cadde2bf5275b7b85c52dc7deb36e57b62af2ff508cbd3fd0346ff80276f65f6c9ff0569c7ad1cfbc1ae3bc6eb4c61b8d5d
 MISC ChangeLog 1969 SHA256 aa31d133752837b6369bb653520308bc67ec42237ff4478725730aa3a9e11e3f SHA512 2239152919b14534467dbda01f4d6e4de4f64b3182540ee73a66f9217c80440eaad75e3b7405b21ab714417e2fbee8d35fd222be4d184f911b61b83dea97c553 WHIRLPOOL e8ebeb4a8918807c006c7ab636c6872758cd6b26ab5dc9a795ec86e22ef5a137315acd48b624ed92f9b986dc7d0c261bd8ec7712028de14b6e03d03f64b02520
-MISC metadata.xml 811 SHA256 a430d1c453b9d1106daa54519cc6fb0f761a3e5925e14bf2523117402b198fd4 SHA512 58d4f7ca0dcac11f6d2d4a303f67ad41dd8f475f03016b3088c377366a5c7beb3622f5157359ef30612f73a3fb3072d4bc9fe495dd8739bec5fc062a62d39f81 WHIRLPOOL 11fe86eb9226f547fe839b960502f6c4debee649bac9f129a7091e70e278d5d51effb56a0cdffb65c2505c0848aa93386e4ab8a81518410cb5667bad0d2c7a2a
+MISC metadata.xml 941 SHA256 e32a1955e38582623e14e0b3a8df9f6a70a4a61c636c19aecd55b828c7835e1a SHA512 7121c2ee306d97a7b1cf438d8cd2fefac565cf2fc4f928280544a1ffce6465f4f93262beb06bc53cad5b9aed4e6caca528ee2f4aec7531ae1fb4ae8b70f556d6 WHIRLPOOL 419691621123acafdf86b373df76f13b50f974b4dac1dd7c4a33a55304ef7ea7db296373f49ff73187c8c17c3f1f2ca57ac32b3eeaf43acda73d5b912357346c
diff --git a/app-text/dblatex/dblatex-0.3.10.ebuild b/app-text/dblatex/dblatex-0.3.10.ebuild
new file mode 100644
index 000000000000..54a1779de911
--- /dev/null
+++ b/app-text/dblatex/dblatex-0.3.10.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 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-mathextra )
+	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
index 4f45d485f7eb..4b0581e12744 100644
--- a/app-text/dblatex/dblatex-0.3.7.ebuild
+++ b/app-text/dblatex/dblatex-0.3.7.ebuild
@@ -30,7 +30,9 @@ DEPEND="${RDEPEND}"
 
 python_prepare_all() {
 	distutils-r1_python_prepare_all
-	EPATCH_SOURCE="${FILESDIR}" EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch
+	epatch "${FILESDIR}/${P}-no-inkscape-dependency.patch"
+	epatch "${FILESDIR}/${PN}-path-logging.patch"
+	epatch "${FILESDIR}/${PN}-setup.patch"
 }
 
 python_install_all() {
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..225c73964a5a
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-0.3.10-no-inkscape-dependency.patch
@@ -0,0 +1,14 @@
+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	2016-10-02 14:21:16.000000000 -0700
++++ dblatex-0.3.10/lib/dbtexmf/core/imagedata.py	2017-06-25 18:26:00.302168655 -0700
+@@ -178,8 +178,8 @@
+ 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",
+-                          "%(input)s"])
++        self.add_command(["rsvg-convert", "-f", "%(dst)s", "-o","\"%(output)s\"",
++                          "\"%(insput)s\""])
+ 
+ 
+ class FormatRule:
diff --git a/app-text/dblatex/files/dblatex-no-inkscape-dependency.patch b/app-text/dblatex/files/dblatex-0.3.7-no-inkscape-dependency.patch
index 1d032f4ac26c..1d032f4ac26c 100644
--- a/app-text/dblatex/files/dblatex-no-inkscape-dependency.patch
+++ b/app-text/dblatex/files/dblatex-0.3.7-no-inkscape-dependency.patch
diff --git a/app-text/dblatex/metadata.xml b/app-text/dblatex/metadata.xml
index 943df18371e8..33912835a882 100644
--- a/app-text/dblatex/metadata.xml
+++ b/app-text/dblatex/metadata.xml
@@ -10,6 +10,9 @@
         <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