diff options
Diffstat (limited to 'app-text/asciidoc')
-rw-r--r-- | app-text/asciidoc/Manifest | 4 | ||||
-rw-r--r-- | app-text/asciidoc/asciidoc-9.0.2.ebuild (renamed from app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild) | 28 |
2 files changed, 13 insertions, 19 deletions
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest index d20c2bf7afe8..f781fe77aa09 100644 --- a/app-text/asciidoc/Manifest +++ b/app-text/asciidoc/Manifest @@ -1,5 +1,5 @@ DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0 -DIST asciidoc-9.0.0_rc2.tar.gz 1145229 BLAKE2B e820a957a5e03f8b28e94fb0e9514b2beebe5b08a30357b7ab70db326894270972cfee1b44c30d51dc1c4794e91a09e36acbf9e464386d9e932ac7d32e2f8e93 SHA512 61ea1eb74a2e2da76f92e32ef279f8940fa4ea77a82078e15b54c7c6f134e9d177b0425c6eb8a239cfd2dc6a6f85ad5e93883a447a3e0e92850c0898747b5ea3 +DIST asciidoc-9.0.2.tar.gz 1144308 BLAKE2B 5f5deca6b8c15d4b86e2bd6fdb131908eecd862a5fdbbd8418937050d335a25ad012a3b1bc716379f5623db676176fc6da1a09691c2b42a213a6230281626b69 SHA512 ea8f64ce54d2f1aa38eceb3c1c9be17b388776de58038f3b888ac5ebed76337fa2779e43eb7f47174adf0a0446ee808dbd1e4f8f7e1d7db99db7c4c8584d5624 EBUILD asciidoc-8.6.10_p20181016-r1.ebuild 2620 BLAKE2B e29260b9b80ccd796662ea0ce4d207a66c4b99ffc371ff7ad02e38350ae9564a21c98740d4de7fb967ebb17cba1ff243e19e51e575ddcf08fa32e34549b2e255 SHA512 21e1a6e7d72d96265be242b2234faff0aa777f22895a4b051fab26be6e36c0d0b9a91463097e87c485cde39168e3ed4bc0033d9eaa164407f051db806281ad58 -EBUILD asciidoc-9.0.0_rc2.ebuild 2718 BLAKE2B 7663a75927e76607a54d7ab8d22b27feb041881cb229f66fafaff69848fbcb725ded0bed61f18252160bf323f4b448fbe0896f2ba65d260fa266672db22bdd45 SHA512 7108bca1b61ac986342c6b8f513ce4cedb6e82913078a6971fbfebea8e4917eee13bb68eb922f20feecdaa409d62b4573b12abe40ea5eacf5deea0e58f17c2d6 +EBUILD asciidoc-9.0.2.ebuild 2354 BLAKE2B cbadac1a48164d34caca69cfeb8fbd7bd8b42e05d07ff751f462092f98723f67c80e2486e1a62611c8fa89ffe5ca9b23b8b949dfee35123a7ce2c9c823ac4f5e SHA512 6ab2cbfd034e16b1c4e99c4222dbaf97bc8409e18211526bf498e07c48d7cdb285cb07cc08842ea8b4fe9448893662d8c2142b617dd6298bccce3d1be6161e87 MISC metadata.xml 514 BLAKE2B 89fefee3e8081fc45a8251255bf365f58eba6aa9eef92a23bd8f234703b7062b1dd2a415260fcda1b799cffa4b46d0da22b153ba8de6b77cb6076666ff43ccb7 SHA512 2587ac6d8c24ceca295eef2dc6e0735461dd09864d6a1f282d67fc3c58cd18aa565099a2c280edec143024295b74a251152918932c37d3be450aef68d367ca70 diff --git a/app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild b/app-text/asciidoc/asciidoc-9.0.2.ebuild index a9c28a003493..322c172ecb88 100644 --- a/app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild +++ b/app-text/asciidoc/asciidoc-9.0.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) +PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 ) inherit autotools eutils python-single-r1 readme.gentoo-r1 @@ -13,8 +13,8 @@ SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${PV/_/}.tar.gz -> ${P}.tar. LICENSE="GPL-2" SLOT="0" -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" -IUSE="examples test" +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" +IUSE="doc test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" @@ -54,6 +54,9 @@ src_prepare() { sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \ asciidoc.py || die + # enforce usage of the configured version of Python + sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die + eautoreconf } @@ -61,25 +64,16 @@ src_configure() { econf --sysconfdir="${EPREFIX}"/usr/share } -src_test() { - local -x ASCIIDOC_PY=asciidoc.py - "${EPYTHON}" tests/test${PN}.py run || die -} - src_install() { default + + if use doc; then + emake DESTDIR="${D}" docs + fi + python_fix_shebang "${ED}"/usr/bin/*.py readme.gentoo_create_doc - - # Below results in some files being installed twice in different locations, but they are - # in the right place, uncompressed, and there won't be any broken links. See bug #483336 - if use examples; then - # examples/website is full of relative symlinks, - # deref them for copying, which dodoc doesn't do - cp -rL examples/website "${ED}"/usr/share/doc/${PF}/examples || die - docompress -x /usr/share/doc/${PF}/examples - fi } pkg_postinst() { |