gentoo resync : 04.01.2022

6 files changed, 60 insertions, 103 deletions

diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 273cbab632d7..0d18a9dd2520 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,9 +1,9 @@
-DIST asciidoc-9.0.2.new.tar.gz 1269444 BLAKE2B 0041073c572267628b8bbfd56258d86c35edb0e7f3a222743ce1476b405483b01144faf768ab1492fd3f378960f6cc8e17d92ef61671d84c318fbe7c1ca8cd7c SHA512 c20629001704f1c3acfef0407b82f35f6077f5b32ef754fcbeee03a5a86d4e01e374e89b79cbdb236fc2c7fc76bf47ba81efd691f2f9e1c87dc85a7111f5e030
-DIST asciidoc-9.0.4.new.tar.gz 1233878 BLAKE2B 506a2c82d95ce0d522f45b20eee31f7ce2b114e0ad43c78bb313f34b210a7bdd282a8a3779a3ea29025e865847eb8298bd5a6ddac7ee338e4b878ae79bdf149e SHA512 59be96514d0c4c82e5842ddea412ddd6e06647ebe09e0f1828b7c07e787d890896bab4271e7566ed038eb2da6755a67c725bee07bcfbd7aa31475f39c3abc089
+DIST asciidoc-10.1.1.tar.gz 214619 BLAKE2B b7dc12d57cc3ad72301335ea84aea45db1a1e98f13aebf17fac6cf86657c509daa48ce1755817076c1c82f0a61c68fa7b178bc78bc6fda7274708bfde619491a SHA512 7b2b1ed9ea32b7336c271faf1e40e3a24d3b3af803c87f9d5d32c2b40cadaed682fbbedc6ec67bbe5a51377812d18180128c27779d7190898446266adee92842
 DIST asciidoc-9.0.5.new.tar.gz 1225334 BLAKE2B c3e428098dc4d71704ed13b54fd5f640b9de81d12939facb5faaf38a3123794e57201ecd9c312a22c220a2ec6b06c88a76ab47f05ffa972fc8751089b3471cfc SHA512 9125631fdee464f96f7e3c76a60fe37331905e9e55a81db27aece4065b246dc05a35db4c157dc7dbb2345eb95c153b474251d6a447d65774bf1b3f57e1883895
 DIST asciidoc-9.1.0.new.tar.gz 1249958 BLAKE2B 0a98f58f7604f84d704092313c38563634bad5d697d60d02760f3be1d2a78a97ee2488dda3a9918b02e0062710175c6513d600f3fbd850fe700bf3fa917a3980 SHA512 c30854a936228fe5bcf2f9305741fbc4b17ef088b2fa637d5f3b19c7803306085634fb71146f0b089c2fad01f986da71a4fae364139f520c0906525317c0c4a6
-EBUILD asciidoc-9.0.2-r1.ebuild 2329 BLAKE2B 61dd6902f330bff8023c6bb92d221ec7ea664332ce198380371ca16e4e08272d9f8ef16d3ef7e6e190545d8524a78123d06fbb49fe2baba0a818c71cc053e054 SHA512 dd4208ebd95a7f788ca93c8d3c4a7eec25aca0c8d09cd3182c53f1f5a63ba0808b2c661cea3bb92926b0ffc5629d71c59142991eef17ec1bd42054386aab822b
-EBUILD asciidoc-9.0.4-r1.ebuild 2329 BLAKE2B 61dd6902f330bff8023c6bb92d221ec7ea664332ce198380371ca16e4e08272d9f8ef16d3ef7e6e190545d8524a78123d06fbb49fe2baba0a818c71cc053e054 SHA512 dd4208ebd95a7f788ca93c8d3c4a7eec25aca0c8d09cd3182c53f1f5a63ba0808b2c661cea3bb92926b0ffc5629d71c59142991eef17ec1bd42054386aab822b
+DIST asciidoc-9.1.1.new.tar.gz 1259206 BLAKE2B da274d3a9389ee2e42ad1be70467f11d0164df3e6f9102e6ef1be6a802dbeb12898786fa1fe37a95755d0db8c9df5d5dd3faf000dfb73b701a83af3cc0261606 SHA512 74b83e8c8904fd761783c2f572d353656fc0794c6cb427f61e9179c9f80b6fc3b3ee8d028baba4e25eafe5f8cf5318f9984a5828849a793a7520f83e6fe50d66
+EBUILD asciidoc-10.1.1-r2.ebuild 1654 BLAKE2B 870db651ec6e6f6c2992eb18fbeb48f07df484bb16a0b70333a82a6bd1b374abca87dac6e8229c9898f753550547f734ea7288bb893d69b352d721084bcb15b8 SHA512 228c9778988ac516d182a143073f8208ad83012a056c88bdff1905eb22037cc46ba08aadb033cf23e3229762185ecbef1aaf6a7dddeebfee53dc5a396fff7e21
 EBUILD asciidoc-9.0.5-r1.ebuild 2329 BLAKE2B 61dd6902f330bff8023c6bb92d221ec7ea664332ce198380371ca16e4e08272d9f8ef16d3ef7e6e190545d8524a78123d06fbb49fe2baba0a818c71cc053e054 SHA512 dd4208ebd95a7f788ca93c8d3c4a7eec25aca0c8d09cd3182c53f1f5a63ba0808b2c661cea3bb92926b0ffc5629d71c59142991eef17ec1bd42054386aab822b
-EBUILD asciidoc-9.1.0.ebuild 2342 BLAKE2B e5c950868bcb3d5e185540c588433deda3ad4d1197cc3062002d66fd8af18471552ad59bc4c6b48203bfc1d22e292bb83ae5e42001f300eb785b424e439e3837 SHA512 b4c7e2232546238a9a4b46b2a59036e64aa13eb46e39747d06f1b55d2a3345f0670a8039f68c463d395053945b14b7144f70e511d66fdabd579707501533dcd7
-MISC metadata.xml 600 BLAKE2B 8bc5d01ffc50de5e1c5d8895496d6b2a9e0bc033a8fbc1d604a109b86d82cccddccb5250e812d3a2d7e79dba4f662844f68cfe733fa8430f58e3576019b872e6 SHA512 111b900f00236132afd8b722017b8e02ad8fc1fa495e343d66cb511a32935447d338b120cbf2d09353494944e4b39f31ab20514f73ec40771a290665625d42bc
+EBUILD asciidoc-9.1.0.ebuild 2335 BLAKE2B abb52d1e593b9bcf266b65a27e62823d1fb9573c88b6104a48f1ea6d53b271e4099825217eca27f010e9323d4f0fe7d6be61792263b89ec14949dc87d6c632b2 SHA512 bd2cbea0a31aadd05784ba20d57c2f812a771c68323e4c3de88f8e4b3c5c94a9dab0c4906911e72e8b37d8be21398b030e3aa4af93eca34848864485dea2ba39
+EBUILD asciidoc-9.1.1.ebuild 2342 BLAKE2B e5c950868bcb3d5e185540c588433deda3ad4d1197cc3062002d66fd8af18471552ad59bc4c6b48203bfc1d22e292bb83ae5e42001f300eb785b424e439e3837 SHA512 b4c7e2232546238a9a4b46b2a59036e64aa13eb46e39747d06f1b55d2a3345f0670a8039f68c463d395053945b14b7144f70e511d66fdabd579707501533dcd7
+MISC metadata.xml 380 BLAKE2B b305117b6bc883045d912377e57fde1a62e33ae3194b722d88e3afa0c062d913c1c3ccdc62d789ee97db89fb4fc1b02edc0dd97d2dfdc1a112b71962d35ee819 SHA512 027c6862485a219997037b8d418a03fbb7da9f4a50cfefac573c3f87d7f1c23cc7e82206e0b3c3ee000a7e05dfc446c340c068ca089bc1af16ed9ddeeb378aa4
diff --git a/app-text/asciidoc/asciidoc-10.1.1-r2.ebuild b/app-text/asciidoc/asciidoc-10.1.1-r2.ebuild
new file mode 100644
index 000000000000..132a1d4ece30
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-10.1.1-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 optfeature readme.gentoo-r1
+
+DESCRIPTION="A plain text human readable/writable document format"
+HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/"
+# Could use the github tarball but we need autotools then
+#SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75
+	dev-libs/libxslt
+	dev-libs/libxml2:2"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+src_install() {
+	distutils-r1_src_install
+
+	# TODO: Consider using Debian patch to allow /usr/share?
+	insinto /usr/share/asciidoc
+	doins -r asciidoc/resources/.
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	optfeature "music filter support" "media-sound/lilypond virtual/imagemagick-tools"
+	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/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild b/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild
deleted file mode 100644
index 7772c2bc97ef..000000000000
--- a/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit autotools optfeature python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/"
-SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz -> ${P}.new.tar.gz"
-
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc 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 )
-
-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
-
-	# enforce usage of the configured version of Python
-	sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		emake DESTDIR="${D}" docs
-	fi
-
-	python_fix_shebang "${ED}"/usr/bin/*.py
-
-	readme.gentoo_create_doc
-}
-
-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/app-text/asciidoc/asciidoc-9.1.0.ebuild b/app-text/asciidoc/asciidoc-9.1.0.ebuild
index f3c86d982e94..ecac9b882fd4 100644
--- a/app-text/asciidoc/asciidoc-9.1.0.ebuild
+++ b/app-text/asciidoc/asciidoc-9.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}
 
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/asciidoc/asciidoc-9.0.2-r1.ebuild b/app-text/asciidoc/asciidoc-9.1.1.ebuild
index 7772c2bc97ef..f3c86d982e94 100644
--- a/app-text/asciidoc/asciidoc-9.0.2-r1.ebuild
+++ b/app-text/asciidoc/asciidoc-9.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit autotools optfeature python-single-r1 readme.gentoo-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}
 
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -33,7 +33,7 @@ DEPEND="
 		dev-texlive/texlive-latex
 		dev-util/source-highlight
 		media-gfx/graphviz
-		media-gfx/imagemagick
+		media-gfx/imagemagick[png]
 		media-sound/lilypond
 	)"
 
diff --git a/app-text/asciidoc/metadata.xml b/app-text/asciidoc/metadata.xml
index bf7692827cad..3c2c02f59a4b 100644
--- a/app-text/asciidoc/metadata.xml
+++ b/app-text/asciidoc/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>marcec@gmx.de</email>
-		<name>Marc Joliet</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">asciidoc</remote-id>
 		<remote-id type="github">asciidoc-py/asciidoc-py</remote-id>