From 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Feb 2018 19:58:07 +0000 Subject: gentoo resync : 24.02.2018 --- app-text/dblatex/Manifest | 4 +- app-text/dblatex/dblatex-0.3.10-r1.ebuild | 53 ++++++++++++++++++++++ app-text/dblatex/dblatex-0.3.10.ebuild | 53 ---------------------- .../dblatex-0.3.10-no-inkscape-dependency.patch | 14 +++--- 4 files changed, 61 insertions(+), 63 deletions(-) create mode 100644 app-text/dblatex/dblatex-0.3.10-r1.ebuild delete mode 100644 app-text/dblatex/dblatex-0.3.10.ebuild (limited to 'app-text/dblatex') diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest index bf3c94ce9e0e..5fca11c5013a 100644 --- a/app-text/dblatex/Manifest +++ b/app-text/dblatex/Manifest @@ -1,9 +1,9 @@ -AUX dblatex-0.3.10-no-inkscape-dependency.patch 751 BLAKE2B 89a8f69af4fe60454cb1fcffbea2f991fc4968cedaa85abb1440c9b0a8488cb075d6eee08d526e2d05d4022dc1d7522ee49d6025162e5320e564a5029249e720 SHA512 47cfbd6a63a9649b25c1eba7d334bd8d6a818bbe33e84f3696ea06a6cb9fd91266c9a148dc7e1d2b3d99795ab88d4a4bb7d7de9779ea471d6e7ead48987dcce5 +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.ebuild 1353 BLAKE2B c834f296898614130fe11f2c59f8caeda3fbb157fdd2be1934e53e2a33f76a50691cfbc3891738ea64829907494bf7ed142d92b972d2461368cc7c9c8e0b034f SHA512 d321a2235dad54b4ad87a089c9c6f954b74a06991ab6b72b2a967667a09bdbc4a14dd56ddd8d80849a185b554a9cde4b0da23b6ced32eeeea278c50a3165aa91 +EBUILD dblatex-0.3.10-r1.ebuild 1353 BLAKE2B c834f296898614130fe11f2c59f8caeda3fbb157fdd2be1934e53e2a33f76a50691cfbc3891738ea64829907494bf7ed142d92b972d2461368cc7c9c8e0b034f SHA512 d321a2235dad54b4ad87a089c9c6f954b74a06991ab6b72b2a967667a09bdbc4a14dd56ddd8d80849a185b554a9cde4b0da23b6ced32eeeea278c50a3165aa91 EBUILD dblatex-0.3.7.ebuild 1157 BLAKE2B 5b2402160a46e98e47031a96c8a5bc1a9b765f1483fef6efc63f998a7e330320850b5706ea0657c8f5d26cecc0a104ce579e16de41b95a5b7bbbb6fa261cff3b SHA512 37d1e843549c1fa45fb768c6b2dbf34c14d7adbaa856811ac23b9b1b37c3eae0d202f44096619812a74600be9fd71cb8cb538d1e9523701f4bddaa31c8f362f5 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..ad0abc3ad3f2 --- /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-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.10.ebuild b/app-text/dblatex/dblatex-0.3.10.ebuild deleted file mode 100644 index ad0abc3ad3f2..000000000000 --- a/app-text/dblatex/dblatex-0.3.10.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# 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-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/files/dblatex-0.3.10-no-inkscape-dependency.patch b/app-text/dblatex/files/dblatex-0.3.10-no-inkscape-dependency.patch index 225c73964a5a..c501cee63042 100644 --- 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 @@ -1,14 +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 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 @@ +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", -- "%(input)s"]) -+ self.add_command(["rsvg-convert", "-f", "%(dst)s", "-o","\"%(output)s\"", -+ "\"%(insput)s\""]) ++ self.add_command(["rsvg-convert", "-f", "%(dst)s", "-o","%(output)s", + "%(input)s"]) - class FormatRule: -- cgit v1.2.3