app-text/dblatex: Bump to 0.3.10 version which also fixes \@xmultirow macro issue, bump kicad-doc now that it builds #4991

zpuskas · 2017-06-26T04:14:17Z

Gentoo bug: #614554

Package-Manager: Portage-2.3.6, Repoman-2.3.2

gentoo-repo-qa-bot · 2017-06-26T04:37:01Z

Pull Request assignment

Areas affected: ebuilds
Packages affected: app-text/dblatex

app-text/dblatex: @zpuskas, @gentoo/proxy-maint

mgorny · 2017-07-01T19:37:39Z

app-doc/kicad-doc/kicad-doc-4.0.6.ebuild

+
+DEPEND=">=app-text/asciidoc-8.6.9
+	>=app-text/dblatex-0.3.10
+	app-text/texlive:=[l10n_en?,l10n_fr?,l10n_it?,l10n_ja?,l10n_nl?,l10n_pl?]


@gentoo/tex, isn't this kind of dependency 100% wrong?

yes, definitely

app-text/texlive is for users to pull texlive with their useflags

ebuilds should depend on the dev-texlive/pkg they need

mgorny · 2017-07-01T19:38:23Z

app-doc/kicad-doc/kicad-doc-4.0.6.ebuild

+	>=app-text/dblatex-0.3.10
+	app-text/texlive:=[l10n_en?,l10n_fr?,l10n_it?,l10n_ja?,l10n_nl?,l10n_pl?]
+	>=app-text/po4a-0.45
+	>=sys-devel/gettext-0.18


Any reason not to sort them? It's easier to check them when they're in order.

mgorny · 2017-07-01T19:38:51Z

app-doc/kicad-doc/kicad-doc-4.0.6.ebuild

+RDEPEND=""
+
+src_prepare() {
+	DOCPATH="KICAD_DOC_INSTALL_PATH share/doc/kicad"


Is this actually used anywhere else? If not…

mgorny · 2017-07-01T19:39:49Z

app-doc/kicad-doc/kicad-doc-4.0.6.ebuild

+
+src_prepare() {
+	DOCPATH="KICAD_DOC_INSTALL_PATH share/doc/kicad"
+	sed "s|${DOCPATH}|${DOCPATH}-${PV}|g" -i CMakeLists.txt || die "sed failed"


sed -e "s|...|&-${PV}|" ...

(& means whole matched thing)

mgorny · 2017-07-01T19:41:09Z

app-doc/kicad-doc/kicad-doc-4.0.6.ebuild

+	done
+
+	# find out which language is requested
+	for lang in ${LANGS}; do


Since L10N is USE_EXPAND, starting with EAPI 5 you can just query ${L10N}; it's going to contain all enabled flags — i.e. just one flag with your REQUIRED_USE.

mgorny · 2017-07-01T19:45:09Z

app-text/dblatex/dblatex-0.3.10.ebuild

+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all


This goes after patching.

mgorny · 2017-07-01T19:45:58Z

app-text/dblatex/dblatex-0.3.10.ebuild

+}
+
+python_install_all() {
+	python_doscript "${S}"/scripts/dblatex


This belongs in python_install since logically you want to install the script for all supported implementations. Even if you have only one.

If it's in python_install along with python_optimize there are all sorts of errors. I don't want to patch the setup.py for now, maybe in another PR as it's going to take quite some time to debug.

You should be more specific than that to convince me. AFAICS it's an ebuild that's heavily broken.

mgorny · 2017-07-01T19:46:27Z

app-text/dblatex/dblatex-0.3.10.ebuild

+
+python_install_all() {
+	python_doscript "${S}"/scripts/dblatex
+	python_optimize


Likewise. Though I'm surprised you need it if Python modules are installed via setup.py.

I tried moving this too. The setup.py is a bit hacky, which would require quite some work, possibly pushing it upstream. For now let's just let this be.

mgorny · 2017-07-01T19:47:43Z

app-text/dblatex/metadata.xml

@@ -10,6 +10,9 @@
        <email>proxy-maint@gentoo.org</email>
        <name>Proxy Maintainers</name>
    </maintainer>
+	<use>


mgorny · 2017-07-01T19:48:21Z

app-text/dblatex/files/dblatex-0.3.10-no-inkscape-dependency.patch

+         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\"",


Is librsvg really unconditionally required? Is there a point in supporting the inkscape option at all?

The point is that people still can use dblatex without installing inkscape if they want to, since inkscape is bit on the heavier side compared to librsvg.

No, I mean is there a point in not using rsvg all the time?

Yes, that was the original authors intent and I would like to keep it as an option.

zpuskas · 2017-07-18T03:25:33Z

@mgorny ping

mgorny · 2017-07-18T17:10:23Z

app-text/dblatex/dblatex-0.3.10.ebuild

+	dev-libs/libxslt
+	dev-libs/libxslt
+	dev-texlive/texlive-fontutils
+    dev-texlive/texlive-latex


Also misindent.

mgorny

I'm sorry for the delay. I've fixed those minor issues and merged the dblatex bump. However, kicad-doc seems not to install to the path you expect it to, and that one you need to fix.

mgorny · 2017-10-13T15:59:04Z

app-text/dblatex/dblatex-0.3.10.ebuild

+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils


eutils doesn't seem to be used.

mgorny · 2017-10-13T15:59:35Z

app-text/dblatex/dblatex-0.3.10.ebuild

+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"


D already contains a trailing slash in EAPI 6.

mgorny · 2017-10-13T16:22:17Z

app-doc/kicad-doc/kicad-doc-4.0.6.ebuild

+RDEPEND=""
+
+src_prepare() {
+	sed -e "s|KICAD_DOC_INSTALL_PATH share/doc/kicad|&-${PV}|g" -i CMakeLists.txt || die "sed failed"


This does not seem to work:

./usr/share/doc/kicad/help/ ./usr/share/doc/kicad/help/pl/ ./usr/share/doc/kicad/help/pl/pl_editor.pdf ./usr/share/doc/kicad/help/pl/pcbnew.pdf

Besides, it should be PF, not PV.

I've debugged this issue and was surprised at what I found:

sed works as expected (yeah, could have been PF though, but whatever)

KICAD_DOC_INSTALL_PATH is completely ignored in the build file, it seems they intended to use it but never did. The hard coded install path is /usr/share/doc/kicad/help/{LANG}

Technically I could patch the CMakeList file in the CMakeModules, however that would still not help much, since kicad itself looks for the help files in the same hard coded location (you can see that in the kicad source code in the file common/searchhelpfilefullpath.cpp.

So I've decided to the the following:

remove the src_prepare section, since it's useless

open bugs to upstream about the issue

In the mean time we will have to put up with the non Gentoo path for the docs otherwise it breaks help for kicad users.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

gentoo-repo-qa-bot · 2017-11-19T05:18:25Z

😞 The QA check for this pull request has found the following issues:

Issues inherited from Gentoo (may be modified by PR):
https://qa-reports.gentoo.org/output/gentoo-ci/e1dc30598/output.html#dev-db/slony1

zpuskas · 2017-12-18T18:08:20Z

Ping? I have updated the kicad-doc-4.0.6 diff on this PR.

gentoo-repo-qa-bot added self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else) assigned PR successfully assigned to the package maintainer(s). labels Jun 26, 2017

zpuskas changed the title ~~app-text/dblatex: Bump to 0.3.10 version which also fixes \@xmultirow…~~ app-text/dblatex: Bump to 0.3.10 version which also fixes \@xmultirow macro issue, bump kicad-doc now that it builds Jun 26, 2017

mgorny requested changes Jul 1, 2017

View reviewed changes

mgorny reviewed Jul 18, 2017

View reviewed changes

mgorny requested changes Oct 13, 2017

View reviewed changes

app-doc/kicad-doc: Bump to 4.0.6 and fix dblatex dependency

6a5fadd

Package-Manager: Portage-2.3.6, Repoman-2.3.2

jonasstein requested a review from monsieurp December 6, 2017 22:13

gentoo-bot closed this in 90956fe Jan 5, 2018

zpuskas deleted the dblatex-bump branch February 19, 2018 04:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

app-text/dblatex: Bump to 0.3.10 version which also fixes \@xmultirow macro issue, bump kicad-doc now that it builds #4991

app-text/dblatex: Bump to 0.3.10 version which also fixes \@xmultirow macro issue, bump kicad-doc now that it builds #4991

zpuskas commented Jun 26, 2017 •

edited

gentoo-repo-qa-bot commented Jun 26, 2017

mgorny Jul 1, 2017

aballier Jul 2, 2017

mgorny Jul 1, 2017

zpuskas Jul 2, 2017

mgorny Jul 1, 2017

mgorny Jul 1, 2017

zpuskas Jul 2, 2017

mgorny Jul 1, 2017

mgorny Jul 1, 2017

mgorny Jul 1, 2017

zpuskas Jul 3, 2017

mgorny Jul 18, 2017

mgorny Jul 1, 2017

zpuskas Jul 11, 2017

mgorny Jul 1, 2017

mgorny Jul 1, 2017

zpuskas Jul 2, 2017

mgorny Jul 18, 2017

zpuskas Jul 18, 2017

zpuskas commented Jul 18, 2017

mgorny Jul 18, 2017

mgorny left a comment

mgorny Oct 13, 2017

mgorny Oct 13, 2017

mgorny Oct 13, 2017

zpuskas Oct 22, 2017

gentoo-repo-qa-bot commented Nov 19, 2017

zpuskas commented Dec 18, 2017

app-text/dblatex: Bump to 0.3.10 version which also fixes \@xmultirow macro issue, bump kicad-doc now that it builds #4991

app-text/dblatex: Bump to 0.3.10 version which also fixes \@xmultirow macro issue, bump kicad-doc now that it builds #4991

Conversation

zpuskas commented Jun 26, 2017 • edited

gentoo-repo-qa-bot commented Jun 26, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zpuskas commented Jul 18, 2017

Choose a reason for hiding this comment

mgorny left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gentoo-repo-qa-bot commented Nov 19, 2017

zpuskas commented Dec 18, 2017

zpuskas commented Jun 26, 2017 •

edited