gentoo auto-resync : 20:05:2023 - 10:17:50

5 files changed, 4 insertions, 46 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 64bf54012da7..c578b8c0ca91 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/pyvim/Manifest b/app-editors/pyvim/Manifest
index af8d643881c8..bf0ec59ae07e 100644
--- a/app-editors/pyvim/Manifest
+++ b/app-editors/pyvim/Manifest
@@ -1,5 +1,3 @@
-DIST pyvim-3.0.2.tar.gz 35227 BLAKE2B 8edc2218b3a0f2ba922531b75f65a5273ad9a2697f72ecf994cf7d2406c6311c3f28b22b6adb1243150a90db74962256ceaa7cf47ec99c2388299742451d6efb SHA512 da961342ba52e5beca44a607cbb923953388e8674409db9ca2b152017eeedce84f92e42a9f6d0e5019c5c4d88d82f4a987cb378f311cf84a169cefa54dc5efce
 DIST pyvim-3.0.3.gh.tar.gz 492633 BLAKE2B d62f1db2ec4af635841d18c860c5ac571c664116c539bab87b5f00a9c15b1f37f9dd53649d98a3d21d3bec9df0af46d18443eb1b34961d0971a7ed75df6a8c74 SHA512 0af9b772b97c21b8a9fe966497849eb83c6f770a212b98c7f261309f2f70d6cc8bcf2175660bee5c44850d6c805570946a79fbe9db7f1ffa8e20e19ef61a0635
-EBUILD pyvim-3.0.2.ebuild 849 BLAKE2B 5c08895d06b830160b61403451d840bdb1d2895a8a8e1f06160459a823d02f490df907d2ee6c165c1b2d023d0479b0acadde751d48aa82dda27731f9137597db SHA512 3210501d06d5170441ccd3dcdb1878d30b352258073daf8b63bb01eba7162acb72b26c95adcbc4b2e0e090b000e2af0c733c5b9cfc750975d574e7b696cba7da
 EBUILD pyvim-3.0.3.ebuild 1011 BLAKE2B 716be0654455cff0c4900540be6f52deaa0be7ea19a98473670501e66b150a649bb27000cf942dd52e2bcf3ea1c7dcd65918118656bf40ec150165e0c79ba7dd SHA512 5dea30eb974395d060a3a054e5c2a12825e38e88f42fa138aaaf95c9b53c145e28c2b71949243e98aa1842ef42d19bddf5ca127886f61648d1e27caa10521ce3
 MISC metadata.xml 490 BLAKE2B a4af1d63730b2d7d6621d0a6fd3f4205016a940cc47d84ac48a692aa2d27c075f146d6a3d2581558af19cbab614fe47d9f9cb3679899387b2dc84b6b0f52c3cf SHA512 5eda2f764c81d21304541fe5d8c8330535d94b382b8bb94e9d15f01c184d4e09a6780dfe3745d4e3661c56e5a5a564147fbd4111fdfdd12b7075e1b9ad06488e
diff --git a/app-editors/pyvim/pyvim-3.0.2.ebuild b/app-editors/pyvim/pyvim-3.0.2.ebuild
deleted file mode 100644
index 3c28440c51e1..000000000000
--- a/app-editors/pyvim/pyvim-3.0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of Vim in Python"
-HOMEPAGE="https://pypi.org/project/pyvim https://github.com/prompt-toolkit/pyvim"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	app-eselect/eselect-vi
-	dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/prompt-toolkit[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-eselect_vi_update() {
-	ebegin "Calling eselect vi update"
-	eselect vi update --if-unset
-	eend $?
-}
-
-pkg_postinst() {
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	eselect_vi_update
-}
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index 57e65aee0947..0b1966b64815 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,6 +1,6 @@
 DIST ReText-7.2.3.tar.gz 527428 BLAKE2B 3c710769a881275d74018ba319b174020dda0b65da22ae926231af56901b56c31b3cff69119a9bb378cd218d7b793f002bb08bf1483cc1e55c95a4963cbe1598 SHA512 eb337866f5dfacad2f23435f09b550f4378df5bb261d6f79b1708fed9e7bd93e96e8f06f940cb7109fe02aa6df0592b151f11dfe13853799f0b1ac2c1065a0da
 DIST ReText-8.0.0.tar.gz 492823 BLAKE2B ba80f01f1a40981220c0b3e16dd04bf551319a35c1a5c7f6d5e70135404537e74fa4625fe4c05c7ee54202de9ae16d181c110fcae9b9172761ca5ecf6400f7de SHA512 0f2480bcc8569cf60ebfe55847a2a068d1e5dd262a4ff212873bf58660ec31e9c37d9b21bdc66229d681c065a0d96b6ff11652e8d9a7c77841ea551480d1154c
-EBUILD retext-7.2.3.ebuild 2019 BLAKE2B b7170d7f63aab68e3dc537ade0b784ed21785e714a6cfcf149869da1cbf8c744f71ae124d9d8b7bb17b1c2601a29b19057d3f586d42954f99bc36a1e44c0ff10 SHA512 db7a5d10188b4221de97c02097f721fe2747b8685100829b4a267cff650968d32f1016ce5a8c675c1f87b00f58466831c3ddd763cd46345cebaaf84a399332d6
+EBUILD retext-7.2.3.ebuild 1983 BLAKE2B d406bcef6bc9bf2a545862329231fad68d6711e7ca711e1d80fc88ffa4077de808fbbd055e26ad53032f3232d7f399ae79564446b72868f18c8f543c629224e3 SHA512 8b52132d60dc5fdc0a506706e97aff082b070ae36d2a0a7a28356bb704e355199e48e2aa97aa90301cd169ba7ac5e284fb904c7fc7362c953561c573a73c607f
 EBUILD retext-8.0.0.ebuild 1932 BLAKE2B 1a90b37a32832dd3b54638c03d582e8f753528f4ba9de67b712046794fe86b82f0784a71a7eb696126eb27eda25a5d5adf2100b8339150f443cc4f77db022c52 SHA512 7c51503e7bdb9f099be160c65f23b3376bc01f7590bc8dffa6b11b697321c78a77c87e6634ffbdde66fa595a72bfc9fe18f864c4f34cae3c128a1befeb902a0c
 EBUILD retext-9999.ebuild 1932 BLAKE2B 1a90b37a32832dd3b54638c03d582e8f753528f4ba9de67b712046794fe86b82f0784a71a7eb696126eb27eda25a5d5adf2100b8339150f443cc4f77db022c52 SHA512 7c51503e7bdb9f099be160c65f23b3376bc01f7590bc8dffa6b11b697321c78a77c87e6634ffbdde66fa595a72bfc9fe18f864c4f34cae3c128a1befeb902a0c
 MISC metadata.xml 535 BLAKE2B 94fbf92941c956601e9ec037a78919fcbddb572baa20f74c0daae31e438e44d214b57926cfa6d31eb176b8be72d2078e44686bada4a4794e130956c7d91b5865 SHA512 5ed97d1ed19c618b1246375d02860f96ce7f58aa759c467ae69e35d6b003cdac44f5c59f166ae6970e9a082e783550381b34540ad1ba03d661a3f3fde7d26dec
diff --git a/app-editors/retext/retext-7.2.3.ebuild b/app-editors/retext/retext-7.2.3.ebuild
index 3d801309e7a0..700a1e8d40b0 100644
--- a/app-editors/retext/retext-7.2.3.ebuild
+++ b/app-editors/retext/retext-7.2.3.ebuild
@@ -7,6 +7,8 @@ EAPI=8
 # old compat matrix is no longer accessible as of 2021-02-13 but stated back
 # in 2020-07-05 that PyQt5 was explicitly not supported.
 PYTHON_COMPAT=( python3_{9,10} )
+PYPI_NO_NORMALIZE=1
+PYPI_PN="ReText"
 
 inherit distutils-r1 optfeature qmake-utils virtualx xdg
 
@@ -20,9 +22,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/retext-project/retext.git"
 else
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-
+	inherit pypi
 	KEYWORDS="amd64 ~riscv ~x86"
 fi