| 1 |
commit: cafdf3e090f07d9a3d206af6bdc593db16b1c0a9 |
| 2 |
Author: Marc Joliet <marcec <AT> gmx <DOT> de> |
| 3 |
AuthorDate: Sun Jul 5 14:34:36 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 19 03:55:21 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cafdf3e0 |
| 7 |
|
| 8 |
app-text/asciidoc-9.0.2: version bump |
| 9 |
|
| 10 |
Bump app-text/asciidoc to version 9.0.2. This series updated to a new |
| 11 |
top-level Makefile, which the ebuild now makes use of. It also replaces |
| 12 |
the "examples" USE flag with "doc", since the new Makefile has a |
| 13 |
corresponding target "docs" that also includes the example website. |
| 14 |
|
| 15 |
This commit also adds Python 3.9 to $PYTHON_TARGETS, since the tests |
| 16 |
pass when run under it. |
| 17 |
|
| 18 |
Closes: https://bugs.gentoo.org/732658 |
| 19 |
Closes: https://github.com/gentoo/gentoo/pull/16934 |
| 20 |
Signed-off-by: Marc Joliet <marcec <AT> gmx.de> |
| 21 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 22 |
|
| 23 |
app-text/asciidoc/Manifest | 2 +- |
| 24 |
...idoc-9.0.0_rc2.ebuild => asciidoc-9.0.2.ebuild} | 26 +++++++++------------- |
| 25 |
2 files changed, 11 insertions(+), 17 deletions(-) |
| 26 |
|
| 27 |
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest |
| 28 |
index 93bda0acf7c..53acfdadb8b 100644 |
| 29 |
--- a/app-text/asciidoc/Manifest |
| 30 |
+++ b/app-text/asciidoc/Manifest |
| 31 |
@@ -1,2 +1,2 @@ |
| 32 |
DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0 |
| 33 |
-DIST asciidoc-9.0.0_rc2.tar.gz 1145229 BLAKE2B e820a957a5e03f8b28e94fb0e9514b2beebe5b08a30357b7ab70db326894270972cfee1b44c30d51dc1c4794e91a09e36acbf9e464386d9e932ac7d32e2f8e93 SHA512 61ea1eb74a2e2da76f92e32ef279f8940fa4ea77a82078e15b54c7c6f134e9d177b0425c6eb8a239cfd2dc6a6f85ad5e93883a447a3e0e92850c0898747b5ea3 |
| 34 |
+DIST asciidoc-9.0.2.tar.gz 1144308 BLAKE2B 5f5deca6b8c15d4b86e2bd6fdb131908eecd862a5fdbbd8418937050d335a25ad012a3b1bc716379f5623db676176fc6da1a09691c2b42a213a6230281626b69 SHA512 ea8f64ce54d2f1aa38eceb3c1c9be17b388776de58038f3b888ac5ebed76337fa2779e43eb7f47174adf0a0446ee808dbd1e4f8f7e1d7db99db7c4c8584d5624 |
| 35 |
|
| 36 |
diff --git a/app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild b/app-text/asciidoc/asciidoc-9.0.2.ebuild |
| 37 |
similarity index 78% |
| 38 |
rename from app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild |
| 39 |
rename to app-text/asciidoc/asciidoc-9.0.2.ebuild |
| 40 |
index a9c28a00349..51bbc5e7936 100644 |
| 41 |
--- a/app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild |
| 42 |
+++ b/app-text/asciidoc/asciidoc-9.0.2.ebuild |
| 43 |
@@ -3,7 +3,7 @@ |
| 44 |
|
| 45 |
EAPI=7 |
| 46 |
|
| 47 |
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) |
| 48 |
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 ) |
| 49 |
|
| 50 |
inherit autotools eutils python-single-r1 readme.gentoo-r1 |
| 51 |
|
| 52 |
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${PV/_/}.tar.gz -> ${P}.tar. |
| 53 |
LICENSE="GPL-2" |
| 54 |
SLOT="0" |
| 55 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 56 |
-IUSE="examples test" |
| 57 |
+IUSE="doc test" |
| 58 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 59 |
|
| 60 |
RESTRICT="!test? ( test )" |
| 61 |
@@ -54,6 +54,9 @@ src_prepare() { |
| 62 |
sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \ |
| 63 |
asciidoc.py || die |
| 64 |
|
| 65 |
+ # enforce usage of the configured version of Python |
| 66 |
+ sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die |
| 67 |
+ |
| 68 |
eautoreconf |
| 69 |
} |
| 70 |
|
| 71 |
@@ -61,25 +64,16 @@ src_configure() { |
| 72 |
econf --sysconfdir="${EPREFIX}"/usr/share |
| 73 |
} |
| 74 |
|
| 75 |
-src_test() { |
| 76 |
- local -x ASCIIDOC_PY=asciidoc.py |
| 77 |
- "${EPYTHON}" tests/test${PN}.py run || die |
| 78 |
-} |
| 79 |
- |
| 80 |
src_install() { |
| 81 |
default |
| 82 |
+ |
| 83 |
+ if use doc; then |
| 84 |
+ emake DESTDIR="${D}" docs |
| 85 |
+ fi |
| 86 |
+ |
| 87 |
python_fix_shebang "${ED}"/usr/bin/*.py |
| 88 |
|
| 89 |
readme.gentoo_create_doc |
| 90 |
- |
| 91 |
- # Below results in some files being installed twice in different locations, but they are |
| 92 |
- # in the right place, uncompressed, and there won't be any broken links. See bug #483336 |
| 93 |
- if use examples; then |
| 94 |
- # examples/website is full of relative symlinks, |
| 95 |
- # deref them for copying, which dodoc doesn't do |
| 96 |
- cp -rL examples/website "${ED}"/usr/share/doc/${PF}/examples || die |
| 97 |
- docompress -x /usr/share/doc/${PF}/examples |
| 98 |
- fi |
| 99 |
} |
| 100 |
|
| 101 |
pkg_postinst() { |
Archives