gentoo auto-resync : 13:10:2022 - 01:41:21

11 files changed, 88 insertions, 33 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index cedc541f1312..173f552cfa1d 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gpp/Manifest b/dev-util/gpp/Manifest
index 86d6a97f2367..49cb856bfe2d 100644
--- a/dev-util/gpp/Manifest
+++ b/dev-util/gpp/Manifest
@@ -1,3 +1,3 @@
 DIST gpp-2.27.tar.gz 66226 BLAKE2B 18490dae11fa295c6a038c6de86919a9b37a10c6008490bd554f11e52916e92e80238bb858c799fa1345419a56b37f9f817cd9c8d0fe221bd8c51b3d12245fb1 SHA512 ad7eaf89796208668143c160bfe764d5b38fb734dfa29869d2b222ce4c1982e8f5eef679960645de51c7d4fda6a18cac4ded55334a62cd16698a42b89aebf71e
-EBUILD gpp-2.27.ebuild 440 BLAKE2B 52358367bed5078d55578c79a65dcd559094814eaa0b68ca340b6bffd5ee33e6eb3222b2de99035c2909150e06e8ae0cc88b97e9daf3f1ecf72d3520c2d33e5e SHA512 f48a95de8552631bf27ede0ef72a488e0d60b80846cee2054d8289f94d15943169b111681b9c596b36bffa2a276533bd0189b1207fdfc0cdf37b50359ad3f99c
+EBUILD gpp-2.27.ebuild 452 BLAKE2B c53fedfa40e1a9402e70e2a0b43b351be0ca31334538c0dc392be2543d308f7cc608917491bf79e2547efa5a8052c886d3ee4080610c4307ef1d43449ade468f SHA512 0abc92f8f416eb13bf5ff3e6ed420df4067e05a0d8312bce8d6ea60d2c2671f498302db4af8b7013e21fc0c2ac6965a3e5bfb144461d73c6da7a9061826f2683
 MISC metadata.xml 823 BLAKE2B fe21889c430825056b947677778a7509837b1ba56156c88d18128497eea04adb2c78c396bd3538a4da698b658917590ee88907c4fe969c3d52ca214ca301f253 SHA512 65f205222a6a282b18c617d9ded5ecbff3b4cb08d068794f6141c5db675fbd6b806f0dd1b7f43af0ab31017a363639c4fd053f1c54851da2c0ec5b52b5daddcf
diff --git a/dev-util/gpp/gpp-2.27.ebuild b/dev-util/gpp/gpp-2.27.ebuild
index d138c0996755..df835f52d3b1 100644
--- a/dev-util/gpp/gpp-2.27.ebuild
+++ b/dev-util/gpp/gpp-2.27.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/logological/${PN}/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 src_prepare() {
 	default
diff --git a/dev-util/muon/Manifest b/dev-util/muon/Manifest
index 2c1bfaabb2f9..b0b69097e69e 100644
--- a/dev-util/muon/Manifest
+++ b/dev-util/muon/Manifest
@@ -1,4 +1,7 @@
+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 muon-0.1.0.tar.gz 472632 BLAKE2B f55fffcc56adc6e84646eae627aa17e3b929f2083d8faf8838ade9f032f23538256dd6f354fc93d3640fd331a2fa98fc42d290f51177b1973883ade3b20b4e34 SHA512 54337fed8ae41bf2dca3cbb0a303a521b7750eb7e5b40ca1aeb0fc045ac82b163d77c7b06a6a790eb3feef6f8d10f2a6b7937f55cfb1404c70b429dd0899dd5f
 DIST muon-0_pre20220714.tar.gz 441746 BLAKE2B 22a9c2d1ba76c01553cfd7c13b738f505710df7337f52a0dcbff0779fd0ff01b188994f25f9f31b84d0730d3d88e4334301f1252170ab0258e4cb835924f27d2 SHA512 326424a626788308e608d0c63db39b8d25c493c7f3636ed3fd87c90c8c89800fab231680c18b97c66a9f316cf569a767f9653a4bddd8c57bf5460e7ab9764259
+EBUILD muon-0.1.0.ebuild 1406 BLAKE2B 05b5042967e1901a1f0f2a26a408964d565061d6e9ee41608654ad7e837cba115fef9fe8f67432e9412bf4135edec5f2eab055af0eb6e2cc8d52e825c24729ac SHA512 32980e781784b5fc3067ccfadb6c61cef9df6d876d8ac3a7bb320f24d90aeecd9d6a875e8c4cf6d2fa6b7876369b5c943e2857a9c4c746fd02c6d4e252cba358
 EBUILD muon-0_pre20220714.ebuild 1440 BLAKE2B 26de57b49675973875c0b6d19e3e5e7b767b4d44a551fded5f81bb5c8213a66e3ef41ee4b3c7619ec1ce817da36b1fcb8c2a90c231f0e286e668d70abcadc325 SHA512 3cb1fafb860f3984018b706cf7e75582bf89e309a6b587fcc88013954e065fe15dfec834713411e8508c5819afc4373e1ec7b522257f5c38037e754d1c4962c6
 MISC metadata.xml 721 BLAKE2B 931fe009d24ade52e7bb48c4af43c9934a64c536a1382f57948fce1f6128c832b37ed6de5086e0bfca4936bb10204fe225ddffa1a3f15a480f8b847b890c9a51 SHA512 dec94997352d6e498eeef43f6853f2bf2c84be1d84afe80a8a7f837084e8365714517cb6caf158ae47d226d1de5b10c2ac69afa69486c12e0e6fb28f55c785fe
diff --git a/dev-util/muon/muon-0.1.0.ebuild b/dev-util/muon/muon-0.1.0.ebuild
new file mode 100644
index 000000000000..45c2381becbd
--- /dev/null
+++ b/dev-util/muon/muon-0.1.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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}]
+		')
+	)
+"
+
+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/ninja/Manifest b/dev-util/ninja/Manifest
index 4a27fbb530f6..c7361f103c64 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,5 +1,5 @@
 AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91f096ccfaa16babdc353269738aef92e68a261f43ba617720f677766f7044acb1a01dd7e07d6c9eca13e SHA512 97935accbef92e6eeda7d38bae6978016f4423e3989fcfb13c6de55644133ddef43db49811fc85d2649d68473d8b81e1bfb70f59a5e63d2607741d90152a4f42
 DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403
-EBUILD ninja-1.11.1.ebuild 2553 BLAKE2B e936a09d0079b91c49d647fb77cfee9c3a94f7a556dac6dc67dd13efa6f3a596751a67c92b29a338a7837d402b125f40835e90bc5f538f17fe466c976b317833 SHA512 a136e0a3fece713b121faa3a3a6aa8c1a3c218370831dd4ea2ec1f328bb5a6b4e63dd4d167d642170a82f42d4a29d19e0a99ce465e5908ab9eabc21966cee80e
-EBUILD ninja-9999.ebuild 2561 BLAKE2B 272031b0e8898d4a0970276869c20dcbfd7a4a90adbc75ea68f28bb7f075b432447cc2fcaadb4715c0b84832f5942d61e77243ff180221ddf07131d7bb844f02 SHA512 4c9ca432475d6d056d10d306f96c5189d9692ef83f8f3ce36901fbf0428d442424134936b7709cb05d22ebe9b4a25b1122e820c6c21207b30e7a5a6a1b13f660
-MISC metadata.xml 345 BLAKE2B 62344dee3d109b90fe9cdc68f581d3dddd9ffee182af72e82509180d9382b6765ecac373680f0c3fc3e1b5c4e9641a689bb036ee877a2117d335ae4e1608718b SHA512 20d5ee6f6448835b6cdcb3ac1f6760d5bc452aa44a1c72de2241cd47432967498c30099c79a5b59a53796cbe1c373291bb62a5d48914996fa20c9e22569d68eb
+EBUILD ninja-1.11.1-r2.ebuild 2585 BLAKE2B 5f7d81db5d943a959ae96a8d0b2748fcda184128246f64d9004856b10212af982aa99de7cedad9b411e96debb0868910e25aa49cc819f238a61d5c6627fa0270 SHA512 41ae047a984b84dfa802794deea4cefebf799d2eeb2e883003ed79986c882e8f12c29230c231c91a092e962af5da7076df8629cc8eadfbed939b11531f62bcdc
+EBUILD ninja-9999.ebuild 2593 BLAKE2B 6d513f77d36e3f1c4949bb8a2b48caa5fd6485756561f97f908f86729da37abd1063a2b3013fea0bfef297f342f8b3cdf3bae1f99178e8fbf69ccc557a8cdc4c SHA512 de7994ffe60c137b96185e71d5579c36bff365d380396cb578c975bc41ce0f539b2a22917ad7049bc1cef1c98adbb02d9fde6c8d7bf94655f86659d38d7fa976
+MISC metadata.xml 340 BLAKE2B fa4555bacb95d21f647d7ee1f5c6f28bea00910580bb680ab7d0ed99a2495c08819bc9a8f29580435f53ab8b69f1779a420bdd6bfd2f088b41304fdc96a3e1a9 SHA512 6182c10c0e91903fe1dbe392882881c00013818f606729c57126a0fe0932f4900d196948dc906c81b5415f649c5ce11233763b4616f4dd87dd744bfce9ec82d5
diff --git a/dev-util/ninja/metadata.xml b/dev-util/ninja/metadata.xml
index 500b65060534..9f465f8c98bf 100644
--- a/dev-util/ninja/metadata.xml
+++ b/dev-util/ninja/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>chromium@gentoo.org</email>
-		<name>Chromium in Gentoo Project</name>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">ninja-build/ninja</remote-id>
diff --git a/dev-util/ninja/ninja-1.11.1.ebuild b/dev-util/ninja/ninja-1.11.1-r2.ebuild
index 68d015410a2a..477e2d2504ea 100644
--- a/dev-util/ninja/ninja-1.11.1.ebuild
+++ b/dev-util/ninja/ninja-1.11.1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..11} )
 
-inherit edo bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
@@ -59,6 +59,8 @@ src_compile() {
 	# configure.py appends CFLAGS to CXXFLAGS
 	unset CFLAGS
 
+	append-lfs-flags
+
 	run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
 
 	if tc-is-cross-compiler; then
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index bedb66f577c5..49a69753e911 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..11} )
 
-inherit edo bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
@@ -59,6 +59,8 @@ src_compile() {
 	# configure.py appends CFLAGS to CXXFLAGS
 	unset CFLAGS
 
+	append-lfs-flags
+
 	run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
 
 	if tc-is-cross-compiler; then
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index e98918530e31..87bb43690e79 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -5,5 +5,5 @@ DIST pkgdev-0.2.2-docs.tar.xz 5496 BLAKE2B 46df2c14370dbe1312e43e08388aa9a3f13e9
 DIST pkgdev-0.2.2.tar.gz 66977 BLAKE2B 50b7c06339438ada28ffc9e8e8ba0c472342cbe447790ec7df7506979a1865ebdcd317071833b05091e3749f78857867729e905c1a971bf04e44137337106abe SHA512 f154c7442c40fb1ef5fe9917079db4ddf5bfda4b4d7ca964b9a11fad2a273e79971455142e99905e2293babf73b45d26974480faf0c5c1b25057afc6d658bdc2
 EBUILD pkgdev-0.2.1-r3.ebuild 2441 BLAKE2B 99cdd71ce398fc02d96ae8cdae0cced060e3854aaa802dd3fa118166f60726d26181ee8a76c191c8b8c8daa4e2028600e92e5f257ff7d93b5626aa59e8897261 SHA512 632fbc60b508672044e7981f9fcb9e9b9df64a187bb371fc2f7e579f5a7e1f21ccb03794288e1808b395b5e6b949fa4824240f85add9210453cb39ae529d5bb8
 EBUILD pkgdev-0.2.2.ebuild 2398 BLAKE2B d226f59a1674e3726c7b4cfb162470243e5435c5d23711381e359ac7687f55faaa7fd0d5913a23a07e8372ac2e7034ec8d29ab1c001fd7a0f36b2e9689597010 SHA512 dc3026258c5f3f9bf84cfa05a9322bc797bc49c90b22c0adeef4c0604a6af3e39c2034e772c6637024c287525842fe98835bc18f280f67fadac336a9fc312bac
-EBUILD pkgdev-9999.ebuild 2392 BLAKE2B c56f5f559c8a4b4b4726c6f92a764069410af473d07aaa44cea78ead6eaa590fd282859eafe7262fc471cd6f42bc5ba9e261e79e96aeefd0ddc70ace9e9d733d SHA512 73f384ed2b5aee56ed5c24ae0b9ed46dfa10b33807d36e36af3208704a02b056df0c9304c3139332f27b2646f9eb30b2290a3ee7c93a4e5e2bc708a0c7d75759
+EBUILD pkgdev-9999.ebuild 1633 BLAKE2B 3f13b2a4108d5005cdf614ecb8b394c4014f4a4e18d0ef77f0d792d2d3608e66186b345abf4fc5b77240af1168f9a3b5e08fa6389f6f6f9f7588fd10abfe3bc5 SHA512 348e552b87ed615fbc73c8dbda0259804715c76fd0f8b509ec0302b52bda60a4fd5d4f6bda4f1f16fbe5ea016f19b8bb3d457d4f80de62004cc9d7954a93b989
 MISC metadata.xml 606 BLAKE2B 9c87b0b058df2a15ad455e54499d6a52e31e5c8f51187d36a42a775f1fa03745c69c99179a21f8c44f64562f78ddade051a2a4568b7984600fc529f35e36811a SHA512 5c7151cd72132faf4d47837a58812aefb919edca3fb613a6751de265994bff327515a07d80dfe175069bde7097581f10cb453dde1545383e300735dfcac09bec
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 2dd46fdefcc4..7fdd98f7203c 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -3,18 +3,8 @@
 
 EAPI=8
 
-# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-pkgdev-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${PKGDEV_DOCS_PREBUILT:=1}
-
-PKGDEV_DOCS_PREBUILT_DEV=sam
-PKGDEV_DOCS_VERSION=$(ver_cut 1-3)
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-PKGDEV_DOCS_USEFLAG="+doc"
-
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
@@ -24,11 +14,6 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-	if [[ ${PKGDEV_DOCS_PREBUILT} -eq 1 ]] ; then
-		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${PKGDEV_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${PKGDEV_DOCS_VERSION}-docs.tar.xz )"
-	fi
-
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 fi
 
@@ -37,10 +22,7 @@ HOMEPAGE="https://github.com/pkgcore/pkgdev"
 
 LICENSE="BSD MIT"
 SLOT="0"
-
-[[ ${PKGDEV_DOCS_PREBUILT} == 1 ]] && PKGDEV_DOCS_USEFLAG="doc"
-
-IUSE="${PKGDEV_DOCS_USEFLAG}"
+IUSE="doc"
 
 if [[ ${PV} == *9999 ]] ; then
 	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
@@ -74,10 +56,10 @@ python_compile_all() {
 
 python_install_all() {
 	# If USE=doc, there'll be newly generated docs which we install instead.
-	if use doc ; then
+	if use doc; then
 		doman doc/_build/man/*
-	elif ! use doc && [[ ${PKGDEV_DOCS_PREBUILT} == 1 ]] ; then
-		doman "${WORKDIR}"/${PN}-${PKGDEV_DOCS_VERSION}-docs/man/*.[0-8]
+	elif [[ ${PV} != *9999 ]]; then
+		doman man/*.[0-8]
 	fi
 
 	distutils-r1_python_install_all