Merge updates from master

10 files changed, 150 insertions, 38 deletions

diff --git a/app-emacs/org-appear/Manifest b/app-emacs/org-appear/Manifest
new file mode 100644
index 000000000000..313ea306f9c2
--- /dev/null
+++ b/app-emacs/org-appear/Manifest
@@ -0,0 +1 @@
+DIST org-appear-0.3.0.tar.gz 95423 BLAKE2B 925e82f6b2757138d8e3b2f20a1c3bd64644aea463fa5b713e363b8cfe8ca1111a666d3a934c313032e5a8339bcab9962129c92a2b1a5bd454fcfb3aefc0ac1a SHA512 5500e838ddfd5a4000604a284a5a967ed2a42abfcb6f24cf86f60116c0a2afc7dd303f9be9b8b879fc8a0cad09e15e168212e6b6c6b3c18ec649b92c5a3ea2b0
diff --git a/app-emacs/org-appear/files/50org-appear-gentoo.el b/app-emacs/org-appear/files/50org-appear-gentoo.el
new file mode 100644
index 000000000000..7a2927fd2ebb
--- /dev/null
+++ b/app-emacs/org-appear/files/50org-appear-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'org-appear-mode "org-appear"
+  "A minor mode that automatically toggles elements in Org mode." t)
diff --git a/app-emacs/org-appear/metadata.xml b/app-emacs/org-appear/metadata.xml
new file mode 100644
index 000000000000..201bfe4d549c
--- /dev/null
+++ b/app-emacs/org-appear/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/awth13/org-appear/issues/</bugs-to>
+    <remote-id type="github">awth13/org-appear</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/org-appear/org-appear-0.3.0.ebuild b/app-emacs/org-appear/org-appear-0.3.0.ebuild
new file mode 100644
index 000000000000..69af3056e18b
--- /dev/null
+++ b/app-emacs/org-appear/org-appear-0.3.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Toggle visibility of hidden Org mode element parts upon entering and leaving an element"
+HOMEPAGE="https://github.com/awth13/org-appear/"
+SRC_URI="https://github.com/awth13/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.org demo.gif )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/dev-python/gpep517/Manifest b/dev-python/gpep517/Manifest
index f99e0b39a4c3..da0085de5540 100644
--- a/dev-python/gpep517/Manifest
+++ b/dev-python/gpep517/Manifest
@@ -1 +1 @@
-DIST gpep517-1.gh.tar.gz 6871 BLAKE2B a298a445cb24dbc708985ebe0be266ed6549525a2b9d250ddb53129502f04a442927ca4c29445f4caf4ada82e106e5498c9586e78dd8a4bd676c7aff747544b6 SHA512 83ccf6124e388aefcdece391d12daf6a337d52b7bb794268effd2abc9bdab6b00d935d01cac774b4a66704578160e44617b16a5b8b9ef821012d419848145e9c
+DIST gpep517-2.gh.tar.gz 6904 BLAKE2B 5d6f8c02805fec0b9c9929a133817be5d06c76ca2dd5ecd6b59d04eca1ca746b2a63a84df29c929ca06a026eef741a2d872abede6f1d0ac3719ff2005cf20043 SHA512 2b1fce7193a5c03175c34251987f42fe82c79a6eef324759fe5728e0f3b66a10f8aa644ece2193c912e9977f21b14a28fe5c9443e3b01ca8cdacf862afe0838c
diff --git a/dev-python/gpep517/gpep517-1.ebuild b/dev-python/gpep517/gpep517-2.ebuild
index 0fbf09a24da9..0fbf09a24da9 100644
--- a/dev-python/gpep517/gpep517-1.ebuild
+++ b/dev-python/gpep517/gpep517-2.ebuild
diff --git a/dev-python/hatchling/hatchling-0.22.0.ebuild b/dev-python/hatchling/hatchling-0.22.0.ebuild
index 72e3b3bb04e8..992bc68216bc 100644
--- a/dev-python/hatchling/hatchling-0.22.0.ebuild
+++ b/dev-python/hatchling/hatchling-0.22.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
@@ -35,11 +35,13 @@ RDEPEND="
 BDEPEND="
 	${RDEPEND}
 	test? (
-		dev-python/atomicwrites[${PYTHON_USEDEP}]
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/platformdirs[${PYTHON_USEDEP}]
-		dev-python/rich[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/atomicwrites[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+			dev-python/httpx[${PYTHON_USEDEP}]
+			dev-python/platformdirs[${PYTHON_USEDEP}]
+			dev-python/rich[${PYTHON_USEDEP}]
+		' 'python*')
 	)
 "
 
@@ -52,6 +54,11 @@ python_compile() {
 }
 
 python_test() {
+	if [[ ${EPYTHON} != python* ]]; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
 	local -x EPYTEST_DESELECT=(
 		# these run pip to install stuff
 		tests/backend/dep/test_core.py::test_dependency_found
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index 813b5593a5fe..8978edcc785f 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1 +1,2 @@
 DIST soupsieve-2.3.1.tar.gz 104251 BLAKE2B c395b8dc0944457d6c5f217a03c6fc5f3895868a629eb72d86733fb0d9c6b1d1c41a2e035d5118c9c6fcc6a22e9ff79b9de8417131d30bbc6e1ba02c813ced56 SHA512 3f1245b27d67e8b37bce4cb0b21b2b3f4d6b7ae112cc66672e5406c0701b28e605ed12db1e111bfeccea15625b17042e398b075b7f026d3f3e15069f0cafccac
+DIST soupsieve-2.3.2.tar.gz 103869 BLAKE2B 0820f3935aaf0bda436abf10ddb0d64d6b2de99d116fdc84518879ca468688918a0995f4666e04d4892fee4d221b2d6a843f200c4bf05c3bf5755004a3fbb7ec SHA512 a91c453098697d0b6120e80dd2cf56ec0359d9d3d98ef54e348e8f9832b3b70626fcdc7c21bc3abe0fba32a83cc62d05b750f2d2fa79261479bf89c0aa782caa
diff --git a/dev-python/soupsieve/soupsieve-2.3.2.ebuild b/dev-python/soupsieve/soupsieve-2.3.2.ebuild
new file mode 100644
index 000000000000..1447e0c4dd37
--- /dev/null
+++ b/dev-python/soupsieve/soupsieve-2.3.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A modern CSS selector implementation for BeautifulSoup"
+HOMEPAGE="
+	https://github.com/facelessuser/soupsieve/
+	https://pypi.org/project/soupsieve/
+"
+SRC_URI="
+	https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index ed2e9f70269f..1724804687a1 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -98,6 +98,8 @@ esac
 #
 # - flit - flit_core backend
 #
+# - hatchling - hatchling backend (from hatch)
+#
 # - pdm - pdm.pep517 backend
 #
 # - poetry - poetry-core backend
@@ -151,6 +153,13 @@ esac
 #     ${DISTUTILS_DEPS}"
 # @CODE
 
+# @ECLASS_VARIABLE: GPEP517_TESTING
+# @USER_VARIABLE
+# @DESCRIPTION:
+# Enable in make.conf to test building via dev-python/gpep517 instead of
+# inline Python snippets.  dev-python/gpep517 needs to be installed
+# first.
+
 if [[ ! ${_DISTUTILS_R1} ]]; then
 
 [[ ${EAPI} == 6 ]] && inherit eutils xdg-utils
@@ -187,6 +196,10 @@ _distutils_set_globals() {
 				bdep+='
 					dev-python/flit_core[${PYTHON_USEDEP}]'
 				;;
+			hatchling)
+				bdep+='
+					dev-python/hatchling[${PYTHON_USEDEP}]'
+				;;
 			pdm)
 				bdep+='
 					dev-python/pdm-pep517[${PYTHON_USEDEP}]'
@@ -911,6 +924,9 @@ _distutils-r1_backend_to_key() {
 		flit_core.buildapi|flit.buildapi)
 			echo flit
 			;;
+		hatchling.build)
+			echo hatchling
+			;;
 		pdm.pep517.api)
 			echo pdm
 			;;
@@ -938,16 +954,20 @@ _distutils-r1_get_backend() {
 	if [[ -f pyproject.toml ]]; then
 		# if pyproject.toml exists, try getting the backend from it
 		# NB: this could fail if pyproject.toml doesn't list one
-		build_backend=$(
-			"${EPYTHON}" - 3>&1 <<-EOF
-				import os
-				import tomli
-				print(tomli.load(open("pyproject.toml", "rb"))
-						.get("build-system", {})
-						.get("build-backend", ""),
-					file=os.fdopen(3, "w"))
-			EOF
-		)
+		if [[ ${GPEP517_TESTING} ]]; then
+			build_backend=$(gpep517 get-backend)
+		else
+			build_backend=$(
+				"${EPYTHON}" - 3>&1 <<-EOF
+					import os
+					import tomli
+					print(tomli.load(open("pyproject.toml", "rb"))
+							.get("build-system", {})
+							.get("build-backend", ""),
+						file=os.fdopen(3, "w"))
+				EOF
+			)
+		fi
 	fi
 	if [[ -z ${build_backend} && ${DISTUTILS_USE_PEP517} == setuptools &&
 		-f setup.py ]]
@@ -1013,30 +1033,45 @@ distutils_pep517_install() {
 
 	local build_backend=$(_distutils-r1_get_backend)
 	einfo "  Building the wheel for ${PWD#${WORKDIR}/} via ${build_backend}"
-	local wheel=$(
-		"${EPYTHON}" - 3>&1 >&2 <<-EOF || die "Wheel build failed"
-			import ${build_backend%:*}
-			import os
-			print(${build_backend/:/.}.build_wheel(os.environ['WHEEL_BUILD_DIR']),
-				file=os.fdopen(3, 'w'))
-		EOF
-	)
+	if [[ ${GPEP517_TESTING} ]]; then
+		local wheel=$(
+			gpep517 build-wheel --backend "${build_backend}" \
+					--output-fd 3 \
+					--wheel-dir "${WHEEL_BUILD_DIR}" 3>&1 >&2 ||
+				die "Wheel build failed"
+		)
+	else
+		local wheel=$(
+			"${EPYTHON}" - 3>&1 >&2 <<-EOF || die "Wheel build failed"
+				import ${build_backend%:*}
+				import os
+				print(${build_backend/:/.}.build_wheel(os.environ['WHEEL_BUILD_DIR']),
+					file=os.fdopen(3, 'w'))
+			EOF
+		)
+	fi
 	[[ -n ${wheel} ]] || die "No wheel name returned"
 
 	einfo "  Installing the wheel to ${root}"
-	# NB: --compile-bytecode does not produce the correct paths,
-	# and python_optimize doesn't handle being called outside D,
-	# so we just defer compiling until the final merge
-	# NB: we override sys.prefix & sys.exec_prefix because otherwise
-	# installer would use virtualenv's prefix
-	local -x PYTHON_PREFIX=${EPREFIX}/usr
-	"${EPYTHON}" - -d "${root}" "${WHEEL_BUILD_DIR}/${wheel}" --no-compile-bytecode \
-			<<-EOF || die "installer failed"
-		import os, sys
-		sys.prefix = sys.exec_prefix = os.environ["PYTHON_PREFIX"]
-		from installer.__main__ import main
-		main(sys.argv[1:])
-	EOF
+	if [[ ${GPEP517_TESTING} ]]; then
+		gpep517 install-wheel --destdir="${root}" --interpreter="${PYTHON}" \
+				--prefix="${EPREFIX}/usr" "${WHEEL_BUILD_DIR}/${wheel}" ||
+			die "Wheel install failed"
+	else
+		# NB: --compile-bytecode does not produce the correct paths,
+		# and python_optimize doesn't handle being called outside D,
+		# so we just defer compiling until the final merge
+		# NB: we override sys.prefix & sys.exec_prefix because otherwise
+		# installer would use virtualenv's prefix
+		local -x PYTHON_PREFIX=${EPREFIX}/usr
+		"${EPYTHON}" - -d "${root}" "${WHEEL_BUILD_DIR}/${wheel}" --no-compile-bytecode \
+				<<-EOF || die "installer failed"
+			import os, sys
+			sys.prefix = sys.exec_prefix = os.environ["PYTHON_PREFIX"]
+			from installer.__main__ import main
+			main(sys.argv[1:])
+		EOF
+	fi
 
 	# remove installed licenses
 	find "${root}$(python_get_sitedir)" \