diff options
author | Zoltan Puskas <zoltan@sinustrom.info> | 2017-06-25 21:11:10 -0700 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2017-10-13 18:26:12 +0200 |
commit | 217d1834d5b9199635ffb21157d28bee28f6f94e (patch) | |
tree | ac2de5a766b718ccee5fc203b19817987943a7f4 /app-text | |
parent | mail-client/neomutt: Version bump to neomutt-20171013 (diff) | |
download | gentoo-217d1834d5b9199635ffb21157d28bee28f6f94e.tar.gz gentoo-217d1834d5b9199635ffb21157d28bee28f6f94e.tar.bz2 gentoo-217d1834d5b9199635ffb21157d28bee28f6f94e.zip |
app-text/dblatex: Bump to 0.3.10 version
(also fixes \@xmultirow macro issue)
Closes: https://bugs.gentoo.org/614554
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'app-text')
-rw-r--r-- | app-text/dblatex/Manifest | 1 | ||||
-rw-r--r-- | app-text/dblatex/dblatex-0.3.10.ebuild | 53 | ||||
-rw-r--r-- | app-text/dblatex/dblatex-0.3.7.ebuild | 4 | ||||
-rw-r--r-- | app-text/dblatex/files/dblatex-0.3.10-no-inkscape-dependency.patch | 14 | ||||
-rw-r--r-- | app-text/dblatex/files/dblatex-0.3.7-no-inkscape-dependency.patch (renamed from app-text/dblatex/files/dblatex-no-inkscape-dependency.patch) | 0 | ||||
-rw-r--r-- | app-text/dblatex/metadata.xml | 3 |
6 files changed, 74 insertions, 1 deletions
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest index d38134bee856..a76bb05e84c7 100644 --- a/app-text/dblatex/Manifest +++ b/app-text/dblatex/Manifest @@ -1 +1,2 @@ +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 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 |