gentoo resync : 19.10.2017

3 files changed, 47 insertions, 45 deletions

diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 8fad5cccba08..0ef5dea66989 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,8 +1,8 @@
 DIST asciidoc-8.6.9.tar.gz 907253 SHA256 78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0 SHA512 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955 WHIRLPOOL dbd576ed3b7bcaf46afd33d9aae7a94f82fb171fa73f0b99f737b6934f62927ea11e1290aeac141ce5de27f66a56d7ed2d110f2b0d84e0598e858eac0e52b35d
 EBUILD asciidoc-8.6.9-r2.ebuild 2194 SHA256 835d09e0de77cd9c3c7d11ff4f5452a0a94aa18b1dbfd728fc63919d82fc15fe SHA512 8800a9c0a0ffc8105315d468194b8c6aa0a23d2345b1a5aa4ba5950c3d2daca94f28ffd81f40e52c10d8de94d9f67306d69a3c00acf4008821ffb4c21625f190 WHIRLPOOL 13ce366a6bf41a82d7f95918d90b3fecd08be57132ca1bc3186865c8771886126a831a2bf417912590653e91035c7ba5ebf57146bda701444c0a44e5320976cb
 EBUILD asciidoc-8.6.9-r3.ebuild 2303 SHA256 e96f7fd6da782041c1e713215eec7e8e23be2dccf27b25ff424f2b17b58e57fa SHA512 2bec7c7ea7c879fd756ea4f47e375a52840f6f000047736a58a2f1df172ab46810263ad8e88cf3d7fbcfab18ed2be5927fb0fb39360d65bfc221df7aff010c46 WHIRLPOOL 8cace39c0d67dd076251b198e10faaea1317d803a7da8215bc401f98c1bf92c0d8360953c178b94077aa5d7c0de1aefb95120ebe21dad617791043f1e2b14445
-EBUILD asciidoc-8.6.9-r5.ebuild 2381 SHA256 07d5ff47533c31492ccc12677b13acd9265d09020abed96e177599391c07fa89 SHA512 90bcd4eda341780c682b3de57f2d25903d0f6990fba83cfaea43214f14553fdcb1095e456f301ad1c754fcd9f9a59e0a063efa6faaefa9d77da70b9f4c76df11 WHIRLPOOL f90c6613007408a942e312c81c112ebde1fb33e0d8e7ffde73bae9c8db2939d8fffa77d88835b5d93a953b67f779f34fede484ba606eb816bf97a59c7c852565
-EBUILD asciidoc-9999.ebuild 2825 SHA256 0463091f73a83241b12717b3cfacb9f6791af906231d80c8d75c9729e2983d09 SHA512 822c2100845e6d960910cdc1af3e10d83c3410b4b92995bcbc86e6e82b91ccc6a24a84575bc85ad831bc45d54cc2056e8281048dde291c043a6ad2fcc68afe21 WHIRLPOOL 6ae1e36dcd44f66e50c1807977026d0158aa4ba629a1f3acc911828c166114555065464da4facda2e3309f6b9ff94cd77a4f94bb59d68edd3f5efaa0ecc30102
+EBUILD asciidoc-8.6.9-r6.ebuild 2393 SHA256 7e0acb328c4862788ddddf78ee2b1ec648e72e8b9806bea687b4db78a7e25f25 SHA512 ef5cd7559f8c7a1a3de05a6ec2b81647b8b2bdb22efe6112d5136a36f83e32071a09febfe9a4310e437fdfa92b1e752bf0744010218653758fff5d39677a7e66 WHIRLPOOL e4daf52c05d9a81058b560d13f50bdb3bfecb95a419c3cf4f15e711013753304336e5e9659d23e243b3ba761590edc4256210c8c22493d259d32252970fd3a2b
+EBUILD asciidoc-9999.ebuild 3024 SHA256 63468200330bd85009b3a9e4a8028dd72b204f27faf21e33301f72c032d97d5a SHA512 a4f71cee5bdd91630d0e3be403666c0bd250f3425a15cdd863da3a429d8cab36304f07b463b2353c1296f8e89ddc28f5ce1e9e6aa0922577659c158f168e805d WHIRLPOOL d862ff60c6c4d956af1fc975dd9c7637eefc8bb99304570057fccfffcc0a137654250d76486e1b644abd4a6c281bb1fcd8e2a12b32ed0e5bc52b2bc9cb05acb5
 MISC ChangeLog 8762 SHA256 a65df8bab04bd07e80c0eecf86081fa5a7061daec43c4d1238143565f8391bca SHA512 a2a2f2961b82d23f1459c508af6aec923eef71d7408653f025a6beac20b9376b2d92774910276b123301e70f2f30d802cf03ddeb5869ef0a2cdccb4903299a0f WHIRLPOOL bf34214d3f4ef42e5156eeb7b0da45c5432be35654884dca44e459dd9dc91e6f496acb4af8a9c116d7d54c21cca30cccaebdb3f7470c78bb6c25f6a0c2ea486f
 MISC ChangeLog-2015 15568 SHA256 d7ba2f8295a1a51593f0394adbb65476298ea2aef511db8c101748a3ad0d59d2 SHA512 3fd8c898a19c9821c2a5cd949e62b5f0076b2d28864785d7f276b0f5eed477bd1980b4cff1731067d150086612d9b1a3844f6ab879873516ef2f7c0c2c43b2d4 WHIRLPOOL ceda16169a2d0f36b1b4ea3a91cded15ee8dcade4148502030e4511bd4fa9e8104ff4c2e0258fc0955e29bb0524b02819d6cd2e743e74b73acb7581777c442b0
 MISC metadata.xml 583 SHA256 745ad8106536c9e69d0697772abfd3a4366b01fa922e292c3b16831311e93e3c SHA512 cf654b12cae851d762b538926912ed626a5681033f9c579ca9e62d442345c8efe5a5373784c702994c2b97a0acf7f251d257da29dc3960a2dc8c1b84327f11af WHIRLPOOL 3c9119d5f49082d19e4d0fe1903fdf41d062ca9d5ab7c3befd1e19ac9e7e94ed6683b378bc7fa04b32b7060b6b64159502d15b92202f37344302971978cce58b
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r5.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
index 2c68badd971e..4b9175db95c7 100644
--- a/app-text/asciidoc/asciidoc-8.6.9-r5.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
@@ -68,7 +68,7 @@ src_install() {
 	python_fix_shebang "${ED%/}"/usr/bin/*.py
 
 	readme.gentoo_create_doc
-	dodoc CHANGELOG docbook-xsl/asciidoc-docbook-xsl.txt \
+	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
 		dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
 
 	# Below results in some files being installed twice in different locations, but they are
diff --git a/app-text/asciidoc/asciidoc-9999.ebuild b/app-text/asciidoc/asciidoc-9999.ebuild
index 39a4499e5458..8577a4a0e1a5 100644
--- a/app-text/asciidoc/asciidoc-9999.ebuild
+++ b/app-text/asciidoc/asciidoc-9999.ebuild
@@ -6,43 +6,47 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 pypy )
 
 [ "$PV" == "9999" ] && inherit git-r3 autotools
-inherit readme.gentoo-r1 python-single-r1
+inherit python-single-r1 readme.gentoo-r1
 
 DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
-HOMEPAGE="http://www.methods.co.nz/asciidoc/"
+HOMEPAGE="http://asciidoc.org/"
 if [ "$PV" == "9999" ]; then
 	EGIT_REPO_URI="https://github.com/asciidoc/asciidoc.git"
 	SRC_URI=""
 	KEYWORDS=""
 else
 	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="examples graphviz highlight test"
-
-REQUIRED_USE="highlight? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
-		dev-libs/libxslt
-		graphviz? ( media-gfx/graphviz )
-		app-text/docbook-xml-dtd:4.5
-		highlight? ( || ( dev-util/source-highlight \
-			dev-python/pygments[${PYTHON_USEDEP}] \
-			app-text/highlight )
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75
+	dev-libs/libxslt
+	${PYTHON_DEPS}
+	graphviz? ( media-gfx/graphviz )
+	highlight? (
+		|| (
+			dev-util/source-highlight
+			dev-python/pygments[${PYTHON_USEDEP}]
+			app-text/highlight
 		)
+	)"
+DEPEND="
+	test? (
+		app-text/dvipng
+		dev-texlive/texlive-latex
+		dev-util/source-highlight
+		media-gfx/graphviz
+		media-gfx/imagemagick
+		media-sound/lilypond
 		${PYTHON_DEPS}
-"
-DEPEND="test? ( dev-util/source-highlight
-			media-sound/lilypond
-			media-gfx/imagemagick
-			dev-texlive/texlive-latex
-			app-text/dvipng
-			media-gfx/graphviz
-			${PYTHON_DEPS} )
-"
+	)"
 
 DOC_CONTENTS="
 If you are going to use a2x, please also look at a2x(1) under
@@ -51,13 +55,12 @@ REQUISITES for a list of runtime dependencies.
 
 if [ "$PV" == "9999" ]; then
 	DEPEND="${DEPEND}
-		www-client/lynx
-		dev-util/source-highlight"
+		dev-util/source-highlight
+		www-client/lynx"
 fi
 
 src_prepare() {
 	default
-
 	# Only needed for prefix - harmless (does nothing) otherwise
 	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
 		"${S}/asciidoc.py" || die
@@ -82,29 +85,28 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	local -x ASCIIDOC_PY=asciidoc.py
+	"${EPYTHON}" tests/test${PN}.py update || die
+	"${EPYTHON}" tests/test${PN}.py run || die
+}
+
 src_install() {
-	emake DESTDIR="${D}" install
+	default
+	python_fix_shebang "${ED%/}"/usr/bin/*.py
 
-	python_fix_shebang "${ED}"/usr/bin/*.py
+	readme.gentoo_create_doc
+	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
+		dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
 
+	# 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
-		# This is a symlink to a directory
-		rm examples/website/images || die
-
-		dodoc -r examples
+		# 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
-		dosym ../../../asciidoc/images /usr/share/doc/${PF}/examples
 	fi
-
-	readme.gentoo_create_doc
-	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
-			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
-}
-
-src_test() {
-	local -x ASCIIDOC_PY=asciidoc.py
-	"${PYTHON}" tests/test${PN}.py update || die
-	"${PYTHON}" tests/test${PN}.py run || die
 }
 
 pkg_postinst() {