diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 2cc6455..139b648 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1 +1 @@
-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
diff --git a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
deleted file mode 100644
index 6b2647a..0000000
--- a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
-
-inherit autotools python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
-MY_COMMIT="618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"
-SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="*"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples graphviz highlight test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75
-	dev-libs/libxslt
-	dev-libs/libxml2
-	${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}
-	)"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-S="${WORKDIR}/${PN}-py3-${MY_COMMIT}"
-
-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
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_test() {
-	local -x ASCIIDOC_PY=asciidoc.py
-	"${EPYTHON}" tests/test${PN}.py update || die
-	"${EPYTHON}" tests/test${PN}.py run || die
-}
-
-src_install() {
-	default
-	python_fix_shebang "${ED}"/usr/bin/*.py
-
-	readme.gentoo_create_doc
-	dodoc BUGS.txt CHANGELOG.txt README.asciidoc 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
-		# 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() {
-	readme.gentoo_print_elog
-}
diff --git a/app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild b/app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild
new file mode 100644
index 0000000..fe1f33c
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit autotools eutils python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="A plain text human readable/writable document format"
+HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
+SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+IUSE="examples test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75
+	dev-libs/libxslt
+	dev-libs/libxml2:2
+	"
+DEPEND="
+	test? (
+		${PYTHON_DEPS}
+		app-text/dvipng
+		app-text/dvisvgm
+		dev-texlive/texlive-latex
+		dev-util/source-highlight
+		media-gfx/graphviz
+		media-gfx/imagemagick
+		media-sound/lilypond
+	)"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc
+	   docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt
+	   filters/code/code-filter-readme.txt )
+
+S="${WORKDIR}/${PN}-py3-${PV/_/}"
+
+src_prepare() {
+	default
+	# Only needed for prefix - harmless (does nothing) otherwise
+	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
+		asciidoc.py || die
+
+	eautoreconf
+}
+
+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
+	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() {
+	readme.gentoo_print_elog
+
+	optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick"
+	optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight
+	optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
+	optfeature "\"graphviz\" filter support" media-gfx/graphviz
+}
diff --git a/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016 b/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016
deleted file mode 100644
index 4e3e78b..0000000
--- a/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=test? ( app-text/dvipng dev-texlive/texlive-latex dev-util/source-highlight media-gfx/graphviz media-gfx/imagemagick media-sound/lilypond python_single_target_pypy3? ( >=dev-python/pypy3-5:0= ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_pypy3(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A plain text human readable/writable document format
-EAPI=6
-HOMEPAGE=http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/
-IUSE=examples graphviz highlight test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt dev-libs/libxml2 python_single_target_pypy3? ( >=dev-python/pypy3-5:0= ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_pypy3(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] graphviz? ( media-gfx/graphviz ) highlight? ( || ( dev-util/source-highlight dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_pypy3(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-text/highlight ) )
-REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_pypy3? ( python_targets_pypy3 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/asciidoc/asciidoc-py3/archive/618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0.tar.gz -> asciidoc-8.6.10_p20181016.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	75ce0f715133825e020f9777032d1376	python-utils-r1	931c328767d245c08a16a3f87be9ce9c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bcb0d5228f1ed9dfdecb8b9794cd3b3e
diff --git a/metadata/md5-cache/app-text/asciidoc-9.0.0_rc2 b/metadata/md5-cache/app-text/asciidoc-9.0.0_rc2
new file mode 100644
index 0000000..a53ba83
--- /dev/null
+++ b/metadata/md5-cache/app-text/asciidoc-9.0.0_rc2
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install postinst prepare setup test
+DEPEND=test? ( python_single_target_pypy3? ( >=dev-python/pypy3-7.3.0:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-text/dvipng app-text/dvisvgm dev-texlive/texlive-latex dev-util/source-highlight media-gfx/graphviz media-gfx/imagemagick media-sound/lilypond ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A plain text human readable/writable document format
+EAPI=7
+HOMEPAGE=https://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/
+IUSE=examples test python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=python_single_target_pypy3? ( >=dev-python/pypy3-7.3.0:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt dev-libs/libxml2:2
+REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/asciidoc/asciidoc-py3/archive/9.0.0rc2.tar.gz -> asciidoc-9.0.0_rc2.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	eutils	06133990e861be0fe60c2b428fd025d9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	43034a822923b18d8f3ab710b753f775	python-utils-r1	157a6a7a3e99c7dbdf81acc9dd4f57cd	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4257adff5d1a99a6cf3e328c3ac19b22