From 1b61cf3e8b53c0ab06ca3694915acc23660fe07f Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sun, 21 May 2023 13:07:44 +0500 Subject: [PATCH 01/18] net-im/kaidan: add 0.9.1 Signed-off-by: Anna (cybertailor) Vyalkova --- net-im/kaidan/Manifest | 1 + net-im/kaidan/kaidan-0.9.1.ebuild | 65 +++++++++++++++++++++++++++++++ profiles/package.mask | 4 -- 3 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 net-im/kaidan/kaidan-0.9.1.ebuild diff --git a/net-im/kaidan/Manifest b/net-im/kaidan/Manifest index c3b5866114..5bd8bc55d5 100644 --- a/net-im/kaidan/Manifest +++ b/net-im/kaidan/Manifest @@ -1 +1,2 @@ DIST kaidan-0.8.0.tar.xz 532028 BLAKE2B 75607bec35606bb87b820277c9d94af02f110c4b56d78cb7e3261555f89eecaa823b9cdbfe53a7561f145d0d94eef3fbd6acb76b4d975746706aa796e565cd3f SHA512 2084693dd2ae0f1410e6df57f77f1c2c080e9b48c771e632b4cc9bf0351e435fd9d6937209f50d0f41a7235317fe42578cc8c983163f61e0d6c541d148a202bf +DIST kaidan-0.9.1.tar.xz 692464 BLAKE2B e99906afb03a27404ca456abda6d4b61e9b8010544f6ec267c8891d747386ecbe42c0642b48c7029fdee4923039292e224e0e3f09b23c8905ffe25681c4639f4 SHA512 256daeb94f4275377e1ef0919eb43660dd76064c414f1ac5570fac33632f853977997c52a504d5dace188f560feac93ea88ae1bb796e2bf6a96bafa4be387cbb diff --git a/net-im/kaidan/kaidan-0.9.1.ebuild b/net-im/kaidan/kaidan-0.9.1.ebuild new file mode 100644 index 0000000000..70f10e542f --- /dev/null +++ b/net-im/kaidan/kaidan-0.9.1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KFMIN=5.67.0 +QTMIN=5.15.0 +inherit ecm + +DESCRIPTION="User-friendly and modern chat app for every device" +HOMEPAGE="https://www.kaidan.im" +SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz" + +LICENSE="Apache-2.0 CC-BY-SA-4.0 GPL-3+ GPL-3-with-openssl-exception MIT" +SLOT="5" +KEYWORDS="~amd64" +IUSE="kde nls" + +DEPEND=" + >=dev-libs/kirigami-addons-0.7:5 + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtlocation-${QTMIN}:5 + >=dev-qt/qtmultimedia-${QTMIN}:5[qml] + >=dev-qt/qtnetwork-${QTMIN}:5[ssl] + >=dev-qt/qtpositioning-${QTMIN}:5[qml] + >=dev-qt/qtquickcontrols-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 + media-libs/kquickimageeditor:5 + media-libs/zxing-cpp:= + >=net-libs/qxmpp-1.5.0[omemo] + kde? ( >=kde-frameworks/knotifications-${KFMIN}:5 ) +" +RDEPEND="${DEPEND}" +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -DUSE_KNOTIFICATIONS=$(usex kde) + + # compile QML at build time + -DQUICK_COMPILER=ON + ) + ecm_src_configure +} + +src_test() { + local myctestargs=( + # needs network + -E PublicGroupChatTest + ) + ecm_src_test +} diff --git a/profiles/package.mask b/profiles/package.mask index 30545a2326..473d7cc8a5 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -29,10 +29,6 @@ dev-python/ufmt # Masked for removal in 30 days. dev-python/promise -# Anna Vyalkova (2023-05-01) -# Unavailable dependency. Masked until a version bump. -net-im/kaidan - # Joe Kappus (2023-04-30) # Upstream disappeared months/years ago. Removing in 30 days. dev-cpp/vectorwrapper From ad79c06389e733fe1b5f7d7a3c728883c05c02b1 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sun, 21 May 2023 13:07:53 +0500 Subject: [PATCH 02/18] net-im/kaidan: drop 0.8.0-r1 Signed-off-by: Anna (cybertailor) Vyalkova --- net-im/kaidan/Manifest | 1 - .../kaidan-0.8.0-no-knotifications.patch | 15 ----- net-im/kaidan/kaidan-0.8.0-r1.ebuild | 56 ------------------- 3 files changed, 72 deletions(-) delete mode 100644 net-im/kaidan/files/kaidan-0.8.0-no-knotifications.patch delete mode 100644 net-im/kaidan/kaidan-0.8.0-r1.ebuild diff --git a/net-im/kaidan/Manifest b/net-im/kaidan/Manifest index 5bd8bc55d5..b0b162e059 100644 --- a/net-im/kaidan/Manifest +++ b/net-im/kaidan/Manifest @@ -1,2 +1 @@ -DIST kaidan-0.8.0.tar.xz 532028 BLAKE2B 75607bec35606bb87b820277c9d94af02f110c4b56d78cb7e3261555f89eecaa823b9cdbfe53a7561f145d0d94eef3fbd6acb76b4d975746706aa796e565cd3f SHA512 2084693dd2ae0f1410e6df57f77f1c2c080e9b48c771e632b4cc9bf0351e435fd9d6937209f50d0f41a7235317fe42578cc8c983163f61e0d6c541d148a202bf DIST kaidan-0.9.1.tar.xz 692464 BLAKE2B e99906afb03a27404ca456abda6d4b61e9b8010544f6ec267c8891d747386ecbe42c0642b48c7029fdee4923039292e224e0e3f09b23c8905ffe25681c4639f4 SHA512 256daeb94f4275377e1ef0919eb43660dd76064c414f1ac5570fac33632f853977997c52a504d5dace188f560feac93ea88ae1bb796e2bf6a96bafa4be387cbb diff --git a/net-im/kaidan/files/kaidan-0.8.0-no-knotifications.patch b/net-im/kaidan/files/kaidan-0.8.0-no-knotifications.patch deleted file mode 100644 index 4ba0aa5737..0000000000 --- a/net-im/kaidan/files/kaidan-0.8.0-no-knotifications.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: Melvin Keskin -https://invent.kde.org/network/kaidan/-/merge_requests/784 -https://bugs.gentoo.org/817251 - ---- a/src/Notifications.cpp -+++ b/src/Notifications.cpp -@@ -82,7 +82,7 @@ void Notifications::sendMessageNotification(const QString &accountJid, const QSt - notification->sendEvent(); - } - #else --void Notifications::sendMessageNotification(const QString&, const QString&, const QString&) -+void Notifications::sendMessageNotification(const QString&, const QString&, const QString&, const QString&) - { - } - #endif // HAVE_KNOTIFICATIONS diff --git a/net-im/kaidan/kaidan-0.8.0-r1.ebuild b/net-im/kaidan/kaidan-0.8.0-r1.ebuild deleted file mode 100644 index d803c57077..0000000000 --- a/net-im/kaidan/kaidan-0.8.0-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KFMIN=5.67.0 -QTMIN=5.14.0 -inherit ecm - -DESCRIPTION="A simple, user-friendly Jabber/XMPP client for every device!" -HOMEPAGE="https://www.kaidan.im" -SRC_URI="mirror://kde/unstable/${PN}/${PV}/${P}.tar.xz" - -LICENSE="Apache-2.0 CC-BY-SA-4.0 GPL-3+ GPL-3-with-openssl-exception MIT" -SLOT="5" -KEYWORDS="~amd64 ~x86" -IUSE="kde nls" - -BDEPEND=" - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" -DEPEND=" - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtlocation-${QTMIN}:5 - >=dev-qt/qtmultimedia-${QTMIN}:5[qml] - >=dev-qt/qtnetwork-${QTMIN}:5[ssl] - >=dev-qt/qtpositioning-${QTMIN}:5[qml] - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 - >=media-libs/zxing-cpp-1.0.8:= - =net-libs/qxmpp-1.3.0 - kde? ( >=kde-frameworks/knotifications-${KFMIN}:5 ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-no-knotifications.patch ) - -src_configure() { - local mycmakeargs=( - -DI18N=$(usex nls) - -DBUILD_TESTS=$(usex test) - -DUSE_KNOTIFICATIONS=$(usex kde) - - # compile QML at build time - -DQUICK_COMPILER=ON - ) - ecm_src_configure -} From 2a8c35bcd8f74a3572b1e5fb868e268acd6b8d3d Mon Sep 17 00:00:00 2001 From: YiFei Zhu Date: Sun, 21 May 2023 02:41:43 -0700 Subject: [PATCH 03/18] app-editors/pulsar-bin: new package, add 1.105.0 ebuild mostly modified from app-editors/atom-bin. Signed-off-by: YiFei Zhu --- app-editors/pulsar-bin/Manifest | 1 + app-editors/pulsar-bin/metadata.xml | 11 +++ .../pulsar-bin/pulsar-bin-1.105.0.ebuild | 91 +++++++++++++++++++ 3 files changed, 103 insertions(+) create mode 100644 app-editors/pulsar-bin/Manifest create mode 100644 app-editors/pulsar-bin/metadata.xml create mode 100644 app-editors/pulsar-bin/pulsar-bin-1.105.0.ebuild diff --git a/app-editors/pulsar-bin/Manifest b/app-editors/pulsar-bin/Manifest new file mode 100644 index 0000000000..762558a4e0 --- /dev/null +++ b/app-editors/pulsar-bin/Manifest @@ -0,0 +1 @@ +DIST pulsar-bin-1.105.0.tar.gz 228995179 BLAKE2B b4b185a161374590b68e2efbd5b2f37ec59278f71cc30ef519c3a67ae546ea9b73f2e2e50eabd8b07855e291704f4d994428f58dca24e144713e4996fe053b03 SHA512 f2ed05bebe81735c21ac80ff82ec051aebc9ec54e8f2ffce0e4e17f0fc6b221992ca5909271f04334211e494647cfef9f1555f0f439ee77c63488585f255f810 diff --git a/app-editors/pulsar-bin/metadata.xml b/app-editors/pulsar-bin/metadata.xml new file mode 100644 index 0000000000..8b9f94c212 --- /dev/null +++ b/app-editors/pulsar-bin/metadata.xml @@ -0,0 +1,11 @@ + + + + + zhuyifei1999@gmail.com + YiFei Zhu + + + pulsar-edit/pulsar + + diff --git a/app-editors/pulsar-bin/pulsar-bin-1.105.0.ebuild b/app-editors/pulsar-bin/pulsar-bin-1.105.0.ebuild new file mode 100644 index 0000000000..904a5f8a57 --- /dev/null +++ b/app-editors/pulsar-bin/pulsar-bin-1.105.0.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop xdg + +DESCRIPTION="A Community-led Hyper-Hackable Text Editor" +HOMEPAGE="https://pulsar-edit.dev/" +SRC_URI="https://github.com/pulsar-edit/pulsar/releases/download/v${PV}/Linux.pulsar-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +# Need different downloads for other architectures; untested +KEYWORDS="-* ~amd64" +RESTRICT="test" + +S="${WORKDIR}/pulsar-${PV}" + +RDEPEND=" + app-accessibility/at-spi2-atk + app-accessibility/at-spi2-core + app-crypt/libsecret + dev-libs/atk + dev-libs/nss + dev-libs/openssl + dev-libs/openssl-compat + dev-vcs/git + media-libs/alsa-lib + net-print/cups + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+ + x11-libs/libnotify + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libxkbfile + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXScrnSaver + x11-libs/libXtst + x11-libs/pango +" + +QA_PREBUILT="/opt/Pulsar/*" +QA_PRESTRIPPED="/opt/Pulsar/resources/*" # Files are already stripped + +src_prepare(){ + default + + # We do not install licenses + rm resources/LICENSE.md || die "Failed to remove LICENSE" +} + +src_install(){ + insinto /opt/Pulsar + doins -r "${S}"/* + dosym ../../opt/Pulsar/resources/pulsar.sh "${EPREFIX}"/usr/bin/pulsar + fperms +x /opt/Pulsar/resources/pulsar.sh + fperms +x /opt/Pulsar/pulsar + + # I will use only npm provided with package itself + # as nodejs is not required to make it working (and it is really big). + fperms +x /opt/Pulsar/resources/app/ppm/bin/{apm,node,npm} + + # Bug 798459 + fperms +x /opt/Pulsar/resources/app.asar.unpacked/node_modules/{vscode-ripgrep/bin/rg,dugite/git/bin/git} + + doicon resources/pulsar.png + make_desktop_entry "/opt/pulsar-bin/pulsar %U" "Pulsar" "pulsar" \ + "GNOME;GTK;Utility;TextEditor;Development;" \ + "GenericName=Text Editor\nMimeType=text/plain;\nStartupNotify=true\nStartupWMClass=pulsar" + + einstalldocs + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst(){ + xdg_desktop_database_update + + elog "To migrate configurations & saved state from Atom Editor, execute:" + elog " cp -a \$HOME/.atom \$HOME/.pulsar" + elog " cp -a \$HOME/.config/Atom \$HOME/.config/Pulsar" +} From 76662f5410091d86ac133496ac62284cdf7beacd Mon Sep 17 00:00:00 2001 From: YiFei Zhu Date: Sun, 21 May 2023 02:46:38 -0700 Subject: [PATCH 04/18] profiles: mask app-editors/atom-bin Signed-off-by: YiFei Zhu --- profiles/package.mask | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 473d7cc8a5..f4cda8ddfc 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -14,6 +14,12 @@ # New entries go on top. +# YiFei Zhu (2023-05-21) +# Unmaintained, outdated ebuild, upstream EOL. +# Use app-editors/pulsar-bin instead. +# Removal on 2023-06-21. +app-editors/atom-bin + # Anna Vyalkova (2023-05-16) # Depend on masked dev-python/toml. # Removal on 2023-06-15. From d77100bfbdbdb28f56255896f6806a568a18613a Mon Sep 17 00:00:00 2001 From: YiFei Zhu Date: Sun, 21 May 2023 02:58:20 -0700 Subject: [PATCH 05/18] app-editors/pulsar-bin: fix deprecated dependencies warning Signed-off-by: YiFei Zhu --- app-editors/pulsar-bin/pulsar-bin-1.105.0.ebuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app-editors/pulsar-bin/pulsar-bin-1.105.0.ebuild b/app-editors/pulsar-bin/pulsar-bin-1.105.0.ebuild index 904a5f8a57..fe0f21f52b 100644 --- a/app-editors/pulsar-bin/pulsar-bin-1.105.0.ebuild +++ b/app-editors/pulsar-bin/pulsar-bin-1.105.0.ebuild @@ -18,10 +18,8 @@ RESTRICT="test" S="${WORKDIR}/pulsar-${PV}" RDEPEND=" - app-accessibility/at-spi2-atk - app-accessibility/at-spi2-core + >=app-accessibility/at-spi2-core-2.46.0 app-crypt/libsecret - dev-libs/atk dev-libs/nss dev-libs/openssl dev-libs/openssl-compat From 862ad84749b84b3ced2fb667444bb836d16dbfd6 Mon Sep 17 00:00:00 2001 From: YiFei Zhu Date: Sun, 21 May 2023 04:12:17 -0700 Subject: [PATCH 06/18] app-editors/pulsar-bin: fix more +x binary & make desktop more upstream Though we can't rally use the part of "env ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=false", because desktop.eclass would autofill a wrong TryExec entry. Signed-off-by: YiFei Zhu --- app-editors/pulsar-bin/pulsar-bin-1.105.0.ebuild | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/app-editors/pulsar-bin/pulsar-bin-1.105.0.ebuild b/app-editors/pulsar-bin/pulsar-bin-1.105.0.ebuild index fe0f21f52b..17ba74aedd 100644 --- a/app-editors/pulsar-bin/pulsar-bin-1.105.0.ebuild +++ b/app-editors/pulsar-bin/pulsar-bin-1.105.0.ebuild @@ -69,11 +69,23 @@ src_install(){ # Bug 798459 fperms +x /opt/Pulsar/resources/app.asar.unpacked/node_modules/{vscode-ripgrep/bin/rg,dugite/git/bin/git} + fperms +x /opt/Pulsar/resources/app.asar.unpacked/node_modules/fuzzy-finder/node_modules/vscode-ripgrep/bin/rg + fperms +x /opt/Pulsar/resources/app.asar.unpacked/node_modules/whats-my-line/node_modules/dugite/git/bin/git doicon resources/pulsar.png - make_desktop_entry "/opt/pulsar-bin/pulsar %U" "Pulsar" "pulsar" \ + make_desktop_entry "/usr/bin/pulsar %F" "Pulsar" "pulsar" \ "GNOME;GTK;Utility;TextEditor;Development;" \ - "GenericName=Text Editor\nMimeType=text/plain;\nStartupNotify=true\nStartupWMClass=pulsar" + "GenericName=Text Editor\nStartupNotify=true\nStartupWMClass=pulsar\n" \ + "MimeType=application/javascript;application/json;application/x-httpd-eruby;" \ + "application/x-httpd-php;application/x-httpd-php3;application/x-httpd-php4;" \ + "application/x-httpd-php5;application/x-ruby;application/x-bash;application/x-csh;" \ + "application/x-sh;application/x-zsh;application/x-shellscript;application/x-sql;" \ + "application/x-tcl;application/xhtml+xml;application/xml;application/xml-dtd;" \ + "application/xslt+xml;text/coffeescript;text/css;text/html;text/plain;text/xml;" \ + "text/xml-dtd;text/x-bash;text/x-c++;text/x-c++hdr;text/x-c++src;text/x-c;text/x-chdr;" \ + "text/x-csh;text/x-csrc;text/x-dsrc;text/x-diff;text/x-go;text/x-java;text/x-java-source;" \ + "text/x-makefile;text/x-markdown;text/x-objc;text/x-perl;text/x-php;text/x-python;" \ + "text/x-ruby;text/x-sh;text/x-zsh;text/yaml;inode/directory" einstalldocs From ca7ea4f1f1dc94661370e13ae54584dd4699f991 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sun, 21 May 2023 18:14:06 +0500 Subject: [PATCH 07/18] dev-python/opentype-sanitizer: add missing dep Closes: https://bugs.gentoo.org/906829 Signed-off-by: Anna (cybertailor) Vyalkova --- .../opentype-sanitizer/opentype-sanitizer-9.0.0.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-python/opentype-sanitizer/opentype-sanitizer-9.0.0.ebuild b/dev-python/opentype-sanitizer/opentype-sanitizer-9.0.0.ebuild index 00eeb2c0ee..1646da604f 100644 --- a/dev-python/opentype-sanitizer/opentype-sanitizer-9.0.0.ebuild +++ b/dev-python/opentype-sanitizer/opentype-sanitizer-9.0.0.ebuild @@ -19,12 +19,14 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" -DEPEND=" +RDEPEND=" app-arch/lz4:= media-libs/woff2 sys-libs/zlib:= " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + dev-cpp/gtest +" BDEPEND="dev-util/meson" distutils_enable_tests pytest From 2b985372ff334c97d9d90be97942e61edbc6e8ff Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sun, 21 May 2023 18:14:38 +0500 Subject: [PATCH 08/18] app-text/mandown: update Manifest Closes: https://bugs.gentoo.org/906828 Signed-off-by: Anna (cybertailor) Vyalkova --- app-text/mandown/Manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/mandown/Manifest b/app-text/mandown/Manifest index f2d4f028ea..fab1d8160a 100644 --- a/app-text/mandown/Manifest +++ b/app-text/mandown/Manifest @@ -1,7 +1,7 @@ DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 DIST deunicode-1.3.3.crate 174981 BLAKE2B 4ef60b90b64e153113e8d22d3e492b1fb001ec288f4cbbf63321d48a7700829a786e1c0e5a8f3fa7102177e2b48285d1c35892ad8ba7f9d86cd7cd5717d81a85 SHA512 ac010c158c58ea19b3c2abd45f2ffbfdb68cdad2f011ee4312b54e3fae6ffc79eacab9b3bd7977134dfc49938e3e67f197c502593301b545b296ac169a8658bf DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f -DIST mandown-0.1.3.gl.tar.bz2 8008 BLAKE2B 1f589bdd66ed5e66513956761b577b7759b4a1cc0ef5636e560e3738a17dfbe16d96d0813e20cd6ae82d69b07ed496eb4ad98d6659cd014e21cc8ba581bde232 SHA512 c0a51e03293286498923d0d0666950f0da140f1347d9953751102bff5b01b47c64fb3858bd2a311465ca97249a2228c0ec4f408089fe15f3a8429aa04e42d31f +DIST mandown-0.1.3.gl.tar.bz2 7592 BLAKE2B f81f701c74dd844e35385b0ed8c0df4599b392cb97b79650e3be4dc8df1a0d26d55a921814480966793b11de35713d12c1cc96acaaa9e75ee64ce696c9910f93 SHA512 de8245f28c227657abd0f084e5427c9a4e2f34b122d191d592d0b04de6607f5a3ed00a224857de2b03846f396eed01b8cd2318fbfc3f18261dcef52f6228dd31 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa DIST pulldown-cmark-0.9.2.crate 115824 BLAKE2B cc8b8cac890b333a864ecb1444128b1aa187392b296c54ccb0c3048d79d17aa7f53bd0ac31f0c6492544ea78636deefaf3ad44804a1c79008e17b27fe1e61fad SHA512 2268a3284da5def75b906373a3c70927bc68ecde7b641231d96ff9437785732134568abaf0b6f81c582dc56498da4e677a7b2e2f1914cd42b345db0a06d75c60 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188 From e75c73870af006070292d631e1fe4e7490b0a5ec Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sun, 21 May 2023 21:17:52 +0500 Subject: [PATCH 09/18] crystal-utils.eclass: add CRYSTAL_DEFINES var Signed-off-by: Anna (cybertailor) Vyalkova --- eclass/crystal-utils.eclass | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/eclass/crystal-utils.eclass b/eclass/crystal-utils.eclass index 8456c5af64..57325a9939 100644 --- a/eclass/crystal-utils.eclass +++ b/eclass/crystal-utils.eclass @@ -48,6 +48,11 @@ SHARDS_DEPS=" ) " +# @ECLASS_VARIABLE: CRYSTAL_DEFINES +# @DEFAULT_UNSET +# @DESCRIPTION: +# List of compile-time defines. Used by 'crystal build' and 'crystal docs'. + # @FUNCTION: _crystal_get_colors_opt # @INTERNAL # @RETURN: "--no-color" if colors should be disabled, empty string otherwise @@ -76,15 +81,6 @@ _crystal_get_debug_opt() { # mycrystalargs bash array. # # Must be run or ecrystal/eshards will fail. -# -# @CODE -# src_configure() { -# local mycrystalargs=( -# -Dfoo -# ) -# crystal_configure -# } -# @CODE crystal_configure() { debug-print-function ${FUNCNAME} "${@}" @@ -107,6 +103,7 @@ crystal_configure() { $(is-flagq -mcpu && echo "--mcpu=$(get-flag mcpu)") $(is-flagq -mcmodel && echo "--mcmodel=$(get-flag mcmodel)") # TODO: --mattr + "${CRYSTAL_DEFINES[@]}" "${mycrystalargs[@]}" ) From a5f49bbc8a320932ab708e68eb86d9666ec48ded Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sun, 21 May 2023 21:18:29 +0500 Subject: [PATCH 10/18] shards.eclass: pass CRYSTAL_DEFINES to docs cmd Signed-off-by: Anna (cybertailor) Vyalkova --- eclass/shards.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/shards.eclass b/eclass/shards.eclass index 0de0deb47f..3258cea48d 100644 --- a/eclass/shards.eclass +++ b/eclass/shards.eclass @@ -77,7 +77,7 @@ shards_src_compile() { done if use doc; then - ecrystal docs + ecrystal docs "${CRYSTAL_DEFINES[@]}" HTML_DOCS=( docs/. ) fi From 1f258e91156f6946f0ff6c8d21708ba794e46744 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sun, 21 May 2023 21:20:45 +0500 Subject: [PATCH 11/18] www-apps/invidious: fix docs build Closes: https://bugs.gentoo.org/906184 Signed-off-by: Anna (cybertailor) Vyalkova --- www-apps/invidious/invidious-2023.05.08.ebuild | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/www-apps/invidious/invidious-2023.05.08.ebuild b/www-apps/invidious/invidious-2023.05.08.ebuild index 6a8627cb29..32c32158b0 100644 --- a/www-apps/invidious/invidious-2023.05.08.ebuild +++ b/www-apps/invidious/invidious-2023.05.08.ebuild @@ -68,6 +68,11 @@ DOCS=( {CHANGELOG,README}.md TRANSLATION ) CHECKREQS_MEMORY="2G" +CRYSTAL_DEFINES=( + -Dskip_videojs_download + -Ddisable_quic +) + src_unpack() { local src depname destname js css @@ -140,14 +145,6 @@ src_prepare() { rm shard.lock || die } -src_configure() { - local mycrystalargs=( - -Dskip_videojs_download - -Ddisable_quic - ) - shards_src_configure -} - src_install() { dobin invidious einstalldocs From c810a3f55ae2f940dc101f9d4d21c253b669122a Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sun, 21 May 2023 21:23:38 +0500 Subject: [PATCH 12/18] dev-nim/nimbus: fix docs deps Closes: https://bugs.gentoo.org/906180 Signed-off-by: Anna (cybertailor) Vyalkova --- dev-nim/nimbus/nimbus-1.1.1.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-nim/nimbus/nimbus-1.1.1.ebuild b/dev-nim/nimbus/nimbus-1.1.1.ebuild index 71f03d0e48..4929ba7cf1 100644 --- a/dev-nim/nimbus/nimbus-1.1.1.ebuild +++ b/dev-nim/nimbus/nimbus-1.1.1.ebuild @@ -28,6 +28,7 @@ BDEPEND=" ${RDEPEND} doc? ( $(python_gen_any_dep ' + dev-python/insipid-sphinx-theme[${PYTHON_USEDEP}] dev-python/sphinx-notfound-page[${PYTHON_USEDEP}] dev-python/sphinx-prompt[${PYTHON_USEDEP}] dev-python/sphinx-sitemap[${PYTHON_USEDEP}] @@ -38,7 +39,7 @@ BDEPEND=" python_check_deps() { use doc || return 0 - python_has_version dev-python/insipid-sphinx-theme[${PYTHON_USEDEP}] && + python_has_version "dev-python/insipid-sphinx-theme[${PYTHON_USEDEP}]" && python_has_version "dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]" && python_has_version "dev-python/sphinx-prompt[${PYTHON_USEDEP}]" && python_has_version "dev-python/sphinx-sitemap[${PYTHON_USEDEP}]" From c982ad6c0f29772d55cc9ba8e6860169e6614b3d Mon Sep 17 00:00:00 2001 From: Laurent Morretton Date: Sun, 21 May 2023 21:21:10 +0200 Subject: [PATCH 13/18] net-misc/tuba: add 0.3.2 Signed-off-by: Laurent Morretton --- net-misc/tuba/Manifest | 1 + net-misc/tuba/tuba-0.3.2.ebuild | 53 +++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 net-misc/tuba/tuba-0.3.2.ebuild diff --git a/net-misc/tuba/Manifest b/net-misc/tuba/Manifest index 92d37de49e..3e2d34424a 100644 --- a/net-misc/tuba/Manifest +++ b/net-misc/tuba/Manifest @@ -1 +1,2 @@ DIST tuba-0.2.0.tar.gz 233703 BLAKE2B 8131986f481031257a59a4d2902364cec042d3d773cee0dee3b1ef8628ea1e2dbb32619c6f9054b43c88a1da51a53d1877896f0082ad482387876000b47d40ab SHA512 c5e07199c950963ac6f398d36f2da760a6fa734e247ba1defc3b98f9aa53d1626cf519988a96c5c7e16f32b79d7f5ad6bec02d6eab84cc132f2f634176fdd2f5 +DIST tuba-0.3.2.tar.gz 276540 BLAKE2B 7f5fa78e84b6df68400f6d4fc0cfeef153607ac1d1ed3e1760c6d330e9f30dd858db53b0fbad5119658120d39e40d888d02799b07993ade2b8698f82fcabe092 SHA512 1cac9547de7733a40fae292481551a5b231eccd51982ab041f50bdcb82e4e74742657d469c940fa8d2b745115aac55dc2202e39a66e0aaddd396b9a226a2ebbd diff --git a/net-misc/tuba/tuba-0.3.2.ebuild b/net-misc/tuba/tuba-0.3.2.ebuild new file mode 100644 index 0000000000..6ccaf3d9dc --- /dev/null +++ b/net-misc/tuba/tuba-0.3.2.ebuild @@ -0,0 +1,53 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome2-utils meson vala xdg + +DESCRIPTION="Mastodon client, previously known as Tooth" +HOMEPAGE="https://github.com/GeopJr/Tuba" +MY_PN="Tuba" +SRC_URI="https://github.com/GeopJr/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="CC-BY-3.0 GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +S="${WORKDIR}/${MY_PN}-${PV}" + +RDEPEND=" + >=app-crypt/libsecret-0.20 + >=dev-libs/glib-2.71.2 + >=dev-libs/json-glib-1.4.4 + >=dev-libs/libxml2-2.9.10 + >=dev-libs/libgee-0.8.5 + >=gui-libs/gtk-4.3:4 + >=gui-libs/libadwaita-1.2 + >=net-libs/libsoup-3 + gui-libs/gtksourceview:5 +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + $(vala_depend) + virtual/pkgconfig +" + +VALA_MIN_API_VERSION=0.48 + +src_prepare() { + default + vala_setup +} + +pkg_postinst() { + gnome2_schemas_update + xdg_pkg_postinst +} + +pkg_postrm() { + gnome2_schemas_update + xdg_pkg_postrm +} From 8239a203642f90b2d066a1747c656d4d4b64462c Mon Sep 17 00:00:00 2001 From: YiFei Zhu Date: Sun, 21 May 2023 12:40:23 -0700 Subject: [PATCH 14/18] */*: replace uses of mirror://pypi/ with pypi.eclass Signed-off-by: YiFei Zhu --- dev-python/asyncpg/asyncpg-0.26.0.ebuild | 3 +-- .../azure-storage-blob-12.14.1.ebuild | 5 +++-- .../browserstack-local-python-1.2.3.ebuild | 8 +++----- dev-python/cx-oracle/cx-oracle-8.3.0.ebuild | 10 +++------- dev-python/decopatch/decopatch-1.4.9.ebuild | 3 +-- dev-python/googletrans/googletrans-4.0.0_rc1.ebuild | 4 ++-- dev-python/i3ipc/i3ipc-2.2.1.ebuild | 3 +-- .../insipid-sphinx-theme-0.4.0.ebuild | 4 ++-- dev-python/mastodon-py/mastodon-py-1.8.0.ebuild | 6 +++--- dev-python/msrest/msrest-0.7.1.ebuild | 4 ++-- dev-python/os-api-ref/os-api-ref-2.3.0.ebuild | 4 ++-- dev-python/pydispatcher/pydispatcher-2.0.7.ebuild | 7 +++---- dev-python/pymeeus/pymeeus-0.5.11.ebuild | 6 +++--- dev-python/pymeeus/pymeeus-0.5.12.ebuild | 8 +++----- dev-python/pytest-cases/pytest-cases-3.6.13.ebuild | 4 ++-- dev-python/pytest-click/pytest-click-1.1.0.ebuild | 6 +----- dev-python/python-http-client/Manifest | 2 +- .../python-http-client/python-http-client-3.3.5.ebuild | 7 +------ .../readability-lxml/readability-lxml-0.6.1.ebuild | 4 ++-- .../sphinx-argparse-cli-1.9.0.ebuild | 6 +----- dev-python/sphinx-click/sphinx-click-4.1.0.ebuild | 4 ++-- dev-python/sphinx-sitemap/sphinx-sitemap-2.2.1.ebuild | 4 ++-- dev-python/srt/srt-3.5.1.ebuild | 3 +-- dev-python/stdlibs/stdlibs-2022.3.16.ebuild | 3 +-- dev-python/types-paramiko/types-paramiko-2.10.0.ebuild | 4 ++-- .../types-python-dateutil-2.8.17.ebuild | 4 ++-- dev-python/types-pytz/types-pytz-2021.3.8.ebuild | 4 ++-- dev-python/ufoNormalizer/ufoNormalizer-0.6.1.ebuild | 7 ++----- dev-python/w3lib/w3lib-2.0.1.ebuild | 3 +-- dev-util/FoBiS/FoBiS-3.0.5-r1.ebuild | 7 +++---- dev-util/FoBiS/Manifest | 2 +- dev-util/reuse/reuse-1.1.0.ebuild | 3 +-- games-misc/gay/gay-1.2.8.ebuild | 3 +-- net-misc/fedigroup/fedigroup-1.0.6.ebuild | 8 +++----- net-misc/fedigroup/fedigroup-1.0.8.ebuild | 8 +++----- .../discover-overlay/discover-overlay-0.4.5.ebuild | 4 ++-- .../discover-overlay/discover-overlay-0.5.4.ebuild | 4 ++-- 37 files changed, 71 insertions(+), 108 deletions(-) diff --git a/dev-python/asyncpg/asyncpg-0.26.0.ebuild b/dev-python/asyncpg/asyncpg-0.26.0.ebuild index 3ff4d663da..aab248ad35 100644 --- a/dev-python/asyncpg/asyncpg-0.26.0.ebuild +++ b/dev-python/asyncpg/asyncpg-0.26.0.ebuild @@ -5,11 +5,10 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) # doesn't build with pypy3 DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="A fast PostgreSQL Database Client Library for Python/asyncio" HOMEPAGE="https://github.com/MagicStack/asyncpg" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" diff --git a/dev-python/azure-storage-blob/azure-storage-blob-12.14.1.ebuild b/dev-python/azure-storage-blob/azure-storage-blob-12.14.1.ebuild index 14da37ddb1..10b7e8ca4c 100644 --- a/dev-python/azure-storage-blob/azure-storage-blob-12.14.1.ebuild +++ b/dev-python/azure-storage-blob/azure-storage-blob-12.14.1.ebuild @@ -5,14 +5,15 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 +PYPI_NO_NORMALIZE=1 +inherit distutils-r1 pypi DESCRIPTION="Microsoft Azure Blob Storage Client Library for Python" HOMEPAGE=" https://pypi.org/project/azure-storage-blob/ https://github.com/Azure/azure-sdk-for-python " -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" +SRC_URI="$(pypi_sdist_url --no-normalize ${PN} ${PV} .zip)" LICENSE="MIT" SLOT="0" diff --git a/dev-python/browserstack-local-python/browserstack-local-python-1.2.3.ebuild b/dev-python/browserstack-local-python/browserstack-local-python-1.2.3.ebuild index 448f4419b7..ad6914301a 100644 --- a/dev-python/browserstack-local-python/browserstack-local-python-1.2.3.ebuild +++ b/dev-python/browserstack-local-python/browserstack-local-python-1.2.3.ebuild @@ -3,19 +3,17 @@ EAPI=8 -MYP="${P/-python/}" -MYPN="${PN/-python/}" +PYPI_PN="${PN/-python/}" +PYPI_NO_NORMALIZE=1 PYTHON_COMPAT=( python3_{10..11} pypy3 ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Python bindings for BrowserStack Local" HOMEPAGE=" https://github.com/browserstack/browserstack-local-python https://pypi.org/project/browserstack-local/ " -SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz" -S="${WORKDIR}/${MYP}" KEYWORDS="~amd64" LICENSE="MIT" SLOT="0" diff --git a/dev-python/cx-oracle/cx-oracle-8.3.0.ebuild b/dev-python/cx-oracle/cx-oracle-8.3.0.ebuild index 4e613d180d..79c2596804 100644 --- a/dev-python/cx-oracle/cx-oracle-8.3.0.ebuild +++ b/dev-python/cx-oracle/cx-oracle-8.3.0.ebuild @@ -4,18 +4,16 @@ EAPI="8" PYTHON_COMPAT=( python3_10 ) +PYPI_PN="cx_Oracle" +PYPI_NO_NORMALIZE=1 -inherit distutils-r1 - -MY_PN="cx_Oracle" -MY_P=${MY_PN}-${PV} +inherit distutils-r1 pypi DESCRIPTION="Python interface to Oracle" HOMEPAGE=" https://oracle.github.io/python-cx_Oracle/ https://pypi.org/project/cx-Oracle/ " -SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" LICENSE="BSD" SLOT="0" @@ -29,8 +27,6 @@ RESTRICT="test" DEPEND="dev-db/oracle-instantclient" RDEPEND="${DEPEND}" -S=${WORKDIR}/${MY_P} - python_prepare_all() { # do not install LICENSE and README to /usr/ sed -i -e '/data_files/d' setup.py || die diff --git a/dev-python/decopatch/decopatch-1.4.9.ebuild b/dev-python/decopatch/decopatch-1.4.9.ebuild index 4512c93df7..cc40a744cc 100644 --- a/dev-python/decopatch/decopatch-1.4.9.ebuild +++ b/dev-python/decopatch/decopatch-1.4.9.ebuild @@ -9,11 +9,10 @@ DISTUTILS_USE_PEP517=setuptools DOCS_BUILDER="mkdocs" DOCS_DEPEND="dev-python/mkdocs-material" -inherit distutils-r1 docs +inherit distutils-r1 docs pypi DESCRIPTION="Create decorators easily in python" HOMEPAGE="https://pypi.org/project/decopatch/ https://github.com/smarie/python-decopatch" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" diff --git a/dev-python/googletrans/googletrans-4.0.0_rc1.ebuild b/dev-python/googletrans/googletrans-4.0.0_rc1.ebuild index 85a9085138..4179417c88 100644 --- a/dev-python/googletrans/googletrans-4.0.0_rc1.ebuild +++ b/dev-python/googletrans/googletrans-4.0.0_rc1.ebuild @@ -3,12 +3,12 @@ EAPI=8 PYTHON_COMPAT=( python3_10 pypy3 ) -inherit distutils-r1 +inherit distutils-r1 pypi MY_PV=${PV/_/} DESCRIPTION="Free Google Translate API for Python. Translates totally free of charge." HOMEPAGE="https://pypi.org/project/googletrans/ https://github.com/ssut/py-googletrans" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="$(pypi_sdist_url --no-normalize ${PN} ${MY_PV}) -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="MIT" diff --git a/dev-python/i3ipc/i3ipc-2.2.1.ebuild b/dev-python/i3ipc/i3ipc-2.2.1.ebuild index 3eb8fbbae2..4fec94f891 100644 --- a/dev-python/i3ipc/i3ipc-2.2.1.ebuild +++ b/dev-python/i3ipc/i3ipc-2.2.1.ebuild @@ -5,11 +5,10 @@ EAPI=7 PYTHON_COMPAT=( python3_10 ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="An improved Python library to control i3wm and sway." HOMEPAGE="https://github.com/altdesktop/i3ipc-python" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" diff --git a/dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.4.0.ebuild b/dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.4.0.ebuild index afb6dc496c..e66e672b5d 100644 --- a/dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.4.0.ebuild +++ b/dev-python/insipid-sphinx-theme/insipid-sphinx-theme-0.4.0.ebuild @@ -4,15 +4,15 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 PYTHON_COMPAT=( pypy3 python3_{10..11} ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="An insipid Sphinx theme" HOMEPAGE=" https://pypi.org/project/insipid-sphinx-theme/ https://github.com/mgeier/insipid-sphinx-theme " -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" diff --git a/dev-python/mastodon-py/mastodon-py-1.8.0.ebuild b/dev-python/mastodon-py/mastodon-py-1.8.0.ebuild index b9beddb14d..1c92b616ac 100644 --- a/dev-python/mastodon-py/mastodon-py-1.8.0.ebuild +++ b/dev-python/mastodon-py/mastodon-py-1.8.0.ebuild @@ -5,7 +5,9 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..11} ) -inherit distutils-r1 optfeature +PYPI_NO_NORMALIZE=1 +PYPI_PN="Mastodon.py" +inherit distutils-r1 optfeature pypi MY_PN="Mastodon.py" MY_P="${MY_PN}-${PV}" @@ -14,8 +16,6 @@ HOMEPAGE=" https://pypi.org/project/Mastodon.py/ https://github.com/halcy/Mastodon.py " -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" diff --git a/dev-python/msrest/msrest-0.7.1.ebuild b/dev-python/msrest/msrest-0.7.1.ebuild index 385e27c562..6d446e27ec 100644 --- a/dev-python/msrest/msrest-0.7.1.ebuild +++ b/dev-python/msrest/msrest-0.7.1.ebuild @@ -6,11 +6,11 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="xml(+)" DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 optfeature +inherit distutils-r1 optfeature pypi DESCRIPTION="AutoRest swagger generator Python client runtime" HOMEPAGE="https://github.com/Azure/msrest-for-python" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" +SRC_URI="$(pypi_sdist_url ${PN} ${PV} .zip)" LICENSE="MIT" SLOT="0" diff --git a/dev-python/os-api-ref/os-api-ref-2.3.0.ebuild b/dev-python/os-api-ref/os-api-ref-2.3.0.ebuild index cd6e364a9c..1801cca09f 100644 --- a/dev-python/os-api-ref/os-api-ref-2.3.0.ebuild +++ b/dev-python/os-api-ref/os-api-ref-2.3.0.ebuild @@ -5,15 +5,15 @@ EAPI=8 EPYTEST_DESELECT=( os_api_ref/tests/test_microversions.py::TestMicroversions::test_parameters_table ) PYTHON_COMPAT=( python3_10 ) +PYPI_NO_NORMALIZE=1 -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Sphinx Extensions to support API reference sites in OpenStack" HOMEPAGE=" https://opendev.org/openstack/os-api-ref https://pypi.org/project/os-api-ref/ " -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" diff --git a/dev-python/pydispatcher/pydispatcher-2.0.7.ebuild b/dev-python/pydispatcher/pydispatcher-2.0.7.ebuild index 5668f0552e..2e45730891 100644 --- a/dev-python/pydispatcher/pydispatcher-2.0.7.ebuild +++ b/dev-python/pydispatcher/pydispatcher-2.0.7.ebuild @@ -5,13 +5,12 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 +PYPI_PN="PyDispatcher" +PYPI_NO_NORMALIZE=1 +inherit distutils-r1 pypi DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism" HOMEPAGE="https://github.com/mcfletch/pydispatcher" -MY_P=PyDispatcher -SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_P}/${MY_P}-${PV}.tar.gz" -S=${WORKDIR}/${MY_P}-${PV} LICENSE="BSD" SLOT="0" diff --git a/dev-python/pymeeus/pymeeus-0.5.11.ebuild b/dev-python/pymeeus/pymeeus-0.5.11.ebuild index 9fcfead255..ac4d598252 100644 --- a/dev-python/pymeeus/pymeeus-0.5.11.ebuild +++ b/dev-python/pymeeus/pymeeus-0.5.11.ebuild @@ -5,7 +5,9 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} pypy3 ) DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 +PYPI_PN="PyMeeus" +PYPI_NO_NORMALIZE=1 +inherit distutils-r1 pypi MY_PN="PyMeeus" MY_P="${MY_PN}-${PV}" @@ -14,8 +16,6 @@ HOMEPAGE=" https://pypi.org/project/PyMeeus/ https://github.com/architest/pymeeus " -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" LICENSE="LGPL-3" SLOT="0" diff --git a/dev-python/pymeeus/pymeeus-0.5.12.ebuild b/dev-python/pymeeus/pymeeus-0.5.12.ebuild index 9fcfead255..70c65c2e31 100644 --- a/dev-python/pymeeus/pymeeus-0.5.12.ebuild +++ b/dev-python/pymeeus/pymeeus-0.5.12.ebuild @@ -5,17 +5,15 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} pypy3 ) DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 +PYPI_PN="PyMeeus" +PYPI_NO_NORMALIZE=1 +inherit distutils-r1 pypi -MY_PN="PyMeeus" -MY_P="${MY_PN}-${PV}" DESCRIPTION="Python implementation of Jean Meeus astronomical routines" HOMEPAGE=" https://pypi.org/project/PyMeeus/ https://github.com/architest/pymeeus " -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" LICENSE="LGPL-3" SLOT="0" diff --git a/dev-python/pytest-cases/pytest-cases-3.6.13.ebuild b/dev-python/pytest-cases/pytest-cases-3.6.13.ebuild index f38ffa7b42..514163671d 100644 --- a/dev-python/pytest-cases/pytest-cases-3.6.13.ebuild +++ b/dev-python/pytest-cases/pytest-cases-3.6.13.ebuild @@ -5,15 +5,15 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 DOCS_BUILDER="mkdocs" DOCS_DEPEND="dev-python/mkdocs-material" -inherit distutils-r1 docs +inherit distutils-r1 docs pypi DESCRIPTION="Separate test code from test cases in pytest" HOMEPAGE="https://pypi.org/project/pytest-cases/ https://github.com/smarie/python-pytest-cases" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" diff --git a/dev-python/pytest-click/pytest-click-1.1.0.ebuild b/dev-python/pytest-click/pytest-click-1.1.0.ebuild index 9fa40b5462..fdf85058a4 100644 --- a/dev-python/pytest-click/pytest-click-1.1.0.ebuild +++ b/dev-python/pytest-click/pytest-click-1.1.0.ebuild @@ -5,17 +5,13 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( pypy3 python3_{10..11} ) -inherit distutils-r1 +inherit distutils-r1 pypi -MY_PN="${PN//-/_}" -MY_P="${MY_PN}-${PV}" DESCRIPTION="Pytest plugin for Click" HOMEPAGE=" https://pypi.org/project/pytest-click/ https://github.com/Stranger6667/pytest-click " -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" diff --git a/dev-python/python-http-client/Manifest b/dev-python/python-http-client/Manifest index f1c3006002..bb6b005a1e 100644 --- a/dev-python/python-http-client/Manifest +++ b/dev-python/python-http-client/Manifest @@ -1 +1 @@ -DIST python-http-client-3.3.5.tar.gz 7852 BLAKE2B 6ebcd545b3dfe06e9daf4c0c373d91f9a8ecbf9dc411b579794bbbfa5047bb388ff2fa7d1ba04cf71c64a9af5b1da2283d8ed5b5b0a3dca49f4db5cd7f569d57 SHA512 54fe0d871be4d9743d5601c218d20c513a88eac8f91afa0222daf8d585819dabe3b9fdaf63e0810e46fe94dbf72185af7460f7c39ebf00312fd8eb7411a90f75 +DIST python_http_client-3.3.5.tar.gz 7852 BLAKE2B 6ebcd545b3dfe06e9daf4c0c373d91f9a8ecbf9dc411b579794bbbfa5047bb388ff2fa7d1ba04cf71c64a9af5b1da2283d8ed5b5b0a3dca49f4db5cd7f569d57 SHA512 54fe0d871be4d9743d5601c218d20c513a88eac8f91afa0222daf8d585819dabe3b9fdaf63e0810e46fe94dbf72185af7460f7c39ebf00312fd8eb7411a90f75 diff --git a/dev-python/python-http-client/python-http-client-3.3.5.ebuild b/dev-python/python-http-client/python-http-client-3.3.5.ebuild index 45f2bb59c8..efe1d29aed 100644 --- a/dev-python/python-http-client/python-http-client-3.3.5.ebuild +++ b/dev-python/python-http-client/python-http-client-3.3.5.ebuild @@ -5,14 +5,10 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="HTTP REST client, simplified for Python" HOMEPAGE="https://github.com/sendgrid/python-http-client https://pypi.org/project/python-http-client/" -MY_PN=${PN//-/_} -MY_P=${MY_PN}-${PV} -SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz" -S=${WORKDIR}/${MY_PN}-${PV} LICENSE="MIT" SLOT="0" @@ -34,4 +30,3 @@ python_test() { } distutils_enable_tests pytest - diff --git a/dev-python/readability-lxml/readability-lxml-0.6.1.ebuild b/dev-python/readability-lxml/readability-lxml-0.6.1.ebuild index 3591d33b7f..91caa24a54 100644 --- a/dev-python/readability-lxml/readability-lxml-0.6.1.ebuild +++ b/dev-python/readability-lxml/readability-lxml-0.6.1.ebuild @@ -4,11 +4,11 @@ EAPI=7 PYTHON_COMPAT=( python3_{10..11} ) -inherit distutils-r1 +PYPI_NO_NORMALIZE=1 +inherit distutils-r1 pypi DESCRIPTION="fast html to text parser (article readability tool)" HOMEPAGE="https://github.com/buriy/python-readability" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" diff --git a/dev-python/sphinx-argparse-cli/sphinx-argparse-cli-1.9.0.ebuild b/dev-python/sphinx-argparse-cli/sphinx-argparse-cli-1.9.0.ebuild index 4973032305..e50c1b26f6 100644 --- a/dev-python/sphinx-argparse-cli/sphinx-argparse-cli-1.9.0.ebuild +++ b/dev-python/sphinx-argparse-cli/sphinx-argparse-cli-1.9.0.ebuild @@ -5,14 +5,10 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..11} ) # no pypy3 support -inherit distutils-r1 +inherit distutils-r1 pypi -MY_PN="${PN//-/_}" -MY_P="${MY_PN}-${PV}" DESCRIPTION="Render CLI arguments (sub-commands friendly) defined by argparse module" HOMEPAGE="https://github.com/tox-dev/sphinx-argparse-cli https://pypi.org/project/sphinx-argparse-cli/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" diff --git a/dev-python/sphinx-click/sphinx-click-4.1.0.ebuild b/dev-python/sphinx-click/sphinx-click-4.1.0.ebuild index c6d034df67..5981ef715c 100644 --- a/dev-python/sphinx-click/sphinx-click-4.1.0.ebuild +++ b/dev-python/sphinx-click/sphinx-click-4.1.0.ebuild @@ -3,16 +3,16 @@ EAPI=8 +PYPI_NO_NORMALIZE=1 PYTHON_COMPAT=( python3_{10..11} pypy3 ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Sphinx plugin to automatically document click-based applications" HOMEPAGE=" https://github.com/click-contrib/sphinx-click https://pypi.org/project/sphinx-click/ " -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" KEYWORDS="~amd64" diff --git a/dev-python/sphinx-sitemap/sphinx-sitemap-2.2.1.ebuild b/dev-python/sphinx-sitemap/sphinx-sitemap-2.2.1.ebuild index 4756602bbd..13c2ea92bc 100644 --- a/dev-python/sphinx-sitemap/sphinx-sitemap-2.2.1.ebuild +++ b/dev-python/sphinx-sitemap/sphinx-sitemap-2.2.1.ebuild @@ -5,14 +5,14 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} pypy3 ) DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 +PYPI_NO_NORMALIZE=1 +inherit distutils-r1 pypi DESCRIPTION="Sitemap generator for Sphinx" HOMEPAGE=" https://pypi.org/project/sphinx-sitemap/ https://github.com/jdillard/sphinx-sitemap " -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" diff --git a/dev-python/srt/srt-3.5.1.ebuild b/dev-python/srt/srt-3.5.1.ebuild index 4022e2af5b..418abeea43 100644 --- a/dev-python/srt/srt-3.5.1.ebuild +++ b/dev-python/srt/srt-3.5.1.ebuild @@ -5,11 +5,10 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="A tiny library for parsing, modifying, and composing SRT files" HOMEPAGE="https://github.com/cdown/srt" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" diff --git a/dev-python/stdlibs/stdlibs-2022.3.16.ebuild b/dev-python/stdlibs/stdlibs-2022.3.16.ebuild index 3b7c80def8..b763ab4a2e 100644 --- a/dev-python/stdlibs/stdlibs-2022.3.16.ebuild +++ b/dev-python/stdlibs/stdlibs-2022.3.16.ebuild @@ -6,11 +6,10 @@ EAPI=8 DISTUTILS_USE_PEP517=flit PYTHON_COMPAT=( python3_{10..11} ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="What's in the Python stdlib" HOMEPAGE="https://github.com/omnilib/stdlibs/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" diff --git a/dev-python/types-paramiko/types-paramiko-2.10.0.ebuild b/dev-python/types-paramiko/types-paramiko-2.10.0.ebuild index 349590ef02..c6f49f23f3 100644 --- a/dev-python/types-paramiko/types-paramiko-2.10.0.ebuild +++ b/dev-python/types-paramiko/types-paramiko-2.10.0.ebuild @@ -3,16 +3,16 @@ EAPI=8 +PYPI_NO_NORMALIZE=1 PYTHON_COMPAT=( python3_{10..11} pypy3 ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Typing stubs for paramiko" HOMEPAGE=" https://pypi.org/project/types-paramiko/ https://github.com/python/typeshed/tree/master/stubs/paramiko " -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="Apache-2.0" diff --git a/dev-python/types-python-dateutil/types-python-dateutil-2.8.17.ebuild b/dev-python/types-python-dateutil/types-python-dateutil-2.8.17.ebuild index 6b2e5984af..c5b7e53335 100644 --- a/dev-python/types-python-dateutil/types-python-dateutil-2.8.17.ebuild +++ b/dev-python/types-python-dateutil/types-python-dateutil-2.8.17.ebuild @@ -3,16 +3,16 @@ EAPI=8 +PYPI_NO_NORMALIZE=1 PYTHON_COMPAT=( python3_{10..11} pypy3 ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Typing stubs for python-dateutil" HOMEPAGE=" https://pypi.org/project/types-python-dateutil/ https://github.com/python/typeshed/tree/master/stubs/python-dateutil " -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="Apache-2.0" diff --git a/dev-python/types-pytz/types-pytz-2021.3.8.ebuild b/dev-python/types-pytz/types-pytz-2021.3.8.ebuild index f3b20023dd..312607d44e 100644 --- a/dev-python/types-pytz/types-pytz-2021.3.8.ebuild +++ b/dev-python/types-pytz/types-pytz-2021.3.8.ebuild @@ -3,16 +3,16 @@ EAPI=8 +PYPI_NO_NORMALIZE=1 PYTHON_COMPAT=( python3_{10..11} pypy3 ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Typing stubs for pytz" HOMEPAGE=" https://pypi.org/project/types-pytz/ https://github.com/python/typeshed/tree/master/stubs/pytz " -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="Apache-2.0" diff --git a/dev-python/ufoNormalizer/ufoNormalizer-0.6.1.ebuild b/dev-python/ufoNormalizer/ufoNormalizer-0.6.1.ebuild index 1aedff8f70..80d38d2465 100644 --- a/dev-python/ufoNormalizer/ufoNormalizer-0.6.1.ebuild +++ b/dev-python/ufoNormalizer/ufoNormalizer-0.6.1.ebuild @@ -3,16 +3,13 @@ EAPI=8 -MY_PN="${PN,,}" -MY_P="${MY_PN}-${PV}" PYTHON_COMPAT=( python3_{10..11} pypy3 ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="A tool that will normalize the XML and other data inside of a UFO" HOMEPAGE="https://github.com/unified-font-object/ufoNormalizer" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip" -S="${WORKDIR}/${MY_P}" +SRC_URI="$(pypi_sdist_url ${PN} ${PV} .zip)" SLOT="0" LICENSE="BSD" diff --git a/dev-python/w3lib/w3lib-2.0.1.ebuild b/dev-python/w3lib/w3lib-2.0.1.ebuild index 708077d54f..08c95fca3e 100644 --- a/dev-python/w3lib/w3lib-2.0.1.ebuild +++ b/dev-python/w3lib/w3lib-2.0.1.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} pypy3 ) DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Library of web-related functions" HOMEPAGE=" @@ -13,7 +13,6 @@ HOMEPAGE=" https://pypi.org/project/w3lib/ https://github.com/scrapy/w3lib " -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT=0 diff --git a/dev-util/FoBiS/FoBiS-3.0.5-r1.ebuild b/dev-util/FoBiS/FoBiS-3.0.5-r1.ebuild index d3fb8ffe62..feaea80f6f 100644 --- a/dev-util/FoBiS/FoBiS-3.0.5-r1.ebuild +++ b/dev-util/FoBiS/FoBiS-3.0.5-r1.ebuild @@ -5,12 +5,13 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..11} ) +PYPI_PN="${PN}.py" +PYPI_NO_NORMALIZE=1 -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="FoBiS.py, a Fortran Building System for poor men" HOMEPAGE="https://github.com/szaghi/FoBiS" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}.py/${PN}.py-${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" @@ -18,8 +19,6 @@ KEYWORDS="~amd64 ~x86" IUSE="graphviz" -S="${WORKDIR}/${PN}.py-${PV}" - RDEPEND=" graphviz? ( dev-python/graphviz[${PYTHON_USEDEP}] ) " diff --git a/dev-util/FoBiS/Manifest b/dev-util/FoBiS/Manifest index 1ac8dbd076..7b4a0bd2f6 100644 --- a/dev-util/FoBiS/Manifest +++ b/dev-util/FoBiS/Manifest @@ -1 +1 @@ -DIST FoBiS-3.0.5.tar.gz 49171 BLAKE2B c65726e84e5eb55d741aeb04f5cf44e94796af2b6539695f1b7a19f56ccfa2ece45d9bd4fabdd224a9d8e113f8e7f5e1258c52ad5f1837b23896a4e4edef971a SHA512 8f0e495cd73f81685b05fd5d491ef21e533a0caba6be5b1a892a15f5f22a625faf038af3f43a700fb6ff4f26d753b50137527fbd380dd17fca6ea1943369c84b +DIST FoBiS.py-3.0.5.tar.gz 49171 BLAKE2B c65726e84e5eb55d741aeb04f5cf44e94796af2b6539695f1b7a19f56ccfa2ece45d9bd4fabdd224a9d8e113f8e7f5e1258c52ad5f1837b23896a4e4edef971a SHA512 8f0e495cd73f81685b05fd5d491ef21e533a0caba6be5b1a892a15f5f22a625faf038af3f43a700fb6ff4f26d753b50137527fbd380dd17fca6ea1943369c84b diff --git a/dev-util/reuse/reuse-1.1.0.ebuild b/dev-util/reuse/reuse-1.1.0.ebuild index 5c31d2cf98..c2ca4b41f9 100644 --- a/dev-util/reuse/reuse-1.1.0.ebuild +++ b/dev-util/reuse/reuse-1.1.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_PEP517=poetry -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="A tool for compliance with the REUSE recommendations" HOMEPAGE=" @@ -13,7 +13,6 @@ HOMEPAGE=" https://pypi.org/project/reuse/ https://github.com/fsfe/reuse-tool " -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0 CC0-1.0 CC-BY-SA-4.0 GPL-3+" SLOT="0" diff --git a/games-misc/gay/gay-1.2.8.ebuild b/games-misc/gay/gay-1.2.8.ebuild index 4f2857ce08..f7b7712ded 100644 --- a/games-misc/gay/gay-1.2.8.ebuild +++ b/games-misc/gay/gay-1.2.8.ebuild @@ -5,11 +5,10 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} pypy3 ) DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Colour your text / terminal to be more gay" HOMEPAGE="https://pypi.org/project/gay/ https://github.com/ms-jpq/gay" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" diff --git a/net-misc/fedigroup/fedigroup-1.0.6.ebuild b/net-misc/fedigroup/fedigroup-1.0.6.ebuild index 384ad557bc..a9a82016f4 100644 --- a/net-misc/fedigroup/fedigroup-1.0.6.ebuild +++ b/net-misc/fedigroup/fedigroup-1.0.6.ebuild @@ -6,17 +6,15 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=1 -inherit distutils-r1 +PYPI_PN="${PN}.py" +PYPI_NO_NORMALIZE=1 +inherit distutils-r1 pypi -MY_PN="${PN}.py" -MY_P="${MY_PN}-${PV}" DESCRIPTION="Emulate group accounts on Mastodon/Pleroma" HOMEPAGE=" https://pypi.org/project/fedigroup.py/ https://github.com/uanet-exception/fedigroup.py " -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" LICENSE="GPL-3+" SLOT="0" diff --git a/net-misc/fedigroup/fedigroup-1.0.8.ebuild b/net-misc/fedigroup/fedigroup-1.0.8.ebuild index 384ad557bc..a9a82016f4 100644 --- a/net-misc/fedigroup/fedigroup-1.0.8.ebuild +++ b/net-misc/fedigroup/fedigroup-1.0.8.ebuild @@ -6,17 +6,15 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=1 -inherit distutils-r1 +PYPI_PN="${PN}.py" +PYPI_NO_NORMALIZE=1 +inherit distutils-r1 pypi -MY_PN="${PN}.py" -MY_P="${MY_PN}-${PV}" DESCRIPTION="Emulate group accounts on Mastodon/Pleroma" HOMEPAGE=" https://pypi.org/project/fedigroup.py/ https://github.com/uanet-exception/fedigroup.py " -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" LICENSE="GPL-3+" SLOT="0" diff --git a/net-voip/discover-overlay/discover-overlay-0.4.5.ebuild b/net-voip/discover-overlay/discover-overlay-0.4.5.ebuild index 1f143bb0d9..d8283d8289 100644 --- a/net-voip/discover-overlay/discover-overlay-0.4.5.ebuild +++ b/net-voip/discover-overlay/discover-overlay-0.4.5.ebuild @@ -5,12 +5,12 @@ EAPI=8 PYTHON_COMPAT=( python3_10 ) DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Yet another Discord overlay for Linux written in Python using GTK3" HOMEPAGE="https://github.com/trigg/Discover" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" diff --git a/net-voip/discover-overlay/discover-overlay-0.5.4.ebuild b/net-voip/discover-overlay/discover-overlay-0.5.4.ebuild index 1f143bb0d9..d8283d8289 100644 --- a/net-voip/discover-overlay/discover-overlay-0.5.4.ebuild +++ b/net-voip/discover-overlay/discover-overlay-0.5.4.ebuild @@ -5,12 +5,12 @@ EAPI=8 PYTHON_COMPAT=( python3_10 ) DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Yet another Discord overlay for Linux written in Python using GTK3" HOMEPAGE="https://github.com/trigg/Discover" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" From b21c536c3e239ba404e39db369fe41d978bb80e9 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Mon, 22 May 2023 02:42:59 +0200 Subject: [PATCH 15/18] dev-python/pytest-mypy-plugins: new package, add 1.11.1 Signed-off-by: Lucio Sauer --- dev-python/pytest-mypy-plugins/Manifest | 1 + ...s-1.11.1-deprecated-chevron-to-jinja.patch | 45 +++++++++++++++++++ dev-python/pytest-mypy-plugins/metadata.xml | 19 ++++++++ .../pytest-mypy-plugins-1.11.1.ebuild | 37 +++++++++++++++ 4 files changed, 102 insertions(+) create mode 100644 dev-python/pytest-mypy-plugins/Manifest create mode 100644 dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-1.11.1-deprecated-chevron-to-jinja.patch create mode 100644 dev-python/pytest-mypy-plugins/metadata.xml create mode 100644 dev-python/pytest-mypy-plugins/pytest-mypy-plugins-1.11.1.ebuild diff --git a/dev-python/pytest-mypy-plugins/Manifest b/dev-python/pytest-mypy-plugins/Manifest new file mode 100644 index 0000000000..1e72cbeeb6 --- /dev/null +++ b/dev-python/pytest-mypy-plugins/Manifest @@ -0,0 +1 @@ +DIST pytest-mypy-plugins-1.11.1.gh.tar.gz 18201 BLAKE2B a21b089321a3d632225e0ac6aa921b23bba111dcc5234c2ada32522b7659533970a9bd19bb432d3304b0291e32ba067ab75c549c4552ca742835155ab8e711b1 SHA512 ac7a0973aba070c80480681f2910d40c7e510c906f8030413ba5c94f50131df19036c7183bfad3f211d6d375661753b9d4ff2a73b3bd7af06d0f442e94af3f64 diff --git a/dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-1.11.1-deprecated-chevron-to-jinja.patch b/dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-1.11.1-deprecated-chevron-to-jinja.patch new file mode 100644 index 0000000000..ae2885893b --- /dev/null +++ b/dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-1.11.1-deprecated-chevron-to-jinja.patch @@ -0,0 +1,45 @@ +Chevron, an engine for the Mustache templating language, has been unmaintained +since 2021 and is not part of ::gentoo. The Jinja and Mustache templating +languages use the same syntax as far as this project is concerned. + +PR issued upstream by : +https://github.com/typeddjango/pytest-mypy-plugins/pull/117 +--- a/pytest_mypy_plugins/utils.py ++++ b/pytest_mypy_plugins/utils.py +@@ -11,10 +11,11 @@ from itertools import zip_longest + from pathlib import Path + from typing import Any, Callable, Dict, Iterator, List, Mapping, Optional, Tuple, Union + +-import chevron ++import jinja2 + import regex + from decorator import contextmanager + ++_rendering_env = jinja2.Environment() + + @contextmanager + def temp_environ() -> Iterator[None]: +@@ -351,9 +352,10 @@ def extract_output_matchers_from_out(out: str, params: Mapping[str, Any], regex: + return matchers + + +-def render_template(template: str, data: Mapping[str, Any]) -> str: +- return chevron.render(template=template, data={k: v if v is not None else "None" for k, v in data.items()}) + ++def render_template(template: str, data: Mapping[str, Any]) -> str: ++ template = _rendering_env.from_string(template) ++ return template.render({k: v if v is not None else "None" for k, v in data.items()}) + + def get_func_first_lnum(attr: Callable[..., None]) -> Optional[Tuple[int, List[str]]]: + lines, _ = inspect.getsourcelines(attr) +--- a/setup.py ++++ b/setup.py +@@ -8,7 +8,7 @@ dependencies = [ + "mypy>=0.970", + "decorator", + "pyyaml", +- "chevron", ++ "jinja2", + "regex", + "packaging", + ] diff --git a/dev-python/pytest-mypy-plugins/metadata.xml b/dev-python/pytest-mypy-plugins/metadata.xml new file mode 100644 index 0000000000..e6717ac2f3 --- /dev/null +++ b/dev-python/pytest-mypy-plugins/metadata.xml @@ -0,0 +1,19 @@ + + + + + watermanpaint@posteo.net + Lucio Sauer + + + proxy-maint@gentoo.org + Proxy Maintainers + + + + https://github.com/typeddjango/pytest-mypy-plugins/blob/master/CHANGELOG.md + + typeddjango/pytest-mypy-plugins + pytest-mypy-plugins + + diff --git a/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-1.11.1.ebuild b/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-1.11.1.ebuild new file mode 100644 index 0000000000..e42608e0ea --- /dev/null +++ b/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-1.11.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_11 ) +inherit distutils-r1 + +DESCRIPTION="pytest plugin for testing mypy types, stubs, plugins" +HOMEPAGE=" + https://pypi.org/project/pytest-mypy-plugins/ + https://github.com/typeddjango/pytest-mypy-plugins/ +" + +SRC_URI="https://github.com/typeddjango/pytest-mypy-plugins/archive/refs/tags/${PV}.tar.gz + -> ${P}.gh.tar.gz" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +PATCHES=( + "${FILESDIR}"/${P}-deprecated-chevron-to-jinja.patch +) + +DOCS="README* CHANGELOG*" + +RDEPEND=" + dev-python/decorator[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/mypy[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/regex[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest From b820c3b9b236ce79fac25f6f52a79f06e71eb3ee Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Mon, 22 May 2023 02:43:32 +0200 Subject: [PATCH 16/18] dev-python/types-protobuf: new package, add 4.23.0.1 Signed-off-by: Lucio Sauer --- dev-python/types-protobuf/Manifest | 1 + dev-python/types-protobuf/metadata.xml | 16 ++++++++++++++++ .../types-protobuf-4.23.0.1.ebuild | 18 ++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 dev-python/types-protobuf/Manifest create mode 100644 dev-python/types-protobuf/metadata.xml create mode 100644 dev-python/types-protobuf/types-protobuf-4.23.0.1.ebuild diff --git a/dev-python/types-protobuf/Manifest b/dev-python/types-protobuf/Manifest new file mode 100644 index 0000000000..42bbe22b4c --- /dev/null +++ b/dev-python/types-protobuf/Manifest @@ -0,0 +1 @@ +DIST types-protobuf-4.23.0.1.tar.gz 47077 BLAKE2B cf3ccfbbf06e9e549811bf7edfec7d5ced17ee2baa102b15a568ea57f3986447db074ad4c64bd3e5cb348ac41a69bfaa6b3e4dbe93394643cd75d8bfa47291d4 SHA512 914bdd95ce5777f00cd406e6e10e0094e3834e9e51868abdffb08b91894e2b896e4eaa6d3ba1a534e0b8f1231c3bef0afca89a4ab38c149d1d7ce4725bd70af6 diff --git a/dev-python/types-protobuf/metadata.xml b/dev-python/types-protobuf/metadata.xml new file mode 100644 index 0000000000..9babd56155 --- /dev/null +++ b/dev-python/types-protobuf/metadata.xml @@ -0,0 +1,16 @@ + + + + + watermanpaint@posteo.net + Lucio Sauer + + + proxy-maint@gentoo.org + Proxy Maintainers + + + python/typeshed + types-protobuf + + diff --git a/dev-python/types-protobuf/types-protobuf-4.23.0.1.ebuild b/dev-python/types-protobuf/types-protobuf-4.23.0.1.ebuild new file mode 100644 index 0000000000..522a3b2df2 --- /dev/null +++ b/dev-python/types-protobuf/types-protobuf-4.23.0.1.ebuild @@ -0,0 +1,18 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 +PYTHON_COMPAT=( python3_{10,11} ) +inherit distutils-r1 pypi + +DESCRIPTION="Typing stubs for protobuf" +HOMEPAGE=" + https://pypi.org/project/types-protobuf/ + https://github.com/python/typeshed/tree/master/stubs/protobuf/ +" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" From 978ae5c140ea5185be9cfe0e78fd6cee4f837d9e Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Mon, 22 May 2023 02:44:06 +0200 Subject: [PATCH 17/18] dev-python/grpc-stubs: new package, add 1.53.0.2 Signed-off-by: Lucio Sauer --- dev-python/grpc-stubs/Manifest | 1 + .../grpc-stubs/grpc-stubs-1.53.0.2.ebuild | 37 +++++++++++++++++++ dev-python/grpc-stubs/metadata.xml | 16 ++++++++ 3 files changed, 54 insertions(+) create mode 100644 dev-python/grpc-stubs/Manifest create mode 100644 dev-python/grpc-stubs/grpc-stubs-1.53.0.2.ebuild create mode 100644 dev-python/grpc-stubs/metadata.xml diff --git a/dev-python/grpc-stubs/Manifest b/dev-python/grpc-stubs/Manifest new file mode 100644 index 0000000000..1e5e0b65ab --- /dev/null +++ b/dev-python/grpc-stubs/Manifest @@ -0,0 +1 @@ +DIST grpc-stubs-1.53.0.2.gh.tar.gz 14607 BLAKE2B a18f17d1fe31133f7bafb4728b1748537db11b5d11f7da9364fb595c86afcfb47199d069e7eb3e05b89b92757b1080dfd443d0ee2006e85e49c75e5ad188e41a SHA512 ea8343231d12a34927bab56ddfdad69233c4e09502cd072db9ed21ec79726a600e9dc31a0b3ecbae47ea5f4357ddb0840e022fb385f6e1296665406254c59fba diff --git a/dev-python/grpc-stubs/grpc-stubs-1.53.0.2.ebuild b/dev-python/grpc-stubs/grpc-stubs-1.53.0.2.ebuild new file mode 100644 index 0000000000..1b9fbdd659 --- /dev/null +++ b/dev-python/grpc-stubs/grpc-stubs-1.53.0.2.ebuild @@ -0,0 +1,37 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_11 ) +inherit distutils-r1 + +DESCRIPTION="gRPC typing stubs for Python" +HOMEPAGE=" + https://pypi.org/project/grpc-stubs/ + https://github.com/shabbyrobe/grpc-stubs/ +" + +SRC_URI="https://github.com/shabbyrobe/grpc-stubs/archive/refs/tags/${PV}.tar.gz + -> ${P}.gh.tar.gz" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + dev-python/grpcio[${PYTHON_USEDEP}] + dev-python/protobuf-python[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mypy[${PYTHON_USEDEP}] + dev-python/pytest-mypy-plugins[${PYTHON_USEDEP}] + dev-python/types-protobuf[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +python_test() { + epytest --mypy-ini-file=setup.cfg +} diff --git a/dev-python/grpc-stubs/metadata.xml b/dev-python/grpc-stubs/metadata.xml new file mode 100644 index 0000000000..668cc18f5d --- /dev/null +++ b/dev-python/grpc-stubs/metadata.xml @@ -0,0 +1,16 @@ + + + + + watermanpaint@posteo.net + Lucio Sauer + + + proxy-maint@gentoo.org + Proxy Maintainers + + + shabbyrobe/grpc-stubs + grpc-stubs + + From 1957eacaed28073cb91b5456edfdb18eadf53069 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Mon, 22 May 2023 06:26:32 +0200 Subject: [PATCH 18/18] dev-python/*: remove proxy-maint from metadata.xml Signed-off-by: Lucio Sauer --- dev-python/grpc-stubs/metadata.xml | 4 ---- dev-python/pytest-mypy-plugins/metadata.xml | 4 ---- dev-python/types-protobuf/metadata.xml | 4 ---- 3 files changed, 12 deletions(-) diff --git a/dev-python/grpc-stubs/metadata.xml b/dev-python/grpc-stubs/metadata.xml index 668cc18f5d..9a74fffccb 100644 --- a/dev-python/grpc-stubs/metadata.xml +++ b/dev-python/grpc-stubs/metadata.xml @@ -5,10 +5,6 @@ watermanpaint@posteo.net Lucio Sauer - - proxy-maint@gentoo.org - Proxy Maintainers - shabbyrobe/grpc-stubs grpc-stubs diff --git a/dev-python/pytest-mypy-plugins/metadata.xml b/dev-python/pytest-mypy-plugins/metadata.xml index e6717ac2f3..3da79fbbd2 100644 --- a/dev-python/pytest-mypy-plugins/metadata.xml +++ b/dev-python/pytest-mypy-plugins/metadata.xml @@ -5,10 +5,6 @@ watermanpaint@posteo.net Lucio Sauer - - proxy-maint@gentoo.org - Proxy Maintainers - https://github.com/typeddjango/pytest-mypy-plugins/blob/master/CHANGELOG.md diff --git a/dev-python/types-protobuf/metadata.xml b/dev-python/types-protobuf/metadata.xml index 9babd56155..99f1d590c9 100644 --- a/dev-python/types-protobuf/metadata.xml +++ b/dev-python/types-protobuf/metadata.xml @@ -5,10 +5,6 @@ watermanpaint@posteo.net Lucio Sauer - - proxy-maint@gentoo.org - Proxy Maintainers - python/typeshed types-protobuf