Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/asciidoc/
Date: Tue, 18 Feb 2020 08:49:24
Message-Id: 1582015746.f8be7774fbb089dbeae3352c15a79a261740adf3.juippis@gentoo
1 commit: f8be7774fbb089dbeae3352c15a79a261740adf3
2 Author: Marc Joliet <marcec <AT> gmx <DOT> de>
3 AuthorDate: Sun Jan 19 14:56:02 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 18 08:49:06 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8be7774
7
8 app-text/asciidoc: 9.0.0_rc1 version bump
9
10 Note that since reference outputs are now included in the source
11 distribution, it doesn't make sense anymore to update the test data
12 outputs.
13
14 - Fix the test deps by adding a dependency on app-text/dvisvgm. This
15 did not cause test failures, but did cause "command not found" type
16 errors.
17
18 - List documentation in $DOCS instead of calling dodocs manually.
19
20 - Consistently put $PYTHON_DEPS at the top of the dependency lists.
21
22 - Constrain the dev-libs/libxml2 dependency to slot 2.
23
24 - Instead of controlling optional runtime deps with USE flags, use
25 "optfeature" from the eutils eclass. While at it, add further calls
26 to optfeature for hitherto only indirectly documented optional
27 dependencies.
28
29 Signed-off-by: Marc Joliet <marcec <AT> gmx.de>
30 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
31
32 app-text/asciidoc/Manifest | 1 +
33 app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild | 92 +++++++++++++++++++++++++++++
34 2 files changed, 93 insertions(+)
35
36 diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
37 index 2cc64555678..9821a9f8b5f 100644
38 --- a/app-text/asciidoc/Manifest
39 +++ b/app-text/asciidoc/Manifest
40 @@ -1 +1,2 @@
41 DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
42 +DIST asciidoc-9.0.0_rc1.tar.gz 1143528 BLAKE2B 97e2ee77cf7554e2e0d53e792213377e6cb233853717487b0c0ac1c70d233a5d58a08f3aa69ae840c90f98185b595f9feb7396795b2de47ff0cfc0147920bc2a SHA512 965d65df18ff90596e5cd72bec8d0f7daf2f6ad585ec77af2a6ae9637569b613e2384cc7015c1823fcde99be8170107789505a543fe8b6d3273f2c75a6a92960
43
44 diff --git a/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild b/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild
45 new file mode 100644
46 index 00000000000..dd4f5537e21
47 --- /dev/null
48 +++ b/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild
49 @@ -0,0 +1,92 @@
50 +# Copyright 1999-2020 Gentoo Authors
51 +# Distributed under the terms of the GNU General Public License v2
52 +
53 +EAPI=7
54 +
55 +PYTHON_COMPAT=( python3_{6,7} pypy3 )
56 +
57 +inherit autotools eutils python-single-r1 readme.gentoo-r1
58 +
59 +DESCRIPTION="A plain text human readable/writable document format"
60 +HOMEPAGE="http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
61 +SRC_URI="https://github.com/${PN}/${PN}-py3/archive/9.0.0rc1.tar.gz -> ${P}.tar.gz"
62 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
63 +
64 +LICENSE="GPL-2"
65 +SLOT="0"
66 +IUSE="examples test"
67 +RESTRICT="!test? ( test )"
68 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
69 +
70 +RDEPEND="
71 + ${PYTHON_DEPS}
72 + app-text/docbook-xml-dtd:4.5
73 + >=app-text/docbook-xsl-stylesheets-1.75
74 + dev-libs/libxslt
75 + dev-libs/libxml2:2
76 + "
77 +DEPEND="
78 + test? (
79 + ${PYTHON_DEPS}
80 + app-text/dvipng
81 + app-text/dvisvgm
82 + dev-texlive/texlive-latex
83 + dev-util/source-highlight
84 + media-gfx/graphviz
85 + media-gfx/imagemagick
86 + media-sound/lilypond
87 + )"
88 +
89 +DOC_CONTENTS="
90 +If you are going to use a2x, please also look at a2x(1) under
91 +REQUISITES for a list of runtime dependencies.
92 +"
93 +
94 +DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc
95 + docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt
96 + filters/code/code-filter-readme.txt )
97 +
98 +S="${WORKDIR}/${PN}-py3-9.0.0rc1"
99 +
100 +src_prepare() {
101 + default
102 + # Only needed for prefix - harmless (does nothing) otherwise
103 + sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
104 + "${S}/asciidoc.py" || die
105 +
106 + eautoreconf
107 +}
108 +
109 +src_configure() {
110 + econf --sysconfdir="${EPREFIX}"/usr/share
111 +}
112 +
113 +src_test() {
114 + local -x ASCIIDOC_PY=asciidoc.py
115 + "${EPYTHON}" tests/test${PN}.py run || die
116 +}
117 +
118 +src_install() {
119 + default
120 + python_fix_shebang "${ED}"/usr/bin/*.py
121 +
122 + readme.gentoo_create_doc
123 +
124 + # Below results in some files being installed twice in different locations, but they are
125 + # in the right place, uncompressed, and there won't be any broken links. See bug #483336
126 + if use examples; then
127 + # examples/website is full of relative symlinks,
128 + # deref them for copying, which dodoc doesn't do
129 + cp -rL examples/website "${ED}"/usr/share/doc/${PF}/examples || die
130 + docompress -x /usr/share/doc/${PF}/examples
131 + fi
132 +}
133 +
134 +pkg_postinst() {
135 + readme.gentoo_print_elog
136 +
137 + optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick"
138 + optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments[${PYTHON_USEDEP}] app-text/highlight
139 + optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
140 + optfeature "\"graphviz\" filter support" media-gfx/graphviz
141 +}