gentoo auto-resync : 18:07:2023 - 19:01:44

5 files changed, 6 insertions, 145 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b3d1d5aaf324..421c7608682e 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/muon/Manifest b/dev-util/muon/Manifest
index 8edaf68537e1..3ccc1f286610 100644
--- a/dev-util/muon/Manifest
+++ b/dev-util/muon/Manifest
@@ -1,12 +1,6 @@
 AUX muon-0.1.0-fix-potential-overflow.patch 1437 BLAKE2B 1aca2550d95961834953eacf019a644e97d1e88a0fb07af86663f49913966a921e3aae178990da3305cd82d91e7d17dee2be60b8016c52e9727fc0cc9b3b2a76 SHA512 ee1c156ab71e8ac9abc4adfd0c345e8d7d0a6ed8a991019961d06a9bc5e67cdd2126af3284cfc46eb31dd3bc239cfcb44c7de658fb270d9dc929ddc016429edd
 AUX muon-0.1.0-test-Wincompatible-function-pointer-types.patch 873 BLAKE2B 492a63c022c38199dd21c1038342385632189a7d23d0f0d977c301eed21fc7873daad1b643066ff903931189f48f505c40d8ec066633f321cc32846a73762b14 SHA512 c82ccc3d59c60a718b35c1a3cd9ab94c7838591bb3053aa48a47a07811cbb158f21ee3f87fccd5b2a8e305f571f20e7b844cbde39730e43f1b0b9a43548346b0
-DIST meson-docs-0.63.0-239-g41a05ff93.tar.gz 78127 BLAKE2B ec4e8ced8ca58ebcef50075ba4e1a93fd54e306089f736cdd3a2236d79b2db0509a7ed4dd4dc9064a8eabb796107f26771fbfb44a17a56b27c891740c73eca3f SHA512 47e0e736db8fcd039b1778296f0dd28bea1c7688bb52c1d7e84bf568050bd058b7569f18f5df6440a9c319558f6397bcc3c35e4c8b261e438220205f96fb44de
-DIST meson-docs-0.63.0-40-g280f3423b.tar.gz 77042 BLAKE2B 2724d720ed05b99d933f85039a22a9a46c5f83322aa6ada16023a721828f0063a3cbc74150b6e682a45493f7af3887fb4422bce656827c638d13467b54d69b79 SHA512 119e6b857e109af47044d0a1515d377490f4c4f4b94a4134f642cf1ed5d9ad7ffc99628133ed5fb49d46891469fddb369b8a469f8eb07a903421b48b835a64e3
 DIST meson-docs-0.64.1-19-g39c6fa4bc.tar.gz 78525 BLAKE2B 19f4768e70f38f744de9bebfcc7416f8ab7f414693dc1f3e379bbbc8370e3d3187e6a9e311a08c054bdfaf1d15efd225558de7d41d688fc4c4a10e3215af85ae SHA512 59c986c4c4d545a6488cd74a2b6563b867716b74aab95fd19a745ce46a99fe5222232e132c80c5ed80f3e61d13e74cf2dc13b1b6d4638fd40a69d82d0d74faaa
-DIST muon-0.1.0.tar.gz 472632 BLAKE2B f55fffcc56adc6e84646eae627aa17e3b929f2083d8faf8838ade9f032f23538256dd6f354fc93d3640fd331a2fa98fc42d290f51177b1973883ade3b20b4e34 SHA512 54337fed8ae41bf2dca3cbb0a303a521b7750eb7e5b40ca1aeb0fc045ac82b163d77c7b06a6a790eb3feef6f8d10f2a6b7937f55cfb1404c70b429dd0899dd5f
 DIST muon-0.2.0.tar.gz 510533 BLAKE2B 6ec67f8875e84fbc2f23f412825dd47b820cd44e97a16d9ac0ab0ba9db6e755a604b66b79d3dbe13d99440daf21c2f0ccbe69661b1fb3c7df3f636c61a0e4dcb SHA512 b2e90048756bdc26bdea24fe227a87ad4d0e57176e217e22ea492a55229c62e2a70243f60af1e162e2dde8468fdda9662a32ea5cfadd69fab95a83499efa077b
-DIST muon-0_pre20220714.tar.gz 441746 BLAKE2B 22a9c2d1ba76c01553cfd7c13b738f505710df7337f52a0dcbff0779fd0ff01b188994f25f9f31b84d0730d3d88e4334301f1252170ab0258e4cb835924f27d2 SHA512 326424a626788308e608d0c63db39b8d25c493c7f3636ed3fd87c90c8c89800fab231680c18b97c66a9f316cf569a767f9653a4bddd8c57bf5460e7ab9764259
-EBUILD muon-0.1.0-r1.ebuild 1553 BLAKE2B 0750f458d6537eff6d93a7d196a8caeefeadc3305f4c885a2bce2f0a01b1e29bf74556e7bf87dddc4b09df4c4e6159c4eea511cbfce1b2fa575d7f5edf6455cd SHA512 5942c2f53b653f5e9dc8c4138a5ff099f678ad85eb8a2c09c31d1646d155b7f10ddca3ef972e02e5a49319b8556e230f27c36800f17882c1e5d8f6fedf704210
-EBUILD muon-0.2.0.ebuild 1434 BLAKE2B 100bbf9da21642c4cad1eebfe0579b20e35b8ceb0cd2614f5671d498d2a670fec5181373e74f43e6303f2e873e8121bfcd76c134fc1d4b2cc4e4a9ca213ec67e SHA512 4da899870e08077ee973e643b94801ded4bdb8e07a9c4672f02291acc9761fd7fa56e9e51ff80f0f973455c1a1a0f8e2195f198c980892bbe25f1713b0aef19e
-EBUILD muon-0_pre20220714.ebuild 1445 BLAKE2B d56e061157379e81d54896d91c4fc8c6b4966480651ed4a5cfad56d5873cd92d7c2baadb254b1a78b60df94d02064af3d114d8c2fd6396fb946b79ddc2f02863 SHA512 55b96a8ff018bc51c5c60169d05a6bbeecefaddbd0ff56ad590af79eff1c71c906a14d4fbc00269366ef4a78073ae5f009c6a26b75cd7d736da7a516133d9a07
+EBUILD muon-0.2.0-r1.ebuild 1488 BLAKE2B 85769edb7bf1d6a9b8075d1f60e42078b2618bc1f380c6a1c789b147fd14711d1974d8e53168c69c073dacb242b0d7976b20a767d5770c0b2ac8f3767f61288d SHA512 5a9e59ee7bd928842f958e6095822f0b032e3f3ab0c21a420d9d91b2436b84640f0ae62a924e1c0a96877d6a8059aa82004cb0cbd1abc114592deec76e9f13b9
 MISC metadata.xml 569 BLAKE2B 8712259e11150e15ad3e4db4291bb9091fab91cfa0901a9457e8538d13ef83fa3da0f0506257f47d4b43b160b1ac9088fe7dab1cd749300cdcd22a27917801ab SHA512 93910e7b6bff19ff5ca1a5987adfcc90eab1b90434c4003622b416a1a035d379ef0561f81f7be4edadcaf07fdbd491dcf0c52952f940d8545e79d4bb3c7c67e0
diff --git a/dev-util/muon/muon-0.1.0-r1.ebuild b/dev-util/muon/muon-0.1.0-r1.ebuild
deleted file mode 100644
index 8873dd97ce3d..000000000000
--- a/dev-util/muon/muon-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit meson python-any-r1
-
-COMMIT_HASH="${PV}"
-MESON_DOCS_TAR=meson-docs-0.63.0-239-g41a05ff93.tar.gz
-
-DESCRIPTION="A meson-compatible build system"
-HOMEPAGE="https://muon.build/"
-SRC_URI="
-	https://git.sr.ht/~lattis/muon/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz
-	man? (
-		https://mochiro.moe/wrap/${MESON_DOCS_TAR}
-	)
-"
-
-# Apache-2.0 for meson-docs
-LICENSE="GPL-3 man? ( Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+archive +curl +libpkgconf +man"
-
-S="${WORKDIR}/${PN}-${COMMIT_HASH}"
-
-DEPEND="
-	curl? ( net-misc/curl )
-	archive? ( app-arch/libarchive:= )
-	libpkgconf? ( dev-util/pkgconf:= )
-	man? ( app-text/scdoc )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	man? (
-		$(python_gen_any_dep '
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/muon-0.1.0-fix-potential-overflow.patch"
-	"${FILESDIR}/muon-0.1.0-test-Wincompatible-function-pointer-types.patch"
-)
-
-python_check_deps() {
-	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	if use man; then
-		mv "${WORKDIR}/meson-docs" "${S}/subprojects" || die
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature curl libcurl)
-		$(meson_feature archive libarchive)
-		$(meson_feature libpkgconf)
-		$(meson_feature man docs)
-		-Dsamurai=disabled  # patched version of samurai downloaded via wraps
-		-Dbestline=enabled  # vendored bestline, an insignificant addition
-	)
-	meson_src_configure
-}
diff --git a/dev-util/muon/muon-0.2.0.ebuild b/dev-util/muon/muon-0.2.0-r1.ebuild
index 48a63dd2044c..8ffb688bf9b7 100644
--- a/dev-util/muon/muon-0.2.0.ebuild
+++ b/dev-util/muon/muon-0.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit meson python-any-r1
 
 COMMIT_HASH="${PV}"
@@ -45,6 +45,10 @@ python_check_deps() {
 	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
 }
 
+pkg_setup() {
+	use man && python-any-r1_pkg_setup
+}
+
 src_prepare() {
 	default
 
diff --git a/dev-util/muon/muon-0_pre20220714.ebuild b/dev-util/muon/muon-0_pre20220714.ebuild
deleted file mode 100644
index f98d035f1bb2..000000000000
--- a/dev-util/muon/muon-0_pre20220714.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit meson python-any-r1
-
-COMMIT_HASH="1d85870cc3b92690d42fa3e480961fb2f708388e"
-MESON_DOCS_TAR=meson-docs-0.63.0-40-g280f3423b.tar.gz
-
-DESCRIPTION="A meson-compatible build system"
-HOMEPAGE="https://muon.build/"
-SRC_URI="
-	https://git.sr.ht/~lattis/muon/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz
-	man? (
-		https://mochiro.moe/wrap/${MESON_DOCS_TAR}
-	)
-"
-
-# Apache-2.0 for meson-docs
-LICENSE="GPL-3 man? ( Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+archive +curl +libpkgconf +man"
-
-S="${WORKDIR}/${PN}-${COMMIT_HASH}"
-
-DEPEND="
-	curl? ( net-misc/curl )
-	archive? ( app-arch/libarchive:= )
-	libpkgconf? ( dev-util/pkgconf:= )
-	man? ( app-text/scdoc )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	man? (
-		$(python_gen_any_dep '
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	if use man; then
-		mv "${WORKDIR}/meson-docs" "${S}/subprojects" || die
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature curl libcurl)
-		$(meson_feature archive libarchive)
-		$(meson_feature libpkgconf)
-		$(meson_feature man docs)
-		-Dsamurai=disabled  # patched version of samurai downloaded via wraps
-		-Dbestline=enabled  # vendored bestline, an insignificant addition
-	)
-	meson_src_configure
-}