gentoo resync : 29.12.2022

4 files changed, 4 insertions, 54 deletions

diff --git a/dev-python/gpep517/Manifest b/dev-python/gpep517/Manifest
index d4deb08c55ff..92e240184911 100644
--- a/dev-python/gpep517/Manifest
+++ b/dev-python/gpep517/Manifest
@@ -1,7 +1,4 @@
-DIST gpep517-3.gh.tar.gz 7074 BLAKE2B 99a499ae13b6aac41e86d11735f0e49a5dc921881a1efa94bee19bfd779af6827707d05d6407ed15e4a3a6b518c8c0b3f50901e3b12df41081930f83b288e461 SHA512 90f756f5a1d783e9d402e098162a70b363a0a81e331e810e5c89c3302bb5839032603252bad1c98c176a7828b70adfac967e39ba455dcd3a20097e74923980c8
-DIST gpep517-5.gh.tar.gz 9568 BLAKE2B 7641ae7792a15be7241d9c02622b589a796a96c76894c29f37733e33820532042f6d5b8018ef021b487c299f3a28adf37949e96c38148d88c140ed6926e95f2b SHA512 3618f3d17cc367716c4813d75814ef295896f210ff32c13f1ef8ad8cde2120a30ba69705e14dbb1e5528bf5a348f9f8c5f5de8b416608cd496733e94afbeb2c6
 DIST gpep517-6.gh.tar.gz 9757 BLAKE2B f1b39f30b7d775330bddfd353610de7c26e34c5572cdaedbb078cc61c711e90e1c520b5e6e5532b0879ccc1eb7025a793c6f8d9745d93967eabbdd9edef69c6a SHA512 681108dab418d0d2d5b017f19bf8802479655f22eb6b72e9d78c6bbd2d08583751a465377c2006c507f0ea258d2d46bf9300865896af4458a763b56a86abe329
-EBUILD gpep517-3.ebuild 1135 BLAKE2B 0ed1877164f202f4cf5822e03bee83449f0acabda3ae6956ba0a135ce4b81928dad7db98648495b8664f04201b952f1d45eb3ccfa210a658fbdae1ba8ca551bb SHA512 fc820987658684408bd842d42ea079938d49d4b81a5f7efd99074b7ce6277dd6231aa45b88cabb11f47c89d9c2b50534c66ff66b2cd576b145813f142ab24c8c
-EBUILD gpep517-5.ebuild 1143 BLAKE2B d88ccd00409897f446f434d2aaec1810093f96778293ff9f90e49a2daba4955bbc4427631499794686fffdbc76e356d1a3cfa2cc566c523f549df2d17bc31fb0 SHA512 90f0c157647e0be7e59629f92d2e7e4855c8e4548a116770af14743b7a7fed2b7e2e5dc5c9825406d83f8697f7d7976e2473f165393a5ea2ab3ced194cf680c5
-EBUILD gpep517-6.ebuild 1143 BLAKE2B d88ccd00409897f446f434d2aaec1810093f96778293ff9f90e49a2daba4955bbc4427631499794686fffdbc76e356d1a3cfa2cc566c523f549df2d17bc31fb0 SHA512 90f0c157647e0be7e59629f92d2e7e4855c8e4548a116770af14743b7a7fed2b7e2e5dc5c9825406d83f8697f7d7976e2473f165393a5ea2ab3ced194cf680c5
+EBUILD gpep517-6-r1.ebuild 1057 BLAKE2B c7ac0dbeafce1f0a563b40ee1a743bdd859094e51de07154f2810079d5b766f324db29e1b8993b9889353eaf75d67c9c01634b9b2338d34811eae0a03bd365a2 SHA512 77b9bbb7fb487a3f1ca660c1f232fe10f8aec39916e86854a9789e8cd1d66b749984cec663e3b18459370d518b0c46482f713635943f4d1779fd8b17402e73db
+EBUILD gpep517-6.ebuild 1135 BLAKE2B 5141d573049a49bc8631f72380f4397c3e1fd5192080fa1dd1f81f6ee31e608e9e63bcbc6d25ecf228610a15602b202260b184ff659de06cd7fccd2695726954 SHA512 73ba576b4f6eba8b9a2cf6d873272db739f70fef7da001311b1fb111eb9c9258b9c6f1cf3f697c438db407b9521d07e7c5f5b6d802e322482c28a28950fe9602
 MISC metadata.xml 396 BLAKE2B a3f6d1cea383a38b4b6e5f80d2306ca320a66c0d3b0131601ef6f0ea48483757b9123d74ba99fe972dde06a998c15290cbc4243285c240493ae0293d2f8e1141 SHA512 8c584869f2fc7a0947b9e5ffa330652d8b6e61a6a472fcddf0422f1719422fb8d477cdf17d87e6d0e9f6994d608a77202c24e531dd146b0f8d731a047f80d14e
diff --git a/dev-python/gpep517/gpep517-3.ebuild b/dev-python/gpep517/gpep517-3.ebuild
deleted file mode 100644
index 768f7fdb313e..000000000000
--- a/dev-python/gpep517/gpep517-3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A backend script to aid installing Python packages in Gentoo"
-HOMEPAGE="
-	https://pypi.org/project/gpep517/
-	https://github.com/mgorny/gpep517/
-"
-SRC_URI="
-	https://github.com/mgorny/gpep517/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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="
-	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.2.3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-# do not use any build system to avoid circular deps
-python_compile() { :; }
-
-python_install() {
-	python_domodule gpep517
-	python_newscript - gpep517 <<-EOF
-		#!${EPREFIX}/usr/bin/python
-		import sys
-		from gpep517.__main__ import main
-		sys.exit(main())
-	EOF
-}
diff --git a/dev-python/gpep517/gpep517-5.ebuild b/dev-python/gpep517/gpep517-6-r1.ebuild
index 1c06fab5af2e..ee64cb1d660f 100644
--- a/dev-python/gpep517/gpep517-5.ebuild
+++ b/dev-python/gpep517/gpep517-6-r1.ebuild
@@ -4,7 +4,7 @@
 # please keep this ebuild at EAPI 7 -- sys-apps/portage dep
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=manual
+DISTUTILS_USE_PEP517=no
 PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
@@ -30,9 +30,6 @@ RDEPEND="
 
 distutils_enable_tests pytest
 
-# do not use any build system to avoid circular deps
-python_compile() { :; }
-
 python_install() {
 	python_domodule gpep517
 	python_newscript - gpep517 <<-EOF
diff --git a/dev-python/gpep517/gpep517-6.ebuild b/dev-python/gpep517/gpep517-6.ebuild
index 1c06fab5af2e..8dfcfc0113db 100644
--- a/dev-python/gpep517/gpep517-6.ebuild
+++ b/dev-python/gpep517/gpep517-6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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="
 	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]