* [gentoo-commits] repo/gentoo:master commit in: app-text/dblatex/files/, app-text/dblatex/
@ 2018-02-21 18:21 Patrice Clement
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2018-02-21 18:21 UTC (permalink / raw
To: gentoo-commits
commit: 76f18b982f1926ba87875e4a644b54a829cde1ab
Author: Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Mon Feb 19 07:10:40 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Feb 21 18:21:01 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76f18b98
app-text/dblatex: fix typo in un-inkscape patch.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --force
Closes: https://bugs.gentoo.org/647860
Closes: https://github.com/gentoo/gentoo/pull/7225
.../{dblatex-0.3.10.ebuild => dblatex-0.3.10-r1.ebuild} | 0
.../files/dblatex-0.3.10-no-inkscape-dependency.patch | 14 ++++++--------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/app-text/dblatex/dblatex-0.3.10.ebuild b/app-text/dblatex/dblatex-0.3.10-r1.ebuild
similarity index 100%
rename from app-text/dblatex/dblatex-0.3.10.ebuild
rename to app-text/dblatex/dblatex-0.3.10-r1.ebuild
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 225c73964a5..c501cee6304 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:
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-text/dblatex/files/, app-text/dblatex/
@ 2020-05-18 13:23 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2020-05-18 13:23 UTC (permalink / raw
To: gentoo-commits
commit: 0051f15a7b3bd297f2ac20d2a18ca4049ce6092a
Author: Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Mon May 18 12:07:57 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 18 13:23:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0051f15a
app-text/dblatex: Drop old stable 0.3.10
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Zoltan Puskas <zoltan <AT> sinustrom.info>
Closes: https://github.com/gentoo/gentoo/pull/15866
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-text/dblatex/Manifest | 1 -
app-text/dblatex/dblatex-0.3.10-r1.ebuild | 53 ----------------------
.../dblatex-0.3.10-no-inkscape-dependency.patch | 12 -----
3 files changed, 66 deletions(-)
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index 8110e82a472..8613f7832bc 100644
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@@ -1,2 +1 @@
-DIST dblatex-0.3.10.tar.bz2 1668202 BLAKE2B 2cc7e33ddc1b4732ae880d3443e65e40b16fc21fa31dfc52ef2250433f4c99bb5b590961095e044b2972b1ac9b4e38358e356b7bdcfb607d6f863720feea7cf4 SHA512 33a5ee3d23d3b9a1576be248a312ca741ea7cb629334a98fb6cb49e0f0f932334506ea934312de04ec645c86ec52699687bd2574b1802d3c23815b44c8514b7b
DIST dblatex-0.3.11py3.tar.bz2 1671505 BLAKE2B 44e89f5f8d81105a3401074ad765479c04a495962c3efb3677cec81bf3b85c67a03585e7da8bdbd103cbea84e38d2bc633bd13704a5835c98d70fed644bfc6ba SHA512 48c1445c702e9c7c3ff83c57bb8a0caf5f4b027669a70887af0a23f75f5f99fb6840c4281b8bad9402910f3850af485d432e3109e5fd93184434cc87eb712695
diff --git a/app-text/dblatex/dblatex-0.3.10-r1.ebuild b/app-text/dblatex/dblatex-0.3.10-r1.ebuild
deleted file mode 100644
index a395a25c9b0..00000000000
--- a/app-text/dblatex/dblatex-0.3.10-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 arm 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/files/dblatex-0.3.10-no-inkscape-dependency.patch b/app-text/dblatex/files/dblatex-0.3.10-no-inkscape-dependency.patch
deleted file mode 100644
index c501cee6304..00000000000
--- a/app-text/dblatex/files/dblatex-0.3.10-no-inkscape-dependency.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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"])
-
-
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-text/dblatex/files/, app-text/dblatex/
@ 2017-10-13 16:26 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2017-10-13 16:26 UTC (permalink / raw
To: gentoo-commits
commit: 217d1834d5b9199635ffb21157d28bee28f6f94e
Author: Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Mon Jun 26 04:11:10 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 16:26:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=217d1834
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
app-text/dblatex/Manifest | 1 +
...{dblatex-0.3.7.ebuild => dblatex-0.3.10.ebuild} | 35 ++++++++++++++--------
app-text/dblatex/dblatex-0.3.7.ebuild | 4 ++-
.../dblatex-0.3.10-no-inkscape-dependency.patch | 14 +++++++++
... => dblatex-0.3.7-no-inkscape-dependency.patch} | 0
app-text/dblatex/metadata.xml | 3 ++
6 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index d38134bee85..a76bb05e84c 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.7.ebuild b/app-text/dblatex/dblatex-0.3.10.ebuild
similarity index 61%
copy from app-text/dblatex/dblatex-0.3.7.ebuild
copy to app-text/dblatex/dblatex-0.3.10.ebuild
index 4f45d485f7e..54a1779de91 100644
--- a/app-text/dblatex/dblatex-0.3.7.ebuild
+++ b/app-text/dblatex/dblatex-0.3.10.ebuild
@@ -1,42 +1,53 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="6"
PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils
+inherit distutils-r1
DESCRIPTION="Transform DocBook using TeX macros"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
HOMEPAGE="http://dblatex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
+IUSE="inkscape"
RDEPEND="
- app-text/texlive
+ 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
- dev-libs/libxslt
- app-text/docbook-xml-dtd:4.5
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
- EPATCH_SOURCE="${FILESDIR}" EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch
}
-python_install_all() {
+python_install() {
+ distutils-r1_python_install
python_doscript "${S}"/scripts/dblatex
- python_optimize
+}
+
+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 "mv doc"
+ 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 4f45d485f7e..4b0581e1274 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 00000000000..225c73964a5
--- /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
similarity index 100%
rename from app-text/dblatex/files/dblatex-no-inkscape-dependency.patch
rename to 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 943df18371e..33912835a88 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-18 13:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-21 18:21 [gentoo-commits] repo/gentoo:master commit in: app-text/dblatex/files/, app-text/dblatex/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2020-05-18 13:23 Michał Górny
2017-10-13 16:26 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox