diff --git a/Manifest b/Manifest
index 44d70374d8ff..da8c6a5e083a 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29633 BLAKE2B 38c1872ed450a1adb9260127bad988665ec36aeaf3f924d713a55a68eb9a338cc428d7436a3bb14898b666f50e95749c4815a19792cdfcbbc428cd09e943a819 SHA512 741c2060c2d3dc553e31c2e142840e4a5ef5620b09b7f7505488467e484245ca9183ffb92defda3b1d011b7701e5206583f75da1c44b4b76d6b5e15f9adf10a6
-TIMESTAMP 2022-04-10T18:09:23Z
+MANIFEST Manifest.files.gz 29621 BLAKE2B 4f610acdb8614deeceadcbc7125f4776d96f75dea50ee800717ef05021303a2e7b6d3c9c2ad19b419e878d25337c49cf5a80058d01bbe58af8d0cb6fa12ffb29 SHA512 1afaa9a3098342bc9c53dc11b9bd0cfbf2885e848bbf71ed5772a3b38c0e12eb9592b80be3f94fcf50e589af3e9b0f2bf7c66d283e88210fc252ea8a905b46c6
+TIMESTAMP 2022-04-11T18:39:22Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmJTHVNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmJUddpfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCHOg/9FYA5kN+ELo5xv2Ix96B+GVwTSwO8zSsOla37zOLO4S4ghj7PV9AQcWON
-tpLx1lHNdx7tv6q9N8CyMTM9TgR9CJ6iIpiocK5dfbSiWFoUmZMvEo7WkYfR3Slj
-yXa13WKlUVSVIm50czc5GL5rPe9LlgLQ8MbJpEs7PuKuUnBs9DXoMUymXEjFefh4
-wVd4/p7WlJ+mhrCxwZiyYkrS/2bss6SH/afzXzIjCqmZQGAPBGqS8oWVqVVrkzcB
-ghCyCD/lIb5+WkOJ/Pkcmt9iZxo+QkX8noyg0UJD740XI5eaXIqLWH8cR+8mT5lr
-iZFBZQQZU1rjqOCb/x5NiWCLCXMQaEV7GaPngYFZ7k4+u3O4wKT9kZAW42KFisvd
-irryJA47kbV+pMkF/TlPTvFSf/1ZjN6yvZyacRCdOBRW9ournLsKhRbRyPqG5nki
-NejMidWdtE/ovIlNHDNM4e3bIh7YZ530casH/mVMytOyh6Y0vM8zV2W5+9RVrCKt
-RP1Geum7XP5MIZHiDsLkDabLR5du4t3Fl1YYdlLACdW7ZiiI0/1KkVL83RUZCaaW
-BjLY3Ui1fZkw6g8m+Y+anuc0L7hSB/AeqNPJxTTnuX5CzrCcz7r/V5TTHw3+dmT6
-Nol7pEltDsNi2uTlJbfBOnGQA2SiIc2kehAXQWkWqiag2Fx0mBs=
-=4dne
+klAaHA/+K7afIGyNqEp/CWnkW4JhODRQC6S4v4HJhUQZKxDhJ4Zjl0VJfRofxYZs
+gbus6mxhJV2CgKrZeTt96biaL3d6Tk2+t53NquMxkpmCBRJ1WXpHzA1SS9WtHGs8
+eS8BJycKpnKBHBV1MfGJLdbIJDrXPpYY78nGs3Cz79etJ8Lv6Ox7s4pyHKVpQYJH
+e4Yj8NV0l9OXk7DlH/mQukiNCKHDSupm1JVPb8i2JDC7br4RJgbaP2TgLNGeKZlU
+hdulHCNp3yMMbGF4sJCfi2Y3RaoT7kfx/OUxyRIvJrCSCng/3MU7QnWrEyjHu/s6
+EGAUWq8GfS6CEJWMWwXf0fDSHPBZ0RuR7LHQiIwErot5j6jJhKLet6dByswZVc80
+mu/uep6r+WDmDuJrbHdPNx97S/wZ0pGRDCH8aGN+YU2CYYSnE+za/pnm334NfjjE
+2MAsWgyoswUzruIMwn+RtRu3x0X5sIzssRo9x4QgPEM4VzDVKWkr66Ds55IFMmrn
+HvA8WOLQzXbvU3B0nvzfEstx0TadQllgKOXouMeTG+vkI328ZgyB9y3JqAmsnOZ6
+AE5QuN3dH6zl/ln2m3XAzIWJWXs8hA1Qzdk0/EctSRMAhpQbwFYnTDQemF1Jtkqc
+rqcGyhb9fNNDFWWhESCpKiLwWDVWdMWcAysWWQKSnbVSldEF5NM=
+=oyD0
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 9dab5e12bb77..c42f407602db 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index e1dcbea40d63..c967ea543d06 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 05b9d11934d4..fe51009b9f05 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -3,7 +3,7 @@ DIST keepassxc-2.7.0-src.tar.xz 8846780 BLAKE2B 74c4e9c6d06239950f1b8a64c5bce894
DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae SHA512 c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9
EBUILD keepassxc-2.6.6.ebuild 2310 BLAKE2B befacb8a5edf657b7dc182b4c1b5580a30e037342d590df9ba4450d2344c0a208ba09b59047880638cbc8c68f4bdd5653cfba873e6682949f967c40d545952fd SHA512 6f5d85aa92508284a335374c4b4c190104e4e70c4c4c228f7015e0c15efdb28931f2d97748ed30edd7fc09d65a0017cef2cb5bd28731cc3cace80dfc2b01db4f
EBUILD keepassxc-2.6.9999.ebuild 2414 BLAKE2B d25231ddef6df71cf2574b46b8c902ba89ad046144a26d011dd3c26ba5061b5e474f80e00d0370fc04bc86e448a377c4dfd1f99535b6e29894b7d951e4a8ed53 SHA512 f3accbf2750712fb4302e7fbd792680b3d3a7094975a56e10bdc205089e8d90520cbc9b29b1cab82196abff1ccd94101d7f49f7ba49ea6ab7cef1fb74b091a33
-EBUILD keepassxc-2.7.0-r2.ebuild 2293 BLAKE2B 9b3113b9b01b59fe34924092539d07db46dbe709b626ed3d3e180810c5e8ed3773fd1fc0c58e51566e1f08f766db97050d4a72423f56fff903351a8456b97142 SHA512 ccb17de9ddfe5b08fb968720c862c915b4edd594aedb8c4e1a8de1f5e9faf00583e643dd0d9e90706931d76e821c7a2c889188d3a08263940cee91e5a1060d0d
-EBUILD keepassxc-2.7.1.ebuild 2293 BLAKE2B 7943b14df4b39ef9fce69f0f7a3f750bfa08f9528cb211efa02c627d04a82188d50c41954d1a67bd4b7a1b2807498860dc7ecf63192c6ba58e099de711bdbfa3 SHA512 254486509b30c1e3ac4926ac4d14986b846131d623c55cbf49ec819f4c5f24f349a718d5c779491aac71a196b2a208dfd4376f7d96a7ecce5a43f8355b2f9edc
-EBUILD keepassxc-9999.ebuild 2293 BLAKE2B 9b3113b9b01b59fe34924092539d07db46dbe709b626ed3d3e180810c5e8ed3773fd1fc0c58e51566e1f08f766db97050d4a72423f56fff903351a8456b97142 SHA512 ccb17de9ddfe5b08fb968720c862c915b4edd594aedb8c4e1a8de1f5e9faf00583e643dd0d9e90706931d76e821c7a2c889188d3a08263940cee91e5a1060d0d
+EBUILD keepassxc-2.7.0-r2.ebuild 2373 BLAKE2B 809a51c4a615d96f25022b0d277fc40501566734abf7cd8c73e24a9a573a73d7cb958deff3de8182c0c3b5e224afc4ed1e4d0b77f2e64059c7553fa49ab70110 SHA512 5509b00aa287d9704f82b72e4e5a8734096bbc33b7893134223fac52c6b7e4ea787ab1791bcdf86edf0f061cd8bbe1b75129b3446721dd655464677902c718c2
+EBUILD keepassxc-2.7.1-r1.ebuild 2373 BLAKE2B f864e4da175f6c3498fe7353359f95c119f59bba95506185a74ded1e747ca8678ea9c3053087474a19853bd67f965d748741cf9429f0b11be9f161e535610501 SHA512 d1243f9a04b99291c6627e6084512d0b3f3d8f587b26b6bf333087c231b5fadc42cbb1ac0100fb0aec0f05073dcfbb1ffc71f9aa1232ee218772b24b7bb1b94d
+EBUILD keepassxc-9999.ebuild 2373 BLAKE2B 809a51c4a615d96f25022b0d277fc40501566734abf7cd8c73e24a9a573a73d7cb958deff3de8182c0c3b5e224afc4ed1e4d0b77f2e64059c7553fa49ab70110 SHA512 5509b00aa287d9704f82b72e4e5a8734096bbc33b7893134223fac52c6b7e4ea787ab1791bcdf86edf0f061cd8bbe1b75129b3446721dd655464677902c718c2
MISC metadata.xml 1042 BLAKE2B 2fd425f8c61e45707a1f1c18a3ee5db9b902eaeb347ced5302495d92e82495fa5f87d73400ee849e5b97302d02faeeeb91f403646132c5e8b0206af04385af56 SHA512 d59770092ee152198e217f12207a257a58cfc5dd794170bbd8fb7f3ad6ed644714285874ecd70c77389bba95f4587e70dbb2a120067631d33acebb75f3f2f352
diff --git a/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild b/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild
index fb5899e8a65b..d148084c50be 100644
--- a/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild
@@ -25,13 +25,13 @@ fi
LICENSE="LGPL-2.1 GPL-2 GPL-3"
SLOT="0"
-IUSE="autotype browser ccache doc keeshare +network test yubikey"
+IUSE="autotype browser doc keeshare +network test yubikey"
RESTRICT="!test? ( test )"
RDEPEND="
app-crypt/argon2:=
- dev-libs/botan:2
+ dev-libs/botan:2=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5
@@ -60,7 +60,6 @@ DEPEND="
dev-qt/qttest:5
"
BDEPEND="
- ccache? ( dev-util/ccache )
doc? ( dev-ruby/asciidoctor )
"
@@ -77,7 +76,9 @@ src_configure() {
filter-flags -flto*
local mycmakeargs=(
- -DWITH_CCACHE="$(usex ccache)"
+ # Gentoo users enable ccache via e.g. FEATURES=ccache or
+ # other means. We don't want the build system to enable it for us.
+ -DWITH_CCACHE=OFF
-DWITH_GUI_TESTS=OFF
-DWITH_TESTS="$(usex test)"
-DWITH_XC_AUTOTYPE="$(usex autotype)"
diff --git a/app-admin/keepassxc/keepassxc-2.7.1.ebuild b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
similarity index 90%
rename from app-admin/keepassxc/keepassxc-2.7.1.ebuild
rename to app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
index f2f002f7a9e2..0793091a0b25 100644
--- a/app-admin/keepassxc/keepassxc-2.7.1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
@@ -25,13 +25,13 @@ fi
LICENSE="LGPL-2.1 GPL-2 GPL-3"
SLOT="0"
-IUSE="autotype browser ccache doc keeshare +network test yubikey"
+IUSE="autotype browser doc keeshare +network test yubikey"
RESTRICT="!test? ( test )"
RDEPEND="
app-crypt/argon2:=
- dev-libs/botan:2
+ dev-libs/botan:2=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5
@@ -60,7 +60,6 @@ DEPEND="
dev-qt/qttest:5
"
BDEPEND="
- ccache? ( dev-util/ccache )
doc? ( dev-ruby/asciidoctor )
"
@@ -77,7 +76,9 @@ src_configure() {
filter-flags -flto*
local mycmakeargs=(
- -DWITH_CCACHE="$(usex ccache)"
+ # Gentoo users enable ccache via e.g. FEATURES=ccache or
+ # other means. We don't want the build system to enable it for us.
+ -DWITH_CCACHE=OFF
-DWITH_GUI_TESTS=OFF
-DWITH_TESTS="$(usex test)"
-DWITH_XC_AUTOTYPE="$(usex autotype)"
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index fb5899e8a65b..d148084c50be 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -25,13 +25,13 @@ fi
LICENSE="LGPL-2.1 GPL-2 GPL-3"
SLOT="0"
-IUSE="autotype browser ccache doc keeshare +network test yubikey"
+IUSE="autotype browser doc keeshare +network test yubikey"
RESTRICT="!test? ( test )"
RDEPEND="
app-crypt/argon2:=
- dev-libs/botan:2
+ dev-libs/botan:2=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5
@@ -60,7 +60,6 @@ DEPEND="
dev-qt/qttest:5
"
BDEPEND="
- ccache? ( dev-util/ccache )
doc? ( dev-ruby/asciidoctor )
"
@@ -77,7 +76,9 @@ src_configure() {
filter-flags -flto*
local mycmakeargs=(
- -DWITH_CCACHE="$(usex ccache)"
+ # Gentoo users enable ccache via e.g. FEATURES=ccache or
+ # other means. We don't want the build system to enable it for us.
+ -DWITH_CCACHE=OFF
-DWITH_GUI_TESTS=OFF
-DWITH_TESTS="$(usex test)"
-DWITH_XC_AUTOTYPE="$(usex autotype)"
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 676234cbb394..48c398fb1f14 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,6 +1,6 @@
AUX 0001-__init__.py-Make-NetworkX-dep-optional.patch 2242 BLAKE2B 63815b66a6b5051ca084fcb265a6eb573f4738288376dada16c86c04ae3dbf4d58ff33583ff323d1096b321f0d410ae3b956b9e82caf710f78baf82db1a769fb SHA512 eac87e9335643b5e2f0de05b6e03c03d250c799e994edd52368b3a50e201beeebfbf40b7bf016200648fadf9c3d5c3708ac94ff158ea327cf2ea73f773ac8653
AUX setools-4.4.0-remove-gui.patch 1015 BLAKE2B f81872b140107337466e1d57bfd3c1935adca838756a0c1a2c4f2d0f42b7ae0ecb60d5c6db0889998bca96d46c08979d03e989a79461bb6ceb3c7bd4ee6fa56f SHA512 6e2b3d0dafbb4b0966f04cd592fc14800755ea4f585ab4d1bf0516cd25f16185b0923045762ce88df47f7264481fb9dd6588efc38d7280e14b5f015192f12924
DIST setools-4.4.0.tar.bz2 275218 BLAKE2B f716a78dd628e0309d3802f2155ef3a045dd8ebee7dec42be9f8b5fc0069b0df4e3d827b0a0cc03f7f02f5a3dff1d7ab7e4eee0d83d6cf4c87af82fe756a9321 SHA512 2ec92d7a6e30261549b6a8d2f17175d4a7d8313ef0cd81f4a19a91c53fe0107bac9a89c19dd67a4c534ee51ec520590795b4312f9e03e69fdf1763b0c35291f8
-EBUILD setools-4.4.0-r2.ebuild 1485 BLAKE2B d99d920a6705bfc0e46cd58408094babf01a53d66af417b7a140fb50d5ffb3569d86b62bde306fe9d7fdb1e5274f906e618bf593ce3b9d93eecb4db38a2b0053 SHA512 e83dcfe365e175fa20525dea24280080fa95bde3af59402db3bcd0337729bd796728b29407afbf2e6d7ae08f06659e2ff5f3665404b347a9a56b83355c93c88b
-EBUILD setools-9999.ebuild 1411 BLAKE2B 74ccfaecb1e994f341e6990ba0914d05b7c1be845a66e1d21fb86b2e17a405ca125930e188553badb42eb9ae4e065c2c1ebf9e50114abfe8d02e9791ad4f1e99 SHA512 fa0405bf8e52c3a461c50505da52991e3d48f03ade22eddd29a14005f00f5c201a2aff5a54b82637d3d4ae973cdc5f710c4a95a5f8bc45d884f9a9397b7765e5
+EBUILD setools-4.4.0-r2.ebuild 1481 BLAKE2B 00e7179edd022254b0db466dc67218cce6d6e7bf288e946a090eb0817cd2f8a44a2190e851800f69a685a6c4bc35e12f799902f72458f3fbc8c5f2e0a5a6f139 SHA512 15b04afeae27ff80307ea8de1380578d3c52eca4d2a134c00a5fa7151b070fe5477c90e907f8aaf3093ad65b8e28cab730342172ccb00acb65988de02846777e
+EBUILD setools-9999.ebuild 1429 BLAKE2B ba01992486d77293a2feab5f64463cb51382421697781ed3f9068354c675df06cf139545e61d7c309e86157733158add124d4a7941e3263aa84f10a2a07a0a36 SHA512 cd4de8e7da24d479a5b1eb172a6d6ddcbdb5ce266ebd927107ed06f0cd0fb2112f1fa2f1aec0c7a222106a2e093b2f2fee60ce5bf110c7f2d9e840c76965815b
MISC metadata.xml 440 BLAKE2B 5ff05dac3cb6a27d99c7ebb2e4425afaef2275aaff5e109feff6870e2e51c55c27dd8baa3d6ad3a2a9a292a20ece18dfb2f0ad61e30cd1dc7b74afaf20d0104c SHA512 f61bdc193e411a635c35e7244fad44b68061c56fa26a1b995f79fb46784d09f52bd85bcbc8caec5043390a72d8548fb4ac0dd84cd4a613dbbdb5fd49e3efa71f
diff --git a/app-admin/setools/setools-4.4.0-r2.ebuild b/app-admin/setools/setools-4.4.0-r2.ebuild
index 0d3f876fd18f..ebb4b7598795 100644
--- a/app-admin/setools/setools-4.4.0-r2.ebuild
+++ b/app-admin/setools/setools-4.4.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
@@ -26,8 +26,8 @@ S="${WORKDIR}/${PN}"
RDEPEND="${PYTHON_DEPS}
dev-python/setuptools
- >=sys-libs/libsepol-2.8:=
- >=sys-libs/libselinux-2.8:=
+ >=sys-libs/libsepol-3.2:=
+ >=sys-libs/libselinux-3.2:=
infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] )
X? (
dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index 3737750ca8eb..82b8e1bd9964 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
@@ -13,21 +13,22 @@ HOMEPAGE="https://github.com/SELinuxProject/setools/wiki"
if [[ ${PV} == 9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
+ S="${WORKDIR}/${P}"
else
SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ S="${WORKDIR}/${PN}"
fi
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
IUSE="test infoflow X"
RESTRICT="!test? ( test )"
-S="${WORKDIR}/${PN}"
RDEPEND="${PYTHON_DEPS}
dev-python/setuptools
- >=sys-libs/libsepol-2.8:=
- >=sys-libs/libselinux-2.8:=
+ >=sys-libs/libsepol-3.2:=
+ >=sys-libs/libselinux-3.2:=
infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] )
X? (
dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 5d88c0861ed5..2ec7dcaa70fe 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,3 +1,3 @@
DIST testdisk-7.1.tar.bz2 742006 BLAKE2B ad67cbef73e502df39cd04537bae9226d043a0f5ed824ed24d5a5ac7c3262060d0c78bfcf38159890ee0c270e1cd7690cbf276eb919e1b4721357fffc8679c61 SHA512 ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5
-EBUILD testdisk-7.1-r1.ebuild 2373 BLAKE2B 9a3c07fbb096b32b5ad008eb9bbf13f2248063c78fd8e9e713db6af0d7825cd22a9c10cce8073ae30867cdd1d5239bc41db2fa5d08e556725c90355b14996669 SHA512 7ea91addd5686b6f2de559ebbfcfb1c9765db5463032d0d2b437099629cbeb953bb72cf425e8f183a874adad42bf5766375d886b0cd5cfa3a61bfffc35d5f0d8
+EBUILD testdisk-7.1-r1.ebuild 2380 BLAKE2B e8463f3ec645f5da11b52cb9df7b7c50a745d62016e6162f44f922a635b9d6d559591546efe67c2379f3ecb955e494e1be0a2bae3c919f51407915298c1834a8 SHA512 733e9cf992b1c4146174f863c8dd0eab4fd7f2cec166762ece258382c8a1e4530baf789b318e2e4aa7272d7afef34135ed19e7c47971ed4f527edc070d4e51a6
MISC metadata.xml 556 BLAKE2B db8777e1d66155225e309d519520fdbfbd47067879183478078571aae5efa75a5ad374af3c5791f306324f02143cb1ce437b9d819bc8665166fc0f0e1dd56a18 SHA512 f0d3184b6e36d4d829b75c44693895a28c216fc83db57d2deaa3a87175738f954e25b0d57fd89ebbc946a40ea2f6b627ca47e8ff09cb996679eda842018af929
diff --git a/app-admin/testdisk/testdisk-7.1-r1.ebuild b/app-admin/testdisk/testdisk-7.1-r1.ebuild
index 49c3412c0a54..2532bfd25503 100644
--- a/app-admin/testdisk/testdisk-7.1-r1.ebuild
+++ b/app-admin/testdisk/testdisk-7.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv x86"
IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
REQUIRED_USE="static? ( !qt5 )"
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 12caa51d0b83..d91a5071756f 100644
Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index ec75c0883067..2f0d885c3889 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -1,9 +1,3 @@
-DIST buildah-1.23.1.tar.gz 11872323 BLAKE2B 6e4cffd11177bca6c3e86cd3372fc7bf295b23559b7478a679ea2bea022c149b5ea058224f0a156df1b9511905795c44ed5e988ec68ca834dd80d0c198543d5f SHA512 2ceb6df5adb671483557bb03937df583857d99c116be5d44aae533c155f560d5d454bebf25908ac02bb85e4c2ba31533adb99f0946ecc4f4830977c14f324b6f
-DIST buildah-1.24.2.tar.gz 14184511 BLAKE2B ad9ee6f332a89038368d9a5d86198f1dfa9cf99a970e85ccf3b272294fc262c68c37004131971b0ec148e999e4d8f192f4955e71673f05188110407949eb3546 SHA512 dada2b65340386355aba3980c38d9be0f43d5c3f9316c6f8e713f299ee2b975e409c1b3a785daa52b59e688c3a9c9016c43d9b0a6443d4a9453aababc0a8afa0
-DIST buildah-1.24.3.tar.gz 14189867 BLAKE2B 18b6eaf0ba54c310c8b946e4763f3b930ff4e0bfd85333767b8baa3320df1f43937d4742404d11de51c6386a12521e3045770d1d19406c163accd9cccc500961 SHA512 74fa6073ddf6b641700f758435d4558fc2d61691172107572dfac3d723f986aa0faf7bb5b5d1e2bd6bed5d118cbed3c78b6faf96972770b304fa28fd363b4700
DIST buildah-1.25.1.tar.gz 14212065 BLAKE2B ec4f668654011f1b93745e1a1d575fdda0cd5f4d6f9f7f7b3106c24aa7d405951ecd645a54c2dd5a3ad2695069e66ad847bdb15f0e73a9c7efba2a7e283d4f58 SHA512 628f8095eb4488ae2be06a2a92de85dde4f3841e8ed9882132c119f27b0c93f26ba10f5dd259d63654b90539d762f6c1973d460f073c0b2450ac5d9582a6a68d
-EBUILD buildah-1.23.1-r1.ebuild 1196 BLAKE2B afd094d8fbefb9622704992892b8b0050fddae3d01e44275cd26f4d927f5c146cc577f8c374d7594083445ba581f7ef557660160725a977276e96ce5ed2f9006 SHA512 bdb5a798fc980be7e8d0c464784b48279af59b80a19a878f7134bb5344c8c807e5e16032f39a6d236ac653039cbf001fe40f64c9f4d2c26ea6ed7fed4805a588
-EBUILD buildah-1.24.2.ebuild 1198 BLAKE2B feaf84c0d34c256dc99cf2e836bde1c49ec4f719ada774763f529f0102ee77d8fe672375ea8d974788bd29ccb06925125aa5a7d818dad827e42c3e501e2f1f92 SHA512 891c06d40cacf7ba614b8de98cb887de6a10d7955b78569f5b96dbfae9de99b3c46221b47933f3364ae1a70f110e6a8aed4f08a8137856785233f55ce6e5cf8f
-EBUILD buildah-1.24.3.ebuild 1198 BLAKE2B 033bb57ef386ee7ca4cfc600eed3129edf00ede613da8bac92fcd428ebe02a36c286e83344e46f06352515ec591979015a605a06343521695d6f1089c6fec9d8 SHA512 63f6bf6c1a4da92404537bc6191deed663c29928105f39234f30d4f6816bbed355774c87fca055c03650c69ba38ba4a00702c1820552cf883b645b4af7d2ec15
EBUILD buildah-1.25.1.ebuild 1196 BLAKE2B 3f0e2e2cb09af594cac29666ef4c9b1f3b7721659f6fff2ff29fa9ebc30f841cb2703d5fd3ce41b4dcc32a30841372ae3b3d36af791423bca05c4f70f2ce655a SHA512 ec2aa76c2ba6676d828534e2ceb7a5e12f800d44b382c35ca2bd76f24631084103ba6e94f519252d90bf4511e47ac0d341dfab3c2f5206781096e87203d51fe7
MISC metadata.xml 328 BLAKE2B 55d2d2b5cc972b7e6b6fb77d14e79e304adcbc7056ff351f5ee3cac6cf5f83b4ef2a10c70754d1d30a5ecd88e652abc07cddd8005c3767e7f709c0c5cb61d068 SHA512 7520f5745909da195d4bfdd750e4c716c461a3789adfde56dd9be46b91dfb789653d642c0958b5a2950eea220cc00143bfcd5db402fcc2578c8fe5f8ff69275f
diff --git a/app-containers/buildah/buildah-1.23.1-r1.ebuild b/app-containers/buildah/buildah-1.23.1-r1.ebuild
deleted file mode 100644
index 7d3899b67e1b..000000000000
--- a/app-containers/buildah/buildah-1.23.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-GIT_COMMIT=d9a41b85
-
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-IUSE="selinux"
-
-RDEPEND="app-crypt/gpgme:=
- app-containers/skopeo
- dev-libs/libgpg-error:=
- dev-libs/libassuan:=
- sys-apps/shadow:=
- sys-fs/lvm2:=
- sys-libs/libseccomp:=
- selinux? ( sys-libs/libselinux:= )"
-DEPEND="${RDEPEND}"
-
-RESTRICT+=" test"
-
-src_prepare() {
- default
- [[ -f selinux_tag.sh ]] || die
- use selinux || { echo -e "#!/bin/sh\ntrue" > \
- selinux_tag.sh || die; }
- sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed'
-}
-
-src_compile() {
- emake GIT_COMMIT=${GIT_COMMIT} all
-}
-
-src_install() {
- dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
- doman docs/*.1
- dodoc -r docs/tutorials
- dobin bin/{${PN},imgtype}
- dobashcomp contrib/completions/bash/buildah
-}
-
-src_test() {
- emake test-unit
-}
diff --git a/app-containers/buildah/buildah-1.24.2.ebuild b/app-containers/buildah/buildah-1.24.2.ebuild
deleted file mode 100644
index 11751a5ccd2c..000000000000
--- a/app-containers/buildah/buildah-1.24.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-GIT_COMMIT=ce608bce
-
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="selinux"
-
-RDEPEND="app-crypt/gpgme:=
- app-containers/skopeo
- dev-libs/libgpg-error:=
- dev-libs/libassuan:=
- sys-apps/shadow:=
- sys-fs/lvm2:=
- sys-libs/libseccomp:=
- selinux? ( sys-libs/libselinux:= )"
-DEPEND="${RDEPEND}"
-
-RESTRICT+=" test"
-
-src_prepare() {
- default
- [[ -f selinux_tag.sh ]] || die
- use selinux || { echo -e "#!/bin/sh\ntrue" > \
- selinux_tag.sh || die; }
- sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed'
-}
-
-src_compile() {
- emake GIT_COMMIT=${GIT_COMMIT} all
-}
-
-src_install() {
- dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
- doman docs/*.1
- dodoc -r docs/tutorials
- dobin bin/{${PN},imgtype}
- dobashcomp contrib/completions/bash/buildah
-}
-
-src_test() {
- emake test-unit
-}
diff --git a/app-containers/buildah/buildah-1.24.3.ebuild b/app-containers/buildah/buildah-1.24.3.ebuild
deleted file mode 100644
index 9f76a531fd27..000000000000
--- a/app-containers/buildah/buildah-1.24.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-GIT_COMMIT=8a645e9a
-
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="selinux"
-
-RDEPEND="app-crypt/gpgme:=
- app-containers/skopeo
- dev-libs/libgpg-error:=
- dev-libs/libassuan:=
- sys-apps/shadow:=
- sys-fs/lvm2:=
- sys-libs/libseccomp:=
- selinux? ( sys-libs/libselinux:= )"
-DEPEND="${RDEPEND}"
-
-RESTRICT+=" test"
-
-src_prepare() {
- default
- [[ -f selinux_tag.sh ]] || die
- use selinux || { echo -e "#!/bin/sh\ntrue" > \
- selinux_tag.sh || die; }
- sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed'
-}
-
-src_compile() {
- emake GIT_COMMIT=${GIT_COMMIT} all
-}
-
-src_install() {
- dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
- doman docs/*.1
- dodoc -r docs/tutorials
- dobin bin/{${PN},imgtype}
- dobashcomp contrib/completions/bash/buildah
-}
-
-src_test() {
- emake test-unit
-}
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 9f9f2d66874c..9ecbfa371609 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -2,6 +2,9 @@ AUX docker-compose-1.29.0-setup-py.patch 1858 BLAKE2B 9a53ffec0449fe1fa110b21617
DIST docker-compose-1.29.2.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
DIST docker-compose-2.3.3-deps.tar.xz 486283624 BLAKE2B 1bb2f743ff0ee46e4b5790bc53fadd03ff9cf177c4bd8f28f435eae7f00ceecf475d78cf0a80082066a62c4e97022afaad2b13ac3bb04893914f84b0a756a2b3 SHA512 9ca0dacabe66620108c8017d5ca2bb7fb568b4edb23460d528f81ad9491dd04efb192983a590db965c26781429cba5c6be6eaa91ac51e9a7d8e6ee4adb9b4c09
DIST docker-compose-2.3.3.tar.gz 270143 BLAKE2B 9ab2863a37402ebcb881797e1d6a170dd9557d14a8174dec4049b55f6f3c106752423ac13d9e2ec1bb95dab83df83e53747519f4ceed91f7d9a5805c630e82e0 SHA512 5986f4f54302fd552c7aeb0cdfbe8d5185744bc2a2fe6f136e1a4009b3b9f68cf7578d3b6a2acb2067ef9a889eb33d159b2daf80140315a29412bda15d2a5446
+DIST docker-compose-2.4.1-deps.tar.xz 110605892 BLAKE2B 042d84818b963c23769e039a930076355cb2ebb2d86c5f8af56f240689012ae7aeff12cf366b46f2bf0fa0799d5f7b825f726686f54db218787e91a6c308ba5f SHA512 28bb292daac3ddf1055c4dd5f0b1920dc8145636e878beaac90863fec8b86e277f6906d82753b62fc7c9f755a9246c223307fad5fb412e41c0ca11b4d60e7e0e
+DIST docker-compose-2.4.1.tar.gz 274404 BLAKE2B 346c9c527630217fdeada28e7329400a910007c5296cf4b8b7f41d90049c51c54c518f82f602b71332d9ecd91eeb65e1135aa18c37fe98ee02b99238cf7dbadb SHA512 0c7611c95955b63a4cc77a4498393c52c7107a4a6fe950dbf2d1181df8f44f682337eb6cc7814e9902551b230507b12a05d1377acac7b2342f829401f1d24651
EBUILD docker-compose-1.29.2-r1.ebuild 1915 BLAKE2B 45e984d2f7c8cf249187355bc2503a1b17642f1e87b0a308779ec027187ed9b700413f2c814880c6618607a3531c766086807b4a9a3021f6695453cc6074cb1b SHA512 37375b33f10219740a7f26b2af9f246635ac9196e17b1bd82337341afcdc21eebedceae1c32139f7c54eaf96b3cfa7a2f25c632a4d96b2a10708e80f5ec1cca1
EBUILD docker-compose-2.3.3-r2.ebuild 1242 BLAKE2B 48e1062372861a1707356495b38ebdf3818a946538f1798016dd187969cac14c88a4c2e268f13f4178be10a65ef4d3cb1d2fbfb58e6d39ea6c4ed8bb03cf1727 SHA512 ba6439a3d2e6f62ae36a780a7c421d0316e2d70e0bf5327bbef4aa27ed9cdc0da0537b05416480fcce01dabf871245ef4f70176ef1503ccb20a4d4f791bb3cb9
+EBUILD docker-compose-2.4.1.ebuild 1242 BLAKE2B 48e1062372861a1707356495b38ebdf3818a946538f1798016dd187969cac14c88a4c2e268f13f4178be10a65ef4d3cb1d2fbfb58e6d39ea6c4ed8bb03cf1727 SHA512 ba6439a3d2e6f62ae36a780a7c421d0316e2d70e0bf5327bbef4aa27ed9cdc0da0537b05416480fcce01dabf871245ef4f70176ef1503ccb20a4d4f791bb3cb9
MISC metadata.xml 544 BLAKE2B d515d07ee7d2045db1d4a2a0e8f0e797e23b01dea7ab164d9bffc85bc00ddc18a050f296db0a80df8a65c9c554d6e189218a1939b07b29ea823e5eea65d803e6 SHA512 17c3b4e7be1318a36aa744e185d7f7d5571107cecc98eed8fce07b4d905273409b95a202129440082f29be57d6a44eabda43730e8f47cc7c63c04d6d0ed05645
diff --git a/app-containers/docker-compose/docker-compose-2.4.1.ebuild b/app-containers/docker-compose/docker-compose-2.4.1.ebuild
new file mode 100644
index 000000000000..3946a436a4be
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.4.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=app-containers/docker-cli-20.10.3"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+ default
+ # do not strip
+ sed -i -e 's/-s -w//' builder.Makefile || die
+}
+
+src_compile() {
+ emake -f builder.Makefile GIT_TAG=v${PV}
+}
+
+src_test() {
+ emake -f builder.Makefile test
+}
+
+src_install() {
+ exeinto /usr/libexec/docker/cli-plugins
+ doexe bin/docker-compose
+ dodoc README.md
+}
+
+pkg_postinst() {
+ has_version =app-containers/docker-compose-1* || return
+ ewarn
+ ewarn "docker-compose 2.x is a sub command of docker"
+ ewarn "Use 'docker compose' from the command line instead of"
+ ewarn "'docker-compose'"
+ ewarn "If you need to keep 1.x around, please run the following"
+ ewarn "command before your next --depclean"
+ ewarn "# emerge --noreplace docker-compose:0"
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index d259ac086f24..ed1083929122 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index 5f46a8aed78f..93ed90021a36 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,7 +1,3 @@
-DIST yubikey-manager-4.0.5.tar.gz 142197 BLAKE2B c48a9c6ae5f2d54b24888b750c6263eb501e68be56beb9fb964e8b9ea5131a608786b2e67d0d092ebcfacb15b09cae3eec19f4271893ac77eba70eee28b6d06d SHA512 f8bddf3121c0c509fcacb56500f1c1885354aff5c00b3347d9ca84cdf1df65276ed744209d9653474909b6cba7595bc5529cd4b37ec34c35d2d2c3cf2ff850de
-DIST yubikey-manager-4.0.7.tar.gz 143622 BLAKE2B 1ea768b4b95a65dc2cbc34f1e796a1012b534495154f475c7deb9ec7dbc807ff688d864abba8001752d3717034acbf39cd1cb17f147842fc38d27a83cb8c8ddc SHA512 7ba11488cddcc7d4bb15e673b7d8d82d8e85c52d8a4a3a13c6681cc494ecf33b88eb54556785783e6ec458292f155668bac0bb3a38a2df1702a24f623f8b084e
DIST yubikey-manager-4.0.8.tar.gz 147076 BLAKE2B efdefb15c3939bfb2171766aec195fb776668894d4439565840587d14387999e052aee6eb225b9332662f1ebdbf1db24fceb606393e23d591ff61b91c1ee96f5 SHA512 87352bbb133eead48d1588df2db5420687278a9f76ceb283a53af8eab3d29e30c86e01a588a6da2884e6dac6af192ad355a28745f2f8505ef6cd0e96dea3e9c7
-EBUILD yubikey-manager-4.0.5-r1.ebuild 992 BLAKE2B 97f3f6c6c731a99c73c0a8c138cf3245a35003d4fab8bfa03908d91183ba8c60f62125e153cd71706c8746f089d77b29d99a1b685cb2db199ac66570d182ca80 SHA512 719cab973ed71b98c2ba156ee072d7c2a524fc259c3d80420925512cb19aebeec1df4306113f8dd8675ad46f4bd40c289a155822c88c38721417f8d954c4da51
-EBUILD yubikey-manager-4.0.7.ebuild 1006 BLAKE2B 364336b23b74f0db1e9423917a68a8b3941c6a2aa8d47aa1eee43b218243b3ffa6fb022e2db31d0f9f6b02072344e083b555b07b2611f0c75392cb1b0f010b74 SHA512 8fcb0743e3c150b37e3c8c7c27be0b228ba8c3392521041c173b486d2894effbd87aae1bf45d988082b9b76d8a252d21a4ac7dec6d44f02f08423a012fe1e2b6
-EBUILD yubikey-manager-4.0.8.ebuild 1096 BLAKE2B 8fbe1728378845152ffb9c0fe81b1ebe46fbcd40c24f478ab56c4192b3f8db250b440dd230b012c688f6e42f642b0962edfb8abb886ef71201919dc03cfaa378 SHA512 9dd08d695f48f8568966b33380992e02c6fd18358e391828be04bfe8922745e1346fad13388d9a8a66ef600ec4a1c6e1437dd923162ae418fc33d5fc2edf4dce
+EBUILD yubikey-manager-4.0.8.ebuild 1095 BLAKE2B 0779e3f2db841ecc0c2026bd4dadc71fc038d2460d69bd2174ac0c5122e45e9967d0f4b884a6a34eb48fba50569dac9e0ff305a6de22790aa11cb327481356f5 SHA512 2561181f6e3682be5b50c9339555f16e17925d2b6c3e138a31a6ffbb386e0a78b385faba5fc4cb02ae1f3d1e9058049f566d5e6dee6a45e2818a575162e25cd6
MISC metadata.xml 534 BLAKE2B 1dc91b31fae812c9abf38e762d18db228cf07cb29dc41f5c7928ef417002826acaaabaa3b1374433f9fdfc251b5f5fbabbc43e66e3b94cc6df3174d3ae5aa059 SHA512 cf47e3400679f7f4feb73ef3b8282d3f4dae6b6d0e5034cbc22935fd0196be0784946bf9ac93dea7fb36a16347f867d092845c1ce3528a00c704de9657ad3821
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.5-r1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.5-r1.ebuild
deleted file mode 100644
index 6ea12c8bda01..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-4.0.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-
-inherit distutils-r1
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
-# the official source for tarballs, not Github
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-RESTRICT="test" # Tests require non-existing package makefun
-
-# app-crypt/ccid required for
-# - 'ykman oath'
-# - 'ykman openpgp'
-# - 'ykman piv'
-RDEPEND="
- app-crypt/ccid
- dev-python/click[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/fido2:0/0.9[${PYTHON_USEDEP}]
- dev-python/pyscard[${PYTHON_USEDEP}]"
-
-python_install_all() {
- distutils-r1_python_install_all
- doman man/ykman.1
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild
deleted file mode 100644
index 8d71a30afada..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-
-inherit distutils-r1
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
-# the official source for tarballs, not Github
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-RESTRICT="test" # Tests require non-existing package makefun
-
-# app-crypt/ccid required for
-# - 'ykman oath'
-# - 'ykman openpgp'
-# - 'ykman piv'
-RDEPEND="
- app-crypt/ccid
- dev-python/click[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/fido2:0/0.9[${PYTHON_USEDEP}]
- dev-python/pyscard[${PYTHON_USEDEP}]"
-
-python_install_all() {
- distutils-r1_python_install_all
- doman man/ykman.1
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.8.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.8.ebuild
index 746a87aea5ee..946c6bf3f775 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-4.0.8.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-4.0.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
IUSE="ssl"
# app-crypt/ccid required for
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index ee74bcac02ee..2d2e14cbbcfa 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 02cfadbc2603..aacacfde890a 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -19,7 +19,7 @@ EBUILD emacs-25.3-r11.ebuild 11079 BLAKE2B 4f96040e5e3db0522b413c152b4ad8b083317
EBUILD emacs-26.3-r6.ebuild 11825 BLAKE2B 1df12880101fce336ded064f8e91840b9f1a66b213367f46503c0ec19fcd1db45f0fedfe0db895141d44a8d2bfcc506c8683dda949429b5910b8cad360d241c7 SHA512 0608d4f489447e4545c2510a446293cd34a4164e2f6348b143a158df78dc6e362d166cda25177d86daac52fb31c7a85d1519de9b8583b1a2b4fe8782bca4c785
EBUILD emacs-26.3-r7.ebuild 11775 BLAKE2B 4b12ed82f48ca1397153daaa99014fcb55be56a3ae4606283d828a8ac28dc753eb69092b19d3b17a4fa87a0ac60b982fda2ceeba907cbd5f022ca2bb67254d50 SHA512 0c827b5b93c930ade6e903584be9ccde1a771678f5ca3be845cacfc6bdfd663312b0fd99d5b4b2aa5218a74c69ad3bfffa0bbecb014e218057d94b8d96d4cbdb
EBUILD emacs-27.2-r5.ebuild 14454 BLAKE2B 0d90b85d520db45e5015962752a4a7c7323b562038514ce0f74845c3a5795e48fe76a70b3723c9c08fa476fe275f3ffa1cc6571ebeaa00407f93b7add3f52db2 SHA512 c1816726913c7337e8cc5977470b5bfad8d6a26661ed7b0c8f09087682c800501b47779bf8c8e7bbfedf9ea56d50d45afde2c60d2dd0d877a1fea4ecb99dfd73
-EBUILD emacs-28.1.9999.ebuild 14904 BLAKE2B 0d583b8f2b78dd37d874b6b0088aae92e45c834dfa48aad9f7e84023ca2844c797cc56533ea0119ffb6cca10368546e02c1cc6a565a8f82d5db9e5c14d547c7a SHA512 d5bb5ff837a850c5100e9075fff32cb4e63f5e8b676dc9d903a3860a7d02646f1e43f8ea6eef62ff454eca60f65031c26b73d1a1328ddbaa186288e421d6eec2
-EBUILD emacs-28.1.ebuild 14906 BLAKE2B 4c6472df1c409567d42bb1f6777c20081103e748028a7192195481aea01a65c9738c4a6ad768570ca4e1862703a46d1d30a1d8e6d2c34f02adeb77bc66760820 SHA512 daab31777157b6215527e5c513487d8376d32f5eddb9e008aa1e30361c3a0127a3f3c32688f8a3ded166b4f2a1601b219afa3060880c84da78dd5d13e77ac0c3
-EBUILD emacs-29.0.9999.ebuild 16386 BLAKE2B ebc681f5e7bc1c8245b23db7debe2ca3e5310ef1ccd6fc813ce18d97ee544d78d69084c4b48d989d4dfec17fb4b186c7b518db8c655ff25bfd7672b5f80107ae SHA512 d1f260804568574a0d4573fbbddca4befe0ae6aba46c82dd457d75d2b84dc96b7ce77551d0ebe5ab33882712b42258a844f00eb9287cc318ec04919abb161e05
+EBUILD emacs-28.1.9999.ebuild 14940 BLAKE2B cc5cb28a781d569b9470f143cb37967bd62ff3a56a3d2c4bef5c87cf7913feeb9e312012d4e98df4f72f89085677bae1361d261597eb55df6bc531dc38f3914c SHA512 d3ee13a6a401c231d902c195296aece6fddd069dc2928e86d46eb146ddf4aa8726537b2f2ecdfd326f058ddce06b0dab208b6342cd704d8266525e62b8c80081
+EBUILD emacs-28.1.ebuild 14942 BLAKE2B ce48131159096bc351b0a59a5ae9f7b02c98f49e948da1463b9f6ec0d551ba6107a69a93740bc9a73de60e40f1f811be1c5c3946069177610fd5dbf3de5bc4e8 SHA512 72bc3720e0bd15e32208633d6c3adc0b5ede4fe5279f4d1301bca8ef6cade76e9f639d924112549b7a174db880b21d7d97b93b11c150dcb6636ece68a226f794
+EBUILD emacs-29.0.9999.ebuild 16422 BLAKE2B 6d2d230685c3208a9900b8de13e02075647eec8d47aa041e54d52dbe1d732e11cb7ad51543d60b489ebbfedd114369792823f75eda0e563a4467d466eddc0eff SHA512 b20a86aa22c929674aa6f1749ad7d9cf0eebd5467b36db86d882bf6296ae5f135416a9d0ad61b4eb6066e22d0cbaaca67fae42fd713a2425f8020df0949649f1
MISC metadata.xml 3130 BLAKE2B 162f49aa253a87b89e80dcbc961cacf659220c16c5b9d83e96b1eb90c40f828b87830173a80fb24cbfae50efb2ddfe51aed3e334c8c0f8e5cd30b63569e991cb SHA512 71a1b4b298ae915a33c7876a20892799c3c7b39f913b7b2606c18e6c14a4169b60f17c41742cdaab870cb60bceee14c0d10ea6f345739b1e9c3d07a14d9d60ee
diff --git a/app-editors/emacs/emacs-28.1.9999.ebuild b/app-editors/emacs/emacs-28.1.9999.ebuild
index 9130393b32fa..4c1a544cb35f 100644
--- a/app-editors/emacs/emacs-28.1.9999.ebuild
+++ b/app-editors/emacs/emacs-28.1.9999.ebuild
@@ -153,9 +153,9 @@ src_prepare() {
# for live ebuilds FULL_VERSION doesn't exist in global scope
QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
- # gccjit doesn't play well with ccache #801580
+ # gccjit doesn't play well with ccache or distcc #801580
# For now, work around the problem with an explicit LIBRARY_PATH
- has ccache ${FEATURES} && tc-is-gcc \
+ has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
| sed -n '/^libraries:/{s:^[^/]*::;p}')
fi
diff --git a/app-editors/emacs/emacs-28.1.ebuild b/app-editors/emacs/emacs-28.1.ebuild
index 85368109ec31..135fab7e795b 100644
--- a/app-editors/emacs/emacs-28.1.ebuild
+++ b/app-editors/emacs/emacs-28.1.ebuild
@@ -153,9 +153,9 @@ src_prepare() {
# for live ebuilds FULL_VERSION doesn't exist in global scope
QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
- # gccjit doesn't play well with ccache #801580
+ # gccjit doesn't play well with ccache or distcc #801580
# For now, work around the problem with an explicit LIBRARY_PATH
- has ccache ${FEATURES} && tc-is-gcc \
+ has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
| sed -n '/^libraries:/{s:^[^/]*::;p}')
fi
diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild b/app-editors/emacs/emacs-29.0.9999.ebuild
index 41b8333bd0ab..0de26a675244 100644
--- a/app-editors/emacs/emacs-29.0.9999.ebuild
+++ b/app-editors/emacs/emacs-29.0.9999.ebuild
@@ -175,9 +175,9 @@ src_prepare() {
# for live ebuilds FULL_VERSION doesn't exist in global scope
QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
- # gccjit doesn't play well with ccache #801580
+ # gccjit doesn't play well with ccache or distcc #801580
# For now, work around the problem with an explicit LIBRARY_PATH
- has ccache ${FEATURES} && tc-is-gcc \
+ has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
| sed -n '/^libraries:/{s:^[^/]*::;p}')
fi
diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
index 684bd5cd26e1..e29548c120fe 100644
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@@ -1,4 +1,4 @@
AUX qhexedit2-0.8.4-setup.py.patch 596 BLAKE2B 15a801d87d9f690aa354162cb4966b1b691da95f7d64926f1b2ab66bd7d1db29b208cfab0f0bbe0f8fb272d67328f1a5ffd84ceb9d7af3d457ed6cd2a7d27ec0 SHA512 2cabb09c9c6e819a43d434a813ce9eb9614c72a3687758a35f338067d9e02add657ed1feee614486c9dbcbca823a848aedc69f9ab42aabd9ebe414b645b0d67e
DIST qhexedit2-0.8.6_p20190316.tar.gz 355512 BLAKE2B a7edc8d05a7788f3a3f2202762ca3dc436cafbde1b1216ff1bb342055600a2e9d53c27fe324380331b8182904545c698106129238065cd2416d244fdfa176446 SHA512 4ef288c8a220c308d38c41fee83fe962e213cdfa448445ef73c3d2fe1952b68f2096732e78d2aa0a87eddd3cf2f47bed3e77807e12d2b7616c1447b3bf1b0e7d
EBUILD qhexedit2-0.8.6_p20190316.ebuild 1878 BLAKE2B 30755598bd0d16eed9bd853ededc9807bf7b344ff209a179f9da712cff3881b34d14a106f07fb53061a0b9f1abb40ddd7bb6814e88877e09b7320e3cc18b5372 SHA512 73ba1483c4f3a4a30b0048d8f9884044259d26ebe067029e4ec62f6676248bf8528ba9e59bc7f46497b145906bb50e032de6a9a52bf8c78e427f29b6b6ddd32e
-MISC metadata.xml 894 BLAKE2B 397b58bb4fe28c270c41d16f8bafa13e7ed2060ca258dd5300123e35e08b425e1eacc358c28d81d80cd1346c4bd1343682b2f3ca87f3df651d667b554e3c5bac SHA512 c075e21b79a843c43de157c77fcb3cf9081788bd37647f00c1cfc139366eb00dbf3870c1f95a5adedf365022f5930b31127c4196a028328bc144af40e7647e12
+MISC metadata.xml 636 BLAKE2B a6f5b56c36f34d3906a135d7b2516bcbbfb47c13b01a98284b8a9d9e1de2cc2d46918459901c4c2b7984d7844c3d7b4fcc6631f0398b25a89e61be0edab80335 SHA512 2cce503a57e04e07b2160c1d3ae4118a7b73b059eab3defb2102b7da46cc39dae277ad01915240ca16349b8a094b1d4494f2267df2b8fb4bdd7d9a305ebadb8b
diff --git a/app-editors/qhexedit2/metadata.xml b/app-editors/qhexedit2/metadata.xml
index b21f150a2481..7db8b420f3d9 100644
--- a/app-editors/qhexedit2/metadata.xml
+++ b/app-editors/qhexedit2/metadata.xml
@@ -1,14 +1,7 @@
-
- ktrace@yandex.ru
- Victor Kustov
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
+
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index 99754ea30245..f2b90d2ef40a 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -8,10 +8,10 @@ DIST vscode-1.64.2-arm64.tar.gz 107090187 BLAKE2B 15587ce30f15c393f78d5ea554da51
DIST vscode-1.65.2-amd64.tar.gz 109564124 BLAKE2B 5b842253ed6438019de5f114f951651adc1773db93b408d3fec59b781ff32c0fb66f0e80ff0c02b6306ae46f541d55667f37d50ccf64709e810bf5e952af543e SHA512 1b5fd6c42966e66f963cb63a289414d3733cb64c051c36ad5a43481ccbd24996e99b58738b23be25a51890eb95593b7a2f224d61c3a21ea3195baed4f57cc761
DIST vscode-1.65.2-arm.tar.gz 90793512 BLAKE2B 8e29cd51635408280a9f3e36cc7d8a0925feee6a2239352b9a44075454ae36d7b784be2ecf9eb310440e416511a0d38b801ae41bfae400edd06345f960d66b29 SHA512 9c10a9a6ed82d321228b41202ab1584d580596bea9aa9759db6500e41f1979d1e9e1fa3e3af4fd86bdbbd0844ec528a499dbeb2eee988bb87b549073f0d112de
DIST vscode-1.65.2-arm64.tar.gz 104431396 BLAKE2B 17251a994ba15b9293b4bebbc8b34b8351bf5d15ea047d8789492839ab902d9802afcd94c6a805f26be505c9f05077c395c6a5c73a8f3614668c042400e3f4b0 SHA512 7365d8bec81bbd8bf72d6073cfd9034b8afca7309044863a921b190aadbb8fe16d5b58f98beab7d24d77c1077c60a1761a68a12e01ea974855608006973ec739
-DIST vscode-1.66.0-amd64.tar.gz 115615178 BLAKE2B e6e13cb52f04cae605868b508f8e3323bfbcff4589a6bd9b29cf978d9fa8cfa3e05d1ec1ba01e6368c943254fe3af0895f7cd20df46ea22348427a3876749be5 SHA512 a2157b9b7b92d0ee194fea20432e839ef7cf42151baeb5ed378de3c0aa9dc9bffce6d45b72bde8b8bbbb5cf41a5508016a07a45ecd16b0f570aa30a0b81ccdfc
-DIST vscode-1.66.0-arm.tar.gz 96717878 BLAKE2B 0eec918894e03941835c11d662567e58a3a8dcdeb386a65aa516cb6fbd8f59c70d9b9adcb4fc4051fd2077e34e1488700e55cc24ba90763bb14696c22eff4a33 SHA512 f58139aa901cf4eba1410d792c4591b81dbd3241b25c1a31a27db1e469cf0e5274bf263ad661cb7d01212e2f1d67de6fcc9f617fb1aa9a227401efb95690694c
-DIST vscode-1.66.0-arm64.tar.gz 110612358 BLAKE2B a0a38121024c2f47fc178893cba0d327c5891bbd74ee2218aff2b9d701c062b427cbaaf2d5115f3c386eb5187db8817323b1d8d4d2d830bf435cb9817232777d SHA512 d91192310787f56f7455ead5ea13940f6051f9efa5a99178adf7b628d9bf7b168e5bbe98b90cd37d472928d25e8eb27659f82bf224bd0238e35d84980f1d1491
+DIST vscode-1.66.1-amd64.tar.gz 115616634 BLAKE2B 9637f33068e4f34d1dc313bc353a722ff46c8be266a58ad03bd007bb5e815bfe1984bc799cd9d0c9eaef87e321f5f4f8f3e3c1eaa8ca1fc6d0b78e5002aa3ac7 SHA512 3a0e41f527b17ad845477f36e0a3b783e07b57fa0f3ac3be5d7387ff0b95f8cef2ce2ab427f971d357d607342645b642c3efc56fd3bbd440ace9e09b8e4b5778
+DIST vscode-1.66.1-arm.tar.gz 96710597 BLAKE2B d2d58d1257a6fa396f460c10df314d2e62b6a9e6abe65a6f5158569da9ee88c2e96ce9a66ba9c9bcdd6843c2a0c24dd50f4be2e0d59a6890c6d53f523a0b3475 SHA512 91234db83bc918feff912d1a0cad4ce2de11f5731583fd9b74bd62451a389882c81e02f2cd7d3c409fa6e92185ec33499e46f3914c7f35581489c8e13c59f864
+DIST vscode-1.66.1-arm64.tar.gz 110611219 BLAKE2B 4928a9e0b874b9b0032c0ee9021fa1aef857a882ad9c0664a9d3096ac27aa5cc763b1c3332ac8714df8018a4e35cec5afe754c12ac3305aee345c2d2d78a41f0 SHA512 a6dfd0d909aa677c4c0ac78c7bb08f637f43fbc20eedd0768fb9673478c9fff4470d0dda1f0311d84873da6fc1dac55206ac7ebce19f939ce74de1cf03b19c01
EBUILD vscode-1.64.2.ebuild 3038 BLAKE2B fc4a05b861e3f704872c17a476c6d2d3012717a9b4e677c3dad731b360bebbfddb836a4ea4953e3bcd98bf8b58a3935c13aba38b395a4308f3597f211c30618a SHA512 04829aa5fa4dd456fcb5a69f71f7a214f6645d83cd04152b94a466eb8b3d0b5db45f8fbc2ed18c4abf43b3fe2405c7bd521d46c0a72a0e1d42ee70989176ac5d
EBUILD vscode-1.65.2.ebuild 3371 BLAKE2B 965d066b8ca1ebfd4001edd4af59756db9c796a4cd9b16a40c8dc0793efa8caaf4c18e156c1d4123a1e2f2a2dfc2fea0fba8773e42bae09f480fbc8c33311128 SHA512 6eb57628ac4c04b0f4d7750817227e6d8105f19f3f0cb1c9c483534cf6a7bc24c97de529d32c9a528a91837eaa3a838b13aa75d03dfa09ca2d8f1e2b28dfa53b
-EBUILD vscode-1.66.0-r1.ebuild 3417 BLAKE2B 6d24820101decb6269287e007109cfeeffc8ccc50d0e3ce4a2c6f44d9508304744105115fcaa645dfadb08c5b01ff380a6b7247cd0eb4c65f49e7cf17eb12503 SHA512 88be11f2d5ff941307e10923a66184c7743e2a68eb1cf9ff1e070dfbab0f30eec59fe0cf63cd1e091c974fbefa01f3eaf34790e2b76791f5873b2ffd1ac2bf11
+EBUILD vscode-1.66.1.ebuild 3454 BLAKE2B 23b031a450a72926262df56e00de3604b26651185fb94faf8c86dde4878a88cb92b4549ed715f251f4607e96caa58435e8ce934a23e1fcbd3e88ae59b45cbd83 SHA512 3bb3fba747cd024ec14630d1379921979bdf54eafb62193f8a701de46aa78c16c2952ca10b02c05cf97d79f2fd858035e5d28dc6ee85adc05647817c14903944
MISC metadata.xml 947 BLAKE2B d2c522407289299e1398799f6187e1c0d6621dfe29c1dd0e9d88281eafe44f4b4b3a0edad920268d220375f9330f0a62c015fb1e5085decf5ca5e485a92cc204 SHA512 6b27ac42f3d67203c46996388f6700c007a299557808505179cfa42deeb71098bf3a257f23c11835389fd7a59180f3536e420ed6cdb93b274d47e4c84a25f738
diff --git a/app-editors/vscode/vscode-1.66.0-r1.ebuild b/app-editors/vscode/vscode-1.66.1.ebuild
similarity index 98%
rename from app-editors/vscode/vscode-1.66.0-r1.ebuild
rename to app-editors/vscode/vscode-1.66.1.ebuild
index 02ef30424081..27f47914fd32 100644
--- a/app-editors/vscode/vscode-1.66.0-r1.ebuild
+++ b/app-editors/vscode/vscode-1.66.1.ebuild
@@ -68,17 +68,18 @@ RDEPEND="
"
QA_PREBUILT="
+ /opt/vscode/chrome_crashpad_handler
+ /opt/vscode/chrome-sandbox
/opt/vscode/code
/opt/vscode/libEGL.so
/opt/vscode/libffmpeg.so
/opt/vscode/libGLESv2.so
- /opt/vscode/libvulkan.so*
- /opt/vscode/chrome-sandbox
/opt/vscode/libvk_swiftshader.so
- /opt/vscode/swiftshader/libEGL.so
- /opt/vscode/swiftshader/libGLESv2.so
+ /opt/vscode/libvulkan.so*
/opt/vscode/resources/app/extensions/*
/opt/vscode/resources/app/node_modules.asar.unpacked/*
+ /opt/vscode/swiftshader/libEGL.so
+ /opt/vscode/swiftshader/libGLESv2.so
"
src_install() {
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index 347f5870b042..b7f8b418a4e7 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -8,10 +8,10 @@ DIST vscodium-1.64.2-arm64.tar.gz 111168123 BLAKE2B 015163f9129e95cce5cb4df255cf
DIST vscodium-1.65.2-amd64.tar.gz 110791055 BLAKE2B c6685f78c786dd36ddb79adce5485670016dc5bf8e72550a0d6f39425237dbdf75c36612e053f74db0c7e92cbc7f21dcd641a1573e03741eed8ae7573d7e6608 SHA512 5a79be254d8fd21e22ca1b557bf11138948793518e761f20cfcc9a8a142e5ae14845989e4a2341f4594a03df0ab9b03e4df971123136c636e1b56bb310397f2c
DIST vscodium-1.65.2-arm.tar.gz 93766888 BLAKE2B 23f1b4a5839b4d8ce35779ae7cd033cfa5ced68272fcb9783307d000ee58dd145d68e8f84e963a1a0dc33ccca81b47119f95cbe49ee788eac5921c9b6ad9071e SHA512 bfc20b5d3de19afb02c11c6dce5b06dec9d843ed7989e400a2d0d2a7f98289db2ae5e7c6262fd31b353eee4efb4f6455aeedffa44e0e7162be03d688ef42c0cb
DIST vscodium-1.65.2-arm64.tar.gz 108364942 BLAKE2B 05fe48a28f9d97487190725e52ef719db7487e27ec537be185bcb8e4ab56137047261b1221b3cf3909ab07fd95e50135a29a57c802e51c35511718c1822fd49a SHA512 42a2bde4685aecff7b15e8315ef5edf05150e9f1228cd55a62693dc5a03ed5154e01353367c29357d652c82c561477b9d6bad34c0aacf7638b3e4597c31312cc
-DIST vscodium-1.66.0-amd64.tar.gz 115792381 BLAKE2B fca762114695e2cebc3658dee0f6e7d7b556d60278a4da512e51f6f3b5bb17b81f83f4a01c2b950c2439e21083023f6e985368419a55b83d0ebe8ab5e303c6cd SHA512 ec4c0bc9a9d928ea2991f5ec9cae247f692601d4e1e63c8b47dcc6d2f62c8e42ef0ebeb800b2cf3864ec66d486e4e17cbd7fb517c2f10727b4203bbb968da305
-DIST vscodium-1.66.0-arm.tar.gz 97612567 BLAKE2B c41b46469cc96f3609982fe1334f8c6e2801a8cac59cd9e30f0c523fdada42b7de711dfbc3ab77e08c136e13088f647010b44404d81152bc38bda130a8d41101 SHA512 dc2820c3fb59be9a5b2152fd45ec7c1617eb7cfc6272d7bed111b5c8d1aa6902e7f59a71df965bb0ff97e9f95d6e59e6ec3db5c55b7185424cffea1d8aa40e26
-DIST vscodium-1.66.0-arm64.tar.gz 113504867 BLAKE2B 2076d239950c745abc4ebf723f832a9934d31ae9582d7a9d1d51a378a79a05b83c0e5bd62a750e63174927d57097d113861633caea80fe2e70559fd8a5965a69 SHA512 46d789aa41991813a758dcf30764353292d6305431407c85249a039681264a7dbe9741569770aa14e2bd8cd9086e146cf128fca382abd383bcfd522f4c332537
+DIST vscodium-1.66.1-amd64.tar.gz 115798733 BLAKE2B a4ed6a7bb83e52d18a9fa920a874a28e1dd9cb148bfc675ccce4082328732588b231bf526a4d2c705b136e3684e4fcee6d876e506e60f8595180abd0364d6c76 SHA512 ab08f04c94b2ec3383d5fced4d2e04c32e5a5d87730cea8d55a4d780d6bcf5f2aba69ed5673634bdcbcfbbee936e37befe279d3a162aa60ead228f92f3b67db6
+DIST vscodium-1.66.1-arm.tar.gz 97608331 BLAKE2B f04a3ea18167298cbffac1fe311ad273760b7c550c28345db26515aeb5dafd347ea03992d8ecffe11a66298bd218c1ecffb4cbe138f86eb68442fab1ac1bf580 SHA512 0fc1785b28b6276f24d71f2edf5f4f3b342707ffbb0330a9fcd0b0594eac99a32604dc3358edf1dfab105b85f3686c003341bd8a55d0cd7a0a0c635b586a18a8
+DIST vscodium-1.66.1-arm64.tar.gz 113500687 BLAKE2B 4e6d1991d41addf476649644c95c017e5c3b116fb183511b1b7dca7249c0137c534e0fc75a72456cb8d7dcbf7c6facff0e1af2ef6d9377053a4ed084df1e302b SHA512 ed4b849d70e94507a6d64c6ff9b919903692fc6e0bcf9500bdda45ac0e8a83d2952c764f43eeeeea03c4c9ec2ce8ba61489e7eb83d560dfa1b6c5e7097c4c71a
EBUILD vscodium-1.64.2.ebuild 2901 BLAKE2B 13b3ac36b9b9718201e74637cb1ff6be3cebdd358106e129e4cf2bfd97f59f3c5a88011305b3de65d4dd8a037dde51491bf4d128007cb2cf0b9625b47032e6c1 SHA512 ba4029c8d718905c2ec6ca88cf1e5e39ffc0292688775898fc736b6e84ca957d89895b6195bc1d89a63f40bbc3fd132a53c8ae880c044abc822e2cc80daf7324
EBUILD vscodium-1.65.2.ebuild 3236 BLAKE2B 3cb64418ae40ca572e8d00b29a83d2c51754648de49f4fba7939994675776e6510f536829689447cfc5d06e85718bfe686e83e57b6caebde16d62d702cc15bcb SHA512 823c050bb727ab3451af94acb155e408242ef1d4535d66470fde7d4b80f184bc3403671f00df49899b666404ac5ce42c6c80f1b8910f1d7edf2601e3b82f20ab
-EBUILD vscodium-1.66.0-r1.ebuild 3282 BLAKE2B ed191419a3997b8570dc73c060edacb023eca1149d19b3f5f33c9f5e363576a899583f3883e2b1c0b5f55c96307ca32dd6ad9600b22f3b05480adf3ebbf361c9 SHA512 6ae1a2f94ac8361ced756477be9c3e29f85e7136f60ae79c5762ffd4fae8d477815b2078d4f3edb7894d5f0643f7f18af2106a92ab633b96868f0f72ff73e379
+EBUILD vscodium-1.66.1.ebuild 3321 BLAKE2B 403e3548d2be58c998f72039fb32c7c4e64a5c6b79505b6c29c780b5bb81ce2c2b54abbae4b45891eaaa8c1532db5c3185f3d3c670b50feed6313460c32b1e52 SHA512 e3cfd41801a2301c4976a71e742c9c43c0f29bb00834f447b832fe40c88fce557e1bfce6c8a64890378e89ff835130fb44e5a35af1f34fd149842bd955420258
MISC metadata.xml 1191 BLAKE2B ac8f365247fc710ade8a690da2a409352c20a886ad96b529ab0fc3f200dda28c2c7ca62fa78a922689373fa483e0a789836b887c8fccf2729ca6aa4c0e06aefe SHA512 e5b56663a757cdfff13ddc25c5d4f118f22d194fb051ae0bbe3264a4721c196a8820db1bfbd5a992827d8c97a81edfc30a97ca9610961ee46684a253d186449c
diff --git a/app-editors/vscodium/vscodium-1.66.0-r1.ebuild b/app-editors/vscodium/vscodium-1.66.1.ebuild
similarity index 98%
rename from app-editors/vscodium/vscodium-1.66.0-r1.ebuild
rename to app-editors/vscodium/vscodium-1.66.1.ebuild
index 10f977221d27..46ea193a4992 100644
--- a/app-editors/vscodium/vscodium-1.66.0-r1.ebuild
+++ b/app-editors/vscodium/vscodium-1.66.1.ebuild
@@ -68,17 +68,18 @@ RDEPEND="
"
QA_PREBUILT="
+ /opt/vscodium/chrome_crashpad_handler
+ /opt/vscodium/chrome-sandbox
/opt/vscodium/codium
/opt/vscodium/libEGL.so
/opt/vscodium/libffmpeg.so
/opt/vscodium/libGLESv2.so
- /opt/vscodium/libvulkan.so*
- /opt/vscodium/chrome-sandbox
/opt/vscodium/libvk_swiftshader.so
- /opt/vscodium/swiftshader/libEGL.so
- /opt/vscodium/swiftshader/libGLESv2.so
+ /opt/vscodium/libvulkan.so*
/opt/vscodium/resources/app/extensions/*
/opt/vscodium/resources/app/node_modules.asar.unpacked/*
+ /opt/vscodium/swiftshader/libEGL.so
+ /opt/vscodium/swiftshader/libGLESv2.so
"
S="${WORKDIR}"
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 455f973bbf40..98c9025cdecb 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/all-the-icons-dired/Manifest b/app-emacs/all-the-icons-dired/Manifest
new file mode 100644
index 000000000000..c14ef01d3bd6
--- /dev/null
+++ b/app-emacs/all-the-icons-dired/Manifest
@@ -0,0 +1,4 @@
+AUX 50all-the-icons-dired-gentoo.el 163 BLAKE2B e9c6aaeef3b0a8fa465ad9c886ba1c6ce0896a46858c0521fd476c87a5d1015dc688a520d1434aa29ff66df5b91cec209bceeef5ed8a999ee598f02e1f54c0b0 SHA512 286976673c84a7d0e3bb02871969d5f897942b2bf23bd7cca7becf04e43d10693297475c1f7b2d436b67db3d2fea75edf82c0abd2793415f272f9cbd7409a01a
+DIST all-the-icons-dired-2.0.tar.gz 61391 BLAKE2B 685213693ddf8e009565dc3dbb5b44b3b364553f07733346dfd77a261f1da46cedde11b0de5d87d6769cdca921984a445ab2e4ec79bad172fdae0c9f131f9e34 SHA512 1043f921d84da38fedd2abf140645d984bcc817cec7b1d608e8a08e4a828f8ddc4c977c28d35a67b9be3458147beb52b8364e6ffc8e1846eb10028fd53140f78
+EBUILD all-the-icons-dired-2.0.ebuild 526 BLAKE2B 9fae39b59d5b5d606a66c2171aed90d5abb8671e9678a11d385d26dda8ebd3e65c900acadb21572ac7e308b963c1507fee4db0db8da7d31a095da73c97a90bf8 SHA512 431ab3b49be67b3d232a3749f1eb653486320ab8dba80b9d16aefe4089312b4cb3243d6c7a0ad79d849588326061751727ddcf4405d467c81c1a2b2d0682c96a
+MISC metadata.xml 443 BLAKE2B 774ea111465498eefa4c5e18d335ed306e687b6b18f51bdfcaff53d16fbdcc65d3eb5c918fbde680e8aa189abec8946ddf30e50e7086b33eabb1d67dd4e216f7 SHA512 00a30b28f11a88653b5b3c5ec331b239583063506fdb004d52f249653038be194016ce1c1181d1b2fe40e4f641de2364bdb7372583fba560415ae07c8bebfbd8
diff --git a/app-emacs/all-the-icons-dired/all-the-icons-dired-2.0.ebuild b/app-emacs/all-the-icons-dired/all-the-icons-dired-2.0.ebuild
new file mode 100644
index 000000000000..20d2896a2583
--- /dev/null
+++ b/app-emacs/all-the-icons-dired/all-the-icons-dired-2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Display all-the-icons icon for each file in Emacs' dired buffer"
+HOMEPAGE="https://github.com/wyuenho/all-the-icons-dired/"
+SRC_URI="https://github.com/wyuenho/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/all-the-icons"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.org logo.png )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/all-the-icons-dired/files/50all-the-icons-dired-gentoo.el b/app-emacs/all-the-icons-dired/files/50all-the-icons-dired-gentoo.el
new file mode 100644
index 000000000000..97b86ad2a6e2
--- /dev/null
+++ b/app-emacs/all-the-icons-dired/files/50all-the-icons-dired-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'all-the-icons-dired-mode "all-the-icons-dired"
+ "Display all-the-icons icon for each file in a dired buffer." t)
diff --git a/app-emacs/all-the-icons-dired/metadata.xml b/app-emacs/all-the-icons-dired/metadata.xml
new file mode 100644
index 000000000000..6d28f321438a
--- /dev/null
+++ b/app-emacs/all-the-icons-dired/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://github.com/wyuenho/all-the-icons-dired/issues/
+ wyuenho/all-the-icons-dired
+
+
diff --git a/app-emacs/all-the-icons-ibuffer/Manifest b/app-emacs/all-the-icons-ibuffer/Manifest
new file mode 100644
index 000000000000..ad23507982a7
--- /dev/null
+++ b/app-emacs/all-the-icons-ibuffer/Manifest
@@ -0,0 +1,4 @@
+AUX 50all-the-icons-ibuffer-gentoo.el 149 BLAKE2B 16bb40261f940124c17ec3c8982408d4decffcf520f06add3b8104e51ead4aa144aed349530489201580fcbd3a5d91c32b60251b94c919bf3e8011d989e10744 SHA512 cd67f05368993997bb61e818bd7eed90fa79e6278a198da0b2428b366ddcb578fa038d6719db367f148c103ea589aa5fc667686f412f7d90ea0df94bf124bb71
+DIST all-the-icons-ibuffer-1.3.0.tar.gz 16247 BLAKE2B 43551d61aeff8f433ee087bd0361c443f95d12828fab7e8742522fd00d323430d3eb5c6205b580482df0be164dd636c151c30ddebdc36f4a2bc15117683748dd SHA512 f1fcde1cf97f02fef7b52d840296504ff621faa0fb35f530d7f20989545c5f24ba6a7762e0a76f5dca209f8e3c8b73a12c23c7f54d688680aa2b9805dcd2c8d2
+EBUILD all-the-icons-ibuffer-1.3.0.ebuild 526 BLAKE2B ffdb48b86a72c7e1ac1d534c72efed9baffca2d85f59d5a01ed87ec07568d7cb428918b3d702f00514dd0c5d875fe3562b2c874e156865d8ffd36fb90f46af78 SHA512 c9cd8e2eb3222cca7862fb276331d3c809c14f5adcd2600c8fdfa8e578d784ec95ad641aa03fd7710342ce35aa012e9635f0b1d971e2eb5c16e96064344fa9ea
+MISC metadata.xml 453 BLAKE2B e089948a9b03d18f99cd84c2925aae7aea619816697511785fb030029656cc00115d525d96c69c8eb7703e701f51814e4a87432fae94c1e2aef6a80b8cc6eca7 SHA512 bd130bf88aa97aea4d07c3ef6c778603794eac6af13b70801c2e6d45dc9c52b2f8aea070013ce8935e5edebae8eeca133b48f4210c186bb78f21e52f544ee254
diff --git a/app-emacs/all-the-icons-ibuffer/all-the-icons-ibuffer-1.3.0.ebuild b/app-emacs/all-the-icons-ibuffer/all-the-icons-ibuffer-1.3.0.ebuild
new file mode 100644
index 000000000000..1e24835199af
--- /dev/null
+++ b/app-emacs/all-the-icons-ibuffer/all-the-icons-ibuffer-1.3.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Display all-the-icons icons for all buffers in Emacs' ibuffer"
+HOMEPAGE="https://github.com/seagle0128/all-the-icons-ibuffer/"
+SRC_URI="https://github.com/seagle0128/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/all-the-icons"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/all-the-icons-ibuffer/files/50all-the-icons-ibuffer-gentoo.el b/app-emacs/all-the-icons-ibuffer/files/50all-the-icons-ibuffer-gentoo.el
new file mode 100644
index 000000000000..cf33c024a408
--- /dev/null
+++ b/app-emacs/all-the-icons-ibuffer/files/50all-the-icons-ibuffer-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'all-the-icons-ibuffer-mode "all-the-icons-ibuffer"
+ "Display icons for all buffers in ibuffer." t)
diff --git a/app-emacs/all-the-icons-ibuffer/metadata.xml b/app-emacs/all-the-icons-ibuffer/metadata.xml
new file mode 100644
index 000000000000..ca81f430464d
--- /dev/null
+++ b/app-emacs/all-the-icons-ibuffer/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://github.com/seagle0128/all-the-icons-ibuffer/issues/
+ seagle0128/all-the-icons-ibuffer
+
+
diff --git a/app-emacs/all-the-icons-ivy-rich/Manifest b/app-emacs/all-the-icons-ivy-rich/Manifest
new file mode 100644
index 000000000000..972ac6054c14
--- /dev/null
+++ b/app-emacs/all-the-icons-ivy-rich/Manifest
@@ -0,0 +1,4 @@
+AUX 50all-the-icons-ivy-rich-gentoo.el 147 BLAKE2B 9d5dcc2b3537c21444dca4eec0138466c09d4f3b8efcb314001563957e7512caddd41b34573aaf5bd04b5b6ec50d8d50c0fe24a656a485640936cbf9b3728550 SHA512 d843d1714e43e3a893cd46b6c759fee46a24227bf1a8001b4119320411e1921e35a40b304313e3f0b2ee6c15971a67e143c5c2a8bb10f70003dbdd03de9cc406
+DIST all-the-icons-ivy-rich-1.7.1.tar.gz 23806 BLAKE2B 28d85c0a4d486900b444e2aab25c6cb257d91ddb4839ab3e71dced02c7ad85e822f465d0d29404c55421c05a1e14002480f977c898a8374e4c51c66631413413 SHA512 526632f74a674bfcd6c2019649be6e305c0d817a1b29d8e5883b239cd97f8b40a63c34bc39e4f4e8ca2ff71ee3cd15e43e40827f40aa2f6579ec4c96eced40e5
+EBUILD all-the-icons-ivy-rich-1.7.1.ebuild 527 BLAKE2B 7e0abd723cab3a6a092de68f7e5621f5df6d3dc07ab4cfffb522480fbbaf8aef7f5db0190a70459b83dc956542b5a9fb8829128250d7ce17cd9a09fcba2aeb63 SHA512 f3c1cb9edaafa0032242d304908bcdc21ad2ac26f8e3430c1cf566db5d9acc47de5aac44249374eb611dee52fef221105050e44bf2706eebbb198235340a6027
+MISC metadata.xml 455 BLAKE2B 8e42e8f90284961bfa2009e40e212db1665b4624ff14b18689a32ec25361d9eefa65acc7e5b7e189d8e3b3b397eb41bfa36e672732f066a937b6bbf3fb70d5e2 SHA512 01b692b5436521b2a4e781aca48fbbee42979990521ab5b74ae6e0fa8f17725880ef9d096d77eb7dd5ebb087981c11d2d5f3736fab536c587211ffae19f784f1
diff --git a/app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.7.1.ebuild b/app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.7.1.ebuild
new file mode 100644
index 000000000000..b0570fb03e28
--- /dev/null
+++ b/app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.7.1.ebuild
@@ -0,0 +1,26 @@
+# 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="Display icons for ivy buffers in Emacs"
+HOMEPAGE="https://github.com/seagle0128/all-the-icons-ivy-rich/"
+SRC_URI="https://github.com/seagle0128/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ app-emacs/all-the-icons
+ app-emacs/ivy-rich
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/all-the-icons-ivy-rich/files/50all-the-icons-ivy-rich-gentoo.el b/app-emacs/all-the-icons-ivy-rich/files/50all-the-icons-ivy-rich-gentoo.el
new file mode 100644
index 000000000000..3b390209616d
--- /dev/null
+++ b/app-emacs/all-the-icons-ivy-rich/files/50all-the-icons-ivy-rich-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'all-the-icons-ivy-rich-mode "all-the-icons-ivy-rich"
+ "Better experience with icons for ivy." t)
diff --git a/app-emacs/all-the-icons-ivy-rich/metadata.xml b/app-emacs/all-the-icons-ivy-rich/metadata.xml
new file mode 100644
index 000000000000..9f1fa8fc0a06
--- /dev/null
+++ b/app-emacs/all-the-icons-ivy-rich/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://github.com/seagle0128/all-the-icons-ivy-rich/issues/
+ seagle0128/all-the-icons-ivy-rich
+
+
diff --git a/app-emacs/all-the-icons/Manifest b/app-emacs/all-the-icons/Manifest
new file mode 100644
index 000000000000..48838605efd5
--- /dev/null
+++ b/app-emacs/all-the-icons/Manifest
@@ -0,0 +1,6 @@
+AUX 50all-the-icons-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST all-the-icons-5.0.0.tar.gz 805496 BLAKE2B c5d81d2ff534bb7ab0000c21fb32107f307d96b1bf09b9227be5900e8160b133cfdc7ea4d4b31a982abb55e29bcf35626af91e3bd9ecbfba00b9b5ed85496a7f SHA512 865db191900dbeb207220df8d91220179dfbbb37e983e9e306ba0a4be576055002beb7335de20327736e8be678056699e8385aa37de766fadc11f4688f99471e
+DIST all-the-icons-5.0.0_p20220325.tar.gz 806105 BLAKE2B bc035ee726bf1d2f9839231ddd3bbaaca93b76c30026a3fcef4579f28f7f9677b37fa8b2652e82ae710f23272b56c884cb9454d54d8c2962f20e0fe9cf3c0bdd SHA512 3e45f208b46e7b1b596b6beb41cc11145db49e3e60e7a42593db94000f226e197b30580ba46d490b456f90349e7db2e49027a572b90f32048bcf0e68af9f22bf
+EBUILD all-the-icons-5.0.0.ebuild 1000 BLAKE2B edbb9634122e62a74cc6601465edd5af266705a77f6834afa12fa76c6a42db5636a8d8f26acf46077b60a435111d36a2d7d826e9b1ed2169d8d2043b00b8b58b SHA512 ff270f803578bb075378ee6a9a8bfe7a12d2b2d57855f12273f7d9c222c746e3bf6881ac2c9bf5219721f879886edeed48adab9307b452922f7ad9f6bb69047b
+EBUILD all-the-icons-5.0.0_p20220325.ebuild 1041 BLAKE2B 1bdc607c82776edeb062c0380f954509a910348fff09de1393663a8ccb1d866adb9a326ebe92167e06015ce3d4df9c5675408e9df78608155674524195a0b516 SHA512 29f5d433b13c1c1e7382ec89fd98e4792868003e0718016eebdb60b51f169eb4b9f66ec6d03b895b198af3ad76a61129d8fbc35baa9371b1bdb2092f6a2638c8
+MISC metadata.xml 439 BLAKE2B 29065345d770b5f2725a0a9dfaf2afa77ad082e349b662dca756150c45eefa1b7f022842e5db1efcd8a7d55cde14ddd25f286cb2cc9ce4370fdf9d4a5cf942b3 SHA512 2189e794f2eefda4ac001013c26e91a5631d1cc71aab214b811ef897f94b3c2ea1858b536b18f38211474c87baaf4a2307619744deec577d6e6aa2db1c634458
diff --git a/app-emacs/all-the-icons/all-the-icons-5.0.0.ebuild b/app-emacs/all-the-icons/all-the-icons-5.0.0.ebuild
new file mode 100644
index 000000000000..cb1873d52bb6
--- /dev/null
+++ b/app-emacs/all-the-icons/all-the-icons-5.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.3
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Various icon fonts propertized for Emacs"
+HOMEPAGE="https://github.com/domtronn/all-the-icons.el/"
+SRC_URI="https://github.com/domtronn/${PN}.el/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( app-emacs/f )"
+
+DOC_CONTENTS="You may need to install the required fonts by executing
+ the \"all-the-icons-install-fonts\" function."
+DOCS=( README.md logo.png )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp_src_compile
+ elisp-compile data/*.el
+}
+
+src_test() {
+ ${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} \
+ -L . -L data -L test -l test/all-the-icons-test.el \
+ -f ert-run-tests-batch-and-exit || die "tests failed"
+}
+
+src_install() {
+ elisp_src_install
+ elisp-install ${PN}/data data/*.el{,c}
+}
diff --git a/app-emacs/all-the-icons/all-the-icons-5.0.0_p20220325.ebuild b/app-emacs/all-the-icons/all-the-icons-5.0.0_p20220325.ebuild
new file mode 100644
index 000000000000..cf28205eb9e6
--- /dev/null
+++ b/app-emacs/all-the-icons/all-the-icons-5.0.0_p20220325.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=65c496d3d1d1298345beb9845840067bffb2ffd8
+NEED_EMACS=24.3
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Various icon fonts propertized for Emacs"
+HOMEPAGE="https://github.com/domtronn/all-the-icons.el/"
+SRC_URI="https://github.com/domtronn/${PN}.el/archive/${H}.tar.gz
+ -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${H}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( app-emacs/f )"
+
+DOC_CONTENTS="You may need to install the required fonts by executing
+ the \"all-the-icons-install-fonts\" function."
+DOCS=( README.md logo.png )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp_src_compile
+ elisp-compile data/*.el
+}
+
+src_test() {
+ ${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} \
+ -L . -L data -L test -l test/all-the-icons-test.el \
+ -f ert-run-tests-batch-and-exit || die "tests failed"
+}
+
+src_install() {
+ elisp_src_install
+ elisp-install ${PN}/data data/*.el{,c}
+}
diff --git a/app-emacs/all-the-icons/files/50all-the-icons-gentoo.el b/app-emacs/all-the-icons/files/50all-the-icons-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/all-the-icons/files/50all-the-icons-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/all-the-icons/metadata.xml b/app-emacs/all-the-icons/metadata.xml
new file mode 100644
index 000000000000..05396e7cc8b6
--- /dev/null
+++ b/app-emacs/all-the-icons/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://github.com/domtronn/all-the-icons.el/issues/
+ domtronn/all-the-icons.el
+
+
diff --git a/app-emacs/amx/Manifest b/app-emacs/amx/Manifest
new file mode 100644
index 000000000000..5034221c15bd
--- /dev/null
+++ b/app-emacs/amx/Manifest
@@ -0,0 +1,4 @@
+AUX 50amx-gentoo.el 176 BLAKE2B ebe37d31809cb6e18caab94ca65d1549b28b00c92aa8a45a43305401fdbea87ae1d0fdeb9617f67e2b733ee6d91db2b592ca1561efb05a07a6ce7ae2d8f8e301 SHA512 c1b808f7daebf3d59aecf2cc8dc23ec44ae0e973700d1edf0357e6af38b4feead5cac2e9c9d6e6dcb9afa14af0480538a09beb128920b209baebf6f76ce1a438
+DIST amx-3.4.tar.gz 33916 BLAKE2B b3b6f6d97e10dcb759bf38a812094de528aaeffd0b8fd0f1d055f67696889939a88622151123986bde42d4a1355a8a4d6cf95b286012bcb5245c1edc9b19a71c SHA512 146b8f6acbe4acca63391771fca73d22f5ce60872f4d18abc865d6cb07f4d12ea01fd59235e1e5987d33b169ea7792368b72e92f8c6409846121850efb75511f
+EBUILD amx-3.4.ebuild 573 BLAKE2B c600639289933531b37244157ae4c27101f78d981eaed79a3476a2dbdd1434028f6763c484a670597efa264c822fe543f6e2eb2aa23236b03289e513d769e29f SHA512 d06c9ebc08b9ac0e4a7ef10bf76943953293b212ae3d56f950d276c25cbfeefee719cce0c7db5953cf329c96d35dede5be32d58fe7a226013e250205b86e07e9
+MISC metadata.xml 431 BLAKE2B cfda173fa701b47b27ae72fd7864d61abcd7befe44b7c31744dd99d8f945f6d80e457ec885ee7ed92821a478483aee94542c6b13ab0e201d9c7562b0aeb37efd SHA512 62ebc4bc14e269ec5f0f753767f6ead66fb03fb312034c3967ce60077e18ec64daab8eccfd7b59c11bbb2461449b9848b9d7126987ef5eafc5864b9fa94c166e
diff --git a/app-emacs/amx/amx-3.4.ebuild b/app-emacs/amx/amx-3.4.ebuild
new file mode 100644
index 000000000000..db2ba6d8d419
--- /dev/null
+++ b/app-emacs/amx/amx-3.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Alternative M-x interface for GNU Emacs"
+HOMEPAGE="https://github.com/DarwinAwardWinner/amx/"
+SRC_URI="https://github.com/DarwinAwardWinner/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# TODO: When ido is packaged: || ( app-emacs/ido app-emacs/ivy )
+RDEPEND="
+ app-emacs/s
+ app-emacs/ivy
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.mkdn )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/amx/files/50amx-gentoo.el b/app-emacs/amx/files/50amx-gentoo.el
new file mode 100644
index 000000000000..12393aba5772
--- /dev/null
+++ b/app-emacs/amx/files/50amx-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'amx-mode "amx"
+ "Use ido/ivy completion for M-x." t)
+(autoload 'amx "amx"
+ "Read a command name and execute the command." t)
diff --git a/app-emacs/amx/metadata.xml b/app-emacs/amx/metadata.xml
new file mode 100644
index 000000000000..9b41a7c40de8
--- /dev/null
+++ b/app-emacs/amx/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://github.com/DarwinAwardWinner/amx/issues/
+ DarwinAwardWinner/amx
+
+
diff --git a/app-emacs/bbdb/Manifest b/app-emacs/bbdb/Manifest
index dd208198d499..838286dffd00 100644
--- a/app-emacs/bbdb/Manifest
+++ b/app-emacs/bbdb/Manifest
@@ -5,6 +5,6 @@ DIST bbdb-3.1.2.tar.gz 378935 BLAKE2B 3fc862d2d68632c997e3f250aa82cced743c3cc386
DIST bbdb-3.2.2a.tar.gz 198749 BLAKE2B 9f9bf9eb1414f66e19ab4e0771275cb15716257019063874000adfd3de56d047f531c440f585def481c79bf69b06b2fa1edb5b6f42ad0619bfb44318fdde9a3c SHA512 767aa7a046a9456dbf0b622a6efabe5c1d87c0022507b3bb6bec07be54e57a7285a9fe39f870599a248d5e78883300de870c168dc9918c2d1a139ef31fd53ac8
DIST bbdb-3.2.tar.gz 189456 BLAKE2B b25efd6a3a156684e0a8f15db056683876c8dd1a44eb585db269746c7424cc18df5407e3a04defcbbd8a2c8438bbe2b16d55ab290e842951f6e475bfc34871fe SHA512 593ba5143b50f2818c19c94452efb2c5d7194ed5dc8deecf1d380da4f80e0fad2542b9a7ee68d8baca2bc2bfd84fa0459eb3cd18faaf998eb0956fcfb62dc5c8
EBUILD bbdb-3.1.2-r2.ebuild 1236 BLAKE2B 4fe817fd96846ec01e582eb9852b5e8bfd2ff695206b67ecbb6f47cda5eff6627efaeec21d7b99e87e35c1b499f9fe42dc4e89fb11a60e3956410d96f2f5ccd5 SHA512 ce494c3108c49a36f09160e023575351daad22b0ae4f42c9cc1732019cdaaf6fbff0da245ab4ef8aa4833c0d9d6dfe5ea2b65d6e370702a9c396695a69596f96
-EBUILD bbdb-3.2.2a.ebuild 1479 BLAKE2B 3f8fedcd095664f11e8ef3470a5975468f10351938247db5d18e61bb0d81a86efa83b0aab0dcb1884b094e3fda2c737e3a0e98408ad19d0af0fae2fa6d1a5be0 SHA512 b602418bdb4e2546db4f60c7e55d18d553d65d58ee75e786b713fa252f9fc04040fe6b64704de81ea0fd8ef5f4ccdb621d6c527fd4c00d663753daf2b9363ef0
+EBUILD bbdb-3.2.2a-r1.ebuild 1556 BLAKE2B 159c0827029cd99e7ff0a72668f77eab21672f558e5cf094be069f88d5e304cb58b5c9f072638bcae0e6420c02041f6edffe5591d908dab24d9b942992891cc6 SHA512 4f15ee84b37f6bdd7f593e12c002aa2a3fba65f5d087f7217fdb6bcc9abec2c5d9b7056758b36ac1f4db6666bcbb8df9b0701e7d2a461561d006315200a7eb77
EBUILD bbdb-3.2_pre20180106.ebuild 1320 BLAKE2B 2436f1a584f6d6abaf66d03c6f8ce9ef5c15aea1010eca6f61661f53fa7e9c2cc39795ec2c2a5659fb5561075be00a2199be208d75032d14b9c42b4a21ac7e0e SHA512 11d3cdd4035e1b2537de3fd4855a51fc94c29477216ae700183efff69d4ac64dc1d307f4941ee71fde79d376718e3c7faf2e4458637e45173d033ec9fbaad21c
MISC metadata.xml 835 BLAKE2B 8079066283e974e301b6f75a0a61907634425cb0b0e1406aaf80003c07b562b93c0e5deabfc6273443f36b7667215f7840ff8bd54febb862ffc23ebb1bb669dc SHA512 2921d9e1f452a42c1752a4f2d533f8ad1eba3a08d48855c8bc81e1b3532990a4728adbfdb4cde12b83b19e02f395bcf2293600ad670a4bcf8b036179e7e783fa
diff --git a/app-emacs/bbdb/bbdb-3.2.2a.ebuild b/app-emacs/bbdb/bbdb-3.2.2a-r1.ebuild
similarity index 84%
rename from app-emacs/bbdb/bbdb-3.2.2a.ebuild
rename to app-emacs/bbdb/bbdb-3.2.2a-r1.ebuild
index 5f856b6fdaef..25ffb5ede6b0 100644
--- a/app-emacs/bbdb/bbdb-3.2.2a.ebuild
+++ b/app-emacs/bbdb/bbdb-3.2.2a-r1.ebuild
@@ -13,15 +13,15 @@ SRC_URI="https://git.savannah.nongnu.org/cgit/bbdb.git/snapshot/${P}.tar.gz"
LICENSE="GPL-3+ FDL-1.3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="tex vm wanderlust"
+IUSE="doc tex vm wanderlust"
RESTRICT="test" #631700
RDEPEND="vm? ( app-emacs/vm )
wanderlust? ( app-emacs/wanderlust )"
-BDEPEND="${RDEPEND}
- sys-apps/texinfo"
-RDEPEND="${RDEPEND}
- tex? ( virtual/latex-base )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/texinfo
+ doc? ( virtual/texi2dvi )"
+IDEPEND="tex? ( virtual/latex-base )"
SITEFILE="50${PN}-gentoo-3.2.el"
TEXMF="/usr/share/texmf-site"
@@ -40,12 +40,12 @@ src_configure() {
src_compile() {
emake -C lisp
- emake -C doc
+ emake -C doc info $(usev doc pdf)
}
src_install() {
emake -C lisp DESTDIR="${D}" install
- emake -C doc DESTDIR="${D}" install
+ emake -C doc DESTDIR="${D}" install-info $(usev doc install-pdf)
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
dodoc AUTHORS ChangeLog NEWS README TODO
diff --git a/app-emacs/counsel/Manifest b/app-emacs/counsel/Manifest
new file mode 100644
index 000000000000..53be3b6007ea
--- /dev/null
+++ b/app-emacs/counsel/Manifest
@@ -0,0 +1,4 @@
+AUX 50counsel-gentoo.el 110 BLAKE2B 223dc0b9991156d3494e9e954624ec060515231f5ca979345864dad802ccaaaff02eb43e13a7af5eed581e4189005493bbda3d849ef8c7b9b877993f9e096a78 SHA512 be21f737978b64065af31df15320ddb06f255a258d05d75227f4762a35a6eb86b0012561a40f7f72f154af58c0ce240c50958a8020d3a0dc5054c6b5834b80c8
+DIST swiper-0.13.4.tar.gz 245190 BLAKE2B c4da021b92fcedfec39cc60f670c97e4a421b8d4aef8183f50c4872bed835db79884cff113f58cf21dfa7ce33158218aa0cf25d72fc0081dc1c24a3b4376c60e SHA512 bf096a13f675f87af6ea68c974455896b64921ca4d7880c9ccc444aa3cea7c7e04c61be5deb2fd57d0568ff4d86f96ffcf94494b55d84d7a9f647f49b69aec9a
+EBUILD counsel-0.13.4.ebuild 787 BLAKE2B fcee8cf90e3384599d3a90aab8ec69cffb5e638a16b7853fc095b1900ef7c419bdc1eeb6cab1e96ae514787a9ad2d426e7ad96ae0c5c0ec4a14697a7b5be1468 SHA512 bd748ff39182ee9e9c6ad954d9c1a3a0db9e445d27766d03feaf36f48abe29e4f4e9806fab143d399fe73543912ac8a997488e338f274ecf2fd6be707f20c81b
+MISC metadata.xml 571 BLAKE2B 26ca5a5dfb1bc67ad37086ddc2c2e5976d1b4c763789a27ee83fb08c4a106a21c33b4c9632a3f2858a6b6249c8c49da3e2eafa7efc5267b655c0c9b2066598e2 SHA512 1879881be5eaeb2a6bac023fd06476a2ccbd25909f7c2f722b4af3680db44b4d3a959e1ac864e86580813a0bc68a2120d936f1c2efd67a6738ee8d83a5adb6f4
diff --git a/app-emacs/counsel/counsel-0.13.4.ebuild b/app-emacs/counsel/counsel-0.13.4.ebuild
new file mode 100644
index 000000000000..fe5b3a0a93e8
--- /dev/null
+++ b/app-emacs/counsel/counsel-0.13.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.5
+
+inherit elisp
+
+DESCRIPTION="Versions of common Emacs commands customized to make the best use of ivy"
+HOMEPAGE="https://github.com/abo-abo/swiper/"
+SRC_URI="https://github.com/abo-abo/swiper/archive/${PV}.tar.gz
+ -> swiper-${PV}.tar.gz"
+S="${WORKDIR}"/swiper-${PV}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test" # Ivy, Swiper and Counsel tests are performed in app-emacs/ivy
+
+RDEPEND="
+ >=app-emacs/ivy-${PV}
+ >=app-emacs/swiper-${PV}
+"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp-compile ${PN}.el
+}
+
+src_install() {
+ elisp-install ${PN} ${PN}.el{,c}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/counsel/files/50counsel-gentoo.el b/app-emacs/counsel/files/50counsel-gentoo.el
new file mode 100644
index 000000000000..1da49244a09f
--- /dev/null
+++ b/app-emacs/counsel/files/50counsel-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'counsel-mode "counsel"
+ "Toggle Counsel mode on or off." t)
diff --git a/app-emacs/counsel/metadata.xml b/app-emacs/counsel/metadata.xml
new file mode 100644
index 000000000000..37581bba4db7
--- /dev/null
+++ b/app-emacs/counsel/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://raw.githubusercontent.com/abo-abo/swiper/master/doc/Changelog.org
+ https://github.com/abo-abo/swiper/issues/
+ abo-abo/swiper
+ https://oremacs.com/swiper/
+
+
diff --git a/app-emacs/ivy-rich/Manifest b/app-emacs/ivy-rich/Manifest
new file mode 100644
index 000000000000..f835f1f17e41
--- /dev/null
+++ b/app-emacs/ivy-rich/Manifest
@@ -0,0 +1,4 @@
+AUX 50ivy-rich-gentoo.el 112 BLAKE2B 761def1e583ad0f01b45fde5e3613605c5b98f28a9d8cf7ca9b7f16098be9719bab4c0cee019101a79e8d52ce414bc2cb797eff973476989629599d1921f3751 SHA512 b650c61f12ab695932b3b7f83cf4acd610fbab3bef844067ba60e4befc9df7873f82952f9d6bb9a6d14408baf96383dd0a272916f76aa3a5310aa8bca9a943ba
+DIST ivy-rich-0.1.6_p20210409.tar.gz 606147 BLAKE2B a496ea10438dbe7c90b825b8c6874b277060d068ab8c8193a91f615c6e1719822032857b4b500346c8c40f9777bccd1554471f05cf37b7c3b1386b97d82b1b8e SHA512 cde5922829a1d53167bc2724ef10844c04c47380d380130efb04cc51efb99538e19acdea05bddbbf88e5cf9bf7da65710e85bd6287d4dbbe50d4009c8e696bd1
+EBUILD ivy-rich-0.1.6_p20210409.ebuild 560 BLAKE2B 472dbdfbc85745ae7714aaa8319865ca1f67c5ef0d881c8d80aa000cc82aa3fbaecd16034b8baa54380e4fb6ab94ef7195dfe4551e34b0bc96e47a8cfef09f62 SHA512 8457443008921295bfa8d05678f8ca29b6ded7393bbfa17230fa77d1592785a14f4f79dc0343bd0873851fe6e04c0c6848d80933ea62a0dc52af882c8fa64c70
+MISC metadata.xml 421 BLAKE2B a232ebb68c8383893b9267dc9868ed24c7a6c0fbf2c2a63a13476f9b4a599540df87f39f547b9c154058bef8d0a475306f4ed66c1cae85586fcb932b192ee98d SHA512 9f02a57261c63d7584502572ddadc2fcf6527da80952356d79bd4d3185000fabcfc47c0f34c060b50cb8537a382d523e2f5117bdd31ae19129ee38b149d497c9
diff --git a/app-emacs/ivy-rich/files/50ivy-rich-gentoo.el b/app-emacs/ivy-rich/files/50ivy-rich-gentoo.el
new file mode 100644
index 000000000000..ee705d5c9fc7
--- /dev/null
+++ b/app-emacs/ivy-rich/files/50ivy-rich-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'ivy-rich-mode "ivy-rich"
+ "Toggle ivy-rich mode globally." t)
diff --git a/app-emacs/ivy-rich/ivy-rich-0.1.6_p20210409.ebuild b/app-emacs/ivy-rich/ivy-rich-0.1.6_p20210409.ebuild
new file mode 100644
index 000000000000..776f722b53ff
--- /dev/null
+++ b/app-emacs/ivy-rich/ivy-rich-0.1.6_p20210409.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=600b8183ed0be8668dcc548cc2c8cb94b001363b
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="More friendly interface for ivy"
+HOMEPAGE="https://github.com/Yevgnen/ivy-rich/"
+SRC_URI="https://github.com/Yevgnen/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/ivy"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.org screenshots.org screenshots )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ivy-rich/metadata.xml b/app-emacs/ivy-rich/metadata.xml
new file mode 100644
index 000000000000..517c4226ea2d
--- /dev/null
+++ b/app-emacs/ivy-rich/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://github.com/Yevgnen/ivy-rich/issues/
+ Yevgnen/ivy-rich
+
+
diff --git a/app-emacs/ivy/Manifest b/app-emacs/ivy/Manifest
new file mode 100644
index 000000000000..8fb01188294f
--- /dev/null
+++ b/app-emacs/ivy/Manifest
@@ -0,0 +1,5 @@
+AUX 50ivy-gentoo.el 98 BLAKE2B 4d474a2c101b1cee20da1c56e5336b31df2a75cf5bf24251ba4c72c9d7cfb6cad9cac61923ca1d5ae83370e94cae545cb276cfa6df3f7bd528bd36fdb9e3156a SHA512 ccd9987b868c613535465b9c3041fb2a8c44561b678fe7bf40a276dff272deafb4bc14ce61228ed9cc27f2d0439652aa888e07c0120f6e2a246b0b5fa30a246e
+AUX ivy-0.13.4-ivy-test.el-skip.patch 1352 BLAKE2B b45c62f336e903d35514c00d8f3f1c922b4191c96c0ad4dfcaede594449f075909d77d012cd162e16d6e442c32101124af10db9e2e7d1dcb1a38270a581562a8 SHA512 f56b610d973b9aa62e5474012c1a3ef61a2be39f1d828e714576e15bb5e53d3e9ea8891915db5cee347b747be8b19c8849ab2912eb3a2f2e522160ee6573c1f2
+DIST swiper-0.13.4.tar.gz 245190 BLAKE2B c4da021b92fcedfec39cc60f670c97e4a421b8d4aef8183f50c4872bed835db79884cff113f58cf21dfa7ce33158218aa0cf25d72fc0081dc1c24a3b4376c60e SHA512 bf096a13f675f87af6ea68c974455896b64921ca4d7880c9ccc444aa3cea7c7e04c61be5deb2fd57d0568ff4d86f96ffcf94494b55d84d7a9f647f49b69aec9a
+EBUILD ivy-0.13.4.ebuild 1399 BLAKE2B 0e2c9dccaf2baced75677fa0e3049a0f204684018362b11b833a5c23f0fec3a8eb2429868b26158c20995e5e0723d2a69b7824585bbdba5a2b61ae2e5e8ca9a4 SHA512 c89d34ca459b4ec5b4b3f2c6b8de83f04f2dacd21e4130a910daeaa55301b587b48b532d2333b5d9dc1012701a7f8af035cb10f9853e15a5d6f390288e76f1d9
+MISC metadata.xml 571 BLAKE2B 26ca5a5dfb1bc67ad37086ddc2c2e5976d1b4c763789a27ee83fb08c4a106a21c33b4c9632a3f2858a6b6249c8c49da3e2eafa7efc5267b655c0c9b2066598e2 SHA512 1879881be5eaeb2a6bac023fd06476a2ccbd25909f7c2f722b4af3680db44b4d3a959e1ac864e86580813a0bc68a2120d936f1c2efd67a6738ee8d83a5adb6f4
diff --git a/app-emacs/ivy/files/50ivy-gentoo.el b/app-emacs/ivy/files/50ivy-gentoo.el
new file mode 100644
index 000000000000..f9115d44c43a
--- /dev/null
+++ b/app-emacs/ivy/files/50ivy-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'ivy-mode "ivy"
+ "Toggle Ivy mode on or off." t)
diff --git a/app-emacs/ivy/files/ivy-0.13.4-ivy-test.el-skip.patch b/app-emacs/ivy/files/ivy-0.13.4-ivy-test.el-skip.patch
new file mode 100644
index 000000000000..e94070cca9c3
--- /dev/null
+++ b/app-emacs/ivy/files/ivy-0.13.4-ivy-test.el-skip.patch
@@ -0,0 +1,39 @@
+diff --git a/ivy-test.el b/ivy-test.el
+index 2062b81..8613337 100644
+--- a/ivy-test.el
++++ b/ivy-test.el
+@@ -2022,6 +1076,7 @@ Since `execute-kbd-macro' doesn't pick up a let-bound `default-directory'.")
+ (should (eq (ivy--sort-function 'c) fn1))))
+
+ (ert-deftest ivy-read-directory-name ()
++ (skip-unless nil)
+ (ivy-mode 1)
+ (unless (file-exists-p ivy-empty)
+ (make-directory ivy-empty))
+@@ -1136,6 +1137,7 @@ Since `execute-kbd-macro' doesn't pick up a let-bound `default-directory'.")
+ :dir "/tmp/"))))
+
+ (ert-deftest ivy-partial-files ()
++ (skip-unless nil)
+ (when (file-exists-p "/tmp/ivy-partial-test")
+ (delete-directory "/tmp/ivy-partial-test" t))
+ (mkdir "/tmp/ivy-partial-test/test1" t)
+@@ -1452,8 +1454,7 @@ a buffer visiting a file."
+
+ (ert-deftest ivy-swiper-wgrep ()
+ ;; `wgrep' requires Emacs 25 or later.
+- (skip-unless (and (>= emacs-major-version 25)
+- (require 'wgrep nil t)))
++ (skip-unless nil)
+ (dolist (search-cmd '(swiper swiper-isearch))
+ (should
+ (string=
+@@ -1585,7 +1586,7 @@ a buffer visiting a file."
+ '("one" "two"))))
+
+ (ert-deftest ivy-avy ()
+- (skip-unless (require 'avy nil t))
++ (skip-unless nil)
+ (require 'ivy-avy)
+ (let ((enable-recursive-minibuffers t)
+ (read-numbers '(ivy-read "test: " (mapcar #'number-to-string
diff --git a/app-emacs/ivy/ivy-0.13.4.ebuild b/app-emacs/ivy/ivy-0.13.4.ebuild
new file mode 100644
index 000000000000..9736ba05dfd7
--- /dev/null
+++ b/app-emacs/ivy/ivy-0.13.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.5
+
+inherit elisp
+
+DESCRIPTION="Generic completion mechanism for Emacs"
+HOMEPAGE="https://github.com/abo-abo/swiper/"
+SRC_URI="https://github.com/abo-abo/swiper/archive/${PV}.tar.gz
+ -> swiper-${PV}.tar.gz"
+S="${WORKDIR}"/swiper-${PV}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="sys-apps/texinfo"
+
+DOCS=( CONTRIBUTING.org README.md doc/{ivy-help.org,Changelog.org,ivy.org} )
+ELISP_REMOVE=".dir-locals.el"
+SITEFILE="50${PN}-gentoo.el"
+
+# Some tests are broken (but fixed on master as of 2022--04-10),
+# tests depending on Avy and Wgrep we force to skip.
+PATCHES=( "${FILESDIR}"/${P}-ivy-test.el-skip.patch )
+
+# Main Ivy sources. Swiper, Counsel and Ivy extensions have their own packages.
+IVY_SOURCES=( colir.el ivy{,-overlay,-faces}.el )
+
+src_prepare() {
+ elisp_src_prepare
+
+ # Wipe "elpa.el" to prevent initialization of the "package" library.
+ [[ ! -f elpa.el ]] && die "no \"elpa.el\" found"
+ echo "" > elpa.el || die "failed to wipe \"elpa.el\""
+}
+
+src_compile() {
+ elisp-compile ${IVY_SOURCES[@]}
+
+ emake -C doc ivy.info
+}
+
+src_test() {
+ emake emacs="${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS}" test
+}
+
+src_install() {
+ elisp-install ${PN} ${IVY_SOURCES[@]} *.elc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ doinfo doc/ivy.info
+ einstalldocs
+}
diff --git a/app-emacs/ivy/metadata.xml b/app-emacs/ivy/metadata.xml
new file mode 100644
index 000000000000..37581bba4db7
--- /dev/null
+++ b/app-emacs/ivy/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://raw.githubusercontent.com/abo-abo/swiper/master/doc/Changelog.org
+ https://github.com/abo-abo/swiper/issues/
+ abo-abo/swiper
+ https://oremacs.com/swiper/
+
+
diff --git a/app-emacs/swiper/Manifest b/app-emacs/swiper/Manifest
new file mode 100644
index 000000000000..3cfc2747761f
--- /dev/null
+++ b/app-emacs/swiper/Manifest
@@ -0,0 +1,4 @@
+AUX 50swiper-gentoo.el 108 BLAKE2B fae1fd6258927f672a77b42eb6c826fa246d77e6ce5984c923d272001a6e7f4b523c47fcdec7103845e9705b43cea7e9a91904f6ef0f56fae4de8aa507d57d75 SHA512 1fab726ea0f7288a3f8daee32f2b70f4ca59de0e31144bc88c405a3418f342eb56d96c09754b118831aa33c55e64db8ee9e0df18821d20c1bbf2df4a4034142f
+DIST swiper-0.13.4.tar.gz 245190 BLAKE2B c4da021b92fcedfec39cc60f670c97e4a421b8d4aef8183f50c4872bed835db79884cff113f58cf21dfa7ce33158218aa0cf25d72fc0081dc1c24a3b4376c60e SHA512 bf096a13f675f87af6ea68c974455896b64921ca4d7880c9ccc444aa3cea7c7e04c61be5deb2fd57d0568ff4d86f96ffcf94494b55d84d7a9f647f49b69aec9a
+EBUILD swiper-0.13.4.ebuild 714 BLAKE2B 19c63ae56138b0fcff5a0d410fdbafbf8825a78723c7826100f833c0ba5c1735b446d9cc201fb5a1cf4475aafaa04d7c60c3149161d0d14a4aec80383459dcb6 SHA512 638c3f0c867abf74145bac09b092558983b0f6e1669c538e2c73b44eaafbe83ab324a0ed34a8538cc12c1176654af76f88eee701b03e6c8c2cd7b292a9157523
+MISC metadata.xml 571 BLAKE2B 26ca5a5dfb1bc67ad37086ddc2c2e5976d1b4c763789a27ee83fb08c4a106a21c33b4c9632a3f2858a6b6249c8c49da3e2eafa7efc5267b655c0c9b2066598e2 SHA512 1879881be5eaeb2a6bac023fd06476a2ccbd25909f7c2f722b4af3680db44b4d3a959e1ac864e86580813a0bc68a2120d936f1c2efd67a6738ee8d83a5adb6f4
diff --git a/app-emacs/swiper/files/50swiper-gentoo.el b/app-emacs/swiper/files/50swiper-gentoo.el
new file mode 100644
index 000000000000..321a3b779ff1
--- /dev/null
+++ b/app-emacs/swiper/files/50swiper-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'swiper "swiper"
+ "`isearch-forward' with an overview." t)
diff --git a/app-emacs/swiper/metadata.xml b/app-emacs/swiper/metadata.xml
new file mode 100644
index 000000000000..37581bba4db7
--- /dev/null
+++ b/app-emacs/swiper/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ https://raw.githubusercontent.com/abo-abo/swiper/master/doc/Changelog.org
+ https://github.com/abo-abo/swiper/issues/
+ abo-abo/swiper
+ https://oremacs.com/swiper/
+
+
diff --git a/app-emacs/swiper/swiper-0.13.4.ebuild b/app-emacs/swiper/swiper-0.13.4.ebuild
new file mode 100644
index 000000000000..2f7a22c9eec8
--- /dev/null
+++ b/app-emacs/swiper/swiper-0.13.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.5
+
+inherit elisp
+
+DESCRIPTION="Alternative to isearch that uses ivy to show overview of all matches"
+HOMEPAGE="https://github.com/abo-abo/swiper/"
+SRC_URI="https://github.com/abo-abo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test" # Ivy, Swiper and Counsel tests are performed in app-emacs/ivy
+
+RDEPEND=">=app-emacs/ivy-${PV}"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp-compile ${PN}.el
+}
+
+src_install() {
+ elisp-install ${PN} ${PN}.el{,c}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 524b328bd6a9..dd8e727ffa65 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index a2c092a6e9e8..794ea33db33f 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,6 +1,7 @@
+AUX virt-manager-4.0.0-setuptools-61-fix.patch 993 BLAKE2B e129b16cdfb1fb819f4cc8e99b67c28a259de92e62254ddd6d2fd4920ab1713cfb3329d219d692a37b963eff6dedfef36e5e5763ec25d7ce736767d17c52966e SHA512 eb0ec5d9cd73ce35b0c0cc75413e607bb57854a0430ef509acbc438d829ba84dc06441f8b333133c2de7cd423b3110faa0b5012eeff72e594905376b716265fa
DIST virt-manager-3.2.0.tar.gz 2858909 BLAKE2B 83bd8589fb7d9c855300e06689fdeeeee575e354f9349b5bc63ff1da1a8b578a842f6f60d95a8b8fa53ed007c090d37f706f50fb8dcbcee83c08e27853a150cc SHA512 90cd98fe6b269007cd30f628490c65df440abe39b4925c65dc80667e7d80d059752695353ccf6ac3e2436206da311bc402eda50df31874d82ef8fe115966e1ec
DIST virt-manager-4.0.0.tar.gz 3096236 BLAKE2B cf6ae282c6a351aab832a06387bf9daf9093c8cce3688cf0597f33d037db875638429a5320ffe28d8d860c83484ba5d6a02a8dc758c98914fa2af483552dede8 SHA512 115dc3feb499bb2f1f6df537bffe150d23b9b568fe8047d43577a138ff9b9180b10259dde3476136cdc85750576da1104e81a8c2f5761b4f2a89852467761f81
EBUILD virt-manager-3.2.0-r1.ebuild 2566 BLAKE2B 9fdea4cfaa4d6cbe5f9b9000695ebd02c8e2c4d9d4ed0222a90690f977f72de63f997187295b13c110242b016003bf693ac032e2edc59eea2b3ea6fd81436336 SHA512 72f75dd06013f473c8620e726a49dde64b20137d1020f7bab0933c3b79ec515eeeae50b592661eba25a0ad57995b06c780dde7b49fe0407141e8cc8a1c0f25e7
-EBUILD virt-manager-4.0.0.ebuild 2582 BLAKE2B 0d108df21ae9bbf274cffbceb86316c7fcfd08263d19214b8f4719b300137b25d5e2784818b460fd2c8be19f8ef14dde2b4bfd18edd5ade14048d79890ed8b24 SHA512 56723af37f1ce09120182e8948f4d77dc5554df81607c15f781bae62b39d6b2c71e8fc3ebaa40b85a81cda6928deab423d19f5440d8bdacf0ddd6a8945c8cf26
-EBUILD virt-manager-9999.ebuild 2569 BLAKE2B 283f21214824727cc312333de65e679abb1d828529c925bc0974776c0c4359e668e74ac8c7b3cd18c4b25051dabf9a8478246411534e0ce62e356d78d26d206e SHA512 5229ef5b1800803385e62196ce8b1dce9e234802e14653670f7b734098deb6ba81f259075e81a3f65bfec97a4c045beb417d85cb0fbd4019eee426c7c5008a21
+EBUILD virt-manager-4.0.0.ebuild 2609 BLAKE2B 74dde12b583551db6aa611046f482353a9ef777ae390f617fb10484e20e2225984e75ffa055d5c822a9607f4e761b4ce5b781d27ea38287d27c009464a13e706 SHA512 4ff3510f4be3bdd1b124f8ec1349920462f07ca9440f6b0c099cb323b306b75185b44e84156273b03fd4ed5ada735bec876e90d3ead99d2d7eed021778796138
+EBUILD virt-manager-9999.ebuild 2524 BLAKE2B 2ec7855cb1f40cbcfe9fc44268a67f232b363afb02beae4450360863721cb08cbc326df90464bc1541585d536dc4b8f699044788c84101cd8249b7ed956bfccf SHA512 8f07683cb85c6ccf57c76ab1451e5beee44dbb8bae4f4a7416e73359d544f5a191e0fcc45da7ba567db87a18c7b3d322a537cc5fd0f4f0ed5d7ffd79db873849
MISC metadata.xml 663 BLAKE2B a8a1b7a90bab2c9ea216c0acf8fc26ee70626dcfe6f171c878edc711f6134911f74282fe7f1feb7725ddcd9cf4d650d145cdfe4143d1e844f380ab9d516178c9 SHA512 f1144dba3cc161096d5564da8264c04552b733085d12a9ccce5f4d74c0a73fb528fe89cc4e709539300151b60e70d1e8a318f15b8474982a32da9360a98c520d
diff --git a/app-emulation/virt-manager/files/virt-manager-4.0.0-setuptools-61-fix.patch b/app-emulation/virt-manager/files/virt-manager-4.0.0-setuptools-61-fix.patch
new file mode 100644
index 000000000000..ace16902486c
--- /dev/null
+++ b/app-emulation/virt-manager/files/virt-manager-4.0.0-setuptools-61-fix.patch
@@ -0,0 +1,34 @@
+From c6fc4524d4448259ea85f93f85898b64a4380154 Mon Sep 17 00:00:00 2001
+From: Peter Alfredsen
+Date: Tue, 5 Apr 2022 22:04:20 +0200
+Subject: [PATCH] setup: add bits for setuptools-61
+
+Quoting https://github.com/pypa/setuptools/issues/3227
+"Setuptools >= 61, intentionally changes the way packages are built in the
+ sensec that it will try to find files and fail if something is weird.
+
+ Empty packages (like this one), are asked to explicitly add packages=[]
+ to their configuration.
+
+ This intentional change in behaviour is described in
+ https://setuptools.pypa.io/en/latest/history.html#v61-0-0."
+
+Bug: https://bugs.gentoo.org/836645
+Signed-off-by: Peter Alfredsen
+---
+ setup.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup.py b/setup.py
+index e95acd39..7e47e7c7 100755
+--- a/setup.py
++++ b/setup.py
+@@ -547,4 +547,5 @@ setuptools.setup(
+ },
+
+ distclass=VMMDistribution,
++ packages=[],
+ )
+--
+2.35.1
+
diff --git a/app-emulation/virt-manager/virt-manager-4.0.0.ebuild b/app-emulation/virt-manager/virt-manager-4.0.0.ebuild
index fa0f4663c4b9..59336c29fbcc 100644
--- a/app-emulation/virt-manager/virt-manager-4.0.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-4.0.0.ebuild
@@ -54,11 +54,12 @@ DOCS=( README.md NEWS.md )
# Doesn't seem to play nicely in a sandboxed environment.
RESTRICT="test"
-distutils_enable_tests pytest
-src_prepare() {
- distutils-r1_src_prepare
-}
+PATCHES=(
+ "${FILESDIR}"/virt-manager-4.0.0-setuptools-61-fix.patch
+)
+
+distutils_enable_tests pytest
python_configure() {
esetup.py configure --default-graphics=spice
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 0f88e40eceea..b596c743f947 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -50,13 +50,9 @@ RDEPEND="${PYTHON_DEPS}
DEPEND="${RDEPEND}"
BDEPEND="dev-python/docutils"
-distutils_enable_tests pytest
-
DOCS=( README.md NEWS.md )
-src_prepare() {
- distutils-r1_src_prepare
-}
+distutils_enable_tests pytest
python_configure() {
esetup.py configure --default-graphics=spice
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index d67c6d6a73fc..733bf9775022 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -7,9 +7,9 @@ DIST wine-staging-7.3.tar.gz 9668058 BLAKE2B 9721fac9728f883309d430fa51221de31d6
DIST wine-staging-7.4.tar.gz 9669176 BLAKE2B b689ace69e9599aada78dacf7f64cc126d0c488d8cbeb6b874d4fa0ba92dfdace88d3a6fd84aceb76a39749fb872d6d23f57044d406944634a24fc77577cc593 SHA512 15e1cbb121b9dfb19ef3754e51f21cb42925daae6e8bf09d192cb46139bee3c3c3fcbb9172e88695a0afaf9f788751d5f8d2055f316972e3efc536570d4401ba
DIST wine-staging-7.5.tar.gz 9669503 BLAKE2B dbc307bebd50f67ea7718d1409734cc724551f1ca5ea359dd0eeb050bb5a74deb1f5732cff74dd07526f719a1ab342ae821d5ecba850f2e1c684256586205668 SHA512 138456d1fd76fa433afe01cd1d2cadb88c631277f69734641f1136795f0761a68fdfc564b9da90a342ff42e82f04436b70bb57913f92417b14e24cd7720a7b90
DIST wine-staging-7.6.tar.gz 9668909 BLAKE2B aa7860c22b10cf7aa29fa5903e5628cd36bf8b8488fc5909b92a462ddfa134a44cd2f85e2396266127d442dc38e172b94dac145507a4f84e0867436b112a16a4 SHA512 83bc03e7f8ee4bf21465d05de22449f26480675129b6b533865c31505e09144554c2d14cfa5c9b867d3ba4273e5acd4589d32231f79a15f3f0e8b3493d32b50d
-EBUILD wine-staging-7.3.ebuild 20294 BLAKE2B 4ce326c41a7f3c12e506b21d76eaa93c3f946f8afba7d3ab72335eeacec33feea55c098949c0ca5e442baeb7ccf3713f480f6a132fa5bdb986b9f71316e5d165 SHA512 02a5ee87fc0a5c986099daca10c4adf1bfe3f92055bd67809927e3a0ad9a886271504d82a24e9df44855b116cccf4e0b0df848784cb55997e360ea853ce94100
-EBUILD wine-staging-7.4.ebuild 20306 BLAKE2B bd60ae94644f733e1f25669f4a1c34026f12debe77a5350f815d238e1e5679b9e234b202913069a3cc5f21655ba4bf0a1f66754d73df400d4bd7afc668f06a64 SHA512 45b1fc5d4322e7e44d5c6e94b98bb4f09eb5b3ad6e1668c97f25557437d1254990bfc2074041455b641f5d5f8c96a9fcc23627704205904f9069c35c4752e4cc
-EBUILD wine-staging-7.5.ebuild 20370 BLAKE2B bb1dfb9f4325e2218fb219c3554509ddbc3353055d981a031e519a9e559c9e6651c45cd5b5aa34e7d82b7667417aa6aae8ed231403cb9cc891340cccf161ea30 SHA512 c705de7e455d038b30d6829fb2500ad994bbc7e7be03f18d35daa446c25a7750614d165abb268769b56dd27bdc190d621cf07f753726bbb8dc5752fd8fa1c92b
-EBUILD wine-staging-7.6.ebuild 20370 BLAKE2B 52f0113e8d3e5901ac375f0d3c969563a65c7b53897179998a1d58ff9a70debae847e11b98b8244cd57abe6b17a5626ab88bb9843d4e1b4dea39a5e716449717 SHA512 a00624dacfb03acaac7e92cd3a769b5fcabbf4941f787e2dc6cde18587c8636384ea805ff2a0155986d63de437f9eaa4795b72f511a40bf13a2116e5ebef8500
-EBUILD wine-staging-9999.ebuild 20370 BLAKE2B 52f0113e8d3e5901ac375f0d3c969563a65c7b53897179998a1d58ff9a70debae847e11b98b8244cd57abe6b17a5626ab88bb9843d4e1b4dea39a5e716449717 SHA512 a00624dacfb03acaac7e92cd3a769b5fcabbf4941f787e2dc6cde18587c8636384ea805ff2a0155986d63de437f9eaa4795b72f511a40bf13a2116e5ebef8500
+EBUILD wine-staging-7.3.ebuild 20333 BLAKE2B fd6e05c036a2fb3e918fb75b74ae06c69dafae82b64ef2282e1eb131c8fcfc4f2db6f5f3d13a890cc39cdc6500286c0f22ceadecf268db4eee80400a2f1d4041 SHA512 111450cd7c2184b71cbabac9474a90b84cd9cb696142b5c1854b20ca7928b0157cd8d963f6ea0766423d2218ce6b2f8d48b01f31dc06d4645984cd592f28f15a
+EBUILD wine-staging-7.4.ebuild 20333 BLAKE2B fd6e05c036a2fb3e918fb75b74ae06c69dafae82b64ef2282e1eb131c8fcfc4f2db6f5f3d13a890cc39cdc6500286c0f22ceadecf268db4eee80400a2f1d4041 SHA512 111450cd7c2184b71cbabac9474a90b84cd9cb696142b5c1854b20ca7928b0157cd8d963f6ea0766423d2218ce6b2f8d48b01f31dc06d4645984cd592f28f15a
+EBUILD wine-staging-7.5.ebuild 20333 BLAKE2B fd6e05c036a2fb3e918fb75b74ae06c69dafae82b64ef2282e1eb131c8fcfc4f2db6f5f3d13a890cc39cdc6500286c0f22ceadecf268db4eee80400a2f1d4041 SHA512 111450cd7c2184b71cbabac9474a90b84cd9cb696142b5c1854b20ca7928b0157cd8d963f6ea0766423d2218ce6b2f8d48b01f31dc06d4645984cd592f28f15a
+EBUILD wine-staging-7.6.ebuild 20333 BLAKE2B f2cbe68c19306b348d2a258532f9836736fbc446c26794d2f9824c227c22f679cee133ebc106c035d11d56244c2e95768156ea0d3d63e3cc7784a2c1fbcd2929 SHA512 fbd886a1de728497e3c83fe48cd20174fe40ea339dcde9501fe088dccd17fb5ebdadace71b0a21905f5893d352c5e378268fe50a469ef336164c6463436e4c41
+EBUILD wine-staging-9999.ebuild 20333 BLAKE2B f2cbe68c19306b348d2a258532f9836736fbc446c26794d2f9824c227c22f679cee133ebc106c035d11d56244c2e95768156ea0d3d63e3cc7784a2c1fbcd2929 SHA512 fbd886a1de728497e3c83fe48cd20174fe40ea339dcde9501fe088dccd17fb5ebdadace71b0a21905f5893d352c5e378268fe50a469ef336164c6463436e4c41
MISC metadata.xml 3508 BLAKE2B 9746414e926a61c411904701eb90034e1e883bf69079057d3dcd22e939677afa8b79845e27e319b80ecff3ff64bb900f3a87b64644e8eb93665e8e3e9d6a4a98 SHA512 a903a74c39cbf2788c54af794b8b235e8477b2af9637d9a774bce073181264eb60aae15dfda4009e913fe24831d20c0f8e40a43b61d1e7853a2282315aef98ff
diff --git a/app-emulation/wine-staging/wine-staging-7.3.ebuild b/app-emulation/wine-staging/wine-staging-7.3.ebuild
index 5c6ad86fddc9..700f6788f5a7 100644
--- a/app-emulation/wine-staging/wine-staging-7.3.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.3.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
PLOCALE_BACKUP="en"
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
+inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolchain-funcs virtualx wrapper xdg-utils
MY_PN="${PN%%-*}"
MY_PV="${PV/_/-}"
MY_P="${MY_PN}-${MY_PV}"
@@ -61,6 +61,11 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
# or fail due to Xvfb's opengl limitations.
RESTRICT="test"
+BDEPEND="mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
+ sys-devel/flex
+ virtual/yacc
+ virtual/pkgconfig"
+
COMMON_DEPEND="
X? (
x11-libs/libXcursor[${MULTILIB_USEDEP}]
@@ -114,7 +119,6 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
app-emulation/wine-desktop-common
>app-eselect/eselect-wine-0.3
- !app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
mono? ( app-emulation/wine-mono:7.1.1 )
@@ -131,10 +135,8 @@ RDEPEND="${COMMON_DEPEND}
# tools/make_requests requires perl
DEPEND="${COMMON_DEPEND}
- sys-devel/flex
+ ${BDEPEND}
>=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
X? ( x11-base/xorg-proto )
staging? (
dev-lang/perl
@@ -275,8 +277,8 @@ pkg_pretend() {
# Verify OSS support
if use oss; then
if ! has_version ">=media-sound/oss-4"; then
- eerror "You cannot build wine with USE=oss without having support from a"
- eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+ eerror "You cannot build wine with USE=oss without having support from"
+ eerror ">=media-sound/oss-4 (only available through external repos)"
eerror
die
fi
@@ -544,12 +546,12 @@ multilib_src_install_all() {
find "${ED}" -name *.la -delete || die
if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
- "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
fi
- use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+ use abi_x86_32 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine64{,-preloader}
# Avoid double prefix from dosym and make_wrapper
MY_PREFIX=${MY_PREFIX#${EPREFIX}}
@@ -564,7 +566,7 @@ multilib_src_install_all() {
# Make wrappers for binaries for handling multiple variants
# Note: wrappers instead of symlinks because some are shell which use basename
local b
- for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+ for b in "${ED%}${MY_PREFIX}"/bin/*; do
make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
done
eshopts_pop
diff --git a/app-emulation/wine-staging/wine-staging-7.4.ebuild b/app-emulation/wine-staging/wine-staging-7.4.ebuild
index cf584a42b185..700f6788f5a7 100644
--- a/app-emulation/wine-staging/wine-staging-7.4.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.4.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
PLOCALE_BACKUP="en"
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
+inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolchain-funcs virtualx wrapper xdg-utils
MY_PN="${PN%%-*}"
MY_PV="${PV/_/-}"
MY_P="${MY_PN}-${MY_PV}"
@@ -48,7 +48,7 @@ fi
LICENSE="LGPL-2.1"
SLOT="${MY_PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -61,6 +61,11 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
# or fail due to Xvfb's opengl limitations.
RESTRICT="test"
+BDEPEND="mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
+ sys-devel/flex
+ virtual/yacc
+ virtual/pkgconfig"
+
COMMON_DEPEND="
X? (
x11-libs/libXcursor[${MULTILIB_USEDEP}]
@@ -114,7 +119,6 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
app-emulation/wine-desktop-common
>app-eselect/eselect-wine-0.3
- !app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
mono? ( app-emulation/wine-mono:7.1.1 )
@@ -131,10 +135,8 @@ RDEPEND="${COMMON_DEPEND}
# tools/make_requests requires perl
DEPEND="${COMMON_DEPEND}
- sys-devel/flex
+ ${BDEPEND}
>=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
X? ( x11-base/xorg-proto )
staging? (
dev-lang/perl
@@ -275,8 +277,8 @@ pkg_pretend() {
# Verify OSS support
if use oss; then
if ! has_version ">=media-sound/oss-4"; then
- eerror "You cannot build wine with USE=oss without having support from a"
- eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+ eerror "You cannot build wine with USE=oss without having support from"
+ eerror ">=media-sound/oss-4 (only available through external repos)"
eerror
die
fi
@@ -544,12 +546,12 @@ multilib_src_install_all() {
find "${ED}" -name *.la -delete || die
if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
- "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
fi
- use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+ use abi_x86_32 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine64{,-preloader}
# Avoid double prefix from dosym and make_wrapper
MY_PREFIX=${MY_PREFIX#${EPREFIX}}
@@ -564,7 +566,7 @@ multilib_src_install_all() {
# Make wrappers for binaries for handling multiple variants
# Note: wrappers instead of symlinks because some are shell which use basename
local b
- for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+ for b in "${ED%}${MY_PREFIX}"/bin/*; do
make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
done
eshopts_pop
diff --git a/app-emulation/wine-staging/wine-staging-7.5.ebuild b/app-emulation/wine-staging/wine-staging-7.5.ebuild
index 1ad582f1f5d0..700f6788f5a7 100644
--- a/app-emulation/wine-staging/wine-staging-7.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.5.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
PLOCALE_BACKUP="en"
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
+inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolchain-funcs virtualx wrapper xdg-utils
MY_PN="${PN%%-*}"
MY_PV="${PV/_/-}"
MY_P="${MY_PN}-${MY_PV}"
@@ -61,6 +61,11 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
# or fail due to Xvfb's opengl limitations.
RESTRICT="test"
+BDEPEND="mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
+ sys-devel/flex
+ virtual/yacc
+ virtual/pkgconfig"
+
COMMON_DEPEND="
X? (
x11-libs/libXcursor[${MULTILIB_USEDEP}]
@@ -114,10 +119,8 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
app-emulation/wine-desktop-common
>app-eselect/eselect-wine-0.3
- !app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
- mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
mono? ( app-emulation/wine-mono:7.1.1 )
perl? (
dev-lang/perl
@@ -132,10 +135,8 @@ RDEPEND="${COMMON_DEPEND}
# tools/make_requests requires perl
DEPEND="${COMMON_DEPEND}
- sys-devel/flex
+ ${BDEPEND}
>=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
X? ( x11-base/xorg-proto )
staging? (
dev-lang/perl
@@ -545,12 +546,12 @@ multilib_src_install_all() {
find "${ED}" -name *.la -delete || die
if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
- "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
fi
- use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+ use abi_x86_32 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine64{,-preloader}
# Avoid double prefix from dosym and make_wrapper
MY_PREFIX=${MY_PREFIX#${EPREFIX}}
@@ -565,7 +566,7 @@ multilib_src_install_all() {
# Make wrappers for binaries for handling multiple variants
# Note: wrappers instead of symlinks because some are shell which use basename
local b
- for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+ for b in "${ED%}${MY_PREFIX}"/bin/*; do
make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
done
eshopts_pop
diff --git a/app-emulation/wine-staging/wine-staging-7.6.ebuild b/app-emulation/wine-staging/wine-staging-7.6.ebuild
index d5b2574f8535..247c7d6f1c35 100644
--- a/app-emulation/wine-staging/wine-staging-7.6.ebuild
+++ b/app-emulation/wine-staging/wine-staging-7.6.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
PLOCALE_BACKUP="en"
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
+inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolchain-funcs virtualx wrapper xdg-utils
MY_PN="${PN%%-*}"
MY_PV="${PV/_/-}"
MY_P="${MY_PN}-${MY_PV}"
@@ -61,6 +61,11 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
# or fail due to Xvfb's opengl limitations.
RESTRICT="test"
+BDEPEND="mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
+ sys-devel/flex
+ virtual/yacc
+ virtual/pkgconfig"
+
COMMON_DEPEND="
X? (
x11-libs/libXcursor[${MULTILIB_USEDEP}]
@@ -114,10 +119,8 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
app-emulation/wine-desktop-common
>app-eselect/eselect-wine-0.3
- !app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
- mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
mono? ( app-emulation/wine-mono:7.2.0 )
perl? (
dev-lang/perl
@@ -132,10 +135,8 @@ RDEPEND="${COMMON_DEPEND}
# tools/make_requests requires perl
DEPEND="${COMMON_DEPEND}
- sys-devel/flex
+ ${BDEPEND}
>=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
X? ( x11-base/xorg-proto )
staging? (
dev-lang/perl
@@ -545,12 +546,12 @@ multilib_src_install_all() {
find "${ED}" -name *.la -delete || die
if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
- "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
fi
- use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+ use abi_x86_32 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine64{,-preloader}
# Avoid double prefix from dosym and make_wrapper
MY_PREFIX=${MY_PREFIX#${EPREFIX}}
@@ -565,7 +566,7 @@ multilib_src_install_all() {
# Make wrappers for binaries for handling multiple variants
# Note: wrappers instead of symlinks because some are shell which use basename
local b
- for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+ for b in "${ED%}${MY_PREFIX}"/bin/*; do
make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
done
eshopts_pop
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index d5b2574f8535..247c7d6f1c35 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
PLOCALE_BACKUP="en"
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
+inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolchain-funcs virtualx wrapper xdg-utils
MY_PN="${PN%%-*}"
MY_PV="${PV/_/-}"
MY_P="${MY_PN}-${MY_PV}"
@@ -61,6 +61,11 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
# or fail due to Xvfb's opengl limitations.
RESTRICT="test"
+BDEPEND="mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
+ sys-devel/flex
+ virtual/yacc
+ virtual/pkgconfig"
+
COMMON_DEPEND="
X? (
x11-libs/libXcursor[${MULTILIB_USEDEP}]
@@ -114,10 +119,8 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
app-emulation/wine-desktop-common
>app-eselect/eselect-wine-0.3
- !app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
- mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
mono? ( app-emulation/wine-mono:7.2.0 )
perl? (
dev-lang/perl
@@ -132,10 +135,8 @@ RDEPEND="${COMMON_DEPEND}
# tools/make_requests requires perl
DEPEND="${COMMON_DEPEND}
- sys-devel/flex
+ ${BDEPEND}
>=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
X? ( x11-base/xorg-proto )
staging? (
dev-lang/perl
@@ -545,12 +546,12 @@ multilib_src_install_all() {
find "${ED}" -name *.la -delete || die
if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
- "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
fi
- use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+ use abi_x86_32 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine64{,-preloader}
# Avoid double prefix from dosym and make_wrapper
MY_PREFIX=${MY_PREFIX#${EPREFIX}}
@@ -565,7 +566,7 @@ multilib_src_install_all() {
# Make wrappers for binaries for handling multiple variants
# Note: wrappers instead of symlinks because some are shell which use basename
local b
- for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+ for b in "${ED%}${MY_PREFIX}"/bin/*; do
make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
done
eshopts_pop
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 3859825d62c1..30359d1e56ac 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -7,10 +7,11 @@ DIST wine-7.4.tar.xz 27538164 BLAKE2B bad6abb8d6aa5a0f08c64e4a96b5a6f81b129e4c3e
DIST wine-7.5.tar.xz 27702532 BLAKE2B e0490d5ca8ef8dc6de807eea9f06e0dd09512dfa34aebf3a2ccbf610ad78fd09c94e3368f92966a92d80e39cd86da71bcd4a7803e1af9f7f3c8ba4cc33b72447 SHA512 70458d702e04075915a97a12c5ebd33ec50cbb094f5f837e6bb498e24ee48630359d819d9689e84d29708398162ca7b8f7737216fb31c350701b66733da98616
DIST wine-7.6.tar.xz 27674208 BLAKE2B 9c1abafca0e489876500e4640e6087456f0f93f544fba547541bc454aae5a8cb757454b1c863edc6f70cbd5a8ef848a8bdb3d6f9aaae471b97891a0a188ec640 SHA512 7eabae6e40df187da977ff412adda23697f8cd5f6c4e565d3fff74770f13f7c93ca3d81e77a72a1b929d7af675499e72925e4ab2225b5ca13ef0d88baf1f9646
EBUILD wine-vanilla-6.0.2.ebuild 18815 BLAKE2B a862e10329dbeca83ada51b2a32262e9aae786d372b53027e4b959553373a146dd46896ee304044686a654529f2bb338cd0e91dbc540c73bbdea44c2b173fb89 SHA512 7658613abbf2338138048fe07cd50b0ec681de9a9811f546b7f5fb4abcac709fc011c7e0c0b1137aac63dc77e4736ace0aac34bf6be339e5e219dd9061f90d34
+EBUILD wine-vanilla-7.0-r1.ebuild 17666 BLAKE2B 0b04232aea5b1de61b9ce0a9759ee7612096122996da6591b643598082145bed361847dcede838cd96b000bab967e880a22417c282d33637e7029714f5335673 SHA512 2549a983d128e6318dde9042e4efab6d0e5c49821b4dee8aca7c2bb6d7cd4f507a710cb1ad8302ef07786a6d96b34a682c860cd9b9c6886f1315525299f365fd
EBUILD wine-vanilla-7.0.ebuild 17626 BLAKE2B 6b39ae043d9704dac40066c931bca49835a91987d305f83fac4707df44cf26b76fd4b492a7ef3f244b8aa8ea6b2a509c3685bbe355b1b53d7fcd05ef691253e6 SHA512 225cc1627057f8795891e5baa178dd9b9ff5b6f2359d0ebf58409750310ec9927770a81844b9a81344acb7bfed9aa64ae7d05a7d573294b771c60079c8a551e3
-EBUILD wine-vanilla-7.3.ebuild 17627 BLAKE2B 3ad8d8aff3e69e8ed4f3f34bae86ebf184d4390983c010c826d8508410d0316829a9f51404bdffb2560c3d4bd5012fb7c003badbdc2cef5d3882b88e4b42068e SHA512 49eebfe34afacef58c8991db34065566c515dabdc54b9935262c5f1533f0a97bb89ef6a1e895a938f21bb67a0eb09b2f36165fe688c885817a82aa72c13e55f5
-EBUILD wine-vanilla-7.4.ebuild 17639 BLAKE2B 50c4b30cdb46bffb68d0d04c7cd16625e0acc237aacfcb2457af409e480dd23b9e55870961ec5fb54cf3c4b2d55a66dc55479333d143d4ab264c07ef76fedd8f SHA512 c8f59592e0efabdb61299ba5fa093efe69bbf6dad373b68f6f5f9d84227960f153dabb82b3edb6fa6d5291fae0a221b0be5c6cca972f21d87527a5c1ba283e43
-EBUILD wine-vanilla-7.5.ebuild 17703 BLAKE2B 65893fb88b0f62918733239d585b479b8b9225f7cea1f9e4313601b27e74e02a2c270e038245bb97968608ba0bae92557c88b418a28285c5b5502df1da515d42 SHA512 27f45a433910f8b2dccc8a5b039f781b117f5f731e9f28d7107086a73c07ea6ce90f079a1b2de3dee3bd708c5ddda3a082ba67621c36c8262db1fd6fe8c5b442
-EBUILD wine-vanilla-7.6.ebuild 17703 BLAKE2B 8a95ea49611d61d99ae3bef106384081af61a093762be02efea29a119b57447b412bcb5320c55d4c7f85e4cd9846a4711ce67b2b24fb03af1204f9655940a8b2 SHA512 e0cf0523a36944670491cd770d8b4efdcd2377089cb3c47571c8e8a9fd7d88892c2bbaf36598113e85d9186be8097e76ba7f5ac724a490078d47b41c7b199c34
-EBUILD wine-vanilla-9999.ebuild 17703 BLAKE2B 8a95ea49611d61d99ae3bef106384081af61a093762be02efea29a119b57447b412bcb5320c55d4c7f85e4cd9846a4711ce67b2b24fb03af1204f9655940a8b2 SHA512 e0cf0523a36944670491cd770d8b4efdcd2377089cb3c47571c8e8a9fd7d88892c2bbaf36598113e85d9186be8097e76ba7f5ac724a490078d47b41c7b199c34
+EBUILD wine-vanilla-7.3.ebuild 17666 BLAKE2B 0cf524ade57fbaab7fe84ce54cd5353481bbf72e4c09a1bcb397eb34e10ec767b687aa9b71ae2f696edf7814708c02d74a9183708b05e00548f92d1d336da4cf SHA512 5b280f5677403068e9724f7234cf1ec787299acfda3b99feefc20c69b492f7473e4b6ba400c6a4516f1cba4960799016cb8af10f6f4b21ca91b2455f0f0ea528
+EBUILD wine-vanilla-7.4.ebuild 17666 BLAKE2B 0cf524ade57fbaab7fe84ce54cd5353481bbf72e4c09a1bcb397eb34e10ec767b687aa9b71ae2f696edf7814708c02d74a9183708b05e00548f92d1d336da4cf SHA512 5b280f5677403068e9724f7234cf1ec787299acfda3b99feefc20c69b492f7473e4b6ba400c6a4516f1cba4960799016cb8af10f6f4b21ca91b2455f0f0ea528
+EBUILD wine-vanilla-7.5.ebuild 17666 BLAKE2B 0cf524ade57fbaab7fe84ce54cd5353481bbf72e4c09a1bcb397eb34e10ec767b687aa9b71ae2f696edf7814708c02d74a9183708b05e00548f92d1d336da4cf SHA512 5b280f5677403068e9724f7234cf1ec787299acfda3b99feefc20c69b492f7473e4b6ba400c6a4516f1cba4960799016cb8af10f6f4b21ca91b2455f0f0ea528
+EBUILD wine-vanilla-7.6.ebuild 17666 BLAKE2B a0a723da507bdf5fce4fcec5fe1fd50e04b870ec82c3450d2f8a157b2a7f9300efe5dedd59acdaf437004d8fac680448479dcc7b7fbae5fb5325083ca7cb0a7b SHA512 2a80f316510a7307b4f93ab7404c374c5193422f6f3c2bc61c411e5ec96950638f8f7ca3443cf1e53555fbf3ce173cc15954ab08fb44c4d852c2e46575204e1d
+EBUILD wine-vanilla-9999.ebuild 17666 BLAKE2B a0a723da507bdf5fce4fcec5fe1fd50e04b870ec82c3450d2f8a157b2a7f9300efe5dedd59acdaf437004d8fac680448479dcc7b7fbae5fb5325083ca7cb0a7b SHA512 2a80f316510a7307b4f93ab7404c374c5193422f6f3c2bc61c411e5ec96950638f8f7ca3443cf1e53555fbf3ce173cc15954ab08fb44c4d852c2e46575204e1d
MISC metadata.xml 3322 BLAKE2B 904d6f935560018eb9d46e62a1caac836bcf33cd082a9e77079c8b82350e3b179d2c2f70e2a02b03cede7b813e6478586127708837c1556f7465736b56f5ae7f SHA512 dbb40789ea04e5e5414e1920a0f2223a0491c83a4ecabf553efd8efe5fc5e8ad45259fbc96c6716ec42862c7b35b1b0e9853b89fa6630f19c9a4db3c6cf90a37
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0-r1.ebuild
new file mode 100644
index 000000000000..96af88c738cd
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0-r1.ebuild
@@ -0,0 +1,543 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolchain-funcs virtualx wrapper xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ #KEYWORDS=""
+else
+ MAJOR_V=$(ver_cut 1)
+ SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
+ KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+GWP_V="20211122"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+ https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+ X? ( truetype )
+ elibc_glibc? ( threads )
+ osmesa? ( opengl )
+ test? ( abi_x86_32 )
+ vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+BDEPEND="mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
+ sys-devel/flex
+ virtual/yacc
+ virtual/pkgconfig"
+
+COMMON_DEPEND="
+ X? (
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ )
+ alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+ capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+ cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+ fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+ gphoto2? (
+ media-libs/libgphoto2:=[${MULTILIB_USEDEP}]
+ virtual/jpeg:0=[${MULTILIB_USEDEP}]
+ )
+ gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+ gstreamer? (
+ media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+ media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+ )
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+ ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+ netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+ nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+ odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+ openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ opengl? (
+ virtual/opengl[${MULTILIB_USEDEP}]
+ )
+ osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+ pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+ pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+ scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+ sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+ ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+ truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+ udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+ udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+ usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
+ v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+ vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
+ vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+ xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
+
+RDEPEND="${COMMON_DEPEND}
+ app-emulation/wine-desktop-common
+ >app-eselect/eselect-wine-0.3
+ dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+ gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+ mono? ( app-emulation/wine-mono:7.0.0 )
+ perl? (
+ dev-lang/perl
+ dev-perl/XML-Simple
+ )
+ pulseaudio? (
+ realtime? ( sys-auth/rtkit )
+ )
+ samba? ( >=net-fs/samba-3.0.25[winbind] )
+ selinux? ( sec-policy/selinux-wine )
+ udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+ ${BDEPEND}
+ >=sys-kernel/linux-headers-2.6
+ X? ( x11-base/xorg-proto )
+ xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+ "${PATCHDIR}/patches/${MY_PN}-6.22-winegcc.patch" #260726
+ "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+ "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+ DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+ # GCC-specific bugs
+ if tc-is-gcc; then
+ # bug #549768
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ ebegin "Checking for gcc-5 ms_abi compiler bug"
+ $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ ( "${T}"/pr66838 || false ) >/dev/null 2>&1
+ if ! eend $?; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
+ fi
+ # bug #574044
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+ ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+ # Compile in subshell to prevent "Aborted" message
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+ if ! eend $?; then
+ eerror "Wine cannot be built with this version of gcc-5.3"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/574044"
+ eerror
+ return 1
+ fi
+ fi
+ fi
+
+ # Ensure compiler support
+ if use abi_x86_64; then
+ ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+ # Compile in subshell to prevent "Aborted" message
+ ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+ if ! eend $?; then
+ eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+ eerror
+ return 1
+ fi
+ fi
+}
+
+wine_build_environment_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ if use abi_x86_64; then
+ if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+ eerror "You need gcc-4.4+ to compile 64-bit wine"
+ die
+ elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+ eerror "You need clang-3.8+ to compile 64-bit wine"
+ die
+ fi
+ fi
+ if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+ ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+ ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+ ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+ fi
+ if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+ if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+ ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
+ ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+ ewarn "See package.env in man 5 portage for more information on how to do this."
+ ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+ fi
+ fi
+
+ if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+ eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+ eerror "See https://bugs.gentoo.org/487864 for more details."
+ eerror
+ return 1
+ fi
+}
+
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${EGIT_COMMIT} ]]; then
+ eerror "Commits must now be specified using the environmental variables"
+ eerror "EGIT_OVERRIDE_COMMIT_WINE"
+ eerror
+ return 1
+ fi
+}
+
+pkg_pretend() {
+ wine_build_environment_check || die
+
+ # Verify OSS support
+ if use oss; then
+ if ! has_version ">=media-sound/oss-4"; then
+ eerror "You cannot build wine with USE=oss without having support from"
+ eerror ">=media-sound/oss-4 (only available through external repos)"
+ eerror
+ die
+ fi
+ fi
+
+ if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
+ eerror
+ eerror "USE=\"mingw\" is currently experimental, and requires the"
+ eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
+ eerror
+ eerror "These can be installed by using 'sys-devel/crossdev':"
+ eerror
+ eerror "crossdev --target i686-w64-mingw32"
+ eerror
+ eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+ eerror
+ die "MinGW build was enabled, but no compiler to support it was found."
+ fi
+
+ if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
+ eerror
+ eerror "USE=\"mingw\" is currently experimental, and requires the"
+ eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
+ eerror
+ eerror "These can be installed by using 'sys-devel/crossdev':"
+ eerror
+ eerror "crossdev --target x86_64-w64-mingw32"
+ eerror
+ eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+ eerror
+ die "MinGW build was enabled, but no compiler to support it was found."
+ fi
+}
+
+pkg_setup() {
+ wine_build_environment_check || die
+ wine_env_vcs_vars || die
+
+ WINE_VARIANT="${PN#wine}-${PV}"
+ WINE_VARIANT="${WINE_VARIANT#-}"
+
+ MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+ MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+ MY_DATADIR="${MY_DATAROOTDIR}"
+ MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+ MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+ MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+ MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+ MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
+ fi
+
+ default
+
+ plocale_find_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+ eapply_bin(){
+ local patch
+ for patch in ${PATCHES_BIN[@]}; do
+ patchbin --nogit < "${patch}" || die
+ done
+ }
+
+ local md5="$(md5sum server/protocol.def)"
+
+ default
+ eapply_bin
+ eautoreconf
+
+ # Modification of the server protocol requires regenerating the server requests
+ if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+ einfo "server/protocol.def was patched; running tools/make_requests"
+ tools/make_requests || die #432348
+ fi
+ sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+ if ! use run-exes; then
+ sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+ fi
+
+ # Edit wine.desktop to work for specific variant
+ sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+ cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+ plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+ # Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+ # Duplicate manpages input files for wine64
+ local f
+ for f in loader/*.man.in; do
+ cp ${f} ${f/wine/wine64} || die
+ done
+ # Add wine64 manpages to Makefile
+ if use abi_x86_64; then
+ sed -i "/wine.man.in/i \
+ \\\twine64.man.in \\\\" loader/Makefile.in || die
+ sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+ fi
+
+ rm_man_file(){
+ local file="${1}"
+ loc=${2}
+ sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+ }
+
+ while read f; do
+ plocale_for_each_disabled_locale rm_man_file "${f}"
+ done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+ wine_compiler_check || die
+
+ export LDCONFIG=/bin/true
+ use custom-cflags || strip-flags
+ if use mingw; then
+ export CROSSCFLAGS="${CFLAGS}"
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --prefix="${MY_PREFIX}"
+ --datarootdir="${MY_DATAROOTDIR}"
+ --datadir="${MY_DATADIR}"
+ --docdir="${MY_DOCDIR}"
+ --includedir="${MY_INCLUDEDIR}"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+ --libexecdir="${MY_LIBEXECDIR}"
+ --localstatedir="${MY_LOCALSTATEDIR}"
+ --mandir="${MY_MANDIR}"
+ --sysconfdir="${EPREFIX}/etc/wine"
+ $(use_with alsa)
+ $(use_with capi)
+ $(use_with cups)
+ $(use_with udisks dbus)
+ $(use_with fontconfig)
+ $(use_with ssl gnutls)
+ $(use_enable gecko mshtml)
+ $(use_with gphoto2 gphoto)
+ $(use_with gssapi)
+ $(use_with gstreamer)
+ --without-hal
+ $(use_with kerberos krb5)
+ $(use_with ldap)
+ # TODO: Will bug 685172 still need special handling?
+ $(use_with mingw)
+ $(use_enable mono mscoree)
+ $(use_with netapi)
+ $(use_with nls gettext)
+ $(use_with openal)
+ $(use_with opencl)
+ $(use_with opengl)
+ $(use_with osmesa)
+ $(use_with oss)
+ $(use_with pcap)
+ $(use_with pulseaudio pulse)
+ $(use_with threads pthread)
+ $(use_with scanner sane)
+ $(use_with sdl)
+ $(use_enable test tests)
+ $(use_with truetype freetype)
+ $(use_with udev)
+ $(use_with unwind)
+ $(use_with usb)
+ $(use_with v4l v4l2)
+ $(use_with vkd3d)
+ $(use_with vulkan)
+ $(use_with X x)
+ $(use_with X xfixes)
+ $(use_with xcomposite)
+ $(use_with xinerama)
+ )
+
+ local PKG_CONFIG
+ # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+ tc-export PKG_CONFIG
+
+ if use amd64; then
+ if [[ ${ABI} == amd64 ]]; then
+ myconf+=( --enable-win64 )
+ else
+ myconf+=( --disable-win64 )
+ fi
+
+ # Note: using --with-wine64 results in problems with multilib.eclass
+ # CC/LD hackery. We're using separate tools instead.
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+ emake depend
+}
+
+multilib_src_test() {
+ # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+ if [[ ${ABI} == x86 ]]; then
+ if [[ $(id -u) == 0 ]]; then
+ ewarn "Skipping tests since they cannot be run under the root user."
+ ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+ return
+ fi
+
+ WINEPREFIX="${T}/.wine-${ABI}" \
+ virtx emake test
+ fi
+}
+
+multilib_src_install_all() {
+ local DOCS=( ANNOUNCE AUTHORS README )
+ add_locale_docs() {
+ local locale_doc="documentation/README.$1"
+ [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+ }
+ plocale_for_each_locale add_locale_docs
+
+ einstalldocs
+ find "${ED}" -name *.la -delete || die
+
+ if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+ rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ fi
+
+ use abi_x86_32 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+ # Avoid double prefix from dosym and make_wrapper
+ MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
+ if use abi_x86_64 && ! use abi_x86_32; then
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+ fi
+
+ # Failglob for binloops, shouldn't be necessary, but including to stay safe
+ eshopts_push -s failglob #615218
+ # Make wrappers for binaries for handling multiple variants
+ # Note: wrappers instead of symlinks because some are shell which use basename
+ local b
+ for b in "${ED%}${MY_PREFIX}"/bin/*; do
+ make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+ done
+ eshopts_pop
+}
+
+pkg_postinst() {
+ eselect wine register ${P}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine register --vanilla ${P} || die
+ fi
+
+ eselect wine update --all --if-unset || die
+
+ xdg_desktop_database_update
+
+ if ! use gecko; then
+ ewarn "Without Wine Gecko, wine prefixes will not have a default"
+ ewarn "implementation of iexplore. Many older windows applications"
+ ewarn "rely upon the existence of an iexplore implementation, so"
+ ewarn "you will likely need to install an external one, like via winetricks"
+ fi
+ if ! use mono; then
+ ewarn "Without Wine Mono, wine prefixes will not have a default"
+ ewarn "implementation of .NET. Many windows applications rely upon"
+ ewarn "the existence of a .NET implementation, so you will likely need"
+ ewarn "to install an external one, like via winetricks"
+ fi
+}
+
+pkg_prerm() {
+ eselect wine deregister ${P}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine deregister --vanilla ${P} || die
+ fi
+
+ eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.3.ebuild
index bc604929a452..35e003de09c0 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.3.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
PLOCALE_BACKUP="en"
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
+inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolchain-funcs virtualx wrapper xdg-utils
MY_PN="${PN%%-*}"
MY_P="${MY_PN}-${PV}"
@@ -47,6 +47,11 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
# or fail due to Xvfb's opengl limitations.
RESTRICT="test"
+BDEPEND="mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
+ sys-devel/flex
+ virtual/yacc
+ virtual/pkgconfig"
+
COMMON_DEPEND="
X? (
x11-libs/libXcursor[${MULTILIB_USEDEP}]
@@ -99,7 +104,6 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
app-emulation/wine-desktop-common
>app-eselect/eselect-wine-0.3
- !app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
mono? ( app-emulation/wine-mono:7.1.1 )
@@ -116,10 +120,8 @@ RDEPEND="${COMMON_DEPEND}
# tools/make_requests requires perl
DEPEND="${COMMON_DEPEND}
- sys-devel/flex
+ ${BDEPEND}
>=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
X? ( x11-base/xorg-proto )
xinerama? ( x11-base/xorg-proto )"
@@ -243,8 +245,8 @@ pkg_pretend() {
# Verify OSS support
if use oss; then
if ! has_version ">=media-sound/oss-4"; then
- eerror "You cannot build wine with USE=oss without having support from a"
- eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+ eerror "You cannot build wine with USE=oss without having support from"
+ eerror ">=media-sound/oss-4 (only available through external repos)"
eerror
die
fi
@@ -477,12 +479,12 @@ multilib_src_install_all() {
find "${ED}" -name *.la -delete || die
if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
- "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
fi
- use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+ use abi_x86_32 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine64{,-preloader}
# Avoid double prefix from dosym and make_wrapper
MY_PREFIX=${MY_PREFIX#${EPREFIX}}
@@ -497,7 +499,7 @@ multilib_src_install_all() {
# Make wrappers for binaries for handling multiple variants
# Note: wrappers instead of symlinks because some are shell which use basename
local b
- for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+ for b in "${ED%}${MY_PREFIX}"/bin/*; do
make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
done
eshopts_pop
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.4.ebuild
index 09120707a07b..35e003de09c0 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.4.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
PLOCALE_BACKUP="en"
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
+inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolchain-funcs virtualx wrapper xdg-utils
MY_PN="${PN%%-*}"
MY_P="${MY_PN}-${PV}"
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -47,6 +47,11 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
# or fail due to Xvfb's opengl limitations.
RESTRICT="test"
+BDEPEND="mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
+ sys-devel/flex
+ virtual/yacc
+ virtual/pkgconfig"
+
COMMON_DEPEND="
X? (
x11-libs/libXcursor[${MULTILIB_USEDEP}]
@@ -99,7 +104,6 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
app-emulation/wine-desktop-common
>app-eselect/eselect-wine-0.3
- !app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
mono? ( app-emulation/wine-mono:7.1.1 )
@@ -116,10 +120,8 @@ RDEPEND="${COMMON_DEPEND}
# tools/make_requests requires perl
DEPEND="${COMMON_DEPEND}
- sys-devel/flex
+ ${BDEPEND}
>=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
X? ( x11-base/xorg-proto )
xinerama? ( x11-base/xorg-proto )"
@@ -243,8 +245,8 @@ pkg_pretend() {
# Verify OSS support
if use oss; then
if ! has_version ">=media-sound/oss-4"; then
- eerror "You cannot build wine with USE=oss without having support from a"
- eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+ eerror "You cannot build wine with USE=oss without having support from"
+ eerror ">=media-sound/oss-4 (only available through external repos)"
eerror
die
fi
@@ -477,12 +479,12 @@ multilib_src_install_all() {
find "${ED}" -name *.la -delete || die
if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
- "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
fi
- use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+ use abi_x86_32 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine64{,-preloader}
# Avoid double prefix from dosym and make_wrapper
MY_PREFIX=${MY_PREFIX#${EPREFIX}}
@@ -497,7 +499,7 @@ multilib_src_install_all() {
# Make wrappers for binaries for handling multiple variants
# Note: wrappers instead of symlinks because some are shell which use basename
local b
- for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+ for b in "${ED%}${MY_PREFIX}"/bin/*; do
make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
done
eshopts_pop
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.5.ebuild
index b0d32d130e61..35e003de09c0 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.5.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.5.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
PLOCALE_BACKUP="en"
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
+inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolchain-funcs virtualx wrapper xdg-utils
MY_PN="${PN%%-*}"
MY_P="${MY_PN}-${PV}"
@@ -47,6 +47,11 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
# or fail due to Xvfb's opengl limitations.
RESTRICT="test"
+BDEPEND="mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
+ sys-devel/flex
+ virtual/yacc
+ virtual/pkgconfig"
+
COMMON_DEPEND="
X? (
x11-libs/libXcursor[${MULTILIB_USEDEP}]
@@ -99,10 +104,8 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
app-emulation/wine-desktop-common
>app-eselect/eselect-wine-0.3
- !app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
- mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
mono? ( app-emulation/wine-mono:7.1.1 )
perl? (
dev-lang/perl
@@ -117,10 +120,8 @@ RDEPEND="${COMMON_DEPEND}
# tools/make_requests requires perl
DEPEND="${COMMON_DEPEND}
- sys-devel/flex
+ ${BDEPEND}
>=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
X? ( x11-base/xorg-proto )
xinerama? ( x11-base/xorg-proto )"
@@ -478,12 +479,12 @@ multilib_src_install_all() {
find "${ED}" -name *.la -delete || die
if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
- "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
fi
- use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+ use abi_x86_32 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine64{,-preloader}
# Avoid double prefix from dosym and make_wrapper
MY_PREFIX=${MY_PREFIX#${EPREFIX}}
@@ -498,7 +499,7 @@ multilib_src_install_all() {
# Make wrappers for binaries for handling multiple variants
# Note: wrappers instead of symlinks because some are shell which use basename
local b
- for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+ for b in "${ED%}${MY_PREFIX}"/bin/*; do
make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
done
eshopts_pop
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.6.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.6.ebuild
index 79e935b29bbb..f8382867c7e8 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.6.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.6.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
PLOCALE_BACKUP="en"
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
+inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolchain-funcs virtualx wrapper xdg-utils
MY_PN="${PN%%-*}"
MY_P="${MY_PN}-${PV}"
@@ -47,6 +47,11 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
# or fail due to Xvfb's opengl limitations.
RESTRICT="test"
+BDEPEND="mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
+ sys-devel/flex
+ virtual/yacc
+ virtual/pkgconfig"
+
COMMON_DEPEND="
X? (
x11-libs/libXcursor[${MULTILIB_USEDEP}]
@@ -99,10 +104,8 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
app-emulation/wine-desktop-common
>app-eselect/eselect-wine-0.3
- !app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
- mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
mono? ( app-emulation/wine-mono:7.2.0 )
perl? (
dev-lang/perl
@@ -117,10 +120,8 @@ RDEPEND="${COMMON_DEPEND}
# tools/make_requests requires perl
DEPEND="${COMMON_DEPEND}
- sys-devel/flex
+ ${BDEPEND}
>=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
X? ( x11-base/xorg-proto )
xinerama? ( x11-base/xorg-proto )"
@@ -478,12 +479,12 @@ multilib_src_install_all() {
find "${ED}" -name *.la -delete || die
if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
- "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
fi
- use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+ use abi_x86_32 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine64{,-preloader}
# Avoid double prefix from dosym and make_wrapper
MY_PREFIX=${MY_PREFIX#${EPREFIX}}
@@ -498,7 +499,7 @@ multilib_src_install_all() {
# Make wrappers for binaries for handling multiple variants
# Note: wrappers instead of symlinks because some are shell which use basename
local b
- for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+ for b in "${ED%}${MY_PREFIX}"/bin/*; do
make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
done
eshopts_pop
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 79e935b29bbb..f8382867c7e8 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
PLOCALE_BACKUP="en"
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
+inherit autotools estack flag-o-matic multilib-minimal pax-utils plocale toolchain-funcs virtualx wrapper xdg-utils
MY_PN="${PN%%-*}"
MY_P="${MY_PN}-${PV}"
@@ -47,6 +47,11 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
# or fail due to Xvfb's opengl limitations.
RESTRICT="test"
+BDEPEND="mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
+ sys-devel/flex
+ virtual/yacc
+ virtual/pkgconfig"
+
COMMON_DEPEND="
X? (
x11-libs/libXcursor[${MULTILIB_USEDEP}]
@@ -99,10 +104,8 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
app-emulation/wine-desktop-common
>app-eselect/eselect-wine-0.3
- !app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
- mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
mono? ( app-emulation/wine-mono:7.2.0 )
perl? (
dev-lang/perl
@@ -117,10 +120,8 @@ RDEPEND="${COMMON_DEPEND}
# tools/make_requests requires perl
DEPEND="${COMMON_DEPEND}
- sys-devel/flex
+ ${BDEPEND}
>=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
X? ( x11-base/xorg-proto )
xinerama? ( x11-base/xorg-proto )"
@@ -478,12 +479,12 @@ multilib_src_install_all() {
find "${ED}" -name *.la -delete || die
if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
- "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ rm "${D%}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
fi
- use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+ use abi_x86_32 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%}${MY_PREFIX}"/bin/wine64{,-preloader}
# Avoid double prefix from dosym and make_wrapper
MY_PREFIX=${MY_PREFIX#${EPREFIX}}
@@ -498,7 +499,7 @@ multilib_src_install_all() {
# Make wrappers for binaries for handling multiple variants
# Note: wrappers instead of symlinks because some are shell which use basename
local b
- for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+ for b in "${ED%}${MY_PREFIX}"/bin/*; do
make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
done
eshopts_pop
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index a29459c4fd9a..474fdd1de110 100644
Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ
diff --git a/app-forensics/libewf/Manifest b/app-forensics/libewf/Manifest
index 79391b7a1b6f..565600dfab61 100644
--- a/app-forensics/libewf/Manifest
+++ b/app-forensics/libewf/Manifest
@@ -1,3 +1,3 @@
DIST libewf-experimental-20171104.tar.gz 2243405 BLAKE2B 86e69eba5313dadbfe2cc63639e96cf964b5d72e3c98299c0262547b2d900b7a8a4a5938435bdafac3890ee05ea0079ef68809086234ff486c985d557d2c4897 SHA512 610174971b8e09385f1f51c02e7be36e7a18d21f8b22ddeb7ba7d5c20e7df97591a70de3523b2d63bed8deb5a2a170a14e825f6a80aeb0937553ecae5925ee0b
-EBUILD libewf-20171104-r1.ebuild 1395 BLAKE2B 76d964775cb6354db05c5164a9c36d91456d0dd87e85372b13c8f785fd695b1c6dcfc41426aa35fbd4b7f11bd9971e85d723f4e0e4517ecfa28187b34f8f0827 SHA512 9af6fd70054f91553f548f20ab02eebfb83a92cd3b7da58dededa8be1f436d831d0fa52816b70960cba7c86787beaa2087322369c76d75c12e342554bdd5ff3a
+EBUILD libewf-20171104-r1.ebuild 1402 BLAKE2B 1e111b8da78cdfe92b392485982b60486653facd175cf9bab2e0775042759e8e2d0f18d249c7a6732739d64475bf170f85b93f10742dcda00712c67d62d2b5ef SHA512 9f84eab90f5a0dc8a9c4ff1d0f0bbd2a271e7c6988ab82638583c230ecf00bd50d9476425f8b6dbdd9bb1acc5404e690ec5c5c58c2eca85dbf0cc9c47ae1b6eb
MISC metadata.xml 462 BLAKE2B f916e7c3b9bf12caefb813e4631bfbf57c6dbf5746115fc9ee872680e5664e3efdd423cd43acfd976dedbba20d9f47784dcd2c4bcd3ccd2afb1c2ca22340c5b9 SHA512 284bf1351b83e4fc07224ba93ea6215ce93ae3211103f4b597c100e1243f0860d6c06e5e2b1f0063941b57a0d90707821e7d0e17bd1d58422e5de2102316bcad
diff --git a/app-forensics/libewf/libewf-20171104-r1.ebuild b/app-forensics/libewf/libewf-20171104-r1.ebuild
index 224990a01d89..6e872b922cf9 100644
--- a/app-forensics/libewf/libewf-20171104-r1.ebuild
+++ b/app-forensics/libewf/libewf-20171104-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/libyal/libewf/releases/download/${PV}/${PN}-experime
LICENSE="BSD"
SLOT="0/3"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~riscv x86"
# upstream bug #2597171, pyewf has implicit declarations
#IUSE="debug python unicode"
IUSE="bfio bzip2 debug +fuse nls +ssl static-libs +uuid unicode zlib"
diff --git a/app-forensics/magicrescue/Manifest b/app-forensics/magicrescue/Manifest
index 6e730f605fbd..e57067d42ae5 100644
--- a/app-forensics/magicrescue/Manifest
+++ b/app-forensics/magicrescue/Manifest
@@ -1,6 +1,6 @@
AUX magicrescue-1.1.10-ldflags.patch 1140 BLAKE2B 98deed569c8809e0e7a31c86cd29f1e79eaa2a2da986f2dcbce3591a1eba0e0aff43caf48db008a1c7c09e27d602e8c10a41889c7a89ad3696e9a5514449eec5 SHA512 abcb734fc4381408d8c4072e637a326a1b619defc244f70fb68608485a4a36ff4b4a206c296bb7dec0ae19fbe8030b88c9a6b528ca0f1934a0308f167ddd966d
AUX magicrescue-1.1.10-remove_toolsdir.patch 4087 BLAKE2B ce13561cac085ca3c558d02fd9538ce9c3973a022fb3e51048ede5643e258d2a352425f5c3e1a164d209d2ecbb46a6c3c73da997c08a2d61f23fa764d8c526be SHA512 4b2a627475d3fff6b3a8c30dd883b3358043a429d05772bc4e1f658273a7c2a7beb29bc69978ac817074ba25827e4954a948076d77de73832eaf479e4bc1b8c8
DIST magicrescue-1.1.10.tar.gz 227237 BLAKE2B a1584f4e6f4b6771783c565901775e181ba2e952e780565831e5d46245a4dd4670657cec7fb57b18d7dfc09954faec410da2dfe1b35130c23d22d8a6ccf0ab07 SHA512 54fc943a1f521563a3416040eb6b140e3ef79966b615ae0223be0558b810f9202c2d1e5ba0165c43a614caf78dbce1b0992775bef39e9611d2dc290e4582c29d
-EBUILD magicrescue-1.1.10-r1.ebuild 990 BLAKE2B 59db47c1b6d56dc622e04f104f0fa92961a820ce8f2aa2033afd1a56556eab6e780a704baf673e9febea1171d15edc3892dbcd322a3362523379b97a3c06a0c9 SHA512 58b58f1f684617195c61d84a7b806f28d16c776f83e89d02b9a7ff911c10a492ea9ec0f2fe26800a96ce67872b11bb8e673356de83e72d86a74c893f69765995
+EBUILD magicrescue-1.1.10-r2.ebuild 996 BLAKE2B c0a53477f47e3b0dbbb5308d8670e561cf80df8adc66a1fa450a0755d28b5fd7615333472d62f2118af8c3eb64e5f3f598d7b0bdde7a4d2a3ffaf6d5ee55da42 SHA512 95053ba5738fdc9505808bae77d7589ea3644306d499fc4d4e93d7740c9e91af0556998009f1d09d6b628d5662f966b77c494676fb4eef05c9b89f6503ebe356
EBUILD magicrescue-1.1.10.ebuild 1016 BLAKE2B ffea7870e2181c79b931b9205e46dba6167a71496f97d81d0ea70b84a7ccb2ff0e279aed3e30bc60bc6fb384b9172232d991ea013bbe1c2523ff6390377ba23e SHA512 3c9586f388b1dfa77af4d5e35d89efb9cb178818e3319d44487c83431e0058da4982f58497abfb1fac245b47a74e1ced44e1cf43442bb8d50a6d79b47e6f805f
MISC metadata.xml 750 BLAKE2B 2d31ceb3d7946f742beea0391f8da9fd3f725fb8f70e9bc307c925789ae0078093dcee5c3701a35a8deed15b3fb7e95fb55e48a5f87058e879437bf4389b953d SHA512 5feab26aca11abdb49fcce5a0ac0db39129bcda43a030f58618beadf9a3299616e91497a5bdf1c347dbb66ba19fd4f30b9cb89149351a086d55a3230a555910a
diff --git a/app-forensics/magicrescue/magicrescue-1.1.10-r1.ebuild b/app-forensics/magicrescue/magicrescue-1.1.10-r2.ebuild
similarity index 92%
rename from app-forensics/magicrescue/magicrescue-1.1.10-r1.ebuild
rename to app-forensics/magicrescue/magicrescue-1.1.10-r2.ebuild
index 7c873a505675..792a497947f0 100644
--- a/app-forensics/magicrescue/magicrescue-1.1.10-r1.ebuild
+++ b/app-forensics/magicrescue/magicrescue-1.1.10-r2.ebuild
@@ -13,10 +13,10 @@ LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-DEPEND="sys-libs/gdbm"
+DEPEND="sys-libs/gdbm:="
RDEPEND="${DEPEND}
!net-mail/safecat"
-# File collision with net-mail/safecat, #702004
+# File collision with net-mail/safecat, bug #702004
PATCHES=(
"${FILESDIR}/${P}-ldflags.patch"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 1d844cb9a48b..5cc10768f45d 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index b04c8dd6e15a..228bdaee9761 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,6 +1,4 @@
AUX gramps-5.1.3-test_locale.patch 1195 BLAKE2B 1b1aeb08b90bff9db9d028499428efa60a16b48597bcf466c07a77e3f658c8550eca84b899047d1bc6e20eb26e8dfab9637ae7aced1b99167466ea6c51707132 SHA512 70daee9afdce0f939ad3cec094fb4004f5c162e6b49849f83486db5baec074a8673d7a6096a367279019712a11f0b40e827f6cb3019e7dc3cc6bad327fee35ec
-DIST gramps-5.1.4.tar.gz 17425713 BLAKE2B 9b3761906b70ed6b85112e502290013cf421669418355ed0dc54d00adbcc2af4cd74c596bacaad50cdac6457e7a3b7675d4afb7b471fd471af8b7a6adae3ad82 SHA512 f43fc250142968331db1875260577e022898cff2d1453ee6b74be760d798b75cfdf93492d8d823dbb094da2ddd96a4f249e813c603e7cd9d0585641424284734
DIST gramps-5.1.5.tar.gz 17425167 BLAKE2B f07fcb84c28f1def84c5568da6ac38a78def8657a0ee010163cb7e0899dd94ebb1c851e2c9d207fd9725754363ac7243a66f0de6e0d9708270d2d43c90485212 SHA512 8e36e8da7cfb41cc0c77881993cfc212a15bf9775dad3c8be131889b70360117e023b6837b91dad28fc03198080290a08c8089856c753246ff14c7fc3bca38be
-EBUILD gramps-5.1.4.ebuild 3485 BLAKE2B 7efd6512d7e337a516056ef5f2bc06f9a7725e094e91395914ca582ab41428675607dd6b4532e13d85e54c8f6a8d45dae515dad87719a6db2c854cc034ec20ab SHA512 b9ad8d41bb15d171b8ccd5ae4d28c8c1241657cb1fa782531135d54a35470998a8a2203b134b40814161d38e3fd13f3c67099599cb3bcbf17f9d987bd00b08f7
-EBUILD gramps-5.1.5.ebuild 3377 BLAKE2B 3306fc8de3faa62e50fc4225a7d60c1bdd00fb4e24490d0718060a897c15861c1c1f1418cd4ccefcf8afbe2f4e021c46d174b2de480c81f267e699419fdd26ba SHA512 1282e654fbe1fa407c46f2551afa10bc5e81745dfd0776d322ddee58ffce04e1547e490aa89f1323c779b5a6ccfae6ffdde2402060cf158fc17cd09c7af55d00
+EBUILD gramps-5.1.5.ebuild 3376 BLAKE2B 0a9ae208f2e4c1a06d484abb81a2daf2924913b774ae51895b7888dd2c04a63e81846bddb5f371b76601b2e31aff2645621cd24c9adfa7945a67521649ff387b SHA512 20b43d369b1b64221d6c1a050ca980d241806d3868e1e29efb494bd5b3e335bd4f89a863c9a4779c5a43ed523568b7b0750fd8d9dd6b817331799c15c32f3758
MISC metadata.xml 5703 BLAKE2B 1c4879fcccfb62b99140eff6e5059129bc75b0a6f5f6d55167981b0ca3476e286a786caec2452c5aa9690e287c7142e3e443edc7ef8ad1d6ea4002d37f624647 SHA512 c3c926d1da8d57f5dc3b9f0691299552aceeef437e01f9385a6555c5fcf1ffea82fd1f9e87f20e23bc54d7578e0819786f1d1bc59d633cc30bbd9e79f236f3b5
diff --git a/app-misc/gramps/gramps-5.1.4.ebuild b/app-misc/gramps/gramps-5.1.4.ebuild
deleted file mode 100644
index fb62bc7dbe1d..000000000000
--- a/app-misc/gramps/gramps-5.1.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Community genealogy program aiming to be both intuitive and feature-complete"
-HOMEPAGE="https://gramps-project.org/"
-SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="berkdb exif geo postscript +rcs +reports spell test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/pycairo[${PYTHON_USEDEP}]
- >=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
- dev-python/pyicu[${PYTHON_USEDEP}]
- berkdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )
- exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
- ')
- gnome-base/librsvg:2
- >x11-libs/gtk+-3.14.8:3[introspection]
- x11-libs/pango[introspection]
- x11-misc/xdg-utils
- reports? ( media-gfx/graphviz[postscript?] )
- geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
- spell? ( app-text/gtkspell:3[introspection] )
- rcs? ( dev-vcs/rcs )
-"
-BDEPEND="test? ( ${RDEPEND}
- $(python_gen_cond_dep '
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- ')
-)"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.1.3-test_locale.patch
-)
-
-python_prepare_all() {
- # Install documentation to the proper location. This can't be done
- # easily with a patch because we substitute in the ${PF} variable,
- # and that changes with every revision.
- sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- DISTUTILS_ARGS=(
- --resourcepath=/usr/share
- --no-compress-manpages
- )
-}
-
-python_test() {
- # Gramps builds just fine out of tree but it confuses its test suite.
- # The following might be an ugly hack but at least it lets the tests
- # run properly until either I or upstream have come up with something
- # better. FIXME: test this when a new release comes out.
- rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
- die "Failed to symlink build directory to source directory"
-
- # Set a sane default locale for the tests which do not explicitly set one.
- local -x LC_ALL=C.UTF-8
-
- # Note that as of 5.1.3, test failures do not actually propagate back
- # to this function. For now this is fortunate because the test suite
- # does not handle the absence of bsddb3 well, in the long run however
- # this should be fixed.
- esetup.py test || die
-}
-
-# Ugly hack to work around Bug #717922
-python_install() {
- local DISTUTILS_ARGS=(
- --resourcepath=/usr/share
- --no-compress-manpages
- build
- )
- distutils-r1_python_install
- echo -n "${EPREFIX}/usr/share" > "${D}$(python_get_sitedir)/gramps/gen/utils/resource-path" || die
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-
- if use berkdb; then
- ewarn "The BSDDB back-end in ${PN} has got known stability and data-corruption issues. It has been deprecated since version 5.1.0 and might be removed in 5.2.0."
- ewarn "If you have any family trees in this format you are highly advised to convert them to SQLite, as described here:"
- ewarn
- ewarn "https://gramps-project.org/wiki/index.php/Gramps_5.1_Wiki_Manual_-_Manage_Family_Trees#Converting_a_BSDDB_Family_Tree_to_SQLite"
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-misc/gramps/gramps-5.1.5.ebuild b/app-misc/gramps/gramps-5.1.5.ebuild
index bcec91d873d7..799a6200fc33 100644
--- a/app-misc/gramps/gramps-5.1.5.ebuild
+++ b/app-misc/gramps/gramps-5.1.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="berkdb exif geo postscript +rcs +reports spell test"
RESTRICT="!test? ( test )
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
index d02ff7831980..b932612f9404 100644
--- a/app-misc/rpick/Manifest
+++ b/app-misc/rpick/Manifest
@@ -152,5 +152,5 @@ DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766
DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
EBUILD rpick-0.8.7.ebuild 2555 BLAKE2B 5cac47e8398b98e6db47e8781cf04c26ce2e7fa72fdae353a8a2df8179f39e67634866fa59f3bac70b77f642cad87d7791f3232e27fce787f0c6205e6e5979b1 SHA512 f7d345a22e787fa774dad4196392a08320230766d8f19c9dbf70eeec539d316408253547783db3e911fd5d167c3818de98c9493f5822f810cd99c700a14e5078
-EBUILD rpick-0.8.9.ebuild 2498 BLAKE2B e7215765ed823ca16182dca25abab209755297ac4aa70ef941f2b7861b2a52f58e88a3ec0b8613a542f9e1c2b79a47561d7db1698bedd8dec2b62f05891fc78c SHA512 92bbab822d28f6c3ad12d405ade6af1392bbfcb500e2a80a20a50a7f16af43c49ec1627c1e45c3c3085ee5716106006edb0fe9e5737b331ddf42a94538aef84c
+EBUILD rpick-0.8.9.ebuild 2495 BLAKE2B 539a674c848097047049978f72e17727e7f126196fd826814c586ba820fb84557b42225ef227415c64e457d6075b628106311a7d788f006b3aaf1ccbb3d6ef0a SHA512 498554d7ea90d873ecbfcaa1cb2fec315e758f7bd72772d1602945ac873409e57b6ddebe65594e2dde73be0a6875e6197ad2840b41b9b7eb19e5e9ee56108b4d
MISC metadata.xml 982 BLAKE2B 81e304c7c73f959b09d1bb5f2d26d1495930f1b340552fbdb989c8741dba6f5ee7b8801e3eb1d7063947f8f424d0c32ccc66c29cf6508ce8c11305e45febf322 SHA512 bfa865140ae1320670b94f4f383931dfc9bbf1a0278597a283cd64d538362d95751e9b9b53a1a46aa96a835a69b9425518760bd286d0375c550d0e110d1f4f08
diff --git a/app-misc/rpick/rpick-0.8.9.ebuild b/app-misc/rpick/rpick-0.8.9.ebuild
index f37cb7218593..7ed974b521ef 100644
--- a/app-misc/rpick/rpick-0.8.9.ebuild
+++ b/app-misc/rpick/rpick-0.8.9.ebuild
@@ -121,7 +121,7 @@ SRC_URI="$(cargo_crate_uris)"
LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
QA_FLAGS_IGNORED="usr/bin/rpick"
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 0cb5c49a9225..700071afb070 100644
Binary files a/app-mobilephone/Manifest.gz and b/app-mobilephone/Manifest.gz differ
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index 77a445d5abd8..7eb5232ae60e 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -1,3 +1,3 @@
DIST gammu-1.41.0.tar.bz2 2167233 BLAKE2B 4b0bf77246cc6a07a52457cff2bae44e63ebfe2715cb0c0b7d89c3d6352bb2df4cd5e7fd9b62d316e316fb1e73108fe561e030b7444eccd601cd0d2541b9f0e9 SHA512 f2c2534d3827216bf015607431938e0cf2524d5f2c670a5f76bb5ab7928962d22de981bbbf2dfa7af833c7903b60a775242048210bac6c35b1a9ee7668db4543
EBUILD gammu-1.41.0.ebuild 1365 BLAKE2B 74a0b9ed1a90a0b124c7ae1eb0a447a0125d83072c0ad0364885b5e6401b6294735923a42fc53871425a0da356d799183a7300a76710584d4b3d79a41747ca86 SHA512 23c4515ef97b923c699027ed34732b94e450ea134b8bc7e66a5ea6212dccec7457b2d3aad980c848a1e11fc2d30bddbb944eb7be7cc27b12535c73f9d1ee8cda
-MISC metadata.xml 1015 BLAKE2B dd6371d095b63cfcba4cf410fc1559e94f7882101c5578c965b6bed409c0e42a97e7cadf7aa2b684a88f5cc2d8ce98a2b3cab9f379499d3c4280a00783721485 SHA512 8b0fcc2f384d06d067db7c9ddcfa4f83b82a5b54755ab10a7a248f0624e9a4a505b10cc8939dc3489f0f14af8607a36f7b2d5491176e53018ce739a5a67d5513
+MISC metadata.xml 757 BLAKE2B 981aca89002970eafdf77a82a14c2dce0abf453eb8b64e86a0337071f1734f07dfe9a0d0a58ef990d4fec5c01c762dbd9029127bccb187053140acbb75219328 SHA512 70e360352edcc1d177cbfc87daf7fa1ad05fc1a49d8eff37833bbb36553b599c23eb3b56f3744aea160a0149a47663fecfcdbeacd3a5a4c8a2a5efa008277e57
diff --git a/app-mobilephone/gammu/metadata.xml b/app-mobilephone/gammu/metadata.xml
index d17bdaf5475d..5fe2fb6a1c5c 100644
--- a/app-mobilephone/gammu/metadata.xml
+++ b/app-mobilephone/gammu/metadata.xml
@@ -1,14 +1,7 @@
-
- ktrace@yandex.ru
- Victor Kustov
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
+
cpe:/a:openssl:openssl
diff --git a/dev-libs/openssl/openssl-1.1.1n.ebuild b/dev-libs/openssl/openssl-1.1.1n.ebuild
index af9f45ed046c..5a7d16cfa51b 100644
--- a/dev-libs/openssl/openssl-1.1.1n.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1n.ebuild
@@ -17,7 +17,7 @@ LICENSE="openssl"
SLOT="0/1.1" # .so version of libssl/libcrypto
[[ "${PV}" = *_pre* ]] || \
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig"
+IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
RESTRICT="!test? ( test )"
RDEPEND=">=app-misc/c_rehash-1.7-r1
@@ -193,6 +193,7 @@ multilib_src_configure() {
$(use_ssl sctp) \
$(use_ssl tls-compression zlib) \
$(use_ssl tls-heartbeat heartbeats) \
+ $(use_ssl weak-ssl-ciphers) \
--prefix="${EPREFIX}"/usr \
--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
--libdir=$(get_libdir) \
diff --git a/dev-libs/openssl/openssl-3.0.2.ebuild b/dev-libs/openssl/openssl-3.0.2.ebuild
index a42efd8d9f4e..2ef0aaed3200 100644
--- a/dev-libs/openssl/openssl-3.0.2.ebuild
+++ b/dev-libs/openssl/openssl-3.0.2.ebuild
@@ -24,7 +24,7 @@ fi
LICENSE="Apache-2.0"
SLOT="0/3" # .so version of libssl/libcrypto
-IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig"
+IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers"
RESTRICT="!test? ( test )"
COMMON_DEPEND="
@@ -180,6 +180,7 @@ multilib_src_configure() {
$(use_ssl rfc3779)
$(use_ssl sctp)
$(use_ssl tls-compression zlib)
+ $(use_ssl weak-ssl-ciphers)
--prefix="${EPREFIX}"/usr
--openssldir="${EPREFIX}"${SSL_CNF_DIR}
--libdir=$(get_libdir)
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index 70efe38f79b2..b8c9cde58c23 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -1,5 +1,5 @@
DIST xmlrpc-c-1.51.06.tgz 933161 BLAKE2B 8023444e14e7e41f5433cebeb0fcb7a7323dd734f658155e117d3547b4d61ef81c189395662bf68074dcf1ec5c47ee550cd18773ce8bf0bd53cb0a1764cce945 SHA512 2927fc8c01d42b6f838d8b0c839f09a7dd0d1ddc5a3d7b36c9d479f1c7bf7fdf14923f640883f98ba66067eda0f5379737bf3a5bc9d4b9abe1a7eff7d7def066
DIST xmlrpc-c-1.54.05.tgz 933228 BLAKE2B 50d73fe22454f04ffebf11d4b88986eaac571d107abce4e04244ad0b74469fc5233178967e3dd832a8525514912e4f835fa1ce13c439caf918a2b2d0c05021a0 SHA512 81bf8f398e9cb73b421907d8e304b9a6dc8da931f573f7296457486ade432f4a00a94b6850391690f7b229928f785522e5852db8aca68cb462c71d139e4f27b1
-EBUILD xmlrpc-c-1.51.06-r2.ebuild 2176 BLAKE2B f6b372741bbc6cddaaf967ab17433632866172f97626ea817d0ee487707b1cb9398224d3703989e96e0fe1f6e2309057aae4a92f9d3098b37acd5a748dea2e94 SHA512 b9f7aa3a4b26d1a7af841d6717c95b62d5d3f7aa77594e0e8bebe9b052107d84f15011ff453895f786da5298f14faea427c1f0847c0605205b439f3154349016
-EBUILD xmlrpc-c-1.54.05.ebuild 2182 BLAKE2B 45d6e9e9db40438a650ac2022ac151d6082e6c68c65bccabe8ebb1f8d0f8940f14a053af25ab768b778fa81f0c7211afa90750b68959f0e5fbcf71b2c595e524 SHA512 79452c94a3dd4f4fd43a6e0a88e4d3c6e08ce7db84d4e955d25f57611452122e79daa8aede48abfb8baefe714efe96108131b17040160ca6301da21724732309
+EBUILD xmlrpc-c-1.51.06-r2.ebuild 2219 BLAKE2B d8d70c722edaa4c880455eb2d70e17c736b1bd9ace3fb67f292944008fa5a4af4064e354671ebf5ff9529c1af49847fc010a58d3c874575f061686a9e6b22025 SHA512 96da498fa8b6cbd3d03c07c76a9a1ab4b557104b2a8ccc8f385b23907b0b69ef3187612f583a8d80add917ff9a1d19a63dd1dc0ffcafe71f36f69d1622d0717b
+EBUILD xmlrpc-c-1.54.05.ebuild 2225 BLAKE2B 19ca410ca4b7fdf29a3b518cbf9fe0a2bba0535325be809a8f7edff5307882e4f6346f3f056dae78e8a59d91befef32c0163042b924df42c5a88a8b61661dbd5 SHA512 a4754adca9484aab14b2ffbdb7360bf7d92468a4e2bd576e331732bef6f8c03a5909b28e12784a7ac96229b695f9c0058076593c88963df3b376325e71912bc1
MISC metadata.xml 617 BLAKE2B b0c8cee5453b850768e8c91bcd2cbe265eb19956644798b3219c9739ec666bedb543e924d2e4fce6874bdab3ac865c4ce94ba5032775fcc2359804ede0c92053 SHA512 729a5c14973bb4bd11a138299e05db0c43dce67a58a9eb4bb60600b097c1fc479231dea287ef9e824a093c9cf15064adb9bc6e0dee2820078c2ee79d9ea9d581
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
index 54cf9c58c907..283f805275ca 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
@@ -64,12 +64,16 @@ multilib_src_configure() {
multilib_src_compile() {
default_src_compile
- # Needed for tests, bug #836469
- cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || die
# Tools building is broken in this release
#multilib_is_native_abi && use tools && emake -rC "${S}"/tools
}
+multilib_src_test() {
+ # Needed for tests, bug #836469
+ cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || die
+ default_src_test
+}
+
#multilib_src_install_all() {
# # Tools building is broken in this release
# #use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild
index 05c4799f8bdf..d6b2720a168b 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild
@@ -64,12 +64,16 @@ multilib_src_configure() {
multilib_src_compile() {
default_src_compile
- # Needed for tests, bug #836469
- cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || die
# Tools building is broken in this release
#multilib_is_native_abi && use tools && emake -rC "${S}"/tools
}
+multilib_src_test() {
+ # Needed for tests, bug #836469
+ cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || die
+ default_src_test
+}
+
#multilib_src_install_all() {
# # Tools building is broken in this release
# #use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 02f52d29daed..8985d91fe76b 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Tk-TableMatrix/Manifest b/dev-perl/Tk-TableMatrix/Manifest
index f865c5240e9d..53638ff80629 100644
--- a/dev-perl/Tk-TableMatrix/Manifest
+++ b/dev-perl/Tk-TableMatrix/Manifest
@@ -1,8 +1,3 @@
-AUX Tk-TableMatrix-1.23-makemaker.patch 959 BLAKE2B f5d8eaf4abc648868baf553b880d78ec9ffa2306c5780ad43739812f975f598a93e0e8d6513d42e6c76680eaca302ce4f79c871a11cffb13df94cc0cdbb7f77c SHA512 807ad91a5147266674c941bd33dac5a44db2df20b34aaf66df5920700bd9c5a72a8d93347f81e4bb5e3b49a9de2cde4241f4583fc8cb0168b43a34f1fd8b9203
-AUX pTk-1.22.patch 558 BLAKE2B c62d921287899aa542a618168f26ff37f1bdf92373c8d72dd98cc52aed15a8d2741968487fab7d4091817517fb01dc541018c0129d7b781e82c8afea0bd30da7 SHA512 c709c5f6baf326389a794764a4b223c0fc154f0f6157e4696ba2e7af6cc029f1e977558be7a16bcdcd40a3e31cfc30bdd23e319ccd5cb33b227a84a55ab82631
-DIST Tk-TableMatrix-1.23.tar.gz 318954 BLAKE2B 9e6380cf0949aaf15861ad9a9209d7fb2cd69c3e1983f26b364aeaaa28143b00a063fc842da48c7d18ba1f9c69a60973519de07fdf91e39532b2347ddbcdd4fb SHA512 115eb2a71c3725392f2bcf5e468bc84844c8a5ad3db221205876d7de6486833a3fd4e98aa32e21f5dcf038a38f9d98721adeebb1f9cd0990359aec7d07f6f32e
DIST Tk-TableMatrix-1.26.tar.gz 410559 BLAKE2B d0a5763469b5abdd6eba92a6a3de05b1b07f7d09f851f6471d3953ef93b242e65be6bcbc00a72ff61c11a9b42b0cf10678c11efbbff91ca4cb209df9317a0874 SHA512 bd45e3c72e330de3722fe365989f6bd0bd938d72fad166c1a65a3667d07f8c10bf792742bf82a8154b43d3453a79e737788b0a4a288f318c370cc0c5fe94917f
-EBUILD Tk-TableMatrix-1.230.0-r1.ebuild 600 BLAKE2B 79819d23e021851851394f08c5208cf125d372a5456aa2ec2674231717f378be2583ab1df8f2312f81dd915c4adb7c14f83aa6e575f9ad48c201ba870c2c5513 SHA512 0ecbd05dd068841b13cb8a1571186fc04346c2ae023652a43d3f4a14faf964ac1918ebfd36f93c69d542b157e4c93744eedb6af88bdf181b16a56cb0c93dd578
-EBUILD Tk-TableMatrix-1.230.0-r2.ebuild 686 BLAKE2B 581ac0a5e85d4733a05cb7d6b6cae34bc945d214db909cd347834dcdba9e7680cfc937fc2ce4adf8497c8b6c36de981c99067992d6f9e673f0b49a5b14ca4874 SHA512 cb170338994051b45c6f150016ca11983e24947045c448bb7abe36d899003f999b7de6ecc34557d556ab3fbf1a60d0b86454482be7a4e47e9501ea4b62916ace
EBUILD Tk-TableMatrix-1.260.0.ebuild 682 BLAKE2B 8cea172216e5095c03c2c12c62c1bdb9e504ea2ef1955341310e9e91d68fd83cf93b9751c887fc9d96ec997c4e9e553a06e7b55b100b4ebd79f2e2ae48de97f0 SHA512 7a4db975972cd15d707111db824746073ee7cef970857e996c10ed49223bf433b65e3501ba5afdafe07fc01bae35546f730fdd05dc3b671e2033230a16a63f54
MISC metadata.xml 559 BLAKE2B 992fe97c68e40e1fa7c68c07686375917197a8ee8c63867847765970e74d5820bb2dad84a3fddc5e0e44b851f51660397ef766202767fabf159d718daaf1852b SHA512 0fa6f4decc0d30c9aeba1209615de0ddc5e81a3e839ebae9d92ca6638f297ca8298e1c949f40b65c9889ef9909a742435a9ef75519f3e12b8747c952d817a85d
diff --git a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r1.ebuild b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r1.ebuild
deleted file mode 100644
index dcf368664ac8..000000000000
--- a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=CERNEY
-MODULE_VERSION=1.23
-inherit perl-module
-
-DESCRIPTION="Perl module for Tk-TableMatrix"
-
-#SRC_TEST="do"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc sparc x86"
-IUSE=""
-
-DEPEND="dev-perl/Tk"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/pTk-1.22.patch" )
-
-src_install() {
- perl-module_src_install
-
- # Clean out stray conflicting file - its generated by perl-tk already.
- # Bug 169294
- rm "${D}"/${VENDOR_ARCH}/auto/Tk/pTk/extralibs.ld || die
-}
diff --git a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r2.ebuild b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r2.ebuild
deleted file mode 100644
index 7698ad6f7eee..000000000000
--- a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CERNEY
-DIST_VERSION=1.23
-inherit perl-module virtualx
-
-DESCRIPTION="Create and manipulate tables in Perl + Tk"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-perl/Tk"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.23-makemaker.patch" )
-
-src_install() {
- perl-module_src_install
-
- # Clean out stray conflicting file - its generated by perl-tk already.
- # Bug 169294
- rm "${D}"/${VENDOR_ARCH}/auto/Tk/pTk/extralibs.ld || die
-}
-
-src_test() {
- virtx perl-module_src_test
-}
diff --git a/dev-perl/Tk-TableMatrix/files/Tk-TableMatrix-1.23-makemaker.patch b/dev-perl/Tk-TableMatrix/files/Tk-TableMatrix-1.23-makemaker.patch
deleted file mode 100644
index 9180e728f312..000000000000
--- a/dev-perl/Tk-TableMatrix/files/Tk-TableMatrix-1.23-makemaker.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 009a27f86c882e229ea8e9cc7efdff9f6f5f751b Mon Sep 17 00:00:00 2001
-From: Matt Chorman
-Date: Wed, 21 Jan 2004 03:02:36 +1300
-Subject: Patch issues with newer MakeMaker
-
-Bug: https://bugs.gentoo.org/34940
-Bug: https://bugs.gentoo.org/70000
----
- pTk/Makefile.PL | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/pTk/Makefile.PL b/pTk/Makefile.PL
-index d035029..3d66a0f 100755
---- a/pTk/Makefile.PL
-+++ b/pTk/Makefile.PL
-@@ -234,12 +234,10 @@ sub MY::postamble {
- my $self = shift;
- my $dep = $self->Tk::MMutil::mTk_postamble;
-
--$dep .= $self->dir_target(@{$self->{'dir_targets'}});
--
--$dep .= "config :: " . join(" \\\n\t",map($self->catfile($_,".exists"),@{$self->{'dir_targets'}})) .
-- "\n\t".$self->{NOECHO}."\$(NOOP)\n";
--
--
-+if ($Tk::MMutil::IsWin32 or ($win_arch eq 'MSWin32' and $^O eq 'cygwin'))
-+ {
-+ my $cc = $Config{'cc'};
-+ }
- $dep . '
-
- '.$self->{NOECHO}.'$(NOOP)
---
-2.16.2
-
diff --git a/dev-perl/Tk-TableMatrix/files/pTk-1.22.patch b/dev-perl/Tk-TableMatrix/files/pTk-1.22.patch
deleted file mode 100644
index ff9938535b69..000000000000
--- a/dev-perl/Tk-TableMatrix/files/pTk-1.22.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- pTk/Makefile.PL.old 2006-05-01 18:09:31.000000000 -0400
-+++ pTk/Makefile.PL 2006-05-01 18:10:05.000000000 -0400
-@@ -234,11 +234,11 @@ sub MY::postamble {
- my $self = shift;
- my $dep = $self->Tk::MMutil::mTk_postamble;
-
--$dep .= $self->dir_target(@{$self->{'dir_targets'}});
--
--$dep .= "config :: " . join(" \\\n\t",map($self->catfile($_,".exists"),@{$self->{'dir_targets'}})) .
-- "\n\t".$self->{NOECHO}."\$(NOOP)\n";
-
-+if ($Tk::MMutil::IsWin32 or ($win_arch eq 'MSWin32' and $^O eq 'cygwin'))
-+ {
-+ my $cc = $Config{'cc'};
-+ }
-
- $dep . '
-
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 0bed54f7e31e..edcb53fd81c9 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest
index b6c7bd12cccf..df86eb956c5c 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,6 +1,10 @@
AUX pecl-http-3.2.4-curl-cookies.patch 7806 BLAKE2B 96bd439d3ccb16bc7a67e062dfe9ad66bdcd193553764e087dd938e3f76c05796bb09571d934658a8b5d6c22bf2db03c213731ab2f35d03a20902c24897625c6 SHA512 cbbb215f3f0c5527f318283db4984a63b830727727081834f3a3383576d581359cfc7865e35a3b0b6ea4693c7c91ff93570c3c8964a8cd7e5d593095b16f0d4a
DIST pecl_http-3.2.4.tgz 220631 BLAKE2B 996236cf9dd2f7d9bfaf046306e99c3ccf778261df19df8fd828b5811798f784841d89a6890e7347bd20cc6da71c966ea3ac9b17bf058e0bb766db7e1a8a6c49 SHA512 59c41d57c94a6e50e2f0b261130a24791b2845246f783b55e7f644f9a897d3650da364c5b38a860761b4a23f9266ed05000d6348bae2a7941e59d6bf5fb61a9e
+DIST pecl_http-3.2.5.tgz 220593 BLAKE2B 3dfeefa69b0566f15f1dda73e7e4da2723033424e704039fbb42177e4996b434ea3450e40aa16844fe52c9fabac96d16ba5154a0112f00ff3838cf7bde149938 SHA512 13e99cd567a708cba56150a2127d060cdc78f9f5908371e5fb5fb3f02f27f8aa1b48c5eb147f61e9b5c9d5f2c627049f846d810f0135072cc9e4cd967e2bfa1d
DIST pecl_http-4.2.1.tgz 224452 BLAKE2B 58d2e1159aa64b9893b2b8b67c8444801308084ac13a743760c25cb3d0456fb586f69dc6b9e77db53341e4e9e45ce68f954c47b4e2663afe86de67d63db5e8e2 SHA512 2ad7e57fae313a7b46ba88e528e124ac9d83804827131a6ef478ccf3cf5883dec2d928b8ceb377ee7f5947c76f24d640d77533a9946612419e526786a79877e6
+DIST pecl_http-4.2.2.tgz 224436 BLAKE2B 26ef3bb38778f0374938ba3f3bddba37c3a2044c7b9ffe2aacbca2566251d26d37882bf66773b8ed62d46855e8f14ad9b577cdb1ef3db9eba9850c0b30e57284 SHA512 1203367d590c7d80ffe7a21e7ac352ba053e3daeb778bf99e08fc13582e665e1429f850e51e36304bdec15e6646b648f2c444b46fa263e5441d008ac41a00f4b
EBUILD pecl-http-3.2.4-r1.ebuild 2227 BLAKE2B 0c0fbb0433464e8a81139c8d40757a70026fff21e236131db38ac6df70a7209107cf04573fc5aa3f7cbc1108899d05fa8783a592c47d37b24b24cf20a043413e SHA512 85abeab748a1cdeabbc85aac2b47bdc3ad4322c7a7c9637670836383a5c69f3f7335a3ccc757bf3597fa3da9ccfdf682868806a02ffbe56e951fbdd6c8ab7494
+EBUILD pecl-http-3.2.5.ebuild 2109 BLAKE2B a1293154f70fe3bf4f0a3fbd6cdd29f6bb82a9b1dff1ae7474bdb476ed431bd5329c7f2a768648f5a36e890b52645e309dc841b725ec9e0fd2c14309efec4b63 SHA512 df5370ac01aec66a9387fbb75fda9ef5c4de45b3a7396dce38115ab375b871b8ded5eee001fc9b3d3b9145ed0898de416dda7b47fb55f1bc269c4fa5d8d2408e
EBUILD pecl-http-4.2.1.ebuild 1828 BLAKE2B c9a009b2883f856958cc5343625a0e0989590c82696a3cd8be215631b522ecb1debd82491f636fede2f6694da5835d3251b8ffbf22364d8ba1c79578746f5795 SHA512 bde6bfd0a6a6e15a3f902298017f7a771ac6e36dbdff4a5bb24d7c37034727fafa2c6f443590397be4446288ec845ffb4b7bec559e54cd97293c6432e9599ea1
+EBUILD pecl-http-4.2.2.ebuild 1924 BLAKE2B aecd010fac9bca6fefb4802828332d40c1ef6b465e80399046357fd9ebea2645f43e879a4839560c91f591ebf47a79f05c781f7e51bb09e8446f9e4c35283840 SHA512 bf835934d3caf66a6b88c288b99bfab7fb2675307043ebd9b5506a337b503ca245803ca09cde7c0cc1d5b534292724f932696821ba5898313724c6ed5dd5c77e
MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-http/pecl-http-3.2.5.ebuild b/dev-php/pecl-http/pecl-http-3.2.5.ebuild
new file mode 100644
index 000000000000..484ce862f8fe
--- /dev/null
+++ b/dev-php/pecl-http/pecl-http-3.2.5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PHP_EXT_NAME="http"
+PHP_EXT_PECL_PKG="pecl_http"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_INI_NAME="50-http"
+
+USE_PHP="php7-4 php8-0 php8-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php7-4"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Extended HTTP Support for PHP"
+LICENSE="BSD-2 MIT"
+SLOT="7"
+IUSE="ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl"
+
+# Patch gets cookies working with curl 7.77, but further interop work was done later
+# Just set min version for this short time to live branch
+COMMON_DEPEND="app-arch/brotli:=
+ dev-libs/libevent
+ dev-php/pecl-propro:7[php_targets_php7-4(-)?]
+ >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-4(-)?]
+ net-dns/libidn2
+ sys-libs/zlib
+ ssl? ( >=net-misc/curl-7.77[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] )
+ !ssl? ( >=net-misc/curl-7.77[-ssl] )
+"
+DEPEND="php_targets_php7-4? ( ${COMMON_DEPEND} dev-lang/php:7.4[session(-),iconv(-)] )"
+RDEPEND="${DEPEND}
+ php_targets_php8-0? ( dev-php/pecl-http:8[php_targets_php8-0(-)] )
+ php_targets_php8-1? ( dev-php/pecl-http:8[php_targets_php8-1(-)] )"
+
+PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
+
+PATCHES=( "${FILESDIR}/${PN}-3.2.4-curl-cookies.patch" )
+
+src_prepare() {
+ if use php_targets_php7-4 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-4 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
+
+src_test() {
+ # Cannot use eclass function due to required modules
+ # All tests SKIP otherwise
+ for slot in $(php_get_slots); do
+ php_init_slot_env "${slot}"
+ # Link in required modules for testing
+ ln -s "${EXT_DIR}/propro.so" "modules/propro.so" || die
+ ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die
+ sed -i \
+ 's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=propro.so -d extension=raphf.so/' \
+ Makefile || die
+ SKIP_ONLINE_TESTS=yes NO_INTERACTION="yes" emake test
+ # Clean up testing links
+ rm modules/propro.so modules/raphf.so || die
+ done
+}
diff --git a/dev-php/pecl-http/pecl-http-4.2.2.ebuild b/dev-php/pecl-http/pecl-http-4.2.2.ebuild
new file mode 100644
index 000000000000..d0642996b9c7
--- /dev/null
+++ b/dev-php/pecl-http/pecl-http-4.2.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PHP_EXT_NAME="http"
+PHP_EXT_PECL_PKG="pecl_http"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_INI_NAME="50-http"
+
+USE_PHP="php7-4 php8-0 php8-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php8-0 php8-1"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Extended HTTP Support for PHP"
+LICENSE="BSD-2 MIT"
+SLOT="8"
+IUSE="ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl"
+
+COMMON_DEPEND="app-arch/brotli:=
+ dev-libs/libevent
+ >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?,php_targets_php8-1(-)?]
+ net-dns/libidn2
+ sys-libs/zlib
+ ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] )
+ !ssl? ( net-misc/curl[-ssl] )
+"
+DEPEND="
+ php_targets_php8-0? ( ${COMMON_DEPEND} dev-lang/php:8.0[session(-),iconv(-)] )
+ php_targets_php8-1? ( ${COMMON_DEPEND} dev-lang/php:8.1[session(-),iconv(-)] )"
+RDEPEND="${DEPEND}
+ php_targets_php7-4? ( dev-php/pecl-http:7[php_targets_php7-4(-)] )"
+
+PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
+
+src_prepare() {
+ if use php_targets_php8-0 || use php_targets_php8-1 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+
+ # Respect LDFLAGS, bug 727134
+ export EXTRA_LDFLAGS="${LDFLAGS}"
+}
+
+src_test() {
+ # Cannot use eclass function due to required modules
+ # All tests SKIP otherwise
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env "${slot}"
+
+ # Link in required modules for testing
+ ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die
+
+ sed -i \
+ 's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=raphf/' \
+ Makefile || die
+
+ SKIP_ONLINE_TESTS=yes NO_INTERACTION="yes" emake test
+
+ # Clean up testing links
+ rm modules/raphf.so || die
+ done
+}
+
+src_install() {
+ if use php_targets_php8-0 || use php_targets_php8-1 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-zmq/Manifest b/dev-php/pecl-zmq/Manifest
index 1e959af9fb3c..dbd9d264d34d 100644
--- a/dev-php/pecl-zmq/Manifest
+++ b/dev-php/pecl-zmq/Manifest
@@ -1,5 +1,4 @@
-AUX pecl-zmq-1.1.3-php7-3-compatibility.patch 9970 BLAKE2B af8c1d546da1786bef6564b42afd731f0ceade8c2d425dfb5910748b4248cc910aa41f5f53fed7ab65394d7da201cc6d3a47b065e45f3f362c9968ab9b229f8f SHA512 d39ab0cce3397a851aa7662664e1f09fbd4096a4942e2172ed66d53292043f808c82d8f13ea8b5bf918ccdcdef9f254324b318e36150a6d76dfb7d051da3fed4
-DIST zmq-1.1.3.tgz 82397 BLAKE2B 5c221abf614bcc33c4c69e64308508d544f790371549c421fe2fcdedd67f2e843b2b82d96f517ea9413ffedd128838725e9afc18f0d4048b270d4982571874d0 SHA512 0f03016e315a6c6a1e1d6eca1e20564834d2a924cef06af1b38693933f1e5a094c37e9c432705a64f61d95e82655f61358fc7783e7a6f06c7dd9ad84fc6f7bbc
-EBUILD pecl-zmq-1.1.3-r3.ebuild 583 BLAKE2B 73de5f99809b8e5420c17a3d06b14d8da6e6c10ed29c9060bd4d71914cbb4e13ea1b0cedaee6b7718d8e2550be5ea371ce2940301ae34713f484d6e9a5491a54 SHA512 f3fc9b751f1246f90e0fd5677ede257ed923025a5dac6dd6ec8a008fd4120353630c12ba914d752716ada37e895463a7e61fc308c5de6a5ff18e621c30ff5a82
-EBUILD pecl-zmq-9999.ebuild 517 BLAKE2B ed1c85df9767503db2b961b7b5c04b0cbef2885c5ea1ba33fd1cb5239e72b91587fc46ab44f63e0a4d2fb43f1e1f0b217b44c5c5c27a4d7b36f47a955727466f SHA512 c547467e09c3f022456ba619e063d4951ad4e2426dcf144bca3848b07ea96dc50925a97c21443cd726f6499e5667cdb1a73f14a064c959873d03559d16bf49a1
+DIST pecl-zmq-1.1.3_p20211103.tar.gz 104608 BLAKE2B 5217c77353cf36eb10fbb4825a77e16293770b58ee92aeec3487816c713982c67e1964e3da40b152952abe7a1e2be1dab3e67f53798849bfa1a52f3c47f2884e SHA512 762ecc78fda2e94d7bec57dc329741e0a4a6442e76a8a0bb367576b961e96482f43698e36adc7c8e6a585c914e696e6a17056a1ea680caa96f69faefc604d873
+EBUILD pecl-zmq-1.1.3_p20211103.ebuild 709 BLAKE2B 7d6c7d4c8ce0d775a160f8753d44e332228320e1281c90c3e12aed1e140654fab7da189ce21366ce76e9c0859eeef5cd673ea08c61cb1170ab6b96d052af2235 SHA512 ee1e88bae1ddd24ad224fe9d44bdeabbd1f6941767a45905276227cc01e3dfd41c8b905c7d94031c1cc995b51138e9fc95934652355ca22dbd90a9544b4e54f9
+EBUILD pecl-zmq-9999.ebuild 517 BLAKE2B 317c85e169fef0c90f35301e8520eec3a7809bb65a20490b78dded0ff27905fb1ebd1443ee51d53b3afe000f46af7417cac70114756c9ea3a8ddf52f17c79b1b SHA512 d7899617f8513b6510f1ecf3908f4d89194037393c17822987d11170f53b81d1aebf05ac2d74f09edf480da02b714d68e81728382a7ef987775b6d7284850ce4
MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-zmq/files/pecl-zmq-1.1.3-php7-3-compatibility.patch b/dev-php/pecl-zmq/files/pecl-zmq-1.1.3-php7-3-compatibility.patch
deleted file mode 100644
index 2de703039b07..000000000000
--- a/dev-php/pecl-zmq/files/pecl-zmq-1.1.3-php7-3-compatibility.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-From af02bde61c2a5af1ae64cac09ffe2b25237aa58e Mon Sep 17 00:00:00 2001
-From: Alex/AT
-Date: Mon, 10 Dec 2018 06:02:27 +0300
-Subject: [PATCH] PHP 7.3 compatibility and bugfixes
-
-- Define new GC_ADDREF/DELREF/SET_REFCOUNT macros for older PHP versions and use them instead of direct GC reference counter access
-
-- Fixup all necessary 'long' type parameters to 'zend_long', PHP 7.3 makes it mandatory, also fixup some direct function implementations to accept the same
-
-- In php_zmq_recv(), zend_string_init() was wrongly called with third parameter as '1', marking new string with IS_STR_PERSISTENT, this caused heap corruption and/or segfaults with PHP 7.3 and could possibly cause other sorts of bugs under any 7.x version
- With ZVAL_STRINGL macro, this last '1' parameter meant to copy the string and was seemingly erroneously moved to zend_string_init(). zend_string_init() copies string by default, and last parameter has totally different meaning here
-
-- In poll(), flag ZVAL separation on passed arrays (PHP 7.3 makes it mandatory)
-
-- Test 19 (exception on connect callback with forced reference parameter): skip on PHP 7.1 and higher, PHP >= 7.1 started to fallback to passing argument by value instead of failing
-
-- Test 21 (warning generation from callback): it is ok, but PHP 7.3 uses 'int' instead of 'integer' for constants, so allow any word in place of the word 'integer'
----
- php_zmq.h | 6 ++++
- tests/019-callbackinvalidsignature.phpt | 3 +-
- tests/021-callbackwarning.phpt | 2 +-
- zmq.c | 40 ++++++++++++-------------
- zmq_sockopt.c | 4 +--
- 5 files changed, 30 insertions(+), 25 deletions(-)
-
-diff --git a/php_zmq.h b/php_zmq.h
-index ef50bfb..3833967 100644
---- a/php_zmq.h
-+++ b/php_zmq.h
-@@ -44,6 +44,12 @@
-
- #include "php.h"
-
-+#if PHP_VERSION_ID < 70300
-+#define GC_ADDREF(p) ++GC_REFCOUNT(p)
-+#define GC_DELREF(p) --GC_REFCOUNT(p)
-+#define GC_SET_REFCOUNT(p, rc) GC_REFCOUNT(p) = rc
-+#endif
-+
- extern zend_module_entry zmq_module_entry;
- #define phpext_zmq_ptr &zmq_module_entry
-
-diff --git a/tests/019-callbackinvalidsignature.phpt b/tests/019-callbackinvalidsignature.phpt
-index 753de31..b5bb20c 100644
---- a/tests/019-callbackinvalidsignature.phpt
-+++ b/tests/019-callbackinvalidsignature.phpt
-@@ -1,7 +1,8 @@
- --TEST--
- Test callback edge-cases
- --SKIPIF--
--
-+= 70100) die("skip PHP 7.1 and higher fallback to passing argument by value even when forced to reference"); ?>
- --FILE--
- val, plist_key->len, &le, sizeof(le)) == NULL) {
-@@ -369,7 +369,7 @@ PHP_METHOD(zmq, curvekeypair)
- PHP_METHOD(zmqcontext, __construct)
- {
- php_zmq_context_object *intern;
-- long io_threads = 1;
-+ zend_long io_threads = 1;
- zend_bool is_persistent = 1;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "|lb", &io_threads, &is_persistent) == FAILURE) {
-@@ -495,7 +495,7 @@ PHP_METHOD(zmqcontext, getOpt)
- Create a new zmq socket
- */
- static
--php_zmq_socket *php_zmq_socket_new(php_zmq_context *context, int type, zend_bool is_persistent)
-+php_zmq_socket *php_zmq_socket_new(php_zmq_context *context, zend_long type, zend_bool is_persistent)
- {
- php_zmq_socket *zmq_sock;
-
-@@ -503,7 +503,7 @@ php_zmq_socket *php_zmq_socket_new(php_zmq_context *context, int type, zend_bool
- zmq_sock->z_socket = zmq_socket(context->z_ctx, type);
- zmq_sock->pid = getpid();
- zmq_sock->ctx = context;
-- zmq_sock->socket_type = type;
-+ zmq_sock->socket_type = type;
-
- if (!zmq_sock->z_socket) {
- pefree(zmq_sock, is_persistent);
-@@ -535,7 +535,7 @@ void php_zmq_socket_store(php_zmq_socket *zmq_sock_p, zend_long type, zend_strin
- le.type = php_zmq_socket_list_entry();
- le.ptr = zmq_sock_p;
-
-- GC_REFCOUNT(&le) = 1;
-+ GC_SET_REFCOUNT(&le, 1);
-
- plist_key = php_zmq_socket_plist_key(type, persistent_id, use_shared_ctx);
-
-@@ -796,7 +796,7 @@ PHP_METHOD(zmqsocket, __construct)
-
- /* {{{ static zend_bool php_zmq_send(php_zmq_socket_object *intern, char *message_param, long flags)
- */
--static zend_bool php_zmq_send(php_zmq_socket_object *intern, zend_string *message_param, long flags)
-+static zend_bool php_zmq_send(php_zmq_socket_object *intern, zend_string *message_param, zend_long flags)
- {
- int rc, errno_;
- zmq_msg_t message;
-@@ -828,7 +828,7 @@ static void php_zmq_sendmsg_impl(INTERNAL_FUNCTION_PARAMETERS)
- {
- php_zmq_socket_object *intern;
- zend_string *message_param;
-- long flags = 0;
-+ zend_long flags = 0;
- zend_bool ret;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|l", &message_param, &flags) == FAILURE) {
-@@ -890,7 +890,7 @@ PHP_METHOD(zmqsocket, sendmulti)
- zval *messages;
- php_zmq_socket_object *intern;
- int to_send, ret = 0;
-- long flags = 0;
-+ zend_long flags = 0;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "a|l", &messages, &flags) == FAILURE) {
- return;
-@@ -910,7 +910,7 @@ PHP_METHOD(zmqsocket, sendmulti)
- /* {{{ static zend_bool php_zmq_recv(php_zmq_socket_object *intern, long flags, zval *return_value)
- */
- static
--zend_string *php_zmq_recv(php_zmq_socket_object *intern, long flags)
-+zend_string *php_zmq_recv(php_zmq_socket_object *intern, zend_long flags)
- {
- int rc, errno_;
- zmq_msg_t message;
-@@ -933,7 +933,7 @@ zend_string *php_zmq_recv(php_zmq_socket_object *intern, long flags)
- return NULL;
- }
-
-- str = zend_string_init(zmq_msg_data(&message), zmq_msg_size(&message), 1);
-+ str = zend_string_init(zmq_msg_data(&message), zmq_msg_size(&message), 0);
- zmq_msg_close(&message);
- return str;
- }
-@@ -943,7 +943,7 @@ static void php_zmq_recvmsg_impl(INTERNAL_FUNCTION_PARAMETERS)
- {
- zend_string *str = NULL;
- php_zmq_socket_object *intern;
-- long flags = 0;
-+ zend_long flags = 0;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &flags) == FAILURE) {
- return;
-@@ -974,7 +974,7 @@ PHP_METHOD(zmqsocket, recvmulti)
- {
- php_zmq_socket_object *intern;
- size_t value_len;
-- long flags = 0;
-+ zend_long flags = 0;
- #if ZMQ_VERSION_MAJOR < 3
- int64_t value;
- #else
-@@ -1303,7 +1303,7 @@ PHP_METHOD(zmqpoll, add)
- {
- php_zmq_poll_object *intern;
- zval *object;
-- long events;
-+ zend_long events;
- int error;
- zend_string *key;
-
-@@ -1423,10 +1423,10 @@ PHP_METHOD(zmqpoll, poll)
- php_zmq_poll_object *intern;
- zval *r_array, *w_array;
-
-- long timeout = -1;
-+ zend_long timeout = -1;
- int rc;
-
-- if (zend_parse_parameters(ZEND_NUM_ARGS(), "a!a!|l", &r_array, &w_array, &timeout) == FAILURE) {
-+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "a!/a!/|l", &r_array, &w_array, &timeout) == FAILURE) {
- return;
- }
-
-@@ -1592,7 +1592,7 @@ void s_clear_device_callback (php_zmq_device_cb_t *cb)
- }
-
- static
--void s_init_device_callback (php_zmq_device_cb_t *cb, zend_fcall_info *fci, zend_fcall_info_cache *fci_cache, long timeout, zval *user_data)
-+void s_init_device_callback (php_zmq_device_cb_t *cb, zend_fcall_info *fci, zend_fcall_info_cache *fci_cache, zend_long timeout, zval *user_data)
- {
- memcpy (&cb->fci, fci, sizeof (zend_fcall_info));
- memcpy (&cb->fci_cache, fci_cache, sizeof (zend_fcall_info_cache));
-@@ -1615,7 +1615,7 @@ void s_init_device_callback (php_zmq_device_cb_t *cb, zend_fcall_info *fci, zend
- PHP_METHOD(zmqdevice, setidletimeout)
- {
- php_zmq_device_object *intern;
-- long timeout;
-+ zend_long timeout;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &timeout) == FAILURE) {
- return;
-@@ -1644,7 +1644,7 @@ PHP_METHOD(zmqdevice, getidletimeout)
- PHP_METHOD(zmqdevice, settimertimeout)
- {
- php_zmq_device_object *intern;
-- long timeout;
-+ zend_long timeout;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &timeout) == FAILURE) {
- return;
-@@ -1676,7 +1676,7 @@ PHP_METHOD(zmqdevice, setidlecallback)
- zval *user_data = NULL;
- zend_fcall_info fci;
- zend_fcall_info_cache fci_cache;
-- long timeout = 0;
-+ zend_long timeout = 0;
-
- if (ZEND_NUM_ARGS() == 2) {
- php_error_docref(NULL, E_DEPRECATED, "The signature for setIdleCallback has changed, please update your code");
-@@ -1718,7 +1718,7 @@ PHP_METHOD(zmqdevice, settimercallback)
- zval *user_data = NULL;
- zend_fcall_info fci;
- zend_fcall_info_cache fci_cache;
-- long timeout;
-+ zend_long timeout;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "fl|z!", &fci, &fci_cache, &timeout, &user_data) == FAILURE) {
- return;
-diff --git a/zmq_sockopt.c b/zmq_sockopt.c
-index 1357032..3a00421 100644
---- a/zmq_sockopt.c
-+++ b/zmq_sockopt.c
-@@ -1,5 +1,3 @@
--
--
- /*
- +-----------------------------------------------------------------------------------+
- | ZMQ extension for PHP |
-@@ -2033,7 +2031,7 @@ PHP_METHOD(zmqsocket, getsockopt)
- PHP_METHOD(zmqsocket, setsockopt)
- {
- php_zmq_socket_object *intern;
-- long key;
-+ zend_long key;
- zval *zv;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lz/", &key, &zv) == FAILURE) {
diff --git a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r3.ebuild b/dev-php/pecl-zmq/pecl-zmq-1.1.3_p20211103.ebuild
similarity index 62%
rename from dev-php/pecl-zmq/pecl-zmq-1.1.3-r3.ebuild
rename to dev-php/pecl-zmq/pecl-zmq-1.1.3_p20211103.ebuild
index d183c65cd902..3263a4973133 100644
--- a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r3.ebuild
+++ b/dev-php/pecl-zmq/pecl-zmq-1.1.3_p20211103.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI="8"
-USE_PHP="php7-2 php7-3 php7-4"
+USE_PHP="php7-4 php8-0 php8-1"
inherit php-ext-pecl-r3
if [[ ${PV} == "9999" ]]; then
@@ -16,6 +16,9 @@ else
KEYWORDS="~amd64 ~x86"
fi
+SNAPSHOT="ee5fbc693f07b2d6f0d9fd748f131be82310f386"
+SRC_URI="https://github.com/zeromq/php-zmq/archive/${SNAPSHOT}.tar.gz -> ${P}.tar.gz"
+
DESCRIPTION="PHP Bindings for ZeroMQ messaging"
LICENSE="BSD"
SLOT="0"
@@ -25,4 +28,5 @@ BDEPEND="virtual/pkgconfig"
DEPEND="net-libs/zeromq"
RDEPEND="net-libs/zeromq:="
-PATCHES=( "${FILESDIR}"/${PN}-1.1.3-php7-3-compatibility.patch )
+S="${WORKDIR}/php-zmq-${SNAPSHOT}"
+PHP_EXT_S="${S}"
diff --git a/dev-php/pecl-zmq/pecl-zmq-9999.ebuild b/dev-php/pecl-zmq/pecl-zmq-9999.ebuild
index a0147e05ff53..d5bd392cbce7 100644
--- a/dev-php/pecl-zmq/pecl-zmq-9999.ebuild
+++ b/dev-php/pecl-zmq/pecl-zmq-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI="8"
-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php7-4 php8-0 php8-1"
inherit php-ext-pecl-r3
if [[ ${PV} == "9999" ]]; then
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9a711143939d..06d2da59115e 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index 5f0b02fb5858..ba724ce08a1c 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1,6 +1,8 @@
AUX PyPDF2-1.26.0-py3-tests.patch 1452 BLAKE2B bdeb36156cf9b6eec975f0b92f85cb6794259081ec8766b316e94efdf90ddf4bd2401fe1954d87e841628aa90b0978e9899f7562c5c15d71c2c271c6e8537894 SHA512 434d1cb0fb934149054d16521ca414291cbb83618de1468a2a9e630e75fddad4c33c3ba254ae00315b2075faad333b9b027625adda3a0cf064df3366989ea399
DIST PyPDF2-1.26.0.tar.gz 77556 BLAKE2B 8ce9b95165a3841154b6e38e24ca5a4db434ceef9c55fbf2d146b379586160cb985948e0feb7aed135f601535d034ef79ddc1af58a670b07ff7d3621907022ec SHA512 7b427f1d099dcd687a718fb8d86e6f677ad45257414c6367e4dfacd8dfef7e3dbe3816027359868764981f36a30721f1731b4c23cbe2f35cfab1c64fb290b034
DIST PyPDF2-1.27.1.gh.tar.gz 1170252 BLAKE2B 81049707d4dd406405ec994228226edfe7cde4d57007146893c5fec14a4e82355c427cac64a2e338945f06c5bce1802e64bf9b042770a2d2ea7da6ed6982908d SHA512 3bd00e7057af8d0f7fdea378b8fae463ce93d37c68997511df10c53b139c0cb13329143bdac133a825404ab459ab3ead64c455ac3e58ddd5097c2985f86c2a46
+DIST PyPDF2-1.27.3.gh.tar.gz 2036376 BLAKE2B fdb35cc61a0fe4c16de9a3717b03c276478a1810ce99996c391d50ccf9ae2d3e048201e95cf9d51e120674aaea2b6435c648ee238d1c9a45de50406c0b3df196 SHA512 01ec6d2f51e6b0865a6d1b5f7cc0297783ee745336b0d8be295c0b1234e1904f2904d49ebbb0f471e65325a75428ed9904f8c565cb7b7001fce27b22521a7f04
EBUILD PyPDF2-1.26.0-r2.ebuild 780 BLAKE2B d3421ce6aeab525aeb2b54ca4904c8f6f7d46f06a430f99b43ba9ea6a3178fa72cea5c5d998f3ef2f10af306781dcb073f2839d70beb3355cd8dd62be65c0a4f SHA512 0c24a667f03548abf6bd43b81af5909f7dc11923cd75d9db36a8836b5082dad411013282f2c5d1de44d53668c31bc2a0849b6d27087bebf2f4b5b346e0ce16e6
EBUILD PyPDF2-1.27.1.ebuild 759 BLAKE2B 4f388fd0c8a9c7acc4003af7c8ab83d33bdeaf4fede8b9d8ded7a13dc574baac0ca4fa49f7e92729daf645030814b1a2179ce7712bd813006a5f583f84b06627 SHA512 ee8ecbbcd68939468302883e6a47b58fb0c5ff8308eec5abda7b7c3a9d935b8f20fb3e2e626909d83ef1a9467aa185ea14b0de467c1af3867e3b55daf9e06a13
+EBUILD PyPDF2-1.27.3.ebuild 759 BLAKE2B 4f388fd0c8a9c7acc4003af7c8ab83d33bdeaf4fede8b9d8ded7a13dc574baac0ca4fa49f7e92729daf645030814b1a2179ce7712bd813006a5f583f84b06627 SHA512 ee8ecbbcd68939468302883e6a47b58fb0c5ff8308eec5abda7b7c3a9d935b8f20fb3e2e626909d83ef1a9467aa185ea14b0de467c1af3867e3b55daf9e06a13
MISC metadata.xml 375 BLAKE2B 2493f7d2ef79342af0ef890e3683fa55255d869c684bba7224ab3afab61e77a239e323c8e63138ce4fea23c32348458cd27a0c58a3b6640854ec27b26cdb40cb SHA512 5e0d6e18e0005e4f323468b8fbfa26dc7ba33d26a94d5fda11c40f62ece84578c1f08843c9f0cf96f0d918d22063f494d486a6d692cecb5b407efaaf92aa9b8b
diff --git a/dev-python/PyPDF2/PyPDF2-1.27.3.ebuild b/dev-python/PyPDF2/PyPDF2-1.27.3.ebuild
new file mode 100644
index 000000000000..f2b04ef62173
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-1.27.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+ https://pypi.org/project/PyPDF2/
+ https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+ https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="examples"
+
+BDEPEND="
+ dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+ if use examples; then
+ docinto examples
+ dodoc -r Sample_Code/.
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/ansi/Manifest b/dev-python/ansi/Manifest
index 93b7b4a406eb..b5daa60940af 100644
--- a/dev-python/ansi/Manifest
+++ b/dev-python/ansi/Manifest
@@ -1,8 +1,3 @@
-DIST ansi-0.2.0.tar.gz 5173 BLAKE2B 436caa8e1f36e96f1844e79e3a0ff0c4099e76b25ce9f56c9d8663aeeb650f32fba75a14fe8548f557fb020e2340707272fdda4cdd3c245c903a4f801ae48413 SHA512 22c69b5030f03eca9470e288c16e62042ccd02ef2e232600a4fab629354601d5da0f7c16b60dae7293c69255e5d4125298890d99dba8e5387960a5be60b92d61
-DIST ansi-0.3.5.tar.gz 6597 BLAKE2B 4e32bd7add4af1d9f11173aa79d6ed139814f3b3727a4599f104e8632a4e169fdaccf3e18ecf425f86c17c70c1d185f6a915bd9cbac2589d376fc23c338127e6 SHA512 a12b7e1231c2691edf6d807907fe6b8a8d6c6bc116fd9681b6bb7603e6e2ce7af17e3e7892d4046752844327eb8f02a248f93686640bec24dbe2be59202b01e3
DIST ansi-0.3.6.tar.gz 6668 BLAKE2B a2bd492aa5c68041feeb04e798ce301ae50ba217c695f4500b033911a719a9e91dc6213d81361e36819a1d46ddeef82e4684ee0c395ec70fc93c6957e2a410b2 SHA512 6b7512013db18436f5982175d82c9f333eef7655eece12454f4731c7f2ed675ab39986e813560d1621b365b7541a5ca6c37d88f2ca5be4460f1ae86cb27d1911
-EBUILD ansi-0.2.0-r1.ebuild 470 BLAKE2B 37aa3b2b8c38e61c9a4e99cca4ec9b131958d12f0df0e116ccc65ff309dd11545fdec24f22964fda28971027764430f4b83258010355e8263338ce17adc96836 SHA512 a5032d3dcc4a5ada1434ccb970622a722dffcc71d697b48e54c6a0e4760f82bddea1241844b51aba5b3cde6b0b615bbb5e6b1f5aed30ec5f8de0b83bc704e621
-EBUILD ansi-0.2.0.ebuild 465 BLAKE2B 2161a95e1dd66b9b0d0706a086e760df876f240584a54081b6d6e76ed6a110d239b99b72730b1e34281b669641571bfd3edafc0e03c93bc5ce6e54b8eac8e748 SHA512 3b37844d0d03f3586da45c015e224e8146360e4b683ff454ad77a4b05700c3a1d02ae41a44111aaa492bc024a2f861ef7d9309e0adfea7a4bad849cc6912d17e
-EBUILD ansi-0.3.5.ebuild 471 BLAKE2B 44bc26a0810107725db720b55d1168cfd564431885a5ec37bb5e3b49ba9aea8176d70c66d074b37d736247a6f2c22ef29bfa767dcc2223b2728f22c8003c239b SHA512 244d1ce356b0efeaa23685eadce723951798b979f499d529631ac5d40fd229f1f0caead0feb6226505bb2a73fae852c4c6521b78145efea0da19d8c5d7bce76a
EBUILD ansi-0.3.6.ebuild 471 BLAKE2B 44bc26a0810107725db720b55d1168cfd564431885a5ec37bb5e3b49ba9aea8176d70c66d074b37d736247a6f2c22ef29bfa767dcc2223b2728f22c8003c239b SHA512 244d1ce356b0efeaa23685eadce723951798b979f499d529631ac5d40fd229f1f0caead0feb6226505bb2a73fae852c4c6521b78145efea0da19d8c5d7bce76a
MISC metadata.xml 391 BLAKE2B 6bc19e1bcc5f7a607edffdee87f993d9c4cfa9e741e5d3f3d1b009279016f1771bb2a5ad0547c19d607b0247437fe92006c59ec10f260434f6eb55201deebe1d SHA512 acc12df2836c216cd40ad604f55664abd2d228018c1164006b05b74aefc3bf81967227dbcf414ed175fa8e07e10f0e0d6decb37c24a4aa8d58fac7407c63cc37
diff --git a/dev-python/ansi/ansi-0.2.0-r1.ebuild b/dev-python/ansi/ansi-0.2.0-r1.ebuild
deleted file mode 100644
index e29598da4af6..000000000000
--- a/dev-python/ansi/ansi-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="ANSI cursor movement and graphics in Python"
-HOMEPAGE="https://github.com/tehmaze/ansi"
-SRC_URI="https://github.com/tehmaze/${PN}/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ansi/ansi-0.2.0.ebuild b/dev-python/ansi/ansi-0.2.0.ebuild
deleted file mode 100644
index 969860654680..000000000000
--- a/dev-python/ansi/ansi-0.2.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="ANSI cursor movement and graphics in Python"
-HOMEPAGE="https://github.com/tehmaze/ansi"
-SRC_URI="https://github.com/tehmaze/${PN}/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ansi/ansi-0.3.5.ebuild b/dev-python/ansi/ansi-0.3.5.ebuild
deleted file mode 100644
index 838f9f8f9f2e..000000000000
--- a/dev-python/ansi/ansi-0.3.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="ANSI cursor movement and graphics in Python"
-HOMEPAGE="https://github.com/tehmaze/ansi/"
-SRC_URI="https://github.com/tehmaze/${PN}/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/autoprop/Manifest b/dev-python/autoprop/Manifest
index 3c2a92e46694..d7e3b25ecae0 100644
--- a/dev-python/autoprop/Manifest
+++ b/dev-python/autoprop/Manifest
@@ -1,4 +1,3 @@
DIST autoprop-4.0.2.tar.gz 20050 BLAKE2B 06165a02dfee0755ccf375041487f015e632b56b24766ac3d4bd484caaf1c99a0506994f16ace753f5890b782690b640196ee0cd6fcce0078ef51f8addcfcfe6 SHA512 27c8578e8f023715b07ebe21f4f46e98e606c863d3257bb1c8c31d9f59551d2494ef99e24eed856b308c8c77e1a3276f9e370434aa3e61ebb0b32a9b44fceee7
EBUILD autoprop-4.0.2-r1.ebuild 533 BLAKE2B c4ba075a1e6ab3a1cb17235693001a1af6d007094a312f4df9d5ea8d9f76bb63d2a9e641c5d97d7991fdb98f4e7b1fc85bc6302a4d8927550e222d1f038c9ee4 SHA512 cac7dd30bb26816c5a76eb6e4caae643434c0c1205e124d5b2cdfe89512131e198c3644b927a1ceca82f9ad0f13217461f797f1bd67fcc61fda882fab0c3e332
-EBUILD autoprop-4.0.2.ebuild 535 BLAKE2B 59f062b2146fc21f9f0ba80d227f95ad20fab977f538482383c2f71be2192ba428cbcc77565fab3bba94a1a050eaf1ee088a545d26518a8d02bd1810c338ba58 SHA512 0565366574789d7ddd74369085d78c9d2eea9b5f5a8afec405deacbd6b809b1824695ce804b974e6998666df88815be386d5e87a8698f9e252b0afae47c6466b
MISC metadata.xml 1376 BLAKE2B 4546775f81e9b3002d39733fceb5b0c505a909c8de9a81159ba6458147c1f7b632464fa55ab43b94c210ec1a2e07a8f4259bf5bd7a07ae3c5f0edee316741648 SHA512 76e109f6d16d5e8de55fa6d613ecaa0c47873ac46b5c5818b7569045eac6108ea6088031a5c9f1c2335dcc3f527cf90443bf5c6346443835c763e7dce07fbd18
diff --git a/dev-python/autoprop/autoprop-4.0.2.ebuild b/dev-python/autoprop/autoprop-4.0.2.ebuild
deleted file mode 100644
index 9d5ce4a8be8a..000000000000
--- a/dev-python/autoprop/autoprop-4.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Infer properties from accessor methods"
-HOMEPAGE="
- https://github.com/kalekundert/autoprop/
- https://pypi.org/project/autoprop/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
- >=dev-python/signature_dispatch-1.0.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/bert/Manifest b/dev-python/bert/Manifest
index 13a87dd5da0d..f4f39a7f934d 100644
--- a/dev-python/bert/Manifest
+++ b/dev-python/bert/Manifest
@@ -1,5 +1,4 @@
AUX bert-2.0.0-remove-basestring-fix.patch 647 BLAKE2B 19b7b65b41be9c3b929c0dc2c92d5f511017f093e924813d547e29a763a0fc23d557798be5542a2991fdb2a808afc087a8e5c40dc03d06d1864564ef6a566aa9 SHA512 e4554308cd81c9b7bd69cac3eed2bb65ce604bfbc494f644b7b0dccbad527af973cb7afb4589b602457ecccbc893f50acbd1031aff87ed30b06f2824ff20d548
DIST bert-2.2.0.tar.gz 3541 BLAKE2B 3f1f87d5205e1098f7d170da5a4e331f9421151af536c106ce2de925082c48bc739df4bbe2294a2dbe8f65d2ccc24a1d5bb944ad90e80e558cb5032e4fd7c639 SHA512 417c9752362c6dc7ade8078f259d1674fcddd09b6af595694a9c31e886dbb523460413d4bf041db29afd4d67a9d639ef8f9254077c31d1593657ad52f8ef45a8
EBUILD bert-2.2.0-r1.ebuild 519 BLAKE2B 9074f3732c947d58509b1ed88e89c4f0169e87962e3b1a9b7e074725f25283bbd34b515a4e56f9ae4e3d665e55d582750f5ea8b73748b06c2c6c70288f154f7c SHA512 17fcbf16ef8bc545718f52ddd3344cc24082cc49420bac723850c636612994f83e16a35cc04af5dc5852ee036490704a3d5d0bccf4e479b566a1a352231ca9c4
-EBUILD bert-2.2.0.ebuild 573 BLAKE2B 3c14c0e133f844330cd8428ef05b4a2af9665375a8a4b92ad3fdb6ff25ecfa3f449bfc979de258bdd8d5ee715b7d97dd75dcdbcd2447c4cff2fc94fc5315d09a SHA512 9fdd7bd85a697b6423e9bca5579351eff172419f7bd983f1f9b4804c8f478873791bc4e3d3c312680c9c145c18dc88da42907d382d7cb0d280f62aedfabe836f
MISC metadata.xml 390 BLAKE2B a4e19fdfa922722d9567edc7fa88c44214bf9a7d2944e8cb2932d425d621b17ddb35ad24fcbc6cd5ab38c117845596eb635dc415f510169ec687517f2f3b8fd9 SHA512 ba375d5d896b29c74a72bb34d2f34da958f4c2a29965e9052fc790d91d8667d96d539708afd51654dcc0dddb77663a3e29418603dd63213fe980ca441bd45c66
diff --git a/dev-python/bert/bert-2.2.0.ebuild b/dev-python/bert/bert-2.2.0.ebuild
deleted file mode 100644
index 63617fa34a44..000000000000
--- a/dev-python/bert/bert-2.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="BERT Serialization Library"
-HOMEPAGE="https://pypi.org/project/bert/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/basho-erlastic[${PYTHON_USEDEP}]"
-
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}/${PN}-2.0.0-remove-basestring-fix.patch" )
diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
index d4a1936fd302..ec5c8741944a 100644
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@@ -2,5 +2,4 @@ AUX carbon.confd 119 BLAKE2B 75505b3aedcc65306a1cd16645e349012652a268d838dc1fd32
AUX carbon.initd2 1329 BLAKE2B 7990f8ee25f2554ce5997075c7fda4cfc69d73ae060657a917498bed4ef237a6e0b43b522ef15b0587d15c71fdb03a26f562d1147212c50f8d838f97522cc9cd SHA512 08d9a7ddc763bb49763b1c873504b0dfb45763ed871f22632885692f41d5d8c86616677c2669b0b8c2160170a7c507c2415571d300e2045675c7002556a4063e
DIST carbon-1.1.8.tar.gz 72452 BLAKE2B d76a281925645ebf6f74ff83f8ea6a52016f29ae0e35143e48e9aa0f2fcc267ceee1b5040ad756bbab8b2c1ffde5040231b8e0b581bd177bfb31ddf33fab7933 SHA512 b679d0329a5c8701af8aad3bdc51d64fbab7d05214c09368a218f1c925593002596a04b50fd2aadf26bd21ea7ef4b8262ae7f8169ef0d6ee40dccbc933539161
EBUILD carbon-1.1.8-r1.ebuild 1980 BLAKE2B afe8b0c091f13cbe066ba42f0bd4633f33f5eb8355669df8eb014931a14d931f97cea636f5e01de7c933435ac9242b557520032aecb8f78892ec76a635ce4a74 SHA512 851fa45ccc3ef30811572b7cc7c94eb7d5d8fd839c3c2b5920eca463b8a0696e10c13e84c193cff07ebb9571980b2a7bb5dfe0c4f455cb2d302ea7d2ea7f2e08
-EBUILD carbon-1.1.8.ebuild 1976 BLAKE2B 572db2a871584dac7cfa542dfda82bcbc30d17ff82092d182057536934b788b1564565a2ef611abfaf6c700afa566f2ff54a85a8009c735961b28ef41b24e7a7 SHA512 4dc5e6b1d9567bdb56bd91a95dc8abcdd5ced0b5885dcf7d6f19b5f20dc882bc02c13dc82493caf0ad92aba01fae22d364170f3aea531053a0c21a85661b299b
MISC metadata.xml 442 BLAKE2B e3ab8eb53738bdacc8fb73e7514c28290609200a34d6d6fc0111e30bd44d7806f91a4c3906cf473f8dc58b6d8012ecdaf320d943f770d05e26f3b0b44d99a57f SHA512 0deb6d56a05c7b0ee70787dad985a0f250d8328c1edd54690092dceeab8ba90e96ec2ddb326202f01eeb702776e448b746a5c92392ea02cba1892155d3eb60ec
diff --git a/dev-python/carbon/carbon-1.1.8.ebuild b/dev-python/carbon/carbon-1.1.8.ebuild
deleted file mode 100644
index ae7b292a9cd4..000000000000
--- a/dev-python/carbon/carbon-1.1.8.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Backend data caching and persistence daemon for Graphite"
-HOMEPAGE="https://graphiteapp.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-# whisper appears to have been missed from listing in install_requires in setup.py
-RDEPEND="
- dev-python/twisted[${PYTHON_USEDEP}]
- dev-python/cachetools[${PYTHON_USEDEP}]
- dev-python/urllib3[${PYTHON_USEDEP}]
- =dev-python/whisper-${PV}*[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
- # Do not install the configuration and data files. We install them
- # somewhere sensible by hand.
- sed -i -e '/data_files=install_files,/d' setup.py || die
- # We want FHS-style paths instead of /opt/graphite
- export GRAPHITE_NO_PREFIX=yes
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /etc/carbon
- doins conf/*
-
- keepdir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
-
- newinitd "${FILESDIR}"/carbon.initd2 carbon-cache
- newinitd "${FILESDIR}"/carbon.initd2 carbon-relay
- newinitd "${FILESDIR}"/carbon.initd2 carbon-aggregator
-
- newconfd "${FILESDIR}"/carbon.confd carbon-cache
- newconfd "${FILESDIR}"/carbon.confd carbon-relay
- newconfd "${FILESDIR}"/carbon.confd carbon-aggregator
-}
-
-pkg_postinst() {
- einfo 'This ebuild installs carbon into FHS-style paths.'
- einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon'
- einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this'
- einfo '(see /etc/carbon/carbon.conf.example).'
- einfo ' '
- einfo 'OpenRC init script supports multiple instances !'
- einfo 'Example to run an instance b of carbon-cache :'
- einfo ' ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b'
- einfo ' cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b'
-}
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 29a426888c99..f46b5338500b 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -3,14 +3,23 @@ AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152
AUX django-4.0-bashcomp.patch 2021 BLAKE2B f04c83b500a92ea8ef9609225191e38a41b3349a295beca8f8575ab05395d0cf37e1aefe295004b11c1bcf34cce9074ac7d274034cb50e1ae43e2fcb5d6952b2 SHA512 2215dca4120023b0fd839738bd602443c49e9adaa98d182bc74081ebe70613649c2dc11e2b5f6242701dceac25755adb8605774895091360b56ed1195a7e629e
DIST Django-2.2.27.checksum.txt 2556 BLAKE2B 770dc5670d0d4aebcfd1956d644b9d7e4e5bf0b511649ae072de1b8ec8d2ea12dbc48563f5372979dead9e729abd9b5174c99323a14170876b1f1b5e61de96f6 SHA512 fb76f2bef6e6d0a3002298e4eeec5b335bfdc365ae55f0c26dcb050d369864c504dd32d40ac3b49897d56bc0dadc10136b588361ddf3598ffdc03830a97e1d63
DIST Django-2.2.27.tar.gz 9185716 BLAKE2B 26d509c722c62b5bf784331466a97ad1b961715572da9e6add4be1bdc7cf999c0ec7c763d9bc8ab2fc1ca35a48783feaf748c3c9388ae9f5f3e393972deea734 SHA512 0db670651a820b49d855e38a336c0c6990ce4701bb686c5e8a292ccb03342e995c61c2c628b1d625d2715404e969fc31c256e5bf0fd6c1ff714d1c1c1ee30bff
+DIST Django-2.2.28.checksum.txt 2554 BLAKE2B 23421008f45040be56c417fb4d31ab8cb72d6d6fb59f12e53de1a7947ffed3a290908a49e7ce08bbb155380472daed93b33c2e90580d3bd0aa3d0d9190478bca SHA512 a7e4b2abf3f3ff79e6a0a55047afc6dcb97a2a27bdd6b25770ad60df3eaa4d260d332ef0b94e63971c500a313c2033127575510e871c5ec648bd045c04353aa1
+DIST Django-2.2.28.tar.gz 9187543 BLAKE2B da6ae04b84a858a678b9740694cf1b638128b783da1aa8443c0e85ea3d7f71104e433de043ff7264575e2df36b6fea7275874ff04391b41eb70ba6c7c78306dc SHA512 228aec6ee8619ff3d0397ff867bd59352900fb95557bd02cfea594b3bc3f813b5bcd13f488b451b0ee79a4d52deab19c5e97aa40f1075ba06db72542d119228e
DIST Django-3.2.12.checksum.txt 2556 BLAKE2B 7ae6e41305b5b07969ddad3474a0819359dff888fc3bdc1c5000ded1b9b726a7c55aa7aaffc85184558edcc6c12b617c8270cc569fa8e645622206631979a9c2 SHA512 5098dde440a15ad066fa7927943f4ec66bb925798afcb42101c5cf50b8148301866c39ad37ebb5db9d7f9e195953337c03dc6fa2c49758716f969ee2ce414d24
DIST Django-3.2.12.tar.gz 9812448 BLAKE2B 39b6e7e8f50b79d7be62be171eb358ab815c9dd630b8b2ad2cf085c42c79a6a8c92914fae3c471f41578e65fa09f011f959dd0794c804e7b30cfbc9411cf4f4b SHA512 fc8ad3af019b268d514cc5240cac9c6b2fbf3a169c7933e8ab2da92e9cfed72df7a2784a8d92eaec8105bc9c245763acd307178bdf662e5d51407e72ae9d8683
+DIST Django-3.2.13.checksum.txt 2554 BLAKE2B 301d816685f6d97c4a18b4f9d015b063521a7e90a870f1c95ec37ebbc1d4e7311abfee7f7c4aafaa40932334d0eab68fc768dcf21acfffe1d098cabd71ea161a SHA512 ef4a5d0fb8e885cbc2854a4b9b2380dec1cec0e8f6d9bc54179354eb6170755bd6f02268ad5bdc81fdea9d30022422462b0b14894ccc0f37d2e7288aeda83abb
+DIST Django-3.2.13.tar.gz 9813985 BLAKE2B eb8319cc225491fc71f719d2eef6daa05114a97b1302093a0cf0f77bb2a51f398e7a034df7aa52c6a64e9796b9cc66b127fccee810cb38508506ba4cd121cfbf SHA512 08f056b18bc04b95d6705cf70c2ecc5be0c1324e0b38582991b907ed5977c4e3d35417ccf4ec06c2436a718e3aae007b015f0d40dd94ce5cfb129a54cceb6578
DIST Django-4.0.2.checksum.txt 2547 BLAKE2B 532139126846e1758bbe7b4dc4ad4aad6c6b3607e298f4373366239637ceca7d01a26472b2a87917e64db7140d28a76c1f5fbb396e7022b1a42b723551770d1f SHA512 eddd8ac31fc60f803f1e6f975c079e84e5ef997e8ac93b7dcf3573bd0c5d057adeb6f092acaecb200529044d81aa2db9849c1c13525678c8c2bd27bd14d6b280
DIST Django-4.0.2.tar.gz 9996300 BLAKE2B 422b0bb000e7f62a854dc8fa686001acc3f629ded462d2520fad9486a9c8eb5d501d29c6a9f30f63ff8da128ded6f40281439371eb688fb9bc95f2377c5ca0f7 SHA512 c64b25aa69b826805cc7a3efcd63ae41bbc31a61e68cdbda90e6bcec6bd8e2c5fc47b82176d0c1708f55d2c7b082c71939b89cb0621fcf1929d1475e3d393a97
DIST Django-4.0.3.checksum.txt 2550 BLAKE2B 19471819fb593611217ae13a7dcb6bc67a0323daa94f4a4aeee508305aa09edbbd88ea759968ac989a1971bd72df766c7651e969aa86d3cbddd65b2bb3bf7efa SHA512 573cd0b9291698bf3218d6a77c146b5cda814e99c01cc2c455bf1b5ab2c4cbf4f2f569ea14a108e658237e933a69ec1a5288c293174916f4393ecb119231b9dc
DIST Django-4.0.3.tar.gz 10061007 BLAKE2B 1cab7d16608acc64b2bd80aeb7d25e740442411080811a2704bbb8ddbc91d86d2aeb761cbb0522a9f095d29468060959ba7f4efd902f6c3afe0f6eb06399dd11 SHA512 4de4445e8b095ad5b858a741adc21939654838ab88b368d532f87490c1c2b3b9c927410f4370e02d2883d51d6a9508f5db3be13c2358221ae687cefea034b294
+DIST Django-4.0.4.checksum.txt 2545 BLAKE2B d82f7b01f49f2b37de3cfd9eb8738e4af69c8eda0c3ed2b6d80a5f876989f36a9335640c5cd5916dcc682fcbf5453c299cb8b3f52e05f2d29413a4c75d274cbc SHA512 9889e086f35192432084fd2ae1104c316e63fa2ab0d34f6954d5eb98b810b5f2e10861a4136c480b54178d2a5453a36f3b893c7720a92f35b44cd578902a8bf9
+DIST Django-4.0.4.tar.gz 10388499 BLAKE2B f839b343bf5c2f83810f2bb22e93a91b18ccc30754589fef2931ebdf29d4600a3bf5493f9e977a3b647097c3a379ea1ef4e0e25366efb54082bc0f43ed00485f SHA512 75ecf5991763237297b458f546d245a25f62272f7013364783aea19469586fa54ce94a16323ac9a6d6b81097f8e962ea7a20f26c7afd8acda842812409215bb1
EBUILD django-2.2.27.ebuild 2676 BLAKE2B fac142da15bc8f27726191808b107e7e49be0d68d779259ce4a1730aba104d3fc978292dd8c5ce7fbe9020a802eedad02d5cf1c50e6cbb314e540a254f78e2d9 SHA512 a7cb898618b31a624561389e19fd318bfa9afaf7609e9fedf1d049b7f3dd99b45c39d619d0db3c895f305dac09ac39c33c947cb60422908c394a2a31690d8a8c
+EBUILD django-2.2.28.ebuild 2887 BLAKE2B edb1a4e936b84b9acb9d62c4dfa236074ce94a123ffe3af342c33f5bb979d072fe42fdf68214ad7e2fa23b7d07805768ba2343ae8d831ec81d090a12490cb41e SHA512 7086c025419a577b0b90a29376b2dfdcdfa53dbc761724ef8682e173f1ce4b357e9538acea176c256f45b449e4ae378e7b295cd28c3c27a3826cd0439bcb7300
EBUILD django-3.2.12.ebuild 2896 BLAKE2B e152a21beddeb46f0b5ca0210bf362fb4eafbd8ac1152964bab008d4fe47d7c250e6f8d082055797a89c0ef34a9fe1137d9f9fe46a45376c53ba433d78fd5e60 SHA512 9a0788fb8f1c916d79871eeb24b67e8f9fe803db707533994e3087c641e430f6eba308f95775b4006f06b7576bb5b9a19c9bf906c4f50cba1f54fd281331532b
+EBUILD django-3.2.13.ebuild 3054 BLAKE2B bb7b8867aa11120f0a0e14cd4713b6c17ba9f82413cda7ae0e53df0538767b34ab0891db33e17f960eb5075c718a3cb9b3b870daa4d116fd85beea3554f39e75 SHA512 5ac07c8a3d4578e3bdbfcbec91423378406af69a117ce4c7b87f860d7a7d8d278814a09f9c077058a4f33417f901d5e5aa63e337ca279b0803e93381d99357d5
EBUILD django-4.0.2.ebuild 2956 BLAKE2B daf8e2523918193db1e242684debfb524dde2a85243f4c8e2700c730f72f16a215dcd507529790f1fdb2d8e033368b96b4b02b6aa238e59a1cfc497dca093ac8 SHA512 1b0912d1432ea5657d752d49d73d1e015039d8fc8760a16271eb5bac9b8d95b68eab1a065162385f13f8fa93f832d3974f5a3800204f191a1101f885238f5390
EBUILD django-4.0.3.ebuild 2973 BLAKE2B 9b278f71f3da3391061d514ee6cf11d5e297e3056a4ea94069a4e85c5e04ab6e581989170953fa78a63bea4e6850d567cc394b39fd4851e9a5ceb643eeb4d08e SHA512 0b1cd5523c196b762bb1a7a41a50721c3eed86ad0b3d4f9b2fa1964b24804c273c1078ac2cd1ad9827e06240fe1cc253c880b76de79e48d78c0ba3a488e45091
+EBUILD django-4.0.4.ebuild 2978 BLAKE2B 4adb294523719ea7a76332fd2427ec7d48c391be85966689f64d9f1fe3ba008feb8ac8fad1a68af328b7eff83fc70d137c0d61d99dc8200ba6e946f13d54c730 SHA512 3612a823e473fa1f505d581609f4b0e24fdbc2f760585b9be74a9face3bc5f63e9f2edaa0c6edb3dd9f233a4ea74e98e03984ff92a79cee0526ab36dffdc9961
MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-2.2.28.ebuild b/dev-python/django/django-2.2.28.ebuild
new file mode 100644
index 000000000000..fc171b9a73e1
--- /dev/null
+++ b/dev-python/django/django-2.2.28.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+ https://www.djangoproject.com/
+ https://pypi.org/project/Django/
+"
+SRC_URI="
+ https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+ verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-python/pytz[${PYTHON_USEDEP}]
+ >=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ $(python_gen_impl_dep sqlite)
+ ${RDEPEND}
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pillow[webp,${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/selenium[${PYTHON_USEDEP}]
+ dev-python/tblib[${PYTHON_USEDEP}]
+ sys-devel/gettext
+ )
+ verify-sig? ( sec-keys/openpgp-keys-django )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+ if use verify-sig; then
+ cd "${DISTDIR}" || die
+ verify-sig_verify_signed_checksums \
+ "${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+ cd "${WORKDIR}" || die
+ fi
+
+ default
+}
+
+python_prepare_all() {
+ # TODO: this suddenly started failing
+ sed -i -e 's:test_custom_fields:_&:' tests/inspectdb/tests.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ # Tests have non-standard assumptions about PYTHONPATH,
+ # and don't work with ${BUILD_DIR}/lib.
+ PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+ die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ newbashcomp extras/django_bash_completion ${PN}-admin
+ bashcomp_alias ${PN}-admin django-admin.py
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ optfeature_header "Additional Backend support can be enabled via:"
+ optfeature "MySQL backend support" dev-python/mysqlclient
+ optfeature "PostgreSQL backend support" dev-python/psycopg:2
+ optfeature_header
+ optfeature "GEO Django" "sci-libs/gdal[geos]"
+ optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+ optfeature "ImageField Support" dev-python/pillow
+ optfeature "Password encryption" dev-python/bcrypt
+ optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-3.2.13.ebuild b/dev-python/django/django-3.2.13.ebuild
new file mode 100644
index 000000000000..3065555963a8
--- /dev/null
+++ b/dev-python/django/django-3.2.13.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+ https://www.djangoproject.com/
+ https://pypi.org/project/Django/
+"
+SRC_URI="
+ https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+ verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ >=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ $(python_gen_impl_dep sqlite)
+ ${RDEPEND}
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pillow[webp,${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/selenium[${PYTHON_USEDEP}]
+ dev-python/tblib[${PYTHON_USEDEP}]
+ sys-devel/gettext
+ !!=sec-keys/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.1-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+ if use verify-sig; then
+ cd "${DISTDIR}" || die
+ verify-sig_verify_signed_checksums \
+ "${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+ cd "${WORKDIR}" || die
+ fi
+
+ default
+}
+
+python_prepare_all() {
+ # Fails because of warnings
+ sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py || die
+ # TODO: this suddenly started failing
+ sed -i -e 's:test_custom_fields:_&:' tests/inspectdb/tests.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ # Tests have non-standard assumptions about PYTHONPATH,
+ # and don't work with ${BUILD_DIR}/lib.
+ PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+ die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ newbashcomp extras/django_bash_completion ${PN}-admin
+ bashcomp_alias ${PN}-admin django-admin.py
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ optfeature_header "Additional Backend support can be enabled via:"
+ optfeature "MySQL backend support" dev-python/mysqlclient
+ optfeature "PostgreSQL backend support" dev-python/psycopg:2
+ optfeature_header
+ optfeature "GEO Django" "sci-libs/gdal[geos]"
+ optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+ optfeature "ImageField Support" dev-python/pillow
+ optfeature "Password encryption" dev-python/bcrypt
+ optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-4.0.4.ebuild b/dev-python/django/django-4.0.4.ebuild
new file mode 100644
index 000000000000..17ed6b3a220c
--- /dev/null
+++ b/dev-python/django/django-4.0.4.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+ https://www.djangoproject.com/
+ https://pypi.org/project/Django/
+"
+SRC_URI="
+ https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+ verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-python/asgiref-3.4.1[${PYTHON_USEDEP}]
+ >=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+ ' 3.8)
+"
+BDEPEND="
+ test? (
+ $(python_gen_impl_dep sqlite)
+ ${RDEPEND}
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pillow[webp,${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/selenium[${PYTHON_USEDEP}]
+ dev-python/tblib[${PYTHON_USEDEP}]
+ sys-devel/gettext
+ !!=sec-keys/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.0-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+ if use verify-sig; then
+ cd "${DISTDIR}" || die
+ verify-sig_verify_signed_checksums \
+ "${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+ cd "${WORKDIR}" || die
+ fi
+
+ default
+}
+
+src_prepare() {
+ # TODO: this suddenly started failing
+ sed -i -e 's:test_custom_fields:_&:' tests/inspectdb/tests.py || die
+
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ # Tests have non-standard assumptions about PYTHONPATH,
+ # and don't work with ${BUILD_DIR}/lib.
+ PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+ die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ newbashcomp extras/django_bash_completion ${PN}-admin
+ bashcomp_alias ${PN}-admin django-admin.py
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ optfeature_header "Additional Backend support can be enabled via:"
+ optfeature "MySQL backend support" dev-python/mysqlclient
+ optfeature "PostgreSQL backend support" dev-python/psycopg:2
+ optfeature_header
+ optfeature "GEO Django" "sci-libs/gdal[geos]"
+ optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+ optfeature "ImageField Support" dev-python/pillow
+ optfeature "Password encryption" dev-python/bcrypt
+ optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 6623c6223f0f..a531f0b23ce7 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,7 +1,3 @@
-DIST dulwich-0.20.32.tar.gz 418100 BLAKE2B 21d41a7b1e491848a11ab3e3b1b63bfbe1798b38ef331136b07609f004e780672477e91a637dd3b1ccd3b26e359461e1a16d759ac2cb98d1091fbdb1968c00a9 SHA512 9af4cb4462ab9a69bea9074aace81eeb8d33087f2c53e64145991913ad132e076b62f7958551729c758cd6eeae029a278723872771ef36b046331c85ebf2fcf4
-DIST dulwich-0.20.33.tar.gz 419863 BLAKE2B 57b7a05f7a23745ba63e2faba9cd3772637a61cf9f2077eaf7ec799f5e3d25de7245aabbebf22cb58f5cb45318b653335251fc46b136b108770aaa6c2b09e099 SHA512 f2d0f8875dc4cd4ac4629f2884a5e68938d14218ef96a19ce322559a16eb64cdee92ed0bc07790e9d527a20fdcd29f6fe1f95479d0055cdab88f509bc318368c
DIST dulwich-0.20.35.tar.gz 420972 BLAKE2B 97c877554199aa8f3abf2f95a43c350cbef784f6f71af6280c537a93297c89981190fe1f66914532641a99cc3dca82a33b43d09f864f2ddf370c0097fa28a5e0 SHA512 23c272153547e0ef25a0e7d2deb64987e5d503545775e7d6f438ae09366c0037686eba1027d38a9dbf042bd1553eeb25ccdc818bdd785a2edf2cd3688f0b1271
-EBUILD dulwich-0.20.32.ebuild 1618 BLAKE2B 7f39288d500bdfe1e2b7820d1482b3d336f9612dcc861e2d20a33ef7a0ed68a8790d6de3e7c6e19f6c4439fe2ee97d682d3b73c8e95d85f49b819df1cd80f8e6 SHA512 102f5b2a6d10f3c4e3b65b38678998138c17e491adbc5695353978229d0b5d776fe2d7409519861d176eb053e0d5c6f89ec86bb0e83904bb5151a17af2415497
-EBUILD dulwich-0.20.33.ebuild 1622 BLAKE2B 5e4f668dd9ac9e4cc4ed0d2e2a96f55724e3838cfba36aa4729af95d6e8c9e40603accfab50df5b105b269756fdb15c46dee53a0d99d352c26b43a3deae5ca9f SHA512 f487b2e6e0ad1245b7cb85fa93d3274284ed9ce179c59eec89b60d72180b2c8129e0e11e80db342c08ff1e772116d2d64966d80bd64f97024a536ce995b63a35
-EBUILD dulwich-0.20.35.ebuild 1620 BLAKE2B fd3c4a75e8a5141f4b439ddf8ddd91249c9e851927d0fb2a57d0369941efc29c79f880543c5244062c03519102f2dd0cf6c8669595fe038a212e663cf5bb386a SHA512 e0c642cd2e0fabb8c16689082fd685fc01b86c7c584bb5d91432ee4d7b7269823647327dbbe455d514ff3a059a8acadf7e3afd1508fec9f0dda37598d42e47c5
+EBUILD dulwich-0.20.35.ebuild 1619 BLAKE2B 94efc3af1507989f62d84725baebd2516bec5dc2d0b359d34bb527da549892a51d9a58acde83fd5fc82c46fbc686c0731418bc08353110ad022626f5de19d8cb SHA512 c221553d435b9e875809baa71150308c9f03b4150c8e4ab245346272ada12e98f81c640c4cf098ca45ac089c787cd73f25cc8cee2b5ffc6e30ebd95e5ab2226f
MISC metadata.xml 556 BLAKE2B 240554ff522160e9508bf6debadafcc44b5ccc4074dd4c9d3ce82358963084c60a1afae9fafee6ab1e6e5d898940ccb4d1b524cebff155e61bf6707c9396b647 SHA512 a7cdca224a01d5bd26bf4a5adb0273977ddff61f75cd02f5642132656fd0c6608114617efcb068d834f107804666cf4fb3725967e804b73d2ddcb67342dc30de
diff --git a/dev-python/dulwich/dulwich-0.20.32.ebuild b/dev-python/dulwich/dulwich-0.20.32.ebuild
deleted file mode 100644
index c0e390ffa35c..000000000000
--- a/dev-python/dulwich/dulwich-0.20.32.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
- https://github.com/dulwich/dulwich/
- https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-python/certifi[${PYTHON_USEDEP}]
- dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- ${RDEPEND}
- !hppa? ( !ia64? (
- dev-python/gevent[${PYTHON_USEDEP}]
- dev-python/geventhttpclient[${PYTHON_USEDEP}]
- ) )
- app-crypt/gpgme[python,${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/fastimport[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_sphinx docs
-
-python_test() {
- # remove interference from the tests that do stuff like user.name
- unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
- GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
- # Do not use make check which rebuilds the extension and uses -Werror,
- # causing unexpected failures.
- "${EPYTHON}" -m unittest -v dulwich.tests.test_suite ||
- die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
- if use examples; then
- docompress -x "/usr/share/doc/${PF}/examples"
- dodoc -r examples
- fi
- distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.20.33.ebuild b/dev-python/dulwich/dulwich-0.20.33.ebuild
deleted file mode 100644
index db9d32133a7a..000000000000
--- a/dev-python/dulwich/dulwich-0.20.33.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
- https://github.com/dulwich/dulwich/
- https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-python/certifi[${PYTHON_USEDEP}]
- dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- ${RDEPEND}
- !hppa? ( !ia64? (
- dev-python/gevent[${PYTHON_USEDEP}]
- dev-python/geventhttpclient[${PYTHON_USEDEP}]
- ) )
- app-crypt/gpgme[python,${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/fastimport[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_sphinx docs
-
-python_test() {
- # remove interference from the tests that do stuff like user.name
- unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
- GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
- # Do not use make check which rebuilds the extension and uses -Werror,
- # causing unexpected failures.
- "${EPYTHON}" -m unittest -v dulwich.tests.test_suite ||
- die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
- if use examples; then
- docompress -x "/usr/share/doc/${PF}/examples"
- dodoc -r examples
- fi
- distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.20.35.ebuild b/dev-python/dulwich/dulwich-0.20.35.ebuild
index c76a06f92d00..413607672873 100644
--- a/dev-python/dulwich/dulwich-0.20.35.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.35.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2+ Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/empy/Manifest b/dev-python/empy/Manifest
index 525ad0aa8818..dc2843ebc861 100644
--- a/dev-python/empy/Manifest
+++ b/dev-python/empy/Manifest
@@ -1,4 +1,3 @@
DIST empy-3.3.4.tar.gz 138495 BLAKE2B 0040b26966d3d6c7911cc7957159084ddb610085affaa5cf214121fdb292c43b071df8990749e02c0c3ef46cba131188e0907b8ab7c28a0834498b505bec0a2e SHA512 5de8de26484468d180a2575bfc8302cb3d32004ed4d70768310b7564a9ed1bb880b8c1d862f419588b2b5baa8c3da8bc707eac41f3921e6136cc5bc3f47f1a3d
EBUILD empy-3.3.4-r1.ebuild 894 BLAKE2B 1f7072a5287c6a01cf02c4deea1ced7b0029938ce7a969731d18055fdf621b6bdffc126199832b256d29a590d6af2e7e5958b0fbee655f794116aa4baeffe948 SHA512 e2b78564e5aabe568f36928e0901a362afbfef39d6332a2b80ac6be71a5dd652d55066023c2759b7415406f6975d1f67e8cc6f3cd8fc120b06d8e3263a1b5c9f
-EBUILD empy-3.3.4.ebuild 957 BLAKE2B f43245aadf728762541a5702e8c5ea5f9c3ec91f0d86d1e8bd283e676259d1ab526338abfd2df5bf8f8016ddf4df8e6750195d14aabc8110767639848a042843 SHA512 3e0d602993f29b80cb049a8a65a764c2fc23f91f7214122204c72f120d12ade32b673ee46f49e96970d8e3fe86c447d47f3e21eccfea1351dc4450e68ea73a4a
MISC metadata.xml 332 BLAKE2B 2235ddd41b38b6448ebc674a4575add6145e50d3f90d67047bf87db70ead40a03e1bc4579e337d644894a98eedd4321eb97c1c448d1b353570286a657b3e3e58 SHA512 9d0195de347c8711a56d77f3f0aa95cfb8078befe3a396250b6a56d83829e7948283d74170bcf78526ab6d00e514201b767af185ea77e7e82000c335b4ab1ce7
diff --git a/dev-python/empy/empy-3.3.4.ebuild b/dev-python/empy/empy-3.3.4.ebuild
deleted file mode 100644
index 73e326ac47c5..000000000000
--- a/dev-python/empy/empy-3.3.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A powerful and robust templating system for Python"
-HOMEPAGE="http://www.alcyone.com/software/empy/"
-SRC_URI="http://www.alcyone.com/software/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc x86"
-IUSE="doc"
-
-python_test() {
- "${PYTHON}" em.py sample.em | diff sample.bench -
- if [[ ${PIPESTATUS[0]} -ne 0 || ${PIPESTATUS[1]} -ne 0 ]]; then
- die "Testing failed with ${EPYTHON}"
- fi
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- if use doc; then
- docinto examples
- dodoc sample.em sample.bench
- # 3.3 has the html in this funny place. Fix in later version:
- docinto html
- dodoc doc/home/max/projects/empy/doc/em/*
- dodoc doc/home/max/projects/empy/doc/em.html
- dodoc doc/index.html
- fi
-}
diff --git a/dev-python/ffmpeg-python/Manifest b/dev-python/ffmpeg-python/Manifest
index 24654312e5c6..db28125132a2 100644
--- a/dev-python/ffmpeg-python/Manifest
+++ b/dev-python/ffmpeg-python/Manifest
@@ -2,4 +2,4 @@ AUX ffmpeg-python-0.2.0-_run.py-collections.patch 507 BLAKE2B 6e503e627656775c4c
AUX ffmpeg-python-0.2.0-setup.py-pytest-runner.patch 366 BLAKE2B 874898215b2102406fa11ab4e2289671dc03a8b40a8831aa6958048b94c64a5cd1cd34d326539144ebe549046cb0df074e6ffb4b37a72aaa44d94c0bc161cfb6 SHA512 627bfc39b3f0feef02306d73d8dc113673483e0e1aa5182cada9d12195413d7638b94071a76b546092061d6916d45575a42aa5d949c8bd9df737c34b1b62ea71
DIST ffmpeg-python-0.2.0.tar.gz 3267771 BLAKE2B 8bca4a24434b6c7a542e3c178cb7bf1e5650f9763636d5378f9652cdd07ef19b0e96007d6bb71fdf1664efb6e33d597844c7d6a44dc8dcb1c083e21f53649469 SHA512 933ed958d61536bbbc0e0b08e19521c4b1f7df1cfe97de0b3d149a2748c5bd74915a3134861e8ecb1f92d5860315228b76aefcd087fcf07e188a56c651f5e301
EBUILD ffmpeg-python-0.2.0.ebuild 918 BLAKE2B 839fe64da380e4fa8c5d4fd1e9c940920858c3935d7a7a70bf35ff879cd094e363de4198e8ac60991b348924d2091fce43c025a2224835d9d924b23cb97241e3 SHA512 df450ca269d477a22b4a0bbdab9a126ddbddfb9a4544f5940244ee5de96892f1e5686ae35b7101c3fac658349be0eff8ad2e0bfebbf1a9d15743c40debb17f80
-MISC metadata.xml 417 BLAKE2B 86f8cba73359487932c4515f4369fc89f0c162693977c8b7ab49c7f3eb1fb3bfb713cb4e2c25b41674891610ed0de6dba6616289b951cb39abe5645a475f4b39 SHA512 27e9d1f757e395fe23660531924c5ea4faa41c782b4ab240ba616aea2bf439cf93b2d21166ff693a9c0055637160bd94c31b8e58dd84c662b2d1a3bee2503663
+MISC metadata.xml 470 BLAKE2B 5819a35a988c5158cd8c58792682a159dd92819b9d1e74dd89ed4728a9ba684861a4af92e681741c48f9a1c5aae61a859caaf2023f49b124a89ce4e10919bc9a SHA512 3afe5ddd4a8ec5983ed0e00df8b40b8c8e66bbc27612045b42a1ee107b40357c4bbae86a054e5a0b95f17ba1828aa65e3d4becb3bfc5c9f824d3db9f62902b1c
diff --git a/dev-python/ffmpeg-python/metadata.xml b/dev-python/ffmpeg-python/metadata.xml
index b908e7d7cbe1..2d6d51daf387 100644
--- a/dev-python/ffmpeg-python/metadata.xml
+++ b/dev-python/ffmpeg-python/metadata.xml
@@ -9,5 +9,6 @@
https://github.com/kkroening/ffmpeg-python/issues/
kkroening/ffmpeg-python
+ ffmpeg-python
diff --git a/dev-python/fitsio/Manifest b/dev-python/fitsio/Manifest
index d134aaf9301d..98c853a8d83d 100644
--- a/dev-python/fitsio/Manifest
+++ b/dev-python/fitsio/Manifest
@@ -1,6 +1,3 @@
-AUX fitsio-0.9.11-test-failures.patch 1560 BLAKE2B 3299a43eda8df89467474c51dec85af9edb8af52c93958e49834317439d440a0993ef6311002a4cddc4cde6aed42ed355dbafcf4f6ecbe98b81d60b9763c1c03 SHA512 224ae91e65d4b5f24cd64f3ab389940bfa58801822ad090966c4c570d5c9fb568588b3efa1dab73c2ebbbd0b5f802c2364fda31097811da78c09903814613c6b
-DIST fitsio-0.9.11.tar.gz 6020222 BLAKE2B a71a0a6a026999b06dce54beb48fab2f510951099788b51456a6e07057daa7c911d5a2841d5f15a397705459daf081ff91bff1014782c93cb1dd76faf0ef2e1d SHA512 751b9612fe051f128d8f5dea61e2d119409293051a130ee3e18836181637e8c8daea757a715012fd024678d00e234e8b6c0cc0c9229c2bd9a406db312e4607d7
DIST fitsio-1.1.7.gh.tar.gz 5052055 BLAKE2B be9c632dcdd08325c5abb2cb9ed9eee6476b27ef2e7197298b269156346ecb72afc9f1d1c2e3ade045f69cde3afac5a6bf3fe5ecbce67fdfc1e6ede529ab1b32 SHA512 d6e81de08c38346050fbaa3e2fb51a496e76133bb0b04f20d816b51b7b7bf21ba37a400c3a6a7f966959223545c736ca6245427457154a4b5976b5a997e9cfcc
-EBUILD fitsio-0.9.11.ebuild 911 BLAKE2B c39dee4861e470d5bdc4d21d3cb699f56efe930c76b28149703cdcd55b4e59d3adb853c0d08f798bcc7aff5f19d65d1b673aba952564413450e84bfb0bdf9602 SHA512 b5dc0d05ec104fb1e6f9f22ebb75081c5bd2d97e8625044f063c1c173f0cdce64fe1e5fac1ece523c6a6c2ef774c780e494e77d1009e82eaa71ae517d1f0bee1
EBUILD fitsio-1.1.7.ebuild 808 BLAKE2B 4057c48c09baff321fd7e51726f2b9b6e0887146ebb20d8204a9eaab18e51a9e7ec5f6fe7b3555e6618a207a835017b52eda42a9c5217d88afc7e2c8d703bf9c SHA512 8a72c943d498a07a1194bc1c93fe3719a9741526aa94165ca6de0b378af9f261ec1c75f3307f62c0b7f4fed6b0ad2d5533ae81ed61c01448f48c2a461f9021e8
MISC metadata.xml 947 BLAKE2B d51c4feb2baade20680a4568b05c28e217d4216f6035dfcbda05876bb7c4d804dc2b02576e2e67eb2b1890e18c86bca9ab4644b0fee69d213ece257d204681d5 SHA512 e8a29ec957adf538929d3639723cfe317c57f6c1d5b7a89a697a0f99dacdab1e21edb774acdb2dcb426f90e1221f9d0b9c008abaf462354d42797ab6bacf9162
diff --git a/dev-python/fitsio/files/fitsio-0.9.11-test-failures.patch b/dev-python/fitsio/files/fitsio-0.9.11-test-failures.patch
deleted file mode 100644
index 243913dc659e..000000000000
--- a/dev-python/fitsio/files/fitsio-0.9.11-test-failures.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Ole Streicher
-Date: Fri, 15 Jul 2016 08:46:15 +0200
-Subject: Mark failures that are known to fail with the original cfitsio
-
----
- fitsio/test.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/fitsio/test.py b/fitsio/test.py
-index bafde15..49a4b3b 100644
---- a/fitsio/test.py
-+++ b/fitsio/test.py
-@@ -545,7 +545,7 @@ class TestReadWrite(unittest.TestCase):
- try:
- with fitsio.FITS(fname,'rw',clobber=True) as fits:
- # note i8 not supported for compressed!
-- dtypes = ['u1','i1','u2','i2','u4','i4','f4','f8']
-+ dtypes = ['u1','i1', 'i2','u4','i4','f4','f8']
-
- for dtype in dtypes:
- data = numpy.arange(5*20,dtype=dtype).reshape(5,20)
-@@ -569,7 +569,7 @@ class TestReadWrite(unittest.TestCase):
- try:
- with fitsio.FITS(fname,'rw',clobber=True) as fits:
- # note i8 not supported for compressed!
-- dtypes = ['u1','i1','u2','i2','u4','i4','f4','f8']
-+ dtypes = ['u1','i1', 'i2','u4','i4','f4','f8']
-
- for dtype in dtypes:
- data = numpy.arange(5*20,dtype=dtype).reshape(5,20)
-@@ -1365,6 +1365,7 @@ class TestReadWrite(unittest.TestCase):
- if os.path.exists(fname):
- os.remove(fname)
-
-+ @unittest.skip("bzip2 is not supported with debian cfitsio package")
- def testBz2Read(self):
- '''
- Write a normal .fits file, run bzip2 on it, then read the bz2
diff --git a/dev-python/fitsio/fitsio-0.9.11.ebuild b/dev-python/fitsio/fitsio-0.9.11.ebuild
deleted file mode 100644
index c58f52da2827..000000000000
--- a/dev-python/fitsio/fitsio-0.9.11.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to read from and write to FITS files"
-HOMEPAGE="https://github.com/esheldon/fitsio"
-SRC_URI="https://github.com/esheldon/fitsio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- >=dev-python/numpy-1.11[${PYTHON_USEDEP}]
- sci-libs/cfitsio:0=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-test-failures.patch )
-
-python_prepare_all() {
- sed -e '/self.use_system_fitsio/s/False/True/' \
- -i setup.py || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- distutils_install_for_testing
- pushd "${TEST_DIR}"/ || die
- ${PYTHON} -c "import fitsio; exit(fitsio.test.test())" || die
- popd > /dev/null || die
-}
diff --git a/dev-python/gpep517/Manifest b/dev-python/gpep517/Manifest
index f8bfe7ff09c5..12acce6f04eb 100644
--- a/dev-python/gpep517/Manifest
+++ b/dev-python/gpep517/Manifest
@@ -1,3 +1,3 @@
DIST gpep517-2.gh.tar.gz 6904 BLAKE2B 5d6f8c02805fec0b9c9929a133817be5d06c76ca2dd5ecd6b59d04eca1ca746b2a63a84df29c929ca06a026eef741a2d872abede6f1d0ac3719ff2005cf20043 SHA512 2b1fce7193a5c03175c34251987f42fe82c79a6eef324759fe5728e0f3b66a10f8aa644ece2193c912e9977f21b14a28fe5c9443e3b01ca8cdacf862afe0838c
-EBUILD gpep517-2.ebuild 942 BLAKE2B e660a9ef46d43a7f785322dd4f721bc2781408eab83900d9686e9301f211fd9d627a4f3f2505663ba5de5ccd14f864b1fb38d28eedf5893cd19cc35d05ad1592 SHA512 e34237abbcf1869a388eae98636858d0dcee35103aaa8eb714450b7da0989bf5f302067616681902f4d88f666da0a16c19b7213bbe36508ec2c99461171f09ed
+EBUILD gpep517-2.ebuild 949 BLAKE2B 32ae90c304e444b7a09268fa378b9a095b5b30ec8e3514f4e09b47b8077f2f41aa0781d35eb68a190f9dcba583e1c8f0b42aef2a47a1fcd5ae480e729eb3602e SHA512 ede517f159ccab3d976ae4dd5c940aab68032fbd79afadb21a4ddd62b582ae6075a26e4165d9311b89f141913c1ac8ea62951de21c4238b893250e6990f4a188
MISC metadata.xml 396 BLAKE2B a3f6d1cea383a38b4b6e5f80d2306ca320a66c0d3b0131601ef6f0ea48483757b9123d74ba99fe972dde06a998c15290cbc4243285c240493ae0293d2f8e1141 SHA512 8c584869f2fc7a0947b9e5ffa330652d8b6e61a6a472fcddf0422f1719422fb8d477cdf17d87e6d0e9f6994d608a77202c24e531dd146b0f8d731a047f80d14e
diff --git a/dev-python/gpep517/gpep517-2.ebuild b/dev-python/gpep517/gpep517-2.ebuild
index 0fbf09a24da9..1a71cfb5393b 100644
--- a/dev-python/gpep517/gpep517-2.ebuild
+++ b/dev-python/gpep517/gpep517-2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~alpha ~amd64"
RDEPEND="
>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/httpauth/Manifest b/dev-python/httpauth/Manifest
index c1d546384e5a..65488cc5f4e4 100644
--- a/dev-python/httpauth/Manifest
+++ b/dev-python/httpauth/Manifest
@@ -1,4 +1,3 @@
DIST httpauth-0.3.tar.gz 4440 BLAKE2B 41c9ba9ee50b7fcc4ed409f4b34897b5243df4065fd081cd5c0951ebe2719a34a424e59c21adbcd9be133c8fe4fa4ad9dc7bec561285b873987f982f684b3682 SHA512 aa35148322a1c5ffc22a132d3062d300118aa23181a0008018d0aacfd473758d86d50ff1236d88126858a53e2f45aeea938988b2d1a8f62f80a97d8c2cc69822
EBUILD httpauth-0.3-r1.ebuild 471 BLAKE2B b4155fd7baaec6e39dbad3daff43803f78e72b24c1ee3e2c246964f26ce2bca191e036683e300b33e958dc0c716d71999fd4553f86de3395d164e0428f5afd97 SHA512 dd144bd32e7ad1944612e91d6beaa3b027bdcb884c0b59a8305abecddd8224786d115ed6e95d45b641976551a36d9f128ff753313b1aea4414a794b1c1984d94
-EBUILD httpauth-0.3.ebuild 467 BLAKE2B f90456d845bd5dd9ab4ec9edd000a8dc53435b0cac9c5356f4b0ba6933400e44f2939cad85620509c1c53f6590525942598f67af9ad790088210027b3a54d71c SHA512 53c2dc77e26d7f3b4296194b591c407e936939f3e3ddc5b269cf14ca3fcf3b6ab8d0694a42444bd31d205ca897b447928abd8ae4efc669f30f2bc441769554a9
MISC metadata.xml 441 BLAKE2B 2c3d0480d416c2d12e0e5a4d511a5a2c04d2e26d1ddf4a52528371f16c36059276ac7f4b2c9b0d2d40a7d93aa5d3323e1763ada535ccc37a2c5b74ee28449dc5 SHA512 17202ae2f283611ae3a31f9519c7d11b32c904e729efbf878c928d5920481d1c4279127763a4d11f89b5354c677a213909cd4db39bbef56539bf4474ad61af1c
diff --git a/dev-python/httpauth/httpauth-0.3.ebuild b/dev-python/httpauth/httpauth-0.3.ebuild
deleted file mode 100644
index 13834cac533b..000000000000
--- a/dev-python/httpauth/httpauth-0.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="A WSGI middleware that secures routes using HTTP Digest Authentication"
-HOMEPAGE="https://github.com/jonashaag/httpauth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests nose
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 4382e2b536e2..27ac6504116b 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,7 +1,9 @@
DIST hypothesis-python-6.39.6.tar.gz 9183382 BLAKE2B c1112dc11d9129c7685eccac563232c978fcb470b0537e468b802ecf1f758af8dfce323514f923605662e720d0d54f525e5aac3e871407255f5f0732856748fe SHA512 985645265e9644bd2731a08ab942984fae5cb35e04e27e60450bfcf237c375dae1f2d3bf3694031a452866669ae2e19a05085ce9e35630965938c066b265595a
DIST hypothesis-python-6.42.0.tar.gz 9186585 BLAKE2B dd08082ef466c91999a6bfa6dfc8386f773182f3e74cc471f6f09bf3c595871aea6508ea2ede4a1375b7ec1e0ba4169a7577c41c6ea97b578233ed64a36b4975 SHA512 fdd6c095aba72660b7cbf4e5200a3500019fef69f45c6a8f40a93815b6bce23c40404af16dba4309400917307485c378b3a12f3eea58d99ce8da68b397a69390
DIST hypothesis-python-6.42.2.tar.gz 9187457 BLAKE2B ee191bed48db8984a1adb14fb655f0d03e76934eeec3004842567de904508dd5e0a565c14d81b018d55ca18827b03e14a54ae520110c5960a6d048690d17a5f8 SHA512 1c82e5d010cccc54c7c4a05f12ac33eae0d53fdb1d4ed68313907c390fb4c1e58d2afb57816fc8f0f7facacaca0fd6eab90e513ba2dc0b47fb73adb19e1f2a8a
+DIST hypothesis-python-6.42.3.tar.gz 9187948 BLAKE2B 3303cea4e8f2776f14defd88dcc2578f11e30bd5842a2cddf96478e31505d38f801a92e031e76070684befb2a9d63713f44b73eea7152e0bdc6cc0d16e25c08c SHA512 869e81b46da7786cc4ca981da56c916922a73fd129dc1f156d062343e40a9b74888bdda17ef2c95e6c3102dc762f7cf587d1aad4ba3b8138060990d2987a0bd1
EBUILD hypothesis-6.39.6.ebuild 1938 BLAKE2B aa0f6e98be237735c8167ebc883926ebf8617e4f532f3101703f6d997e0161be53db73fedbf4436b2e7387db45a67353ba72c58e257c9ba9cead21b1ea90ea9f SHA512 77cc5020afa8bef789c5c43f7f89e2a96d9eb8be4d00ed48436186731141f4ecbb7755e5fa7af257499251387157fc31cd55cdd0f168e66819fe210b55baac61
EBUILD hypothesis-6.42.0.ebuild 1946 BLAKE2B 4daef9c38314a33596d32aad67429379c9f7fd9bbaf5a10b19f1ccc5bcf2490dac7eba0e606f14d6e54039ff9a7b0827c9ca00ec3323ad2c245859b1e9486ad5 SHA512 9ef63a9cfb3d8a30da63d2e0f61989597b96093c6324c94d03881a1ac93dd0d83c9f6db57acf2d00344bed30596fc9d2a5fa4e7ee8ebba40d2f925287aa8f20e
EBUILD hypothesis-6.42.2.ebuild 1946 BLAKE2B 4daef9c38314a33596d32aad67429379c9f7fd9bbaf5a10b19f1ccc5bcf2490dac7eba0e606f14d6e54039ff9a7b0827c9ca00ec3323ad2c245859b1e9486ad5 SHA512 9ef63a9cfb3d8a30da63d2e0f61989597b96093c6324c94d03881a1ac93dd0d83c9f6db57acf2d00344bed30596fc9d2a5fa4e7ee8ebba40d2f925287aa8f20e
+EBUILD hypothesis-6.42.3.ebuild 1915 BLAKE2B 8cc25174afaba87a3d7515cd5ee71fd447f3d109033e9ebcc0d1605a4642ddd51900b726887b8351a5894c63c96d7fa525a7788ced868d97aa0d331b446e0c92 SHA512 baa5ed8f44f392bd6abe858280d077f483c69907356b04698f8da3f82c0188ba288b50b884b0bd295b17add9feb99061ec7d6fff3b73204fb43dcd809998bc9d
MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.42.3.ebuild b/dev-python/hypothesis/hypothesis-6.42.3.ebuild
new file mode 100644
index 000000000000..7eae997f3fdb
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.42.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+ >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+ >=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+ cli? (
+ $(python_gen_cond_dep '
+ dev-python/black[${PYTHON_USEDEP}]
+ dev-python/click[${PYTHON_USEDEP}]
+ ' python3_{8..10})
+ )
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+ # subtests are broken by warnings from random plugins
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+ epytest tests/cover tests/pytest tests/quality \
+ -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install() {
+ distutils-r1_python_install
+ if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
+ rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+ fi
+}
+
+pkg_postinst() {
+ optfeature "datetime support" dev-python/pytz
+ optfeature "dateutil support" dev-python/python-dateutil
+ optfeature "numpy support" dev-python/numpy
+ optfeature "django support" dev-python/django dev-python/pytz
+ optfeature "pandas support" dev-python/pandas
+ optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 6b39d673a34a..cebcad6446d9 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,5 +1,7 @@
DIST imageio-2.16.0.gh.tar.gz 360333 BLAKE2B fbfea25b9a6dfb945bcaced141649bcc3a7c578115fe2be3151d7a90bab6a51fc20e4806085a2afc934b7ec9de95b5df9fedba9af9722242dac44e2f86009e2b SHA512 18f6e3f0b5c09ac546640ef88a0fe6c157e20ecbaa2de5a2199eab6caac3ca9fd294cf66a2eea79b954271c27390816392af62a27d0e2e11817776efec3a0cd3
DIST imageio-2.16.1.gh.tar.gz 361506 BLAKE2B df7df1cdf414fa762a37c509f2452f7ef20b811695b71acd391d6f565161ae4b5d1caa9dc2f9278ddb87ad518087ed2c729b93806cf1f01a7402e7a77af9383f SHA512 8cd5ce184f67be9cd5edbd5bf51f59c271a71e8fe68c22d284ddabe24cdec6bcf5e590c9c95664b0205509c133e9cd959d11605226a1d4d99f14e95c6d7527c3
+DIST imageio-2.16.2.gh.tar.gz 366758 BLAKE2B cf2f9f2649f3d5a44d5d8efee19406b38cbb8de6fbd079170fd8eb43f893151f68b256e5d3d1fbb766c7f0562783ca2237e6171785927c8ed69a14840f1acb02 SHA512 1a6e0c9ed58d91fc89810d36acc8f5355ec5f0cf8a7dcc099f3a71cd77bc9d5fcf2821a7bd5f67723be46395290c99e4f478949aa11134f11ff2068504c83c04
EBUILD imageio-2.16.0.ebuild 1094 BLAKE2B 3d34653e906f921a0148618c445a58e4214ecba8d1396bcef26f880c0678583a1ecbb40150a3d6c06c6bdf76cd6a558bc38635f4f817617b8ba489fdf694d399 SHA512 0dd8a20ccb2ed4406ae92d833f45728494b93c9c92e111821bb8ed8afa71bb4024aff8b6694f0f2af4c6db05a2a59125d5b5da0c07b22da86d1162f9269f454d
EBUILD imageio-2.16.1.ebuild 1094 BLAKE2B 3d34653e906f921a0148618c445a58e4214ecba8d1396bcef26f880c0678583a1ecbb40150a3d6c06c6bdf76cd6a558bc38635f4f817617b8ba489fdf694d399 SHA512 0dd8a20ccb2ed4406ae92d833f45728494b93c9c92e111821bb8ed8afa71bb4024aff8b6694f0f2af4c6db05a2a59125d5b5da0c07b22da86d1162f9269f454d
+EBUILD imageio-2.16.2.ebuild 1094 BLAKE2B 3d34653e906f921a0148618c445a58e4214ecba8d1396bcef26f880c0678583a1ecbb40150a3d6c06c6bdf76cd6a558bc38635f4f817617b8ba489fdf694d399 SHA512 0dd8a20ccb2ed4406ae92d833f45728494b93c9c92e111821bb8ed8afa71bb4024aff8b6694f0f2af4c6db05a2a59125d5b5da0c07b22da86d1162f9269f454d
MISC metadata.xml 959 BLAKE2B 284b4b8fdf53cc63b6d46d1afd03abf322f8a91ad5feac3828c30198a9e0baa1514f34b91385dbc00830b306e4f78eac5d2bf4be8e377fe98cfb7e5c8db896be SHA512 0a72e91831dec56af50fa96fc6ed74b19fdc15e68255d19fb09c542eea85cfcdaa5a382608add10a63d3e421783225829d20d9b31c26883f7640b6214f2c20e3
diff --git a/dev-python/imageio/imageio-2.16.2.ebuild b/dev-python/imageio/imageio-2.16.2.ebuild
new file mode 100644
index 000000000000..4a1ac91da053
--- /dev/null
+++ b/dev-python/imageio/imageio-2.16.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="https://imageio.github.io/"
+SRC_URI="
+ https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# over 50% of tests rely on Internet
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
+ >=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
+ media-libs/freeimage
+"
+# requests for fsspec[github]
+BDEPEND="
+ test? (
+ dev-python/fsspec[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/tifffile[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+ # Fails because of system installed freeimage
+ tests/test_core.py::test_findlib2
+)
+
+EPYTEST_IGNORE=(
+ # Needs unpackaged imageio_ffmpeg
+ tests/test_ffmpeg.py
+ tests/test_ffmpeg_info.py
+)
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 9c49c6870d7b..7ac04a357207 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -2,9 +2,11 @@ AUX ipykernel-6.5.0-drop-pytest-cov.patch 420 BLAKE2B 89c6eafcf86a9033122a59a944
DIST ipykernel-6.10.0.tar.gz 129057 BLAKE2B e50fd0b5d041236002d29360eb670e5bcf97ad6e0eff091e62a4189567d14832b6fa95915bbd29818b897430fa3f37b930c54155a407cc46d7a9607aa19caf2b SHA512 9f2c9e24244e5c3aafbfd2da6a131cbf19abfeb8164e6a64c69aa4b65dad92101137482c71f53eb5d8395944d6714938a73556e5dbfc8a6c92303c716d6244b5
DIST ipykernel-6.11.0.tar.gz 129429 BLAKE2B 746cff0b32a1282f8abe02bd339d35061ceb04d3f4d7fc325bc97b744185958ed91beaff83c19d269e0d8ec7b35c5c88412c135c1aa2dcbf770846986eddc82f SHA512 69b88e3c8b552f5277f392a004a33a5c64c2edc93aeea0d2c2d03b0d8ee649f41fc1378068c1dd8322807cce188f5579c0d92730760baeca8170a98f585f500b
DIST ipykernel-6.12.1.tar.gz 129979 BLAKE2B 96ee301974c9353374b6869003995238068f4abcdaa0cf4c2b6294c1ef8c4e6358e93a41feaa49fcba587fb94ca719f3180eac2b47fbbf6c54fa9fb315d784ad SHA512 309701a287e8b87d0f8b07eac402e2fc163515f471f3b5b3187bc210c47714d4cfb496f40e34ebad47be5e7eca8157ef0eea7da141fb16a6fd943f4a2095f360
+DIST ipykernel-6.13.0.tar.gz 131331 BLAKE2B 95a662b5ff6062fd8f6712a214b2bdcb227064acec145ebbb2ff7dfc0647ee9c486bbb560502e8ab6c5f74bb44c7715a1ee16f4b8cd2661b7a6e77206be7ab67 SHA512 6025a540d7ae08f637d2cc9a022805df54c11844c93d989be73a3a800fb0985ec56f2ce5d8ee940a5ce51d41b4d1f632131b25c1f5847cb51623c285c4944f39
DIST ipykernel-6.9.2.tar.gz 128759 BLAKE2B 74740bdbe420d14cbb75e5a1dee9bfb0894c3e10ebf029bd7ceb29eb5112489ef83bc9a2075f6dd1cf16745f893d3782ee22144edfec66d650246eaa0d97215c SHA512 a452d7a44c4e33cb2d79262916045fe3044803f20db7d525bca3277dd49e9d216d07a832312b29a5a61293ecf7863641a45e0f188136059799287c5983beb0d4
EBUILD ipykernel-6.10.0.ebuild 2200 BLAKE2B 77c1722799ea3d15759b3ab31da3627dbf9a9fd994072a215b4b4fe1323b336e01b62594cdf9d0ba4ac3a063bc9652f88479d40a67c77c8b1a6ea716ea48380e SHA512 49901d9c9d20c82449be2d408bc4ad48558772f2f998561673e7c049983ba3683e68766ad0858b62f16f12f6b6cd9da9b9d8212137fd850745d625cd8b7a200f
EBUILD ipykernel-6.11.0.ebuild 1954 BLAKE2B 9274963c4e0e9610c258eebe67233a42be41cabf038cf9fd923cd5b71bfdd2800b0473740fb63649a62cf1a72ddb00376497daa6ea34b6fe72f566257f710376 SHA512 e5ca662cabb40d34df9271ec094f67c82d71a20327582ebc2419265fcd809adbf352949ac31c0cc58f93c7d7d950a9c32c171c060e2e377a6c06a9948d9f226a
EBUILD ipykernel-6.12.1.ebuild 2027 BLAKE2B f0e464beeb603d1096bd5650dc3a2c3f52cb860156e43075c52d88bd8da014cd560f87f7b772025af89c723234f4d2b3e6d34f8588752a1e5599826a9ce5c720 SHA512 488d7c57ce1df00cec65e0556d1540ac2085da3e24dbd7806766b3da683a049d22ff60b687b4bb99f9d22fa4ff1a48b5e8587b1f70f793b3624a156e40aa8e7a
+EBUILD ipykernel-6.13.0.ebuild 2027 BLAKE2B f0e464beeb603d1096bd5650dc3a2c3f52cb860156e43075c52d88bd8da014cd560f87f7b772025af89c723234f4d2b3e6d34f8588752a1e5599826a9ce5c720 SHA512 488d7c57ce1df00cec65e0556d1540ac2085da3e24dbd7806766b3da683a049d22ff60b687b4bb99f9d22fa4ff1a48b5e8587b1f70f793b3624a156e40aa8e7a
EBUILD ipykernel-6.9.2.ebuild 2192 BLAKE2B 5770e09eb90f1d2155cebd9dbce1a4c41ef2b90bb5122c2b25102e55c8d5e03632f6cc65673ee1e89396a0ab17c4ea4b28f19234690d66253648800697e46daa SHA512 928f2cd0c55b57f36f52955d17a491416e661e3520d0c8b6bb12a8a85fb9e7d5017dda0a1f5570759ae8a7eb55cece93d93ed2c3217b48ed82b595c0028a5369
MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.13.0.ebuild b/dev-python/ipykernel/ipykernel-6.13.0.ebuild
new file mode 100644
index 000000000000..f3c45991a014
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.13.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+ >=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
+ >=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+ >=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
+ >=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+ >=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+ >=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+ dev-python/nest_asyncio[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+ ${RDEPEND}
+ test? (
+ dev-python/flaky[${PYTHON_USEDEP}]
+ dev-python/pytest-timeout[${PYTHON_USEDEP}]
+ dev-python/ipyparallel[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+ # TODO
+ ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
+ ipykernel/tests/test_debugger.py::test_attach_debug
+ ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+ ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+ ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+ ipykernel/tests/test_debugger.py::test_set_breakpoints
+ ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+)
+
+src_prepare() {
+ sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+ distutils-r1_src_prepare
+}
+
+python_compile() {
+ distutils-r1_python_compile
+ # Use python3 in kernel.json configuration, bug #784764
+ sed -i -e '/python3.[0-9]\+/s//python3/' \
+ "${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
diff --git a/dev-python/itunespy/Manifest b/dev-python/itunespy/Manifest
index 84e2540d8afc..75acf0a72da5 100644
--- a/dev-python/itunespy/Manifest
+++ b/dev-python/itunespy/Manifest
@@ -1,4 +1,4 @@
AUX itunespy-1.6-setup.cfg-description_file.patch 206 BLAKE2B a2df4fa4391a17e823cb0e389adf33a6b9045da604663007d4d43c533bc992244306f30f282a0022963882f6237f332e547186ee4fef15bab68e45a70d8c1c19 SHA512 3cfc66283030f9a2caae086afaedee858cae4a322c001fd7716e7751a6e3228c8d059a0f68a15ff0f508d0f1b54e61d38c1fd3b4b5e58aa276b0b6a8a9a114d6
DIST itunespy-1.6.tar.gz 9724 BLAKE2B c46ccfd00a3dec1772499d3299dae7c20355628176db4e660aca0b2b819b81423ac78ce55319c822c15e1c4bf0641c2fc3c4d9ba94dafad1ffdeb503be4f76f9 SHA512 d91428e23a71bdbc62e6b8126b379aa48f06a365056147cf30eb4fa6132243d35c8a8d6dc536174a53f206bf7bcb4dcebb5a3697fac0fd88cbcb38205202ad81
EBUILD itunespy-1.6-r1.ebuild 735 BLAKE2B fff57c918202e4de83b8b291a68df703516bd7d588e3d5d9544353e2652db8cff1038e39120a4d5cf798c1484cd106b10757d1588c56b6e37dd443683bced267 SHA512 d320d16839c9e43a4a05c85f1bba5c6dd353c5e61107191fcfbce9b6a5aaeb182e7ce864d095898d7febbb5f667787699fd3cf412cd411515a9d91cef6a9c2f3
-MISC metadata.xml 409 BLAKE2B 88afe27e4e9962a63bd257732b539d187aa00d88ee0446d7b70b0d239d22229002c0f7ec5db4f9888eabff8832e5698a1813dbe66e9ab0efd1fbcc6ca9b47a18 SHA512 d90439813c6027846bed561d8f0085c5aa9f024794d5aa3b8639644a4f62720cffcc91967bcbd31309bc1d88eef9dff91e97cd089e8814402c942c301bc99941
+MISC metadata.xml 457 BLAKE2B f9363dddfff811a399f7be80aadf8f4f33957137c497a28d0cf1860f95f0c51f829f9c8c7630f2374f71abe2c22c812e3701a18643cf8989837bbf405a48020a SHA512 ed7c5ab634be60af43ad020a6075d5b41bb1f781bf763fccfee697a3f9e74d36373af6735a34a16de5c588d7ddae6b921e2b5ca35861f345095fb871cd7bbf1e
diff --git a/dev-python/itunespy/metadata.xml b/dev-python/itunespy/metadata.xml
index f449f0046a80..3ca6ab0ecde7 100644
--- a/dev-python/itunespy/metadata.xml
+++ b/dev-python/itunespy/metadata.xml
@@ -9,5 +9,6 @@
https://github.com/sleepyfran/itunespy/issues/
sleepyfran/itunespy
+ itunespy
diff --git a/dev-python/jsondiff/Manifest b/dev-python/jsondiff/Manifest
index 37d510705985..f9001f20938c 100644
--- a/dev-python/jsondiff/Manifest
+++ b/dev-python/jsondiff/Manifest
@@ -1,3 +1,5 @@
DIST jsondiff-1.3.1.gh.tar.gz 15457 BLAKE2B f3896c85b601ac32859e59f2a5a29b51f124a1dd27fa2b0da40e44c4b776bbba933043fb7334e5ec20833eea25143d40cc7988a8308f56eff20510db982688b0 SHA512 cbbed17bf00f1757d81477e02435c3f5a9a3246774f3fd9a433be31de1617525acfe33d6790be33dcf9b5da5ef3d6910d13958fb7b8ea4fbd802c74485a9dc6f
+DIST jsondiff-2.0.0.gh.tar.gz 15405 BLAKE2B d69e5a9316e8ce32c6fd3e62162b609a471ff57bacb77f47a192b85352e77135a37c964d0ade5df4b4e37fe7d996eab13649dd4c6a3bc3fc0479294f840c82f9 SHA512 ca266040294c064b499763174613628125a9d426f37eddb8f63806d5774ce8828d514ca30ea4b42f6e2529aa34344c601ece05b6c1b42dcedd71c7b62ed0afba
EBUILD jsondiff-1.3.1.ebuild 794 BLAKE2B 05e0cae5fec0e4686d2c781d337deb53e0b1c47a8783160cd494d46e8de77ad564a61dc9d6e17b8e9f8e6fc0c8dc22e16a0190fb3b800e123d2fa12626f9d085 SHA512 e49ad77fb53f24e718503f3671db9cee86bb8435e5f24a4f6a7e89eb9c01004f7222480d2a321e77930883facdec29ad2ffb9ccb66ee05e985be08f1be9486b0
+EBUILD jsondiff-2.0.0.ebuild 799 BLAKE2B 9a824cbffb550b4b543c525dff8e56f2bffb61f426e9255d67512cfaacb5e2d229339f40772c042c4995123bf373356fc38db384fc6af7b3b1224234c6d4bbc0 SHA512 79afdc04ff9c41c3882778b77134bb3b3ec6bfd6e85d02fea4c0dd23d0efc1ed9946f422d4159b7f5ac22e72d82c4d34383a88cdabad37234b20dadbd065a977
MISC metadata.xml 561 BLAKE2B f11baa5f35a81e4fd69adde15b5a39d728e8137a112ef7c794e8d008d5de829ab5a333fcfdc2e1dd2156d91bb779db204a21c73eaad424e983c7865b33a81785 SHA512 238d5cedd70a0fd887f6007cbee0e11faf4b574b346fa91c66ee6d93e06571364fb80a0fbc13fe347f34e217e7589f5b61984c5ab0ead465d5e725d1792af4c5
diff --git a/dev-python/jsondiff/jsondiff-2.0.0.ebuild b/dev-python/jsondiff/jsondiff-2.0.0.ebuild
new file mode 100644
index 000000000000..901fc3049256
--- /dev/null
+++ b/dev-python/jsondiff/jsondiff-2.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Diff JSON and JSON-like structures in Python"
+HOMEPAGE="
+ https://github.com/xlwings/jsondiff/
+ https://pypi.org/project/jsondiff/
+"
+SRC_URI="
+ https://github.com/xlwings/${PN}/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ test? (
+ dev-python/nose-random[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+ # Avoid file collision with jsonpatch's jsondiff cli.
+ sed -e "/'jsondiff=jsondiff.cli/ d" -i setup.py || die
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index 022de6cc1145..23e1a681e201 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1,3 +1,5 @@
DIST jsonpointer-2.2.tar.gz 8292 BLAKE2B 837c6c8a87e0d19cbeed07769afb29fa56ddfb629f05d0f2de94f4e94af916358f71892e085c7c18b9c711ac8e604a0ff7d1fa7dfbf52836edb1a600e5ed390b SHA512 ce680e3915ea9db915095c4106e58acf7cc2148bdc67944e03e225a33b882964ed0c154fdbe8415f787c5aa5bfa007b9e1fd2a31689dcadc88b1560931ca6a6d
+DIST jsonpointer-2.3.tar.gz 9295 BLAKE2B 8a33c8ce21721b6c402a44d3d1572a767e3b7485fa1dd80baf98120c9822412841cc21e3bc2d6b7e058793ab4ade5993712c689631cb4a1237afc1d7f36e6bdf SHA512 e04da474a5ec376d1cd2c764c2d7a11ac296450df199449994cb1dedf02a49df3ae3a4e75b2963370dba1da166464602b849a79609f7a98d8246dab0b342c819
EBUILD jsonpointer-2.2.ebuild 624 BLAKE2B bb9b72396f6e6554ccbbf043e2b84747dd28357ede583c7a5d8608fedbd974720aab716fc5e430d13f8f593ca1a6fa6e8304ed3e8acaf96515d2b52d05c2a1c6 SHA512 141d3009671f827cd95e41d059fdf1824a7068f5a49730abe2513e91f7418c1bfca8040b5da74153ef04041c158d8415e7f3c51433913c1061ac2c39af33e026
+EBUILD jsonpointer-2.3.ebuild 670 BLAKE2B 379201c538059796e316e7d6330efb6132b39bf30444250b3d285a83f3f01a89c735115decb52ef9c4a571f5e6aef5d165531f31ef8236bafb7d258414084672 SHA512 2faac21f58392ad53f3aa777de9bc4cf1862c07c6456a7c95f43acefe5bc6617043557ef722957e14d5388a8fcecaf222124bc2ce606b4bd0725f30521fd224b
MISC metadata.xml 728 BLAKE2B f14151531af31af82ca130caa61b9c9af6cded41678899d5413f076d7fb6da93e2c4aad3ff27e66f64ba56b8ccc70c065763157312438f32ccf2573766ee160d SHA512 6b19c6b90a5d151d4837d8be641b52ffc4e7eb3be956760d1cffbb2af03258c5a2b81a9074daee9b667fcb5df7223836130729cd5ea4130d2b7f3c7415e62569
diff --git a/dev-python/jsonpointer/jsonpointer-2.3.ebuild b/dev-python/jsonpointer/jsonpointer-2.3.ebuild
new file mode 100644
index 000000000000..6fe5363d2610
--- /dev/null
+++ b/dev-python/jsonpointer/jsonpointer-2.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Identify specific nodes in a JSON document (according to draft 08)"
+HOMEPAGE="
+ https://github.com/stefankoegl/python-json-pointer/
+ https://pypi.org/project/jsonpointer/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+ "${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/jsonref/Manifest b/dev-python/jsonref/Manifest
index e4eab6c8d142..6e6fe3fbc7d0 100644
--- a/dev-python/jsonref/Manifest
+++ b/dev-python/jsonref/Manifest
@@ -1,4 +1,3 @@
DIST jsonref-0.1.tar.gz 12296 BLAKE2B cab2b4778b8a0184989ed6ff520ed6f12a68e9109a92aa0fd5521b69ea14cd5b6301ce61bf98f0d0d4d44fb016f7d6bd99fc804975bddf1c350bc4b46d62f77f SHA512 9900601feab0c20c902a6d5575fd411898af126a650d0c9ff955f50f5bd1f5da8e5a071ca86cac31ce3c5fb35a516f849cbb70098cac2cfdc910ba33a1f7411b
EBUILD jsonref-0.1-r1.ebuild 509 BLAKE2B c7ad24fc9290f43ff5eec8a18431b106b894255fa010be3c2986019e4ad536d94ea39d0c5f9b4a5d1555776e956b5a8b974103484eb7631e056792f18df91282 SHA512 6ebff5e004b907b0684b8290d02d57792e54211b4fe362f5d4de2ab530c4ebc5966a9574d1fba8d3df93459c10b4ac1827c94ebe5ed0636e852c006a8fde702e
-EBUILD jsonref-0.1.ebuild 505 BLAKE2B 2b27d83d27d4c2a1f8b0561a0634240393d18c749e1d7c64eb72c0687f5af74966d9d36e6748d26962864db1fd868fdd12c04ef999a2f979add9e4e83c51a0ce SHA512 fda5bbf44b9bd2bafeb566bd931d24d19d95fe058c15fdc2e16678390057f9c30431869628b47b0e1583c0b7b9ea02a7e7a5be9ba76480a85a6d0ea39c35c446
MISC metadata.xml 797 BLAKE2B 4afca797d34cb036eefde373c1c02ac9619153670c8f3d9612b5687f248639942a51cb23e18119f61e3cb3dada9566113334662514a89bc6bb2de9ec9f49b4a4 SHA512 803607e8f9a7391f97aa104a4f3997023d341772eac6af0934bea84cbe45dfc1aff59928d8d45116ef52a4b86edc3ff3e28d3547b2f4ceaf37eeb7f2fde0ea7a
diff --git a/dev-python/jsonref/jsonref-0.1.ebuild b/dev-python/jsonref/jsonref-0.1.ebuild
deleted file mode 100644
index 2e8274b1dde9..000000000000
--- a/dev-python/jsonref/jsonref-0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of JSON Reference for Python"
-HOMEPAGE="https://github.com/gazpachoking/jsonref https://pypi.org/project/jsonref/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
-
-python_test() {
- epytest tests.py
-}
diff --git a/dev-python/liblarch/Manifest b/dev-python/liblarch/Manifest
index b711d6f354e9..64cd35f63f59 100644
--- a/dev-python/liblarch/Manifest
+++ b/dev-python/liblarch/Manifest
@@ -1,4 +1,3 @@
DIST liblarch-3.1.0.tar.gz 55727 BLAKE2B 531602b43f7729f59f59394aa1dd6d3ee4ad653d4ef8802de2074c9a9746d43da1638941c1e8f2075d9092810ba680f2e01bee360c55b0826bb725d6515b31df SHA512 042a763dd12612d6630c064b5af84011f1fb908626f17f866e103743cdaabb4983f922290287b0138938488a7c9bff33680ef8157f8bbcbc166e4f4f2d008951
EBUILD liblarch-3.1.0-r1.ebuild 648 BLAKE2B ab3ad9a16022abcd91fcba42bb26dca3700182e582bdec3832c09a7083c110aab7dd296179453b74a18d3bcedf12a6d72fe8d1698d54c5a8a59728b7ce5e7b47 SHA512 c2696aa75faac4392e42babac3aa58380cd033021e8e70198fe39506675781df2563ef471694a1356b174d019dfaf6f2fdab582f6399c46be6a8293732485b57
-EBUILD liblarch-3.1.0.ebuild 740 BLAKE2B 60c39735fc2be5cbca97d8b5aab985040bd07237efd572cb6aa8f0fbededd6c110410559b63ddb9cd96e8773fdb0b6b693d399de7877fbbd166948bcd37db723 SHA512 3d5f901e8b3c7452f477b2f628385f62497db0064d76d979119d020724cbba48e5b603e6fcb535e68684d3870713fc387c37021033c73c4b2b996a7cb800e3e8
MISC metadata.xml 817 BLAKE2B cb4a3bf8595de2a98b53b5086eff0623e6eb7639515c13ac236d3b52ea0d6c31e51454d6d92a242e132ac333265a414da29f2ef3a547ca2790819e7440b1a069 SHA512 ed7203c3ab4682a42f52b1ddf5f03a129d7991bc7783545b03399e63c13d0b8a131252212c4a051aaf13a8e914015f68bfbb881035243ac91de32138c9c99eb2
diff --git a/dev-python/liblarch/liblarch-3.1.0.ebuild b/dev-python/liblarch/liblarch-3.1.0.ebuild
deleted file mode 100644
index 94cdf47d60a1..000000000000
--- a/dev-python/liblarch/liblarch-3.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library to handle directed acyclic graphs"
-HOMEPAGE="https://wiki.gnome.org/Projects/liblarch"
-SRC_URI="https://github.com/getting-things-gnome/liblarch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- x11-libs/gtk+:3[introspection]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_test() {
- virtx nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/makefun/Manifest b/dev-python/makefun/Manifest
index 2c97562ae065..ec74b3cf6a18 100644
--- a/dev-python/makefun/Manifest
+++ b/dev-python/makefun/Manifest
@@ -1,4 +1,4 @@
AUX makefun-1.13.1-no_pytest-runner.patch 184 BLAKE2B 663db5f0d235f5117a066fff19bbb940c3a2b7d7cfbe2c2b07430d85d33e0a62800aa89c38530526eeae76611a6619eee765f5fdd69d9ab38d39458d85cb104d SHA512 179e9db22717ec79d0c4ae9dc53ceee26d542eb4e3a957bb4ae4689ba808476894a8276e536214c9923140ee8307393d96b417ea8477d393e399ca4c953dfdd4
DIST makefun-1.13.1.tar.gz 72170 BLAKE2B b1b5e76277e742ef51bcdf2bf6f1d1e761010d75bc3f20d7a8c079b368972b90775bd3bb23cf1787911a8d858549d72d4a2c9379675e59f359486bf1c49566e2 SHA512 ae103d3827673c4124d051e3c76d3d0d126c783ac7a1ea09de3801fd695439eaa549c297bd5c262184a3ee6fdf7b046065081fa3183642778148c2134d7bfc06
-EBUILD makefun-1.13.1.ebuild 624 BLAKE2B c4d2a7c0fe5e73c7b619bfc17159dede182b2257d8d68007e9b0ec160fb2e2ac70595ab98872c2029e1a05d544f7e4c225578d17098f595c627abef3f6ac6000 SHA512 31e7f630fd878f8d0db139a10977640ccad762dcf1553c5802ea467178943e6c2ac308e55657e60feb9760ed3f5e53f01b8f58dab645fc8a1425790e341ef644
+EBUILD makefun-1.13.1.ebuild 623 BLAKE2B 84ee1a780585bfc5b53f575a50c01ad6de218039ae3b851bf631c9880b0db3b5902070798748dc389d2aa0dfdac30cd69f029d994a5989ccf19bc01dc1433b22 SHA512 e96b200831c021ad0ba9d0a7440930756c8dfeb93d5ae753e91074171913988ab4c266abdf9555b62f75ce4cbf291859ee6f16f28078fcfd814387e8becf6fd5
MISC metadata.xml 401 BLAKE2B 0657deb821edfdf648e5bb0a95255b87df0c090c6e719a5ad94a6d3f6e2e64f36d4093a2bfddb5e8592d3d38741e8d0251c8331133113766ef2fc4caa48e88ad SHA512 cda21fbaa9b62896ba3389cf281ae35bd9a59fb0d0604e61fb3b046061de47a2535d7a98d335b66f44483ae43deadf05abde0a2285902c1c3fab2762b080dbad
diff --git a/dev-python/makefun/makefun-1.13.1.ebuild b/dev-python/makefun/makefun-1.13.1.ebuild
index b0a02e0a7471..eb2656703a7e 100644
--- a/dev-python/makefun/makefun-1.13.1.ebuild
+++ b/dev-python/makefun/makefun-1.13.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index a77b989c5690..8569057bd62a 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,7 +1,9 @@
DIST nbconvert-6.4.2.tar.gz 902691 BLAKE2B ee61836ac423db0803d90b92f5cfce7e53e311637dfff7e31e5506fc1588a41515e984860bc56f617b0e0add033c41e6d2099f2abfdda7f31015f6e751110639 SHA512 325637844044ff4a118ca7803e9803fd6909667e017dae04859f58a02e1aadc8b8c699f9b9612bd47991a4c06a23acd526abdcbf1a219e29d985001ae01237bb
DIST nbconvert-6.4.4.tar.gz 906988 BLAKE2B 84ea6726804ccb738995df1e2e961a9816d3bf9c77034d464afbfa2ba0cf3ce19c1f6af1775fa027795ba3faeaacac765decce2d309f8a60a27e76934cdb356a SHA512 2b319fcc13c6b2addc7e1ca319f36e8a37e8390eb0d8d8df9f9456e7ae816b93ec30ab00a1003894c92091030658920729f0e31fdb5031dccb3f36b38b5d8f99
DIST nbconvert-6.4.5.tar.gz 906309 BLAKE2B 5aee22eb9ce6bb36e04cc3b3db5460041b0a2dfb4afeb1e4787e941d6815f22b7621104ca6d14cb0977c5d09f9a0fade8a5787416b5f55ca1b09149730560bf7 SHA512 9a32eceaff065016baea9fc79478aeb8981f55a2cd47889e640815f2bf924df201d9ce72a4b615d533bcadbd681900678d30de61f777ae4f12bd9fce62d73622
+DIST nbconvert-6.5.0.tar.gz 908377 BLAKE2B a91c6c93e9e33f90c5c7f19743e20aa6cf88e5dd29be4ee777744d96037dddd15294858776c8391d79f5436e929fb1b623a3f11f6c4cbcf60728dba2204b6e2e SHA512 4e0d26d581435525f819c05207890cc7cbeaff786a16c354f0356c9bc50111a724a92b7e15445a0cf0ebf1e1c2f0ff064a2c8722267f66dd8677ad82b5e61714
EBUILD nbconvert-6.4.2.ebuild 1950 BLAKE2B 57c46c9cb91a9184828662f72e1ff8829c4300dd261d7880c8474f111aad9118e91008e43796460b868400189f4d7f1038dff09f33388d1fe628b30d5d9dc4b0 SHA512 cf15a34a5eab40af2ac832a52d599cd3ae45588975730c0fe30436ebb1cf9242c8596512724ec8bf9d26d829f6312c03114c3e8fe19b5131cfb62994f990ab3e
EBUILD nbconvert-6.4.4.ebuild 2001 BLAKE2B 52386a9cbcadce8335a3c690b78911381d3146945897583b320c727ca5a0e49a552ccda1585c4d1ffde6ef233148267701244faf032870c0876f74fdf997d5d8 SHA512 64a2adb2595bc9a99473df2f8111fafb95e1d7b9d8a313930c582453e2bc6f35de280daa2196708ad81d2394ac489b290b176c368e74cd3651105e1480185032
EBUILD nbconvert-6.4.5.ebuild 2048 BLAKE2B 284e671a8d0aa7bd34c14ef3fdaa3c746576126ecf7f0bd1a285dd3cc625146f8c7b8832434c8ff8727bee6fed82602ceed0734dfb5ac486902e0349052290f3 SHA512 c206b09549758c34e3940ce0c9fa846e1127b9e4eab924c6748589653df4acfd5ec99b63b1113e17c676ac52917bdf0069b79c964c295564c6d49dca2e191082
+EBUILD nbconvert-6.5.0.ebuild 2048 BLAKE2B 284e671a8d0aa7bd34c14ef3fdaa3c746576126ecf7f0bd1a285dd3cc625146f8c7b8832434c8ff8727bee6fed82602ceed0734dfb5ac486902e0349052290f3 SHA512 c206b09549758c34e3940ce0c9fa846e1127b9e4eab924c6748589653df4acfd5ec99b63b1113e17c676ac52917bdf0069b79c964c295564c6d49dca2e191082
MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-6.5.0.ebuild b/dev-python/nbconvert/nbconvert-6.5.0.ebuild
new file mode 100644
index 000000000000..ed66dc80cf13
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-6.5.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converting Jupyter Notebooks"
+HOMEPAGE="https://nbconvert.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ dev-python/bleach[${PYTHON_USEDEP}]
+ dev-python/defusedxml[${PYTHON_USEDEP}]
+ >=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/jupyter_core[${PYTHON_USEDEP}]
+ dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
+ >=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
+ >=dev-python/mistune-0.8.1[${PYTHON_USEDEP}]
+ =dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ >=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
+ dev-python/testpath[${PYTHON_USEDEP}]
+ www-servers/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/pebble[${PYTHON_USEDEP}]
+ dev-python/ipykernel[${PYTHON_USEDEP}]
+ dev-python/ipywidgets[${PYTHON_USEDEP}]
+ >=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+ mkdir -p "${HOME}/.local" || die
+ cp -r share "${HOME}/.local/" || die
+ distutils-r1_src_test
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # Missing pyppeteer for now
+ # TODO: Doesn't skip?
+ nbconvert/exporters/tests/test_webpdf.py
+ # Needs pyppeteer too
+ 'nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
+ )
+
+ epytest --pyargs nbconvert
+}
+
+pkg_postinst() {
+ if ! has_version app-text/pandoc ; then
+ einfo "Pandoc is required for converting to formats other than Python,"
+ einfo "HTML, and Markdown. If you need this functionality, install"
+ einfo "app-text/pandoc."
+ fi
+}
diff --git a/dev-python/pdm-pep517/Manifest b/dev-python/pdm-pep517/Manifest
index ca1effa69102..18c3cc662f1c 100644
--- a/dev-python/pdm-pep517/Manifest
+++ b/dev-python/pdm-pep517/Manifest
@@ -1,5 +1,3 @@
-DIST pdm-pep517-0.12.1.gh.tar.gz 303954 BLAKE2B 65344c2571264b9fadcffcf5ae05f42246912dce3e7029a1ea5e91df72f1c9425d603024099146cb7d9ed95d8e3ab0fcf5058ab35346893e28d3595d430548f6 SHA512 a7c27c685eec274798b5d9fa7fd3d7ec7ca77d204110c7c9962a53b1522c4c6dbc56d7413ce5ff6fe8e8f091b0d4e4914b9e3296dc226bcae9f5fbc2cb28444e
DIST pdm-pep517-0.12.3.gh.tar.gz 304242 BLAKE2B ad4beb6ab35c219e1991b585bf9ce087be3e7e957f34b1dbc9de676f7b49c3084471e2b55c634eb6fd1cf6cb88dd4161b5060a17a5ca7e5e3ae57c9610303f6e SHA512 4c0f098d5237353fea73ef62149b8177987881239cb6b1b112bd6789931acd7484c56d413f780db4f23c60f4ff3a37c6956de3e1de472fed114487925b0e3553
-EBUILD pdm-pep517-0.12.1.ebuild 1284 BLAKE2B de8507d9fb7a4202ba5f5322679d07fa5ec9aeff63be7a82fc2812d747f25e2714c85633d72f9f29045a8cda1ac99eb3d98b734d9d15419ea2ea98b7e8e0af35 SHA512 000f54f4f4460432478f558536758face9e999aa42061c13a5f1e1011eb3b4ed10ba2e3fb280855235764cc9e7fc977403986934fbd2030cc09d3bd0d4259e47
EBUILD pdm-pep517-0.12.3.ebuild 1284 BLAKE2B de8507d9fb7a4202ba5f5322679d07fa5ec9aeff63be7a82fc2812d747f25e2714c85633d72f9f29045a8cda1ac99eb3d98b734d9d15419ea2ea98b7e8e0af35 SHA512 000f54f4f4460432478f558536758face9e999aa42061c13a5f1e1011eb3b4ed10ba2e3fb280855235764cc9e7fc977403986934fbd2030cc09d3bd0d4259e47
MISC metadata.xml 400 BLAKE2B 0882adff4040585d2881a8712b035a5204909639f80f637526b793fd9e31e9d6cda6119cc069d8ff2e768b9d5807eab16bc27bfd35beb5a613722afead2d8b0c SHA512 484e17561642cf1d26d61a1d95554614b9e77b1ee985cba61ad35dad9c9470d0f64e99385200b8eb7e2cdd5e1427cf7835d6e39c10dece1fb90dd6e81cd15d91
diff --git a/dev-python/pdm-pep517/pdm-pep517-0.12.1.ebuild b/dev-python/pdm-pep517/pdm-pep517-0.12.1.ebuild
deleted file mode 100644
index c95abf912f72..000000000000
--- a/dev-python/pdm-pep517/pdm-pep517-0.12.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
-HOMEPAGE="
- https://pypi.org/project/pdm-pep517/
- https://github.com/pdm-project/pdm-pep517/
-"
-SRC_URI="
- https://github.com/pdm-project/pdm-pep517/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- >=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
- dev-python/license-expression[${PYTHON_USEDEP}]
- >=dev-python/packaging-21.0[${PYTHON_USEDEP}]
- >=dev-python/tomli-2[${PYTHON_USEDEP}]
- dev-python/tomli-w[${PYTHON_USEDEP}]
-"
-BDEPEND="
- ${RDEPEND}
- test? (
- dev-vcs/git
- )
-"
-# setuptools are used to build C extensions
-RDEPEND+="
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- rm -r pdm/pep517/_vendor || die
- find -name '*.py' -exec sed \
- -e 's:from pdm\.pep517\._vendor\.:from :' \
- -e 's:from pdm\.pep517\._vendor ::' \
- -i {} + || die
- distutils-r1_src_prepare
-}
-
-src_test() {
- git config --global user.email "test@example.com" || die
- git config --global user.name "Test User" || die
- distutils-r1_src_test
-}
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index f9320aed42c3..9f0045f3d564 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -2,4 +2,5 @@ AUX pexpect-4.8.0-fix-PS1.patch 662 BLAKE2B 93bf985deee0b14690fe08abbb21be09044e
AUX pexpect-4.8.0-sphinx-3.patch 761 BLAKE2B 609849b3587cd5eeada58ba5065111f3d5d38514d525c49682a9554fe5b21c4b5994ad3cc70725c1a73e19daf03c66644a7fa0ac880d87e912620263396df3d9 SHA512 d6cd0c3554c83c0092f46a2254dbe1752773abd76c220e0eeecd4a416f01ec57ecd51f26011e17d03537746d24f913472467d9ac8b569bdc168b6975292b4cab
DIST pexpect-4.8.0.tar.gz 157037 BLAKE2B 742642bd6b9ec3f6cdfad054d4fd22db56b4a55b746d675c27a8cdf824ea749ec4589e296dffa08778195f3ccd20feb56bc0fd5212984396ea5aa0555c41ca96 SHA512 7447ae2d1e13be422c894a8fd51c5aaa788e37ea7f0c798c88b77afd401fb3631400a637077ccbb83c2e3876b0d0c5e1dbd5fdc9d3739d785b4d5ad7c0192580
EBUILD pexpect-4.8.0-r2.ebuild 1182 BLAKE2B fdc67f66d369333f3f8b356c2e16d800311ccc4b38e2a53d5ee850cfee53a78d67cee56a217820e6f5befec113ba7d36c21a49be914325d76a19914c4a1a9854 SHA512 a215279bd237b49cdc12af2c4a7957649fddff7247ab351b302a674288bbfd913a439d953ed2f66efcc51c499d654f816058822d040a2c13cd11f3f0ebb03ae1
+EBUILD pexpect-4.8.0-r3.ebuild 1202 BLAKE2B ebc9a0382a86bc19b67c5124e03db54b3a92b2fd520954a1cde3fa4a0cc8ff096c1c3012ef51e16c574270623defd9ab7c7a83755dec9fd4102004b0919d8b0e SHA512 13b55bcf51f702dcae1620f613e3d5c2d0871f1d0f13566efdf27fa29a2ee6febb7469afd9104f8a91fc9956123073794051887cb1ca18a42e381ee34a50e00b
MISC metadata.xml 403 BLAKE2B 0e07f64f32ee9f6776e53f5e59b91e0e22675ebb0e8c8b98eadfb9a46d29af3e7daaafbf4e60fd7fa20bf57d42619ebdf26994b087ed0773a943acd6fddc8ab4 SHA512 4c3e18b98b69213899a6af8366ade2ebfaa4eabef76f880cd71c300b03fc7725246200bc00491942b3f7b4b4f87bdfbc9181663fe5c8b7c5325f1e7c6e76356d
diff --git a/dev-python/pexpect/pexpect-4.8.0-r3.ebuild b/dev-python/pexpect/pexpect-4.8.0-r3.ebuild
new file mode 100644
index 000000000000..4fbf5faed1a0
--- /dev/null
+++ b/dev-python/pexpect/pexpect-4.8.0-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for spawning child apps and responding to expected patterns"
+HOMEPAGE="
+ https://pexpect.readthedocs.io/
+ https://pypi.org/project/pexpect/
+ https://github.com/pexpect/pexpect/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="examples"
+
+RDEPEND="
+ >=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-sphinx-3.patch
+ "${FILESDIR}"/${P}-fix-PS1.patch
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
+
+src_test() {
+ # workaround new readline defaults
+ echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
+ local -x INPUTRC="${T}"/inputrc
+ distutils-r1_src_test
+}
+
+python_install_all() {
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pmw/Manifest b/dev-python/pmw/Manifest
index 83869806d025..06034a4a9017 100644
--- a/dev-python/pmw/Manifest
+++ b/dev-python/pmw/Manifest
@@ -1,3 +1,4 @@
DIST Pmw-2.0.1.tar.gz 830448 BLAKE2B c78fef1570a34b9784f936f16856c4450164d8a232770e59cc084c1113888af8ee002cd1c7ddeadcddaacb5eae9ff58fcbfc270fc066875523e31a9d26770cd3 SHA512 99654e961aa40a64eebc08fe473e94da0ce431e6465255c68c251dfd544a51edef1a5d97dfd89ce756eb5f7fcf917dbef27f646ba9451ab72f3d460daa09a556
EBUILD pmw-2.0.1-r2.ebuild 1107 BLAKE2B bdfd68ec23822835e2c6c18db3db40ee107e9d1145470c9dbfcf48649ae4ea057c0cfcc0af48c284f4ba1ec87110c42175c000b17038563816c3b0af7ef3c2b7 SHA512 90af072444604f1827ae50567a316006e3e623ba0ed7afa384074dc196798b31d4bb68f39081276cd26eb8fb753960c972ca5a3777d86cc66732b9a746dd6b23
+EBUILD pmw-2.0.1-r3.ebuild 1114 BLAKE2B 67f360696405bc804a18b44605ae63b8b2d4a5477ba930d157ae599d8c902cd84c8d2e2a919d6806bcc94c75304c3e50148d735acfdc285cf43034ce386bc821 SHA512 b9c35e62d742a72ea580b7e529e91803d2190b7084da8a344d94f6d0e5174b001d414e059f63dd2424d35108038c054b869db523465a8272e0d1d00e59fcc373
MISC metadata.xml 387 BLAKE2B 99c3a902dae4415dd912cad8aad2e27721685de791aa8957bec02ab02e21fc2d7fdefb058c8c1f0ea8068bf32f85067915b709b9f862ae08559578e2078ffb22 SHA512 d0347142c16a2de1e49ca50e30f474abbf7e41eac7ca080c26a5457b8da5fb8808c6b9c2103052eb6772585663037e9fc57ae15bbb42e574b6958b8ce2f968e2
diff --git a/dev-python/pmw/pmw-2.0.1-r3.ebuild b/dev-python/pmw/pmw-2.0.1-r3.ebuild
new file mode 100644
index 000000000000..84486c02a806
--- /dev/null
+++ b/dev-python/pmw/pmw-2.0.1-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="tk"
+
+inherit distutils-r1 virtualx
+
+MY_PN="Pmw"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Toolkit for building high-level compound Python widgets using the Tkinter module"
+HOMEPAGE="http://pmw.sourceforge.net/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="py3"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc test"
+# https://sourceforge.net/p/pmw/bugs/39/
+RESTRICT="test"
+
+DEPEND="!dev-python/pmw:0"
+RDEPEND="${DEPEND}"
+
+python_test() {
+ VIRTUALX_COMMAND="${PYTHON}"
+ cd "${BUILD_DIR}/lib/Pmw/Pmw_${PV//./_}/" || die
+ cp tests/{flagup.bmp,earthris.gif} . || die
+ for test in tests/*_test.py; do
+ echo "running test "$test
+ PYTHONPATH=tests:../../ virtx emake -j1 $test || die
+ done
+}
+
+python_install_all() {
+ local DIR="Pmw/Pmw_${PV//./_}"
+
+ use doc && HTML_DOCS=( "${DIR}"/doc/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pyDes/Manifest b/dev-python/pyDes/Manifest
index 0c5bf895aadc..24a377863e2f 100644
--- a/dev-python/pyDes/Manifest
+++ b/dev-python/pyDes/Manifest
@@ -1,3 +1,3 @@
DIST pyDes-2.0.1.tar.gz 9878 BLAKE2B 45a2d0575519afc389abe080f2c3a6751c5ee1f973e9e4370f24c5dbf9d85882e875682005eae3d749a2e11bffc3cd46868f83baa58f9e7e4feb7a25db641a14 SHA512 9d2a048dd6f629713d93d5cfcf5eaccb45a28fd3942f6837baf492bc6d9f0fcd16a1611e467231e9abfa6756d1684b0848c2190195e9e772bed2e6574327885c
EBUILD pyDes-2.0.1.ebuild 410 BLAKE2B a46713dcf80199358c91069fe810cee071574f60242cd91dc190f678b191e7abcdef51e51d5a516020529fa52f68a3aad43856402c0f81d1c4a6aeaf366c8647 SHA512 6c085f5b156fc2c6549567fd52a8aa0a31f463718941c3ea6d6b9423a73cf97cb47e42f3153dbf466437ddc541a807e187b231c112dc7ccfbd58fed0cf336c31
-MISC metadata.xml 401 BLAKE2B d2e507ac1fbff3f6f0f61baceb9baba2b2d40e7400a1a892f2a230ba09f243236fb2d9efb619d43a8667736a1df822c31fbf00d26361636b8b0765b07329faa5 SHA512 b9dd93cbf9f77d53a9a51f96d0c0aaec3ba3d83db52e66f0e65bf075f02fc9b8593cf595f2710924203f64f70bdb4dc5143d1fb40ca6c2fc4f9f37adf3c3c555
+MISC metadata.xml 446 BLAKE2B 8e721b577146cb6d08fd3b985582471426b38ba6ee06c3b7626181531908c6a97b0239d4d41778539febab9904751f3b336256ffe9e772dc61271ad6b8487c82 SHA512 c92b41bcc41a04c6a2879a9bf72df911a4c0278e586bd1c228ab41a6217b92636d1dc01ae67054a090b767ecad846c2c8a3928ef7e41c4d0eb0c789c404e38d4
diff --git a/dev-python/pyDes/metadata.xml b/dev-python/pyDes/metadata.xml
index 3f3432b413f8..ffbbcc001108 100644
--- a/dev-python/pyDes/metadata.xml
+++ b/dev-python/pyDes/metadata.xml
@@ -9,5 +9,6 @@
https://github.com/twhiteman/pyDes/issues/
twhiteman/pyDes
+ pyDes
diff --git a/dev-python/pyh2o/Manifest b/dev-python/pyh2o/Manifest
index 34e1d903d03e..fc9afee2d354 100644
--- a/dev-python/pyh2o/Manifest
+++ b/dev-python/pyh2o/Manifest
@@ -1,4 +1,3 @@
DIST pyh2o-1.tar.gz 7327 BLAKE2B 9d6b308d17dd799e2c83a191c346a3d78fc0a097de2a2fd5cb6277a1525992aa18f6c6b61b2c2503ae4a9e7ddd3575e092aef77a0e84223a5a2c702c0a808f1d SHA512 529fa4d8e9c477346fcbd23d7172d41de96789797f0e1ad0557f4c0bdaea8a519a8e8735845d0080cf171182874ce0819e76357ca7c7db1d62a9544f907095db
EBUILD pyh2o-1-r1.ebuild 507 BLAKE2B 8f2976c6faa562a4dcc2fc71cfdcecad766e77607aa9c83bad0cc9b2d3cbbd398d67d6ce2e1c74d5be58f156c247f7f9e6ca5621330a39107357147f768a79d9 SHA512 2d369737d678f8d5a90666865e5e3f60fb1cb7777a02163cae0214cf711fe8fad00f25bdf757f06baaea92d49832880bd4aedfa9cd598ede6e1f3e9091be1ad6
-EBUILD pyh2o-1.ebuild 503 BLAKE2B a5e471435ca681b6cacf7a4cf9f52e0454095e1fc26f48c5aa5d47248e068a7c2c881a1b4f831b42a0653ea17a67960cb793f6377caba3e26f969a74e017fa85 SHA512 17148936251dfe5c7ea2e8855f4fff6070b454ce8f3bbf43ab4d92a2683158ff1b33060b0f7d1cc80b03b6c7adbf41255029a6f72a9d291aa71c3397ac1b4626
MISC metadata.xml 543 BLAKE2B dfed4810be25f6ff5858e519f465c02aedff046e3ec24bf5a1bb1a0fddd5609de4189f829a7a3ec61b60c3626f4fd5527d5245aa02a6350b30957b1967a5325e SHA512 e06b7c94f5c9768161d4337990ff59fc60d10c9bfbed073bd7642db0746cf20160e297a09b00ce5acaa7b5b3c3e269cb493a83c686f3ad6a506ca97483c30270
diff --git a/dev-python/pyh2o/pyh2o-1.ebuild b/dev-python/pyh2o/pyh2o-1.ebuild
deleted file mode 100644
index 987ad144960e..000000000000
--- a/dev-python/pyh2o/pyh2o-1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API for sci-libs/libh2o"
-HOMEPAGE="https://github.com/mgorny/pyh2o/"
-SRC_URI="
- https://github.com/mgorny/pyh2o/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=sci-libs/libh2o-0.2.1:="
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pymad/Manifest b/dev-python/pymad/Manifest
index 4fefff65b6de..b77f64a0cb45 100644
--- a/dev-python/pymad/Manifest
+++ b/dev-python/pymad/Manifest
@@ -1,4 +1,3 @@
DIST pymad-0.10.tar.gz 26815 BLAKE2B df694f1fcc7b2c6d0d0aa064b60d061ade2240085867b6a12b3ed63a93cbcac20ac40b3929fbf5b8d9c7b6dbc52883130d02b309ce7690addda6c78813ca2847 SHA512 68a7c93031d174ab50dfa406eec4166be2158d39c4231baee18b7d9c879692376cbf491bcd3e5747e65c496b07a40d1597532551aedcdf05d0fa46f6e185a3d8
EBUILD pymad-0.10-r1.ebuild 573 BLAKE2B 8374d2baa09eb088aaa4bcb85df56c0bc8131eac5c1517a9cc22582f93cb2561dd63f591a2184c8a8cb128ab69eef18aa4684c9b026afd72b7a42c10faba9081 SHA512 660c8e5cfa778e78f6abdbc271bdd88c6e4eb05b0b770143486aca490e4e07d6fc078f05c0413ee14fa48c684a287ecc9d391e8feaf9e07546bc8570d3f89957
-EBUILD pymad-0.10.ebuild 526 BLAKE2B 232c8fbf1facc1d99e2df341e48eb40cfe5afaa2024d0bc4603c3fafa4d0cbd7bcd567f147f88364ce2d8db2da6aad0468ab6507c80853170a95e65cfc926ea3 SHA512 e82fd24bdd5755298f2a359076953dbda1964c187791da26718a3f9e35cf74fb2ddfb4d4e8c5271832a87f85b349b996160fa676a317bb86f4e49312e46d4f72
MISC metadata.xml 361 BLAKE2B 7fe46dc6890e49f46abd33d87400a260162295a0b386e9ee20103cbe2165b820bf4b39253634bc12dfad6ecd4b6c9b2e88ed791427ddc50c75f819b5536f28a4 SHA512 d0cd267049f6cd4e697d51bdbd9b1e93570b0a4517f00201a10ade1503b95f7a6b5fb91a8c72ddcf7ace18622ca945e853509a0253172c56cdff0d93ab9c4ab2
diff --git a/dev-python/pymad/pymad-0.10.ebuild b/dev-python/pymad/pymad-0.10.ebuild
deleted file mode 100644
index f4ffe3c8629f..000000000000
--- a/dev-python/pymad/pymad-0.10.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for libmad MP3 decoding in python"
-HOMEPAGE="https://github.com/jaqx0r/pymad"
-SRC_URI="https://github.com/jaqx0r/${PN}/archive/version/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-version-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="media-libs/libmad"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/pypeg2/Manifest b/dev-python/pypeg2/Manifest
index e0cb16993012..9ef2f2cb7fa3 100644
--- a/dev-python/pypeg2/Manifest
+++ b/dev-python/pypeg2/Manifest
@@ -1,5 +1,4 @@
AUX pypeg2-2.15.1-test.patch 399 BLAKE2B 64afae813084e2bcceb3354d6a9819425f5454d7febbb3df12d7b7f73329bfeed1a93fd7bbd046c69899f26757d984fd70964e13809ba9bb30305b80d35cdbc8 SHA512 20428aa41858da3b73a262ec2f36aed0df8626999eae27438a6bad1908b1dc79056ab33069c273aae56eabc02dfd0c080daaf42fee7e7c92ec32b95244ba41c4
DIST pyPEG2-2.15.2.tar.gz 40334 BLAKE2B 7a171824da4c0ccc3bfaef4e429efb16f5c8c4e03dd47c5cd59656a51fe37c9d0b3940e58e2f321a4d9976f66935fd5b9d526d24bd1e0342ef15a3a1341e77a3 SHA512 f78e3b1294169167809c5fe05f2a69af2bd6c7c4c1bcbebafb4aa6b8ae6ead181a46b051e41193bc31f49c4b4fa7b1ef231d172217c11d301d0ee21d8e411b6f
-EBUILD pypeg2-2.15.2-r1.ebuild 626 BLAKE2B 7bc10d1044d37ddf32573c4fb938dcc5ab5b57d034938d12b0ecb1e52e6e4506108d97ffc3f619ba87c09cabcf7cb73e21e2c4fc80bfbce0118717de2e5e7561 SHA512 a0fbed1a0e5eea2bfb7d4b7f6caea9dc149730a29d07e274e32238b1ae1300b6b966d451d807426af16cef0e140ee467888703487022cdea3a998e57368e19ae
EBUILD pypeg2-2.15.2-r2.ebuild 629 BLAKE2B 4b7872eb750793e1b78c47c75cad49a90c41b4dee4a5f4f2ed86ed4c4de1b4246c93f7c731d0719096f8159e3d48d47fdc953a9697aba5302613c814b7d35809 SHA512 f0892d078644a8d15e3e58f402c899bc63e706f78625cddd32e8d022c9c1197381a23569fa9b5208c0cfaf9591fdeb9903d3f4b6104119ed06e0e241b2fecb11
MISC metadata.xml 310 BLAKE2B ef3ace0746990efb4b3df2d32aba68f26817250a78aac1239eb9b438ab5e9b6336b0835fa7ff63de16d7ab09d61be74a64922ce3c36d950eb7923e86818d4155 SHA512 e508bf8b05e07573ef2ab6ece6c642e33a9252767ae8d419f0500f347b214fd8e4046917b4b285310726beaa51a574ebcaf2f733889ee355aeaab1222e34cd31
diff --git a/dev-python/pypeg2/pypeg2-2.15.2-r1.ebuild b/dev-python/pypeg2/pypeg2-2.15.2-r1.ebuild
deleted file mode 100644
index 64ff4c69a5c1..000000000000
--- a/dev-python/pypeg2/pypeg2-2.15.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_PN=pyPEG2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="An intrinsic PEG Parser-Interpreter for Python"
-HOMEPAGE="https://fdik.org/pyPEG/
- https://pypi.org/project/pyPEG2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.15.1-test.patch )
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyte/Manifest b/dev-python/pyte/Manifest
index 1db9c43ca108..321ebffa68d0 100644
--- a/dev-python/pyte/Manifest
+++ b/dev-python/pyte/Manifest
@@ -1,3 +1,5 @@
DIST pyte-0.8.0.tar.gz 91320 BLAKE2B b973050912c7d3b67393208a5b17f382705fe78964528e003b71addc12586353a3a9c7eeb68c224dfb945b5f9d3b52823cd254885dd5ac6901be119583a71a2e SHA512 c488fd0a61c1dc34b27e12ed9ba1109bb2c331626c982da06e7540bdd168008cb5106a17c71e60e38c493f2dd9f21ba3cf05118928744dfa192d62e511b4c4e8
+DIST pyte-0.8.1.gh.tar.gz 92220 BLAKE2B f4f803ecbf9bc62936ea499929b7fb976c14ee09fe00ee56d5499bb2543a6ac769dd7c87e177c297bbf8ab082c34f154a26daf3a1c84917249400b09556c2b80 SHA512 f49d9394cca92c27fdd5319bdce164d5cac63b77d13156de7105bee6087a615e844fafa8507089c8bf6cf31a796cc858a3ccf597aa23cfa595d0d9e0adfab5d4
EBUILD pyte-0.8.0-r1.ebuild 798 BLAKE2B eead274cc268188b967a4e13e863b5d5a31d1b46beb9a351955aa97f7e89bdc7522a0fb7f90fdfe4af19fab9dc47ccaf4ea88d1bef7e97a8e9d63407427982d2 SHA512 0cd58575ceac136485ffcac21c1b02134155d531e5c04f309065d716f7f809f3bc57dada8acc8d1b36bc881f2c8323a5e7d9196651e24b686f3656d302881a44
+EBUILD pyte-0.8.1.ebuild 740 BLAKE2B e1576484ba1b78b35599e194bf7db30156834319940979603b58e1781cbb235982a0b938ca7b6c86a5f9db58afde8719307d3ec33e8be38bcd79dc521a929e9c SHA512 612bd723a7a7a742adea0dce90966f1f1583b2092156437b1b0c4993d7e341db5878e0ad49e920df47d0e1b7b1f479a31c010dfa514e4cddcb3b6ff7e6db7a6c
MISC metadata.xml 373 BLAKE2B 0d75ebf59f26354f2efdcdb8803173e129847f5599c8bdc80bf990174d09adbc43d0d0e9b8a01f5757bcbc93db3ce0dfb08b485816777fb699156ace03e0a0a5 SHA512 b58c0a13ea3c23d2a9534e139b8691d17a69f43d3c04192b1a8a3750d44fdb0ee4d043c8fd04740680e1f3967a9ea4b578becb307b1a1628e35006d7ca987e23
diff --git a/dev-python/pyte/pyte-0.8.1.ebuild b/dev-python/pyte/pyte-0.8.1.ebuild
new file mode 100644
index 000000000000..7a8fc8d73612
--- /dev/null
+++ b/dev-python/pyte/pyte-0.8.1.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=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple VTXXX-compatible terminal emulator"
+HOMEPAGE="https://pypi.org/project/pyte/ https://github.com/selectel/pyte"
+SRC_URI="
+ https://github.com/selectel/pyte/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # run pytest directly for tests
+ sed -i '/setup_requires=\["pytest-runner"\]/d' setup.py || die
+
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index d7216c0774bd..18aeb22f4800 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,7 +1,3 @@
-DIST python-lsp-server-1.3.3.tar.gz 62604 BLAKE2B 16f49013ccefc0dabcf58c6007c05828a930d0bc873805543fde79630bdc8bd020cb63d0d0ba56c181282a96c57c6084acde30dc2a8011d208040c2a93c3644b SHA512 94e9bf1e74799c395589451c02c1220bc79336e1c1cdc243e95e891f61c7977b2438d78da3db3da572022870e67305b8caca22241e0cfab23d3b546639c69aa7
-DIST python-lsp-server-1.4.0.tar.gz 75443 BLAKE2B 7522ff0d5c9a0c9300f288debc4f606168f968cad80e32d612a674803046c91dc777d9ee320cf844224f6da791b6d66413c643fc48799ef5f57c19bca4f09858 SHA512 9f53e288b9bdb22575b06ec8a89022f533a323457746ef8e2cb52c84f06ac48b3408b4ebfbf96754ce68cdc9ddf1a745365d5ea21ba188a4372064fc87c1e6f4
DIST python-lsp-server-1.4.1.tar.gz 76416 BLAKE2B 65638b876182c478434c563371b802367fb8439820ccf57e4404dc1507f3cd514ae5d738d418386607db606025fe5126a533c656ec3fede53fdcfd364a4292cf SHA512 4c9171adc88d219c80055ebbc76566583925129969467c156277b52de9b5981b74b11b9961247045ea98cd9e51e146b2d606c8351a7be5db76f6f4e0e4d7195c
-EBUILD python-lsp-server-1.3.3.ebuild 3226 BLAKE2B 539d592055d3ee03e4b0a01944fa1ec3157c325220e93285d27577acb2939b7cb5ed13b94d2e0a1af798639f3210df96e248c07c1d12d81ca43fe8554e985522 SHA512 51de2e1dd4bd169a4bd70c61ce6533c1a6f55d3ab50261d80fd58d70c72e70c90b8870bf945d7da316fa1f144fb0ad5ee02a235c8f12e18501e5cddae23d7528
-EBUILD python-lsp-server-1.4.0.ebuild 3225 BLAKE2B 0293ecb93bafa11e8bb2878053946d54e7f1893ab66787ca896b47cca187e6dde081ade14918506de9ae12a1d0d22e53c0c6bb104ce5a328bd80ff7efe644502 SHA512 067561897f72054192d95c5cf1cb6cebed22c12998d90c4422069c4fef9e9dc0a4a0705f8ba1eab9b8c07f6f78884b370b96a825a1c6c318760a35cb95109804
-EBUILD python-lsp-server-1.4.1.ebuild 3024 BLAKE2B d7e3a48b0034580ae677a84b446c68e05792a4bc91ed5a3bfb2c018b319bc54ecf0727541d951652161964e3f188df016dcc7f8410109dd53efc9c7220421522 SHA512 6b1d48ffd2983f94e916740899dc0aef6e9ff210772bcd33c3202ef5fe7c22b900da4c721ada2bba3790efbafbdf94b910792c25d815be0f55e06139e0e2f6c3
+EBUILD python-lsp-server-1.4.1.ebuild 3022 BLAKE2B 70afa37aa74104074f3571023bd958258a71772ec4de133fa74894764e3113ef78f9601a05be6dfa1e32bd08b9e43d9b188c56d09c9f765a303d0d4aed615cff SHA512 1394fca67580bc6d2af26444a14ff642257ee7aa394f9866f69f092d3624eb7c5f0fa46d56f2d90068ddf90006d6fb9a62c51c0dfd8162d4b77664242829dae1
MISC metadata.xml 542 BLAKE2B ca71a08385d37c7f5cc562986630ae482970842054ffa944151d2e4a5d8449329b71c16c61e2a81f3d3d93f02a61ce637fe0bd0961ba3f86b7182b9728b62d5c SHA512 2d5103643838ba8aec53e7d3e924517cc3d735c724b6dfea249bcce3716aebb9f54e3264cb2cccc15dfe7d0ad4b7d052388122144fe6248d4faeef3482d197e7
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.3.3.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.3.3.ebuild
deleted file mode 100644
index cd8b13b06497..000000000000
--- a/dev-python/python-lsp-server/python-lsp-server-1.3.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python Language Server for the Language Server Protocol"
-HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-IUSE="all-plugins"
-
-BDEPEND="
- test? (
- >=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
- =dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
- =dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
- =dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
- =dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
- =dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
- dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
- >=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
- dev-python/yapf[${PYTHON_USEDEP}]
- )"
-
-RDEPEND="
- >=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
- =dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
- dev-python/pluggy[${PYTHON_USEDEP}]
- all-plugins? (
- >=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
- =dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
- =dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
- =dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
- =dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
- =dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
- dev-python/yapf[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # remove pytest-cov dep
- sed -i -e '0,/addopts/I!d' setup.cfg || die
-
- # This fails with py3.10, but it is not important. Instead of
- # 'invalid syntax' we now get 'syntax-error'
- sed -i -e 's/test_syntax_error_pylint_py3/_&/' \
- test/plugins/test_pylint_lint.py || die
-
- distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
- optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
- optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
- optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
- optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
- optfeature "Python docstring style checker" dev-python/pydocstyle
- optfeature "Passive checker for Python programs" dev-python/pyflakes
- optfeature "Python code static checker" dev-python/pylint
- optfeature "Python refactoring library" dev-python/rope
- optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.4.0.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.4.0.ebuild
deleted file mode 100644
index ad82e4fc954d..000000000000
--- a/dev-python/python-lsp-server/python-lsp-server-1.4.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python Language Server for the Language Server Protocol"
-HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE="all-plugins"
-
-BDEPEND="
- test? (
- >=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
- =dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
- =dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
- =dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
- =dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
- =dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
- dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
- >=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
- dev-python/yapf[${PYTHON_USEDEP}]
- )"
-
-RDEPEND="
- >=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
- =dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
- dev-python/pluggy[${PYTHON_USEDEP}]
- all-plugins? (
- >=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
- =dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
- =dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
- =dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
- =dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
- =dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
- dev-python/yapf[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # remove pytest-cov dep
- sed -i -e '0,/addopts/I!d' setup.cfg || die
-
- # This fails with py3.10, but it is not important. Instead of
- # 'invalid syntax' we now get 'syntax-error'
- sed -i -e 's/test_syntax_error_pylint_py3/_&/' \
- test/plugins/test_pylint_lint.py || die
-
- distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
- optfeature "Automatically format Python code to conform to the PEP 8 style guide" dev-python/autopep8
- optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
- optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
- optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
- optfeature "Python docstring style checker" dev-python/pydocstyle
- optfeature "Passive checker for Python programs" dev-python/pyflakes
- optfeature "Python code static checker" dev-python/pylint
- optfeature "Python refactoring library" dev-python/rope
- optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.4.1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.4.1.ebuild
index f36d3cf1600b..215fdd8a49a4 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.4.1.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="all-plugins"
diff --git a/dev-python/rcssmin/Manifest b/dev-python/rcssmin/Manifest
index df956ac986a4..b8a6064b597d 100644
--- a/dev-python/rcssmin/Manifest
+++ b/dev-python/rcssmin/Manifest
@@ -1,6 +1,3 @@
-DIST rcssmin-1.0.6.tar.gz 582894 BLAKE2B 64fcd9bd9ea96037acfcbb0edf5ddba45f0804cb1862fb60dffaa5b60a0ee2a0927fc237fd04cbf9be438a9468b54dfccb56729a6d191ee323d9ccb819857dbc SHA512 5129a6007755a5b1949256bba7ad3616a08034d7bfcf06a1f9d8143897dddc5d2f6b8a0ebde7abb2e8b12e5b1aee2e46260e59101a78f35026e15f9f6503db77
DIST rcssmin-1.1.0.tar.gz 580779 BLAKE2B 162ec087b791a4ee0c23994cea431e01f76c199c1d2118a75c9e49ebfc0d4f46fc4088126032851446acf2bd7b76b8f17095896100338636f4df8de75612f55d SHA512 9dc7fac0fef73c389baf8fc132e58599471517a2b77b13fe6bfabd30246b46bf859f7307ff1606d6634bdcdc472bdde0882fe7282018a34fba7b8fc80f6e9279
-EBUILD rcssmin-1.0.6.ebuild 598 BLAKE2B 6a82a9a551c6ab5ce7f41d5deb7b8a980149dcf7b084dd2a0e2210a2a4b058509a712353d646bcdf2289339bc8c95b3a6f6ec077e908f57bc05f2a9eed0340e7 SHA512 3a0a4a5420112a1cab22b5fb27544d2f8d88b01c10ea98d2f5a8328b95aabaf430c2d822de6608d5fd79cb0649c5c5de4fc3e8d21c92b910b5cd8712f5bb26b6
EBUILD rcssmin-1.1.0-r1.ebuild 595 BLAKE2B 05aed0d510e0865dae3f410bab486db2d4b227821bd786717f93906c49c090425f7a2c2c49b50b4f184e0326c1dc3641a7a0b491710208f3e7f8cf2d37de83a0 SHA512 74afe6452a8babbf05c69eff93828987b96b2bc2b03addcd733704a6bf687e3af1e58c67244dd68a21b9992f9ea9e88161503608d938bbb9b64800c943a626a9
-EBUILD rcssmin-1.1.0.ebuild 562 BLAKE2B 8ed7d3b2d1bde30c8aadda2ee939a75bc1558712582dde0eed2db1beb20527901bd47998fdae18c22dbe43703cd66d5d1331d7c0d6e7ae10e3ab8792a3453b13 SHA512 b3e997cc6aab77a17be88882ff605e822de9faf12e136ebcd1d6d8408d3888fa42fef124147c43d131b4e137d6a74828fa02480a1610245918dbd5f604373257
MISC metadata.xml 294 BLAKE2B c502bfbc75a7d9fab19f1aba913da9d42cb64dba2e964042e5fb100b295ba512ede3425456731d4d58783f044e1fd029248fddf9c877ae1e37af6b48915965ef SHA512 bcc3ec707b0de17ae43be3832957bedb8f2f46b7ef3790edc44456713f9447fdba7c8ce269181a6750415d8a41d2bde5fe68530ad64040fd97dcbb7f44728001
diff --git a/dev-python/rcssmin/rcssmin-1.0.6.ebuild b/dev-python/rcssmin/rcssmin-1.0.6.ebuild
deleted file mode 100644
index 12c42137cab2..000000000000
--- a/dev-python/rcssmin/rcssmin-1.0.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="CSS minifier written in python"
-HOMEPAGE="http://opensource.perlig.de/rcssmin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-python_install_all() {
- distutils-r1_python_install_all
- mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
-}
-
-python_test() {
- "${EPYTHON}" run_tests.py tests || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/rcssmin/rcssmin-1.1.0.ebuild b/dev-python/rcssmin/rcssmin-1.1.0.ebuild
deleted file mode 100644
index fdf0aa52df6d..000000000000
--- a/dev-python/rcssmin/rcssmin-1.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="CSS minifier written in python"
-HOMEPAGE="http://opensource.perlig.de/rcssmin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
-
-src_configure() {
- export SETUP_CEXT_REQUIRED=1
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
-}
diff --git a/dev-python/sarge/Manifest b/dev-python/sarge/Manifest
index 4a17b600ceb5..f0f502082b40 100644
--- a/dev-python/sarge/Manifest
+++ b/dev-python/sarge/Manifest
@@ -1,6 +1,3 @@
-DIST sarge-0.1.6.bb.tar.gz 55320 BLAKE2B 2a641f43ea57ee3b22668dedcfa15fa5e07e8b8d8630e3764739254fb109d61eaedfe8e6e059c43bd22760d822a8cf251616108a6662e9daa2e79a0e35443cb4 SHA512 8cf77141f516297cfc029b6255618f497ab94453214e61ef280dd571019a40f461d81ab9bb793b08de2dae89832e50aaf687205814b22c305e03883b9dc3bfea
DIST sarge-0.1.7.gh.tar.gz 57029 BLAKE2B 4cba823073b6699d9a3152b55de63b8ea9ba7cafa0f50556d6c2115a863fd3cae44a9d8fc9e6bf14727aa312c90f69dd03ebcb73508c5a2cdb0d1f6ff190435f SHA512 f2017fdab137e1aebfcd60a125ea7ff057158c6bf6a277d3084db73ed62a07cfd3464deba883284980c9f6ea3f56810effb551e8e8523ab750a086895ad0297a
-EBUILD sarge-0.1.6.ebuild 625 BLAKE2B 8ee081368b78c4a9f72ed6bfe53d4d45b2d0a0e6c0115ea87ef6e904a9cb257dc0bec4ca31b288dd595eab18c4964b34454cd2d1c68ccd92efbf88ae95c14416 SHA512 6f981030d848e1ced990340c49a43f3295be310be3e9f913c9423b92dc64977dad6e72e6eaf1d70250bf18686549e6ea6d06af764870514c13468d5c0e520dc7
EBUILD sarge-0.1.7-r1.ebuild 632 BLAKE2B 6a7212838a09fee479dd1e6220a86dd197e6432ace5bc1e3dc9daff8da158c7542c2f3760dedf96e2304cd15f3914bb1c67cf04196d7e65c75cda9857e95cc02 SHA512 6a1aa4d6763dbab82cd939bbe382a81f590ae43f435b5550d97551c8f399b737ca74ce20fb71cda3e06072fd31537fd9e4ced2abfcd3269051a4a7a616810c07
-EBUILD sarge-0.1.7.ebuild 627 BLAKE2B 457356d875fadacfbacaeead01d4e007bc3071d34c2d27bef81c20ebd494c4aedcc797a725f5b17dc49d83d197b505530e77db7c3b6f94914d78e07af9635a11 SHA512 1f1de7bfb5a3979bcc68435d59c3e82127f0a5b30ab99c08100a333aae9d6235f6775dbe32515e62be7a3515666b5d5e41a9824adc356fff850c831880b798cb
MISC metadata.xml 470 BLAKE2B 157ea921141b74ec467c00c1b671146c2fe11efd7156146188eb5126739c789a6dffe1d2954c2c40d144258bc2e09be62e56b184504fddcc55e5fb5686fd835a SHA512 b211a65f489e20031ded07eb5908a04ab26fa9d5ba3a5c0d7cc4f134ee9233fb7519c60c9ad60c42ad444021de3fa32303d951a16cc3a6c41256761f15cfcba5
diff --git a/dev-python/sarge/sarge-0.1.6.ebuild b/dev-python/sarge/sarge-0.1.6.ebuild
deleted file mode 100644
index 72f8684fde47..000000000000
--- a/dev-python/sarge/sarge-0.1.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-COMMIT="81dc3347651b"
-
-DESCRIPTION="wrapper for subprocess which provides command pipeline functionality"
-HOMEPAGE="https://sarge.readthedocs.org/"
-SRC_URI="
- https://bitbucket.org/vinay.sajip/sarge/get/${PV}.tar.gz
- -> ${P}.bb.tar.gz
-"
-S="${WORKDIR}/vinay.sajip-${PN}-${COMMIT}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-python_test() {
- "${EPYTHON}" test_sarge.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/sarge/sarge-0.1.7.ebuild b/dev-python/sarge/sarge-0.1.7.ebuild
deleted file mode 100644
index 2d02a3cd0009..000000000000
--- a/dev-python/sarge/sarge-0.1.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="wrapper for subprocess which provides command pipeline functionality"
-HOMEPAGE="
- https://docs.red-dove.com/sarge/
- https://pypi.org/project/sarge/
- https://github.com/vsajip/sarge/
-"
-SRC_URI="
- https://github.com/vsajip/sarge/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-python_test() {
- "${EPYTHON}" test_sarge.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index c993adc0305d..297fef59d312 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -6,10 +6,12 @@ DIST setuptools-60.9.2.tar.gz 2425956 BLAKE2B 09baded7eef555ebd76db1672d69cd06cf
DIST setuptools-61.3.0.gh.tar.gz 2643769 BLAKE2B 4ede87e7a597a6916dc089c311b0e4d098b08debbd1c4a9cb97078730e9cdc8dbcacd4236ca98a42e3cfafdf66d8f39bb64bc9135291335224b1c3b0bf79deff SHA512 35e2b848cf79e577b8c469562cb68a80b27d42d2d9c1c94f84fea9beb85e2db0796ed64d414add67a404d801c4f4e6cd489a72153de4dc8ed8b45fab24c28fd9
DIST setuptools-61.3.1.tar.gz 2508220 BLAKE2B be59b7f666d8cc583b98b73d681eddf2d15e1437f05ddb534cb6e95bf458aed01a6e136ddc10bef2b2f66fe3f888187ece8262906079f1321f194e03a93fccca SHA512 463f2203416a298f65b66199fd62941ed32fc0914a4b6afff74b4abb8db37c063ab208a67383b5a7e6108a8c1ed0fda0fbb6b47d8fbc95c68b9e23e4ba152aec
DIST setuptools-62.0.0.tar.gz 2512032 BLAKE2B 688afed5a19e70a0fd7ab91a8d137e6641597d9f9acf31826216cd59e4632872a9661fe9ca18e45aec5cd40e52956147aa8d40ac2c376380ffa0f01dc2997e63 SHA512 9017ab055c81063eaf741d45bd2479fcf85d15795bdcf0fa55522d194a69b5a912cbdba94e9eeaa6cf2a6cdaa5dda09604205d6e02d56e7c9fd3be4c1c79ba0a
+DIST setuptools-62.1.0.tar.gz 2512885 BLAKE2B a26a6bd5001922885b623bc7f1d42da90c59e6d9e195e9dd292ce2e73cd35a51f07fc714261c12db2fdf4510fa1137f57e7f3f649312f6a75035b9d927936a7c SHA512 41f39b5aa22e908c123e8e04c11e505e23cd3aaaae72793e106015dc14b1a44ff3b17aa15ca3da34f34a4becc887ceea7f41932650e38d409f95d7227707d2e1
EBUILD setuptools-60.10.0.ebuild 4160 BLAKE2B 1b04acd31df87b7c8911c3f8b6e12920bb108583921245f0c733028476b7d521048c89cfa23c39b77fa1f508d2ba147b5809b4613a23bc220ca49f8214daf47a SHA512 7072f7b4825b9d972c55e0a5d6e117b99f81df7f8e942793bf0fe954ff44d7d2f90a26d22fdf1402d96f2626345f726a0d30b600e826a9c9c1b279b05c84c065
EBUILD setuptools-60.5.0.ebuild 3392 BLAKE2B 93280ff6c52f3f0e6bfc94057bcf5e60db4d71d50f20d2aab7589996a625ab09c3645a5232711386d304517af149f2fc460c1e04d4f86658415b028de61a254a SHA512 6a55a979216217d7f6c39460e8058541423c33bb1474128dc6e2c5bdd69e13a10a4581057b37ccc2f5c600ed6f495e96f9aa8b0d4f9cb0a6e0fb2ec4b687d0c9
EBUILD setuptools-60.9.2.ebuild 3958 BLAKE2B d9ab297e87453adc0395b0aabbaeea1b71f9ddf4137cc6276bb3ccda55e4b8138301c2008dc437a71919dc080cf3c171bc0b46ccef0bf9bc5ae948a335d684ac SHA512 af7c6a4b1c370e160fcebb0ab6502c770ec64064fb8fe803d9432c8f252ea132d2ae5cacec41ececcedf9888fab9910a11051215cd8a7c2f6c6c83efbf0a3256
EBUILD setuptools-61.3.0.ebuild 4528 BLAKE2B 0bbfcbe4a56263e867aadb744bab3b28902fb8965f422654e72e9c0c5ff3b48328f2f3ccbe8eedf292c1d76f9e151aba6878b275203f83ff6aa7e0a42c6bafc0 SHA512 4b14c8bbfedf9398ebe393298cd3b70cfafff4510b43e44fe6badbd79b38c6ee14abae25c530913efa677dedc068d7045f8e2b0e2f44fa50e17d500c8cd387c9
EBUILD setuptools-61.3.1-r1.ebuild 4687 BLAKE2B 5a5f6931fc312d20c04fc677885abae94cf466a127fa68b761fbe45803af0f1e2ca4ac83e089fdbacad32cf9f9c39fb3f84d19a7d0186fa7709a817f2da580c5 SHA512 71f8ab62ae73b2f293af7c12d7da08859a935c867cd8098aa4627a766c930644cc7e9195e5baec7cd54d926314afcfb1563eb2ac61e26ce827a5fb0ff51e131d
EBUILD setuptools-62.0.0.ebuild 4726 BLAKE2B 441b8eb88aadb86da1a37abba16baf0801fa897f780053e64084e62a511a6fa6053334af03fba73036945df8a81599864807e4d2d12430c6eef785025820f8a9 SHA512 b404010aaf5ef0d054da8fbf083d9ec893d2d2ea09ad44b025d1d1bf1ab30640f3f2e8b1e927629b8ca8b8f4a071853b1f407536e54aedf521bb927a96d1bd2c
+EBUILD setuptools-62.1.0.ebuild 4726 BLAKE2B 441b8eb88aadb86da1a37abba16baf0801fa897f780053e64084e62a511a6fa6053334af03fba73036945df8a81599864807e4d2d12430c6eef785025820f8a9 SHA512 b404010aaf5ef0d054da8fbf083d9ec893d2d2ea09ad44b025d1d1bf1ab30640f3f2e8b1e927629b8ca8b8f4a071853b1f407536e54aedf521bb927a96d1bd2c
MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-62.1.0.ebuild b/dev-python/setuptools/setuptools-62.1.0.ebuild
new file mode 100644
index 000000000000..0bcb480a73c4
--- /dev/null
+++ b/dev-python/setuptools/setuptools-62.1.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-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_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.4"
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+ https://github.com/pypa/setuptools/
+ https://pypi.org/project/setuptools/
+"
+SRC_URI="
+ mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+ https://dev.gentoo.org/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~m68k ~s390 ~x86 ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+ >=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+ >=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+ dev-python/nspektr[${PYTHON_USEDEP}]
+ >=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+ >=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/importlib_metadata-4.10.1-r1[${PYTHON_USEDEP}]
+ ' 3.8 3.9)
+ $(python_gen_cond_dep '
+ >=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+ ' 3.8)
+"
+BDEPEND="
+ ${RDEPEND}
+ >=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/build[${PYTHON_USEDEP}]
+ >=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
+ >=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+ >=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
+ dev-python/pip-run[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+ dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ dev-python/tomli[${PYTHON_USEDEP}]
+ >=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ ' python3_{8..10} pypy3)
+ )
+"
+PDEPEND="
+ >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+ # remove bundled dependencies, setuptools will switch to system deps
+ # automatically
+ rm -r */_vendor || die
+
+ # remove the ugly */extern hack that breaks on unvendored deps
+ rm -r */extern || die
+ find -name '*.py' -exec sed \
+ -e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+ -i {} + || die
+
+ # apply distutils patches to the bundled distutils
+ pushd setuptools/_distutils >/dev/null || die
+ # TODO: distutils C++ patch?
+ eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
+ popd >/dev/null || die
+
+ distutils-r1_src_prepare
+
+ export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+ local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+ # keep in sync with python_gen_cond_dep above!
+ has "${EPYTHON}" python3.{8..10} pypy3 || continue
+
+ local EPYTEST_DESELECT=(
+ # network
+ # TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+ setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+ setuptools/tests/test_distutils_adoption.py
+ setuptools/tests/test_virtualenv.py::test_clean_env_install
+ setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+ 'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+ setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+ setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+ setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+ # unhappy with pytest-xdist?
+ setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
+ # TODO
+ setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+ setuptools/tests/test_test.py::test_tests_are_run_once
+ setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+ setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+ # expects bundled deps in virtualenv
+ setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+ setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+ setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+ )
+
+ # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+ # It tries to sandbox the test in a tempdir
+ HOME="${PWD}" epytest \
+ -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
+}
diff --git a/dev-python/sexpdata/Manifest b/dev-python/sexpdata/Manifest
index 821741d1aa47..f69dbc12459e 100644
--- a/dev-python/sexpdata/Manifest
+++ b/dev-python/sexpdata/Manifest
@@ -1,4 +1,3 @@
DIST sexpdata-0.0.3.tar.gz 13105 BLAKE2B 36c4082a63f6748759d71fc38a056ecb7467eafebf0a1a0b006fbef1302488f23a859462c9526dc365f7c88b8b6c331dc6e4892e1d96358abb44ca60a909d283 SHA512 03d4d1557bcc950124e408d6870894c8ee9e72a2ee83c881adf48f8e53bdf3744b4f3e3e133a74a195d236424b434cc690583a68d8395324ca4e84947e548501
-EBUILD sexpdata-0.0.3-r1.ebuild 465 BLAKE2B e5f7f34fbd6d3d41124765656ac47997ee9df46fa00206e1c62c32e343087c0bdc6a0bcdf52f1a1527c22b765349b31d21ef524fbd3a49d794edf29780d3ef78 SHA512 97eaafcd97b470b015a305b16469f1fa925145cf5bf51dd427a7eea971a9162a938fdd972f0e254d3736a000763ec3ae130405dcbb83e63922a50f459fc677c8
EBUILD sexpdata-0.0.3-r2.ebuild 469 BLAKE2B 90434045a9af0209128dcc3ae132364edfcfe94e364f14b670c54bb02e4c1ed0d64aac276b01cc24e588cc9b63b2ec6ae903bcddffce699ad61b570a5f68b039 SHA512 c61e71f2927e75371e070d9c9a6824b3d79f1dd006f46c497b922be6f43406daceaaacc2c60c63c4ae90478ea6883f2d5fe14de330de0e178d54469fcf19b814
MISC metadata.xml 380 BLAKE2B 531e59f20c41d7f47f34245fa53682a5b00659e8ff591762c779e82c80ab1a6d37a9ec6c22a83a35b780cb362c18b0b909702184e8865152e9a475930fcc775f SHA512 65e354095ed1f50d31db59f03308e4a5a6cfee73c74dbca59a5b0ffdd1ce7434bcea308d31f23dc8d6ea1a04c09c50f25a872fd4a7b4b6f06646ff232648c93e
diff --git a/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild b/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
deleted file mode 100644
index e4d0ca64c36a..000000000000
--- a/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="a simple S-expression parser/serializer"
-HOMEPAGE="https://github.com/jd-boyd/sexpdata"
-SRC_URI="https://github.com/jd-boyd/sexpdata/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-distutils_enable_tests nose
diff --git a/dev-python/signature_dispatch/Manifest b/dev-python/signature_dispatch/Manifest
index de5e5ad823de..a4940e83c637 100644
--- a/dev-python/signature_dispatch/Manifest
+++ b/dev-python/signature_dispatch/Manifest
@@ -1,4 +1,3 @@
DIST signature_dispatch-1.0.0.tar.gz 15102 BLAKE2B d0fe384551136d23f815129849ec70c0d1bd8616dab571122b7407578f3cc0d614fc5c44f3de5d9541bed9e9e3a0887517fff1183fd6c782bde603d774fe09f1 SHA512 c13ac92f50a8bd7a9fcd0b231f74a14539fd9c0303fdb29860a93116512a20113708c3207c4b2d8f61a48a9632e8cd21f7ea3fcb49ae3a4b1c79eb6a71df4eab
EBUILD signature_dispatch-1.0.0-r1.ebuild 561 BLAKE2B cff3565808446ea7b754048932590a53a5773e07e74baa2dcf91148d829ea2f779fc0a219c7d91a74c8f6e229d3dec182763682cb54475c1e5f14b8100560ba4 SHA512 1425ee42684c059decb51af74172ad7f5db66983014f3a85ba451d97c8a14b49b585c739f11395d6221261d80412fe1aa014ed1bfe2d0d0589f0c963efbc5c1a
-EBUILD signature_dispatch-1.0.0.ebuild 557 BLAKE2B 9a60e0db2cdc6294a7c2eec151edbd74bfce2ead92e3fd5fce7f3baa93dbd9bd0818969213d344546f880f2c436427a7e6a423e1f2fbeaec3b99862fbeb4b53a SHA512 a58c1c204e8f23dbae1111e9e3bdc51e12a6eab4f64605d5e5a6e1038091b6cce9f178bc6011904ca7256a03bb6c7edaf5b9ad0e81d9fc32401c9015ced85cc8
MISC metadata.xml 394 BLAKE2B 8edd4cb637f99bc844dd55e0475c74887f04e272a1238985692cc40e89e45dec82599139c419b894a7ca7f9f35bd2603e78cec838cdbf870da80fed27b7b67d8 SHA512 ed7aa29b9c0407e8b786b75020032040fd127946429ee239a142a6cef313c46af2ba67e7c8d631e5fe3dd733318b0a4a0603ec2fda39de95df861f68084f2369
diff --git a/dev-python/signature_dispatch/signature_dispatch-1.0.0.ebuild b/dev-python/signature_dispatch/signature_dispatch-1.0.0.ebuild
deleted file mode 100644
index 73c2bc0b51b2..000000000000
--- a/dev-python/signature_dispatch/signature_dispatch-1.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Execute the first function that matches the given arguments"
-HOMEPAGE="
- https://github.com/kalekundert/signature_dispatch/
- https://pypi.org/project/signature-dispatch/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-RDEPEND="
- dev-python/typeguard[${PYTHON_USEDEP}]"
diff --git a/dev-python/simber/Manifest b/dev-python/simber/Manifest
index 1735f077acf1..a5e56906a44d 100644
--- a/dev-python/simber/Manifest
+++ b/dev-python/simber/Manifest
@@ -1,3 +1,3 @@
DIST simber-0.2.4.tar.gz 91600 BLAKE2B 64ef49a8458fc98bfe87ceaeaa7bfcf9f76c8283f8a80cd918dcc8709ca5f4c2b1d657fda345812b3cb280855f3bc7bc9e3d8045b593bc8dd9dbc134f84e0e81 SHA512 17def9e8c6f0695ec36b5e48011d2db892436b7076203fe008aac7c8c2ce0e0ab9cc5be45f6eb136984f41997a7e91549c77cb1761b65694039619bdb8397ae1
EBUILD simber-0.2.4.ebuild 525 BLAKE2B 5dc000b26f7f5953205b63e363c24bdeac3205c8c45676f4e4813b2008f8ac0eda602d8abac1be854b4d55652cd3f68553a4138f515d824c3a2e3bbb3265a0e2 SHA512 05ef7a43e748d1373aebfc2726a4f7e93346596bceee7bf2a3bef7f73ccb326be76cbb7e17e1084719d459b28648d79b35d7c9a1725fdb359de28b41834ce510
-MISC metadata.xml 407 BLAKE2B 0b9b67af0e14ef3c6e5b7e07a25cddb39407a31c4d0de9f095031860bf733bba270c04bd437523fe5348d9a4653358e46e6bfe91612c5926eb6cbc933a01360c SHA512 5e4edab466055ddaffd4c51c9d6ed44872b20b58be2a27631a3df6cfe92ba42db29d45272d00488dad22faed7beb8c2efe08cc573f40e2e968a994ca334d5adf
+MISC metadata.xml 453 BLAKE2B fe5fc90f5deebd7469827aeb23f8eec4541a36cbb2c2248fe7560e6403353758fa97710b3626860594860eb2b97af1d374c765938184bff92ad859b6ae7ab7ac SHA512 00146d59c31512ea9c06f8a6a61a8fc65c746f320aa6b355acf0f29457600d6c327598f997ff17e3ebccb1ef39167a16679d79d24bdb552a1a2f4c00c1f9f9e5
diff --git a/dev-python/simber/metadata.xml b/dev-python/simber/metadata.xml
index bc2c7ed4c7f4..240cc57edb23 100644
--- a/dev-python/simber/metadata.xml
+++ b/dev-python/simber/metadata.xml
@@ -9,5 +9,6 @@
https://github.com/deepjyoti30/simber/issues/
deepjyoti30/simber
+ simber
diff --git a/dev-python/sphinxcontrib-bibtex/Manifest b/dev-python/sphinxcontrib-bibtex/Manifest
index f66aa0fdd83c..86fcd0ffd488 100644
--- a/dev-python/sphinxcontrib-bibtex/Manifest
+++ b/dev-python/sphinxcontrib-bibtex/Manifest
@@ -1,5 +1,7 @@
DIST sphinxcontrib-bibtex-2.3.0.tar.gz 100159 BLAKE2B 96c9ebf48f11354ea3978a053828f9290457aff4fa1f0bb3d9f94bfe6fb5d5463f83bb12004f22bf8e34a517393848482a27d6754c682d25a0de64c3c7d06ecc SHA512 84652cfc7ad19ad5cdc1dba9a8aa7f835c5c95850a8e941067fd79b6b271733a63a1ba457a59e18156737888c2f42350b7fe0cf2d55ea478629b74b00d14f908
DIST sphinxcontrib-bibtex-2.4.1.tar.gz 108355 BLAKE2B 2ebe53186b7bbf6ef5e09f05e3586b3a2d126978ef87a023f577cb9768621ceea8eaba8be3d03f55d3c7cd0cd7682c598cf141468129866fb7ac9f08ed0e9245 SHA512 9f323379d2626837dc199ac6c63c555eef8a9fa7c1b215f68d5f2c2769ff4027a027c1a46abe9b09aadf87144ddb22e08aaa47838183a82ff0e12fbd91a5334a
+DIST sphinxcontrib-bibtex-2.4.2.tar.gz 284061 BLAKE2B 06d9a868da621cca522c45998ce5f28a5aafc501127760c494e9e796d807800cccf3ee0cace7f4b824a00a76e8dd80e77d0ac5e037f2eaebbeec2ce4ea2ead70 SHA512 52d47bf0a20ef13f29b712bbe66cbcb98bd9531b8032a847375ff23180368decc3f89c2323b9ccff77c9bc9fdada63c521a81da6b701533973fcf627c2672e82
EBUILD sphinxcontrib-bibtex-2.3.0.ebuild 683 BLAKE2B 1384758ff607eb88782904286af4dc154d799072a5369bb8d1b6d07b4ed84c5cf9d89f2c5fd2acd22746aed8a831eddb1a7d4ed0043fe6bcbbc1781584aca94b SHA512 682e29f3834d198b3586eddecdbbe6776fb8627d6278f31c0ed4ee671617baf31c90f2735cc799764c8d56e019f3b4e9a63f9f8cab5ab664dede842c2518b71e
EBUILD sphinxcontrib-bibtex-2.4.1.ebuild 986 BLAKE2B b6a97ab8ad322f2de9f5b932f51a69268b669c2a6014ec759f0182a25b2c9094ca90f01b389486690bc866bffe1a420da28581c1a7aee8e9dfc87a388ac205be SHA512 a985dd543d498a1f753d332a16cd886a2d05e1e4a7a05fe94d817a95581642ff912f5e420e8a7480f89359bb0025800b9c518fdc9820c83ecec9f8a0f790d6d1
+EBUILD sphinxcontrib-bibtex-2.4.2.ebuild 1205 BLAKE2B 76c03f8760aebfe8c03f56976d6e72da1b2e60e2db1e7215262f3db12515f229c691f5d6a827513dc9a25891245dbbbe898ae98d01512f3cd0d4208b23cd1de1 SHA512 9b847a6e2abc61c402c8f43dddd18433928f75bfb760b6da0fa94894e362f136929076a71da34d7de1906937be13bd75cf09dbfb0c5bc43ae9a3f80d619f1d1a
MISC metadata.xml 438 BLAKE2B 265a193a9152a7ba1974237391e9d6bad963df7634d1b6c9f28322c0032de1897c3f1ef370bfd036f35e752fa15209cd4e856d1cd3ca3a5294cfdcb3802f877d SHA512 450565aa679724dc0b99db698ffbf99f91e5c019b74bfe7772750eda72f094649ebb4ca815cbea26f4ecb795939ded7af8cb45cec2cd118e9e69d68f01c889fa
diff --git a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.4.2.ebuild b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.4.2.ebuild
new file mode 100644
index 000000000000..5d8bcffd2fd0
--- /dev/null
+++ b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.4.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extensions for BibTeX style citations"
+HOMEPAGE="https://github.com/mcmtroffaes/sphinxcontrib-bibtex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/docutils[${PYTHON_USEDEP}]
+ >=dev-python/pybtex-0.24[${PYTHON_USEDEP}]
+ dev-python/pybtex-docutils[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/numpydoc[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
+
+python_compile() {
+ distutils-r1_python_compile
+ find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+ # this is needed to keep the tests working while
+ # dev-python/namespace-sphinxcontrib is still installed
+ cat > "${BUILD_DIR}/install$(python_get_sitedir)/sphinxcontrib/__init__.py" <<-EOF || die
+ __path__ = __import__('pkgutil').extend_path(__path__, __name__)
+ EOF
+ epytest
+ rm "${BUILD_DIR}/install$(python_get_sitedir)/sphinxcontrib/__init__.py" || die
+}
diff --git a/dev-python/spotipy/Manifest b/dev-python/spotipy/Manifest
index 13de582c7400..1179d9026743 100644
--- a/dev-python/spotipy/Manifest
+++ b/dev-python/spotipy/Manifest
@@ -1,3 +1,3 @@
DIST spotipy-2.19.0.tar.gz 102703 BLAKE2B bc132edb972236b43097c0bbc9d86932a3305d8bd3807e44e20767b123455950b8e01060efd83c87b3a162e329f5c48614205f131686af7f9312a44894a7f1e7 SHA512 fbaecd1a2cab3ef458d30de46cb89462021dfc3cfc85516d8bfe509af016a0b19af2f8de4f5cae36188b1ce1f5718c75edff0e71af2a87f4d720ee99d4541a6a
EBUILD spotipy-2.19.0.ebuild 1142 BLAKE2B e5758cedfe1043cdd44513808189a9414f51779f213488bf8fd10f047caff435329a1fb4f1e51c731d63e3cacf817c7f2268205cda6d1a46eff49472dcaf00fb SHA512 060ac664853b219996e5fa75f82601c07bdcbf25c657d6a22c17cba3c38c740caa0d5eda4513b336e69c82d4f22209982dcfe37ce8836a416f55968c6409c7d9
-MISC metadata.xml 401 BLAKE2B 431a96f43d9ed792a38755d916c3f50bc0f25be327504226513a9d40cf1632485bd27c83494f8043d629c3827d214db1bda49dc38fe0b648e5498bbcc6ede387 SHA512 d976ffef1ddd34a9d58ed9b5e04aa8d1ba3655b2fd8a7c9d1546239ae8a8763faace560b1eaf2dac91ae58101826b2aa1680123d0f19f66a80a8caac60593522
+MISC metadata.xml 448 BLAKE2B 2307d0b3ca490bcd41c1bf6f6c5a9b12ec0325781125bc68bb17ffb8408873243a9ce224c9405e5d998d1158376eefc211b0cb2575b8ef7dfdaf018d1dc58eba SHA512 17a5a5b1829478029810b46d448d03a74466ae2dc68bb83f295e71cf26c3b5c68a9f5c255529d7d19681986c8ed9f2386c818c73d47f94e85201123cf3ba6243
diff --git a/dev-python/spotipy/metadata.xml b/dev-python/spotipy/metadata.xml
index d6cea39e5dcb..7e88424460d2 100644
--- a/dev-python/spotipy/metadata.xml
+++ b/dev-python/spotipy/metadata.xml
@@ -9,5 +9,6 @@
https://github.com/plamere/spotipy/issues/
plamere/spotipy
+ spotipy
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index 315aff19f48b..36fb76163020 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,3 +1,5 @@
DIST tempest-30.0.0.tar.gz 1110715 BLAKE2B b697ecbced21124719e6b1d7ebd2c4f8ba83528a84da0b8f8109c155b61124581b97c180bbdc6885ae53850fb28daed25772d12be5026c44ecc3fe4f0dad98a3 SHA512 fa9be713ccb130ad065628592f59bebda3dc1fa8222ab3c382ec5b299504dc0a730f2110ef80f98bbdd1288b5785ab745fe39b721b77f7343983c1bc0a036f19
+DIST tempest-30.1.0.tar.gz 1112219 BLAKE2B 864dbd01a843b9c480656788a3a673ea6c089af8bf67e66837fdb77ee46eef00f2caed3ee08722b113db45d1e39fee167dcb344676543ec82fe5f022ae8c713d SHA512 3c4469d5ab590fe2185dbe77cc1ca1179022b75b4da9f2fe0d43956b14598d56328dd4e62e8445197b25f93017c812edd75cb9fef2d81ae183aea478fd817b15
EBUILD tempest-30.0.0.ebuild 2080 BLAKE2B 08756fd5379f4accc888100a62ff0fdc1cc498dc538537603bc9c860944f543d0562c40550feba5b0c1a38483d80118c3f938531f01c380146a7495d426cc712 SHA512 80a1009431495512478aaa8a749156a2ff12a09ee8cadf6ec68fe3a715a52b14e4db1325ee666c1514086fe30e3a9dc2e5a27b338ac186ec176fde81ea580a6f
+EBUILD tempest-30.1.0.ebuild 2095 BLAKE2B 75b6870291b66b6c341067cad00154c141e88dd83141d09d823e0aa736250dbf863b56045a8c14dc798b9f670481b73e785b6facfbba737e3c5dd1b3ef88f591 SHA512 7662dcd27592e150f9e8198edc40049fb19a3e6ae496a5db98aa2e771ff66493113697c26be291add5f06e6fcbad1cdbebfe0ac21b1046825d2a04eb73b1b20b
MISC metadata.xml 402 BLAKE2B 9a28d185d29e8844299c1f6276b80759cb0ba7d0b9de14f70cb92f4bd69a4604aaffb7ed0cd0e65764099007a87de3e15c519dbdbc8a247d8ffe884613c7af5e SHA512 e9ef089f055cb4d6bb527f58d2e386d7796b2df34a8bb850c90f86cb98d08259b5ecd5e785389cfa6351f1319502c6822e3cf6a6250ac7dcd1838923b3deac87
diff --git a/dev-python/tempest/tempest-30.1.0.ebuild b/dev-python/tempest/tempest-30.1.0.ebuild
new file mode 100644
index 000000000000..7e06788117ab
--- /dev/null
+++ b/dev-python/tempest/tempest-30.1.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Integration Testing"
+HOMEPAGE="https://pypi.org/project/tempest/ https://docs.openstack.org/tempest/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+ >dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+ >dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+ >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/paramiko-2.7.0[${PYTHON_USEDEP}]
+ >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+ >=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+ >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+ >=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+ >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ >dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+ dev-python/stestr[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+ # Small subset of tests, which fail as result of not using specific
+ # testing environment. Others expect to run suite using stestr.
+ rm -r tempest/tests/lib/services/volume/v3/ || die
+ rm tempest/tests/test_list_tests.py || die
+ rm tempest/tests/lib/cmd/test_check_uuid.py || die
+
+ # remove dep on hacking
+ rm tempest/tests/test_hacking.py || die
+
+ distutils-r1_src_prepare
+}
+
+python_compile() {
+ distutils-r1_python_compile
+ mv "${BUILD_DIR}"/install/{usr/,}etc || die
+}
+
+python_test() {
+ local -x OS_LOG_CAPTURE=1 OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=320
+ eunittest -b -s tempest/tests -t .
+}
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index bb7020162934..140d2f97b4d8 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,3 +1,5 @@
DIST tox-3.24.5.tar.gz 306305 BLAKE2B a6d3338d21068d9123505a29da3beec4fd5a15c263bcaf5ba62f65a253d04e11d453bef159d06e88b2cbac9a895d786d0d9444cc16cd3de7a868eac6919b82ea SHA512 4e1ef81c978977e905edbdc00ff971eb4132b9009ce21456fcebf95d8ee2c583e04e464f1db5ca6e5454f4f1ad0353ffc9df7898f6389fe8084dc5b9726ca59b
+DIST tox-3.25.0.tar.gz 307073 BLAKE2B 2dda34fc6d6518897bdc587ca6a31b92f2add463c3bcce9df3f4e511d2588dc75265b60809195c2d78a9c1b0d08d79c32811aab1e2c01934faf40019a1882042 SHA512 9c10524c5a67b32a01cb0dd4d25cc01d0641e46ca4e0c03a4c76eb8913f6038075aeb21e647a94d6b8d99c80edb7701b1c62893ebd6a20584121fdf33b9d9010
EBUILD tox-3.24.5.ebuild 2135 BLAKE2B a84e8f10804ae79620b42d7c41a9653234e84a4713dde8d298326f6c728e86e9d541c9561b8888ea00b3af411c186abc735fabef2980e9a3fd515aef20a6fa82 SHA512 7938df52c3d4f4b20b05db6ee4c585d3d5bfb5f946a3fda7e02e134d259e937c0a00dd78d1636cab5abdf23ebe855fe9160af8b47055e2bfbd4d6e80b6a42991
+EBUILD tox-3.25.0.ebuild 2192 BLAKE2B 4f1ad22c5cb015e59eda3047c751a7780d3935b271f2c68c9810008ab4e6722a700df4611029f76ecae10dd97c5b06528a4627ec02df9220ea6381a3d7dcbf75 SHA512 e817ad9c8eac18eded5ad4c4b44bbe195767ab7ab3c19f509636a808ba1fc182cd3be1904e8e88adf1f336f9ef1c0db747f8100306bd2a77292af8addd6fb171
MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-3.25.0.ebuild b/dev-python/tox/tox-3.25.0.ebuild
new file mode 100644
index 000000000000..71dda6586496
--- /dev/null
+++ b/dev-python/tox/tox-3.25.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-python/filelock[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ >=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
+ dev-python/py[${PYTHON_USEDEP}]
+ >=dev-python/six-1.14[${PYTHON_USEDEP}]
+ dev-python/toml[${PYTHON_USEDEP}]
+ >=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ >=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+ >=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ )
+"
+
+src_configure() {
+ export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # broken without Internet
+ tests/unit/session/test_provision.py::test_provision_non_canonical_dep
+ tests/integration/test_provision_int.py::test_provision_interrupt_child
+
+ # expects python2 to exist
+ tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
+
+ # fragile and relies on checking stdout
+ tests/unit/util/test_spinner.py::test_spinner_progress
+
+ # TODO
+ tests/unit/test_z_cmdline.py::TestSession::test_summary_status
+ tests/unit/session/test_provision.py::test_provision_bad_requires
+ )
+
+ [[ ${EPYTHON} != pypy3 ]] && EPYTEST_DESELECT+=(
+ # TODO?
+ tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
+
+ # broken without tox installed first
+ # TODO: why it can't import itself?
+ tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
+ )
+
+ epytest --no-network
+}
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index ecd0007ba31b..9d68452b1746 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -3,8 +3,10 @@ AUX twistd.init 563 BLAKE2B 24488118b025bf2068bbf07af900064ff6a7ee99106c3da30f15
AUX twisted-22.1.0-force-gtk3.patch 2634 BLAKE2B bf297589d56a59149e1a269aef416a9aef26dd2123cd9fc87358d19b279bd2924e84d3e9fffe5e6edb70f7268c19b4053cfdf6362b04dd6e91b3a2c997e0f92f SHA512 85b1678cf6c73e78004a015424f2e092b42bf4f5899ed607093b4c26ff1411fe22267df09c331f80086f9d46e5a6dadfad7fe62cbb04e3edeaaa05f40c96239a
DIST twisted-22.1.0.tar.gz 3883519 BLAKE2B 0b438481af94fbfe08c7470a71421e176ca4994efaf7144b2bd3bc7e69c774295e04831d5356af104d087d970856c1c153b30331cb1598226f83e761b624a53c SHA512 1db52865d00e07044bc755b25bef2fa260cf269a8b51512bec97a015fa484d0b331b41154b52f97b5e8c477d3e5ad1d003f5ac15c7361988d073d097c6e7355d
DIST twisted-22.2.0.tar.gz 3887750 BLAKE2B 43b50aa33f9a70f2123930ebfc0e9fec08a6faa791dc8fb73c1252fc1de3e00844e421f653d920e5f651aff89557750c6dc6c4557689e01bc9a0793c15de8eea SHA512 a2f66055f0ea6658a04888316b9eb90bd0f389c72db8315fe1722a70f16bb290805d98acc8cfd8a5d22b4817683603aaea50bb04a204927898bd74fc58a1db6d
+DIST twisted-22.4.0.tar.gz 3896724 BLAKE2B 830a724156473a28394e6c731f6cec184c491410dc880bc2e37a99cb460c7fe040219463f224941532b12478abe953aa0228c70676e5baecda4a3b2bdd6a0a32 SHA512 776d36040bcefb9ca65e471d9058fe1067ffc8171a501cb451e9d4824a88dd83f79dc9b27a127ca898451587454ee661000acbce6c4c39b069aeadd64710f103
DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
EBUILD twisted-22.1.0-r1.ebuild 4698 BLAKE2B bb60d1c5f7c7f1db5475fb630014efd2362627ac1dcac9b77c85086c993bfc423be25f09001d88738c5691f2cb34dd6edfb26e4565947c0b0e86a780565bd26d SHA512 db2b1908397c98b97db86f5005e1c485c3b4dce7adc8144533eeb78a039f8372dd2bd041297339efb74444c0b91a15b62ce8b9921b188a9ed7aca3f616275826
EBUILD twisted-22.1.0.ebuild 4740 BLAKE2B 20fd3b47a7880c92c2d44ff6509147b3a7fe66a27bd960236b14b5d1b31c51cbf8ddd0b0ddacbd41cd18920a4da07c102deab13643bf2e82e62a49027e6887c7 SHA512 717b0f7fc47f8ff0a5b470b5a9a0bf21f4c76d75681aec55763d8b0bcd0996c75242950fe7498e07e46046fa383fccf6f572ad6f83db97fbfa11da0b3111d575
EBUILD twisted-22.2.0.ebuild 4328 BLAKE2B d8106f754f5244bf13d1e3b9c1a3be76c1b36816a2e36e0fcfaceea9b193ecfc6da4e4b5fad53b8c13f5bf84d787cdcb90c51a5457134f6c18cc27ae2221c508 SHA512 a5049f1f33c2d765708ca836bb62f081931572ff57669a9aa13c04d4d117642276e257fc848a4b9699811492eec497250be3c4741eca67b8815aecde3ace6387
+EBUILD twisted-22.4.0.ebuild 4450 BLAKE2B 50c3c04e250fa9356547d72f6b30175921f2f7af30e5c3cf1e92a4916666c36f75c2ac5910db02332582a0547d27b122c1125c09412405252de3be9358484d77 SHA512 24f8d3c106ed99747c395dcb8f2f0a15cd2cdb25f42690eb0ac77d41aed34082635fd19163bf9e5935aa9fab0ad35d03e9f3d873f01e1bda7e3113951bac84ed
MISC metadata.xml 1352 BLAKE2B da3eecfbfd73709ff8fb48b985d64fa80d134c38a0c04d8c7b08e0ebd936cb2179f579deb6f91f38fd08b74e9454b693b4a89c9ab194296104c519e6f80ddc8a SHA512 f244db7eb7a13e35f8825e2b16cf3cb953c47e68be234efc9d922462cc7ee66e1748e09bf4735bee59cd1016eb38c64ca23f70a25da5bb7311f869cebbb45569
diff --git a/dev-python/twisted/twisted-22.4.0.ebuild b/dev-python/twisted/twisted-22.4.0.ebuild
new file mode 100644
index 000000000000..a8f3f14af373
--- /dev/null
+++ b/dev-python/twisted/twisted-22.4.0.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+HOMEPAGE="https://www.twistedmatrix.com/trac/"
+SRC_URI="
+ https://github.com/twisted/twisted/archive/${P}.tar.gz
+ https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
+"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="conch crypt http2 serial test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+ >=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
+ >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+ >=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
+ >=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/typing-extensions-3.6.5[${PYTHON_USEDEP}]
+ >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+ conch? (
+ >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+ dev-python/bcrypt[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ )
+ crypt? (
+ >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+ dev-python/service_identity[${PYTHON_USEDEP}]
+ >=dev-python/idna-0.6[${PYTHON_USEDEP}]
+ )
+ serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
+ http2? (
+ >=dev-python/h2-3.0.0[${PYTHON_USEDEP}]
+ =dev-python/priority-1.1.0[${PYTHON_USEDEP}]
+ =dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+ dev-python/bcrypt[${PYTHON_USEDEP}]
+ >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+ dev-python/cython-test-exception-raiser[${PYTHON_USEDEP}]
+ dev-python/idna[${PYTHON_USEDEP}]
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pyserial[${PYTHON_USEDEP}]
+ net-misc/openssh
+ $(python_gen_cond_dep '
+ dev-python/gmpy[${PYTHON_USEDEP}]
+ ' 'python*')
+ !alpha? ( !hppa? ( !ia64? (
+ >=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+ dev-python/service_identity[${PYTHON_USEDEP}]
+ ) ) )
+ )
+"
+
+PATCHES=(
+ # https://twistedmatrix.com/trac/ticket/10200
+ "${FILESDIR}/${PN}-22.1.0-force-gtk3.patch"
+)
+
+python_prepare_all() {
+ # upstream test for making releases; not very useful and requires
+ # sphinx (including on py2)
+ rm src/twisted/python/test/test_release.py || die
+
+ # puts system in EMFILE state, then the exception handler may fail
+ # trying to open more files due to some gi magic
+ sed -e '/SKIP_EMFILE/s:False:True:' \
+ -i src/twisted/internet/test/test_tcp.py || die
+
+ # multicast tests fail within network-sandbox
+ sed -e 's:test_joinLeave:_&:' \
+ -e 's:test_loopback:_&:' \
+ -e 's:test_multiListen:_&:' \
+ -e 's:test_multicast:_&:' \
+ -i src/twisted/test/test_udp.py || die
+
+ # These tests rely on warnings which seems work unreliably between python versions
+ sed -e 's:test_currentEUID:_&:' \
+ -e 's:test_currentUID:_&:' -i src/twisted/python/test/test_util.py || die
+
+ # broken by new expat
+ sed -e 's:test_namespaceWithWhitespace:_&:' \
+ -i src/twisted/words/test/test_domish.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+src_test() {
+ # the test suite handles missing file & failing ioctl()s gracefully
+ # but not permission errors from sandbox
+ addwrite /dev/net/tun
+ virtx distutils-r1_src_test
+}
+
+python_test() {
+ "${EPYTHON}" -m twisted.trial twisted ||
+ die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ # own the dropin.cache so we don't leave orphans
+ > "${D}$(python_get_sitedir)"/twisted/plugins/dropin.cache || die
+
+ python_doscript "${WORKDIR}"/twisted-regen-cache
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ newconfd "${FILESDIR}/twistd.conf" twistd
+ newinitd "${FILESDIR}/twistd.init" twistd
+}
+
+python_postinst() {
+ twisted-regen-cache || die
+}
+
+pkg_postinst() {
+ if [[ -z ${ROOT} ]]; then
+ python_foreach_impl python_postinst
+ fi
+}
+
+python_postrm() {
+ rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
+}
+
+pkg_postrm() {
+ # if we're removing the last version, remove the cache file
+ if [[ ! ${REPLACING_VERSIONS} ]]; then
+ python_foreach_impl python_postrm
+ fi
+}
diff --git a/dev-python/uri_template/Manifest b/dev-python/uri_template/Manifest
index 9cda8feade6b..13e2a2f7537a 100644
--- a/dev-python/uri_template/Manifest
+++ b/dev-python/uri_template/Manifest
@@ -1,3 +1,5 @@
DIST uri_template-v1.1.0.tar.gz 18014 BLAKE2B 01ac4439b6661d0d1e7adb5b5ebcc594497cdaeef24b33cbfc8a26f607e779a72ae20838dbbcce28278886c87df475adfd53c73287a4768d848f65b95ba2ce58 SHA512 b6d34931e750acc6c160e7157fc000984acc099023e9794163777679cbe706b8a646bab89e82171c0318827b7a7b9cfcfb997768120cabcf36e7982214321665
+DIST uri_template-v1.2.0.tar.gz 18284 BLAKE2B cf857ccd8496111f61fb95af020514f1c484e5c3ff19829f28bc2dc112887fe276dac68aa21e0d092d42a22319e8d6ac8aff95c734aadd8417c56f57b0076256 SHA512 81b046bbc2dc4d5c0b40a76f13713c10e69d803e3d9da13ab69cc6d40569ef0a39c786a6637a66651a5c3d3e68807f923ad48a7feaf898ae3ca6fd03c0e68c37
EBUILD uri_template-1.1.0.ebuild 658 BLAKE2B 7f4c44c92a22390f610a16ee6f067973040706c2d468ac2fcd5c65a64771e5e97584ce761dd5b12423ddb64d18b85343556424ebab74083c47590d63e4280d14 SHA512 67841fd510d2703a616d47a80544d43a917524ad997872fcf81729a0aba268a7ea30ca5fda04c43df802146ab14487b5f57960fa48a71f78ce86eb87c001c7c5
+EBUILD uri_template-1.2.0.ebuild 658 BLAKE2B 7f4c44c92a22390f610a16ee6f067973040706c2d468ac2fcd5c65a64771e5e97584ce761dd5b12423ddb64d18b85343556424ebab74083c47590d63e4280d14 SHA512 67841fd510d2703a616d47a80544d43a917524ad997872fcf81729a0aba268a7ea30ca5fda04c43df802146ab14487b5f57960fa48a71f78ce86eb87c001c7c5
MISC metadata.xml 595 BLAKE2B 06f55493da74b24bd7ee6266accaa73b33e3f48a1d7d0f176a6278231e281fe269e6825f34ad1fa122b6d11ac1f66b21696410ae51d0917868f02d2ea57814ec SHA512 148737f47b030bb76659503ca70582385c005ffa5168e46ccdcfc8f7729299c38bd3b6b20a875e69690ff1bbf117da61d92f0f4657b97cf172ac358241fd4709
diff --git a/dev-python/uri_template/uri_template-1.2.0.ebuild b/dev-python/uri_template/uri_template-1.2.0.ebuild
new file mode 100644
index 000000000000..2aa659f49c57
--- /dev/null
+++ b/dev-python/uri_template/uri_template-1.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P="${PN}-v${PV}"
+DESCRIPTION="URI Template expansion in strict adherence to RFC 6570"
+HOMEPAGE="https://gitlab.linss.com/open-source/uri_template/"
+SRC_URI="https://gitlab.linss.com/open-source/${PN}/-/archive/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+python_test() {
+ "${EPYTHON}" "test.py" || die "Tests fail with ${EPYTHON}."
+}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index c6abe59df1ef..bf89a704cb98 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,7 +1,9 @@
DIST virtualenv-20.13.3.tar.gz 12152717 BLAKE2B 791eff66e02d0e7b563d68136cf9652ca0e7422cde94ddf558053778e7677937f7f3ddd9e2d6d0a5fd56c79d9061474685b39aa8519471cea230f4dc5ea71c83 SHA512 e9e05e6e6aba10bb6c0813484f508aede9fe2a78401272bb12ea68b80e8f4059f4292de51e37c2487efb92d27f6eeda6e108dd12f45623984966d8fe821352c0
DIST virtualenv-20.13.4.tar.gz 12153741 BLAKE2B 050553253f2576917b71eccb94b9a4f370d8c131c61fd84e1d4e6445181c793435ca7ce988ff62cffedb406d357c52337ba5ad921f1837ac29d81896958b58e0 SHA512 d2800ce3830ac154e9c0f03fe96535286a4322b89ef94c01638065ec353ee1dc439f7dbdbd9647836e514e828781c5a48fce3723f80c32bfa9ce96243610a396
DIST virtualenv-20.14.0.tar.gz 12209889 BLAKE2B d6b89f71009109ec688045b92fa2907baa2a174a8736b66e3635b125d05f9cedf2b0cf26497e47193d3c99d44b94b899205e8b94d20beeeacab0b22b47e3eb41 SHA512 c4f1b40187d847602cb2ccef1be9ecce6acd234d08abf5967219d8cf900e641337ce027018c2cca566409a5ab3dda1f363d7381a0d2f676000c04e10677bfada
+DIST virtualenv-20.14.1.tar.gz 12216889 BLAKE2B 7d06b47629dcf4a60299b9b0a192478b20ef820b8a7516569e50b57b2df383781e7e14fd4beda14a3425164997e69c8ed922edb593f86eb3bd85e4ee3a9f2ac1 SHA512 149e78787db23eabd4238baa172bf023ddcf87d59284fdd090269acfa15991aab182f9e168851f88ef810d5c50dd7cdce69d132c46ebedb10080d65a308e63a1
EBUILD virtualenv-20.13.3.ebuild 4468 BLAKE2B a2199bef63bb6af77b329a569fd38622a7c8021cbf81cd06702a2ead3bff972890e5201c14e6d89338881848e769e809aa1a17993208e6d4b1053f49fc049e3c SHA512 71fa926c8dc8a1221a8b7c6336e2e090c799438f96d9c4c4091654e327b78af164e63c53d206a523df5003bdf19bc175db255be3657b09e78c572418edff7bbc
EBUILD virtualenv-20.13.4.ebuild 4476 BLAKE2B 058657b5fba38d0b0c3cf8f49d145a2c562b755d681eb5b5f52bd424f6c01e9812dcb73ec64bc5441946ab07e26dfd7d78693d85f792233760de209b1fe35fd9 SHA512 c24faf2bd0c46df5d323318ac59e71ded0be5cad21ce8aee517f7a2288cef0db9cd28fb0622110ab525fec36868ecfc7d28af68e889fe138aaa45e23092ca790
EBUILD virtualenv-20.14.0.ebuild 4478 BLAKE2B 411c1f672c7699e487be6bc4f5ea748e560dcfe5281fbe014169cd6dc920409c56e94d3cf44624ef11c8dc70fe1cbe8f1ead373022e89a8c6c83213c71cb967d SHA512 1e6aa35a36c9c5823c57d7cfcb1eb18a979e385a03002dbd3db60c81b2f3e5cab537ba27c33a842274e1254cdc950ca4f6eaa1d87b1260f6289f75840e89056d
+EBUILD virtualenv-20.14.1.ebuild 4478 BLAKE2B 411c1f672c7699e487be6bc4f5ea748e560dcfe5281fbe014169cd6dc920409c56e94d3cf44624ef11c8dc70fe1cbe8f1ead373022e89a8c6c83213c71cb967d SHA512 1e6aa35a36c9c5823c57d7cfcb1eb18a979e385a03002dbd3db60c81b2f3e5cab537ba27c33a842274e1254cdc950ca4f6eaa1d87b1260f6289f75840e89056d
MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.14.1.ebuild b/dev-python/virtualenv/virtualenv-20.14.1.ebuild
new file mode 100644
index 000000000000..049e901dc93d
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.14.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+ https://virtualenv.pypa.io/en/stable/
+ https://pypi.org/project/virtualenv/
+ https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+ >=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
+ >=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+ >=dev-python/filelock-3[${PYTHON_USEDEP}]
+ >=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+ >=dev-python/setuptools-41[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/flaky[${PYTHON_USEDEP}]
+ >=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+ >=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+ >=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ >=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+ )
+"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+# dev-python/sphinx-argparse \
+# dev-python/sphinx_rtd_theme \
+# dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+ export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ tests/unit/activation/test_xonsh.py
+ tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+ tests/unit/create/test_creator.py::test_cross_major
+ )
+ [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+ 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+ 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+ 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+ 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+ 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+ 'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+ 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+ 'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
+ 'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+ )
+
+ epytest
+}
+
+pkg_postinst() {
+ elog "Please note that while virtualenv package no longer supports"
+ elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+ elog " $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/yaswfp/Manifest b/dev-python/yaswfp/Manifest
index 9065e7b93a2e..cedf061bfe07 100644
--- a/dev-python/yaswfp/Manifest
+++ b/dev-python/yaswfp/Manifest
@@ -1,4 +1,3 @@
DIST yaswfp-0.9.3.tar.gz 29845 BLAKE2B 2c5961b79d8378b707a920a4c6a1d75cf8cb09cc6a689035c7118758de3fc1f6fddf6a23e91f4cddea5f7370e4b558b40dfd4a05b16d7fb5f881c5ca74beb4a5 SHA512 06fb5d38c92f418fff77d812507621236b3fc74cf75786031bbd81ac1e61767a29647c7f1d0ffbb25d2f6f1a8749e5a732896ad66956e16c886e24e85915f72b
-EBUILD yaswfp-0.9.3-r1.ebuild 426 BLAKE2B 512e71c37d687cedf4a130c0d4df2ed7119ee1ab25e4c65fac0592900edfe5b9d89730f0ba392597299e1e2294d07844ccc18021845172e15839ee24d7d10f9f SHA512 772f24dc1f510228c0ae734237abfb91ad939e206229c25c9ffdf26658759a4a88e8402356611fca6fa78d546486fb2987e3dd296bb14f55f33c0e5f8aafafc8
EBUILD yaswfp-0.9.3-r2.ebuild 391 BLAKE2B 53b02e947ff3a6330fd35a79a5a81f7f7ed0689ec5251a3eb9f38471179051323ab1b907c06c107cdf1f88a78c6b96b7e9a59c6804cb54770d61c19919af81e8 SHA512 90c7ba7b90ffe58a4e6d4d665c3950a3ddab671a7f4167a60e2b7c1a213fb6326e678c08b8dec6c6e9927d6bbde3e7cdbfbe7bcb0317ebac5b6f50603cf0ebd4
MISC metadata.xml 484 BLAKE2B 4fa5be54bd2a548f1661c7ddf67dd11ab870896719c0b5abdf3378ee55841b89e5eb3f7a0759a34ca742d8acb5da0cbe7ef143f3c434f532d6f6949df46af7b5 SHA512 a69f339a22e5208dcf557a3d0187ebdbeb24d0c4688377c84b1192398d1e4366ac700ffeec4bdc753dd07f21b60e9952060081e6449b0da4fcc8902919ea031b
diff --git a/dev-python/yaswfp/yaswfp-0.9.3-r1.ebuild b/dev-python/yaswfp/yaswfp-0.9.3-r1.ebuild
deleted file mode 100644
index b835d4a1778b..000000000000
--- a/dev-python/yaswfp/yaswfp-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet Another SWF Parser"
-HOMEPAGE="https://github.com/facundobatista/yaswfp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-python/youtube-search-python/Manifest b/dev-python/youtube-search-python/Manifest
index b115ca9dcb62..15c589ec9e0f 100644
--- a/dev-python/youtube-search-python/Manifest
+++ b/dev-python/youtube-search-python/Manifest
@@ -1,3 +1,5 @@
DIST youtube-search-python-1.6.3.tar.gz 115934 BLAKE2B 1151a29da0d66206424a88a2ac3839269f11d970b4a829f9d33ede4ef7ffec39c6762bfe138edd5da9c57308444021be93054c34cbc71e12a031a8d798d94975 SHA512 16d0dfbc95387bb3ccac9224e53ea087cdfa41d1330abd96fc3ad0136af227359fc2d8409a2eca81ae2fe9790efdb86a42e409748ba1a49c595df2629216e331
+DIST youtube-search-python-1.6.4.tar.gz 116117 BLAKE2B 297e171cf72381994ed93804833b49182c5099db8584937258867ec9f9e14c680a5cf4c9f09fe186e1d5405481afb6656dab35f204c09bcf2f77d07de9b4103a SHA512 50109d5704ceabe101b6190a157a656eb3690bc29b95112526fc1363935d14afc142af6c5bf512a38c3938f06db06a50a26f9a13d1601abd0fa224a0cd3b84f5
EBUILD youtube-search-python-1.6.3.ebuild 535 BLAKE2B 878846d79f99acecef667a7942eec2304f87529f97c7cfe250682ee37add76eeb5ccb2285ca50ec9cef97eb53ef1cb3503a1c38f61d8d8673a61f64d2ea55b43 SHA512 c43886ce2d34f39ae3c41a80d94f1823cc77efd550ece662e5408f1f8804ee1bde59ccfe63c12f4ad30b26fd4e54b710fd2a05eeeb2e41e8f33d78cdea1aff4f
-MISC metadata.xml 441 BLAKE2B 886bea7098ee9959e832ebff56473617460048fba908c5273e76b40a6452d6a2bb637365985eeffd937b1ff5793168b0336971c609d3ef6eebd1decffa4f8471 SHA512 3c53fe9194609683298cd17417ab00bf0767bcbba364511e491b26b251dd634d902ef5fc13d114e03b0e7860666d0ff20f2018640ad84fe581e0c853d2ee9db0
+EBUILD youtube-search-python-1.6.4.ebuild 535 BLAKE2B 878846d79f99acecef667a7942eec2304f87529f97c7cfe250682ee37add76eeb5ccb2285ca50ec9cef97eb53ef1cb3503a1c38f61d8d8673a61f64d2ea55b43 SHA512 c43886ce2d34f39ae3c41a80d94f1823cc77efd550ece662e5408f1f8804ee1bde59ccfe63c12f4ad30b26fd4e54b710fd2a05eeeb2e41e8f33d78cdea1aff4f
+MISC metadata.xml 502 BLAKE2B 584aca713a2a0a26f8ccf19180a3f4d5b557234af2eb71cb107104bed143434e0320c5a3438000445e5770766ac09ae35a870063c06aa3a8c6d3b560fcc7b000 SHA512 b756db4567df28dd49a214796019f50fec6d5aa9d83fa8d3c9f8268275b0a7420166a0e4b2cafb500a1c87b2551ff0825c1ec5824ebd8fbfe54b8121e34baee7
diff --git a/dev-python/youtube-search-python/metadata.xml b/dev-python/youtube-search-python/metadata.xml
index bc129c31ebbe..14584445f52d 100644
--- a/dev-python/youtube-search-python/metadata.xml
+++ b/dev-python/youtube-search-python/metadata.xml
@@ -9,5 +9,6 @@
https://github.com/alexmercerind/youtube-search-python/issues/
alexmercerind/youtube-search-python
+ youtube-search-python
diff --git a/dev-python/youtube-search-python/youtube-search-python-1.6.4.ebuild b/dev-python/youtube-search-python/youtube-search-python-1.6.4.ebuild
new file mode 100644
index 000000000000..923cfa88f17f
--- /dev/null
+++ b/dev-python/youtube-search-python/youtube-search-python-1.6.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Get YouTube video information using link WITHOUT YouTube Data API v3"
+HOMEPAGE="https://github.com/alexmercerind/youtube-search-python/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/httpx[${PYTHON_USEDEP}]
+ net-misc/yt-dlp[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/ytmusicapi/Manifest b/dev-python/ytmusicapi/Manifest
index f1e7884fd4a6..664f9f263239 100644
--- a/dev-python/ytmusicapi/Manifest
+++ b/dev-python/ytmusicapi/Manifest
@@ -1,3 +1,3 @@
DIST ytmusicapi-0.21.0.tar.gz 48457 BLAKE2B ace8818c2a6859bb17d98fa608ac8cf7a806745741e634f639f4022527021089dc9b0b7bc48c0f999937a4599847a144afcb9f7e5585daa5d7b0ea1d5d12e399 SHA512 c34abbe8ba8d3b92ac162ffc9679ab21ce6c618a349aaeaa6c06b5597a3aed14e9b9f78a6b351ba545729da1c0bd57c2b7f999957bd8e56b0b453c04624bca4b
EBUILD ytmusicapi-0.21.0.ebuild 535 BLAKE2B a58ef20fb67c130a7b70d53c2c47fc4e92db5526161cd98f7b518d145f6c15489b33759f2e4db135676f960c50b31daf46f1d0a7b0194c15b4fcfd1ea0ef0390 SHA512 d604121b1ed2182763677998afdca3aab24dde4ab0cf4b5c019e652d4aa6e2dfff9bc2000010ed539eaa9185dcf7efbbc4ed4a4950e5813a7f9406ad4f3d477f
-MISC metadata.xml 407 BLAKE2B c51bff212087de6c6b73454cee783eba2cfb957777a4a15640275dc9ba8c29c4a56ec6d52a8f7775e74df19ed6456f1a5102939a8dcdd1a2ffd4427cd39868be SHA512 cda71d030fbdea3a4b60e357211050132b23c5f45e2ac63216586c4424c7dc9b46876e666272ed33f497129f8d40c3827420962380e40706a043d22f193acba7
+MISC metadata.xml 457 BLAKE2B d0c47a8419447ae65b9d126c3e57283790e48e97099b08ddd6666c51e3d6452412d7df7caf2c6ca538a34f2de81309cf1e1c9468d932feea51fae9047e8592df SHA512 843a8ef31306802557af79c2f7bffa00c339f1c17600d95cbe55ac12de89cfc07127c4efd57002ae27a2899c5b39d9b704c56c03223734545dd0608def9a4711
diff --git a/dev-python/ytmusicapi/metadata.xml b/dev-python/ytmusicapi/metadata.xml
index 2bfd4cd3600b..3b9fb04abbd5 100644
--- a/dev-python/ytmusicapi/metadata.xml
+++ b/dev-python/ytmusicapi/metadata.xml
@@ -9,5 +9,6 @@
https://github.com/sigma67/ytmusicapi/issues/
sigma67/ytmusicapi
+ ytmusicapi
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index e58a30a23c3d..a7c250eb8f0c 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index 2da453852155..aa7e3d279d45 100644
--- a/dev-ruby/yajl-ruby/Manifest
+++ b/dev-ruby/yajl-ruby/Manifest
@@ -2,5 +2,5 @@ DIST yajl-ruby-1.4.1.gem 557056 BLAKE2B ade1c18bff1d95a733a1981f7898f1ebaecaed6e
DIST yajl-ruby-1.4.2.gem 558592 BLAKE2B 620db8f9c5ef4b010143382a2641793bc7a59f30d35a759470aa85b50e8b0e587e7442cb0727e2fe03a98c7aa3cd1f5bb05d173294743bc8fdf2d646176e11b8 SHA512 faf775367eb3143fe659064569a235b34557b84b21bf55f9e9fc6f815dce04c8c1b58832056f367fc4c9ebc0e4389d1e55dd79b5fbb773f845860e4652269d4e
EBUILD yajl-ruby-1.4.1-r1.ebuild 1098 BLAKE2B a53f21b6dd575bdda32a764dc1297f8790f171c49b5d5e2beace1aebcca103cbb1f27ad839a77a7a2dd22214bd7757019d0709f831c49978e96c0dca0cd63ff4 SHA512 899ae81ebca83499cc459afc169ef02dc991f052480f212b1724132db9c81ad572869c3b7b8bd0accaa98826be639ec1375c1bc484c04dd36467ab84d4273174
EBUILD yajl-ruby-1.4.1.ebuild 1224 BLAKE2B b2d0ea92e78e2064a35088b69dabce151e92afbacda771b888820df8c7a6477760c63c9bff3b41f9bf76c5a51d64c70c1d0f9e1cbb608c1864583d36150798de SHA512 9e5bc66bf68533037c0371775d22a70e9d4f5618d2cd02f2052d03d00d1be9e52573781375e72c420eb01726745a65e44d6b03bb6203a3f0d05599032ea45ea8
-EBUILD yajl-ruby-1.4.2.ebuild 1085 BLAKE2B 903dd279292d257138ddbb40a810c1db47e5e01f2bb67d586200c2dce838219e2b86f5911ec33e391033531ce261cc044f3cdfbfd809be8760a7ee65d139e968 SHA512 bddce2d1ba01fe54fa45948dd6d930dbb91f505bd6551619d6ceba65d73bc5457ab9cae7a8a584044d3744354575ff8648dfdab733f25325e036183b944b3d23
+EBUILD yajl-ruby-1.4.2.ebuild 1083 BLAKE2B b3cf3b8415ebaefadc00246f16affa6205bd3934a3d2b39c13cf0e3bce8120edc54f1ad1f07faa69b79994413279b785d169c3ac01908952c87a0d91f57e81aa SHA512 d0c98ff34524f4728215669cb8816f38d4596307ceaa62b6c58d17c3bb08944674820da30372538b09f726ec10efc12829338e50157e4bac3440b37ba77c5149
MISC metadata.xml 347 BLAKE2B 30c40d137c44f1f3e97af535260d3078329e3194bbdcaebeeb63e5c4f21ee6b6282349d0d32fbdf8e9c624a6dddef4a1393b67c4cdfd90bd1856c67d8c255a7a SHA512 3973f86d3ad549282ef3bd9e23e7a2e03451f6c4886824e845fb075f2162db1dbb96db4de2ab5850ac24c6955ebbd4ed4376f45d89c657b645df54ffb8d47111
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.4.2.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.4.2.ebuild
index 8632cdf4bd61..7aba96591650 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.4.2.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.4.2.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/brianmario/yajl-ruby"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="${RDEPEND} dev-libs/yajl"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index dcb3ca5e20a0..a97e118a6d5c 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 52e6b3c11a2f..87ffdb1368e0 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -8,8 +8,8 @@ DIST intel-graphics-compiler-1.0.10713.tar.gz 8489446 BLAKE2B 063b938ae6d32f3a64
DIST intel-graphics-compiler-1.0.10778.tar.gz 8515512 BLAKE2B 56d7a0b54ce026d93179737fe199d006923398b7f85d582487469f1cfa665ae5351bc160c6babda5d8bf2bf6173a051277b2fb11c9ccf4b888cd0e06295161c4 SHA512 e8fcdab3a8c70f8560f49288db42a926f1e8e82d3e433bb897fcd1648acdf0f8fe425a1cd8dae5bfabc7d0a91fe0c985550e35c6396fe46778091852e185e750
DIST intel-graphics-compiler-1.0.10840.tar.gz 8526951 BLAKE2B 08497e7c3259f33cb5dbdc43a0554f7f83173f43e2d39249d3845e6a4592035c085242d6534719dbb15f14351e301344598618790232db43ea3cee6fa2b7c5af SHA512 268b118732a6e5828a13eddc396b38aef5e7b746f8db0786dce76323fadcfe2a64b0bac87b6557c5bb7ddb000ec31e08f7b2557acfa612d960516e93cec78c81
DIST intel-graphics-compiler-1.0.8744.tar.gz 7586378 BLAKE2B 0f20f99a2659f733521af35c1dd63c2b1398bf4fc5745a217b96ad62cfa53f105d4c9a34eba09651d0f0679d6957820011446f5657170f5ad07d110372b8b1f3 SHA512 dbbe6c08f32b80be305add570187df883aacefbf90b252c70b5705ecc7732f25873732a85558f0aed2ee8db5bcd1a59aec4d7ba110774922dbb19d4d3522a539
-EBUILD intel-graphics-compiler-1.0.10713.ebuild 2529 BLAKE2B 1f3dc2f992387aa44093a630cc1c318873b946fcfb8df7bd9e933801fc402be926743cff604fd4b78e40f829ade9ad7b13810e084fed30e3b391d32f33f4c411 SHA512 d7f0e579756040368ea7c870761a304f3b9a89fe4cabfa61b1b1d88669aa17687938fac8aa689259a1b201ead85090f44b16485ff6c37d83db29bd46809f2744
-EBUILD intel-graphics-compiler-1.0.10778.ebuild 2454 BLAKE2B 0ad651fc0267ae6f778ba3eabe472587d5fa6805e58d80979b867ac2025d73dbc603758c3303db2858e0da3c9a7673d551c8726a2565609b4050b0e6bed6c315 SHA512 7b5e16a35e1b56643022f6e674370e897e1981769cbc73a1d92a3d61272b6f9f92323583641dd3ad8137e24c7f2b3526d77830388aa2b035ff0493c00bf879d9
-EBUILD intel-graphics-compiler-1.0.10840.ebuild 2454 BLAKE2B 0ad651fc0267ae6f778ba3eabe472587d5fa6805e58d80979b867ac2025d73dbc603758c3303db2858e0da3c9a7673d551c8726a2565609b4050b0e6bed6c315 SHA512 7b5e16a35e1b56643022f6e674370e897e1981769cbc73a1d92a3d61272b6f9f92323583641dd3ad8137e24c7f2b3526d77830388aa2b035ff0493c00bf879d9
+EBUILD intel-graphics-compiler-1.0.10713-r1.ebuild 2563 BLAKE2B 140fc5a13dca0f1db2319654408ed9c85cb0715ff6eeaffd2912af41a643f6c1f002a543b5612afdd9820f8c3098def091b2b7d368ae91507e773eb030f2f1a8 SHA512 8a880b9543accfdb14626bdc46fc6439b6566cc5b5e5ac05e511a48d81c2ad7faec3bdefba04c89e7d5177f8df6a8b47769326c0331e39693477b1894154d4d9
+EBUILD intel-graphics-compiler-1.0.10778-r1.ebuild 2488 BLAKE2B 1244c1cce52c3b1b1ccc4ba1281e1e5d558f0fdc1290d396d539fb866619683af76aea0f79834da09f8cdb19b76447cf867023a81f549b9fccb584e099815b02 SHA512 9cae6ca91189253ac4ccd7635d3fdf9ec43a3e7463707b9757c15d897e923a749c8b7394a9f8c837912817a8c7a69114145519482328bf4ee9106c6e95e7d847
+EBUILD intel-graphics-compiler-1.0.10840-r1.ebuild 2488 BLAKE2B 1244c1cce52c3b1b1ccc4ba1281e1e5d558f0fdc1290d396d539fb866619683af76aea0f79834da09f8cdb19b76447cf867023a81f549b9fccb584e099815b02 SHA512 9cae6ca91189253ac4ccd7635d3fdf9ec43a3e7463707b9757c15d897e923a749c8b7394a9f8c837912817a8c7a69114145519482328bf4ee9106c6e95e7d847
EBUILD intel-graphics-compiler-1.0.8744.ebuild 2150 BLAKE2B 217fa07639962ee989287889658a1816c9a21237f862fa0a40f0d96c149769c6c778c798b95ef4e2dfef31dede8bfa0b17723b69b3f96fae5f654cad026b5256 SHA512 35be130f95ef04a171293c885c9c3d7df549cbfd21e28f454d0dc4fa3c575e8a40c91988cd2e9a70ac6df05facc44bda036828154014fb00fbb64c4e29e9c1f4
MISC metadata.xml 594 BLAKE2B de9f434fc853417b9d1c6199c7501c9fe702aa68b0eaa0f88d298563431de126fbdc259f0d541e85674b0205444f5d1febf0433b292a6ac40661d62af23457d8 SHA512 b939b315122a5fe3252242ccab8fbf049d9234ee67c6910969c178bcb56fc835bc954380f8c15bab23905ac852fa0fe0640f6ef2ee9d48502ae0e3379d7f7460
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713-r1.ebuild
similarity index 97%
rename from dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713.ebuild
rename to dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713-r1.ebuild
index d0d4c3c1272a..1bd12b64e774 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713-r1.ebuild
@@ -24,14 +24,15 @@ IUSE="debug"
DEPEND="
dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
dev-util/spirv-tools
+ =sys-devel/lld-${LLVM_MAX_SLOT}*
sys-devel/llvm:${LLVM_MAX_SLOT}=
"
RDEPEND="${DEPEND}"
BDEPEND="
+ =sys-devel/lld-${LLVM_MAX_SLOT}*
${PYTHON_DEPS}
- >=sys-devel/lld-${LLVM_MAX_SLOT}
"
PATCHES=(
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778-r1.ebuild
similarity index 97%
rename from dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778.ebuild
rename to dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778-r1.ebuild
index 1869d0071897..7934a1f20302 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778-r1.ebuild
@@ -24,14 +24,15 @@ IUSE="debug"
DEPEND="
dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
dev-util/spirv-tools
+ =sys-devel/lld-${LLVM_MAX_SLOT}*
sys-devel/llvm:${LLVM_MAX_SLOT}=
"
RDEPEND="${DEPEND}"
BDEPEND="
+ =sys-devel/lld-${LLVM_MAX_SLOT}*
${PYTHON_DEPS}
- >=sys-devel/lld-${LLVM_MAX_SLOT}
"
PATCHES=(
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10840.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10840-r1.ebuild
similarity index 97%
rename from dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10840.ebuild
rename to dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10840-r1.ebuild
index 1869d0071897..7934a1f20302 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10840.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10840-r1.ebuild
@@ -24,14 +24,15 @@ IUSE="debug"
DEPEND="
dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
dev-util/spirv-tools
+ =sys-devel/lld-${LLVM_MAX_SLOT}*
sys-devel/llvm:${LLVM_MAX_SLOT}=
"
RDEPEND="${DEPEND}"
BDEPEND="
+ =sys-devel/lld-${LLVM_MAX_SLOT}*
${PYTHON_DEPS}
- >=sys-devel/lld-${LLVM_MAX_SLOT}
"
PATCHES=(
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index 03cffcde2187..ad51a50a740f 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,7 +1,5 @@
-DIST opencl-headers-2020.06.16.tar.gz 54769 BLAKE2B 8b8bf4e1948a38e12cbaba8a5df22757136655c72059af3c1e4526db529e272198fb84d805a79b275bf8432eec6a0f102f062f203e5d43b29bb482d109d05b08 SHA512 702c64648cd5d220aaeea1fc7f8a552f3ec75d1a867e1e9db7295452b288f22c2794e7b9a9bce7f01362b1fc2466940eef45aa7e88dd0e5a4570450a79c66391
DIST opencl-headers-2021.06.30.tar.gz 59866 BLAKE2B 7bf7b7d6f69178ae14d4ba5b012d134e0d0005acd8aa6c1c09c6d34b531ccf74381af072aaf85fa41ab1d8cb783b8c3c5fc528ddef078ba8dbb91708849fb0d0 SHA512 9d3ddf3a02ff4de00686f7e8cc7eef9f75e3c0e68920e787941c2d8a3ad895ae46d7c717894527a56144febf19ccc25ed733018d3d683509b1d8cc368d99b8ba
DIST opencl-headers-2022.01.04.tar.gz 62719 BLAKE2B 6791a679a09248746dd6b23d46001a8b6fcb3efc0a5d7c35be14463543ca08e57d24d1a4ab3ec765c315f44e849aa9c52d574f521ee1f660f9232979e511a9b3 SHA512 7c47486f40db16b8264f7e1febedd09c0481308eb15b5f4c4b5ff37c4ffb7697ae79427d221babe921704681942cd152b676b3bed660ba79d2901a48228d14ae
-EBUILD opencl-headers-2020.06.16.ebuild 607 BLAKE2B 256e0ef32db80dc37bfa06a49135f081b11154dfe791752b2322058a32d074ede2b780bf6bc1354ad015de25812b05cbfe477c3bfd4d8aa38f20bca27fb40826 SHA512 3da5cc9e8e83a0ed1d96817990b16920e3172e52cd99621d10e2f59c98a89368f212533f1470267dbfae8e0eab94d54340ec3a5f62f9cb1586b251eb2f1d78ee
EBUILD opencl-headers-2021.06.30.ebuild 502 BLAKE2B dbc937549550a6ccba57cc73ef86aea42fdc941aa5e0d24c4c0c3c94cbded49bfdc79765684330053156bcc36807043d51916c4e16ddb1e64f3e6b36d811f581 SHA512 1390696b1c4251cd94d6235897843433f4f3ef6966f6a0ea711b475f499d9933bc4a02ee96d177b28d681fa66404e984789d3cbb05524129fcf43a3a7758a886
-EBUILD opencl-headers-2022.01.04.ebuild 528 BLAKE2B b8f8ded5e9ccca8cc36636f54c524a20403ab08b8c79c7a9a68f3bd6402a6aad51ca8b04ebe87d972b702012c9adf202b4a51d8a835e5eb15228a4d57e2efba0 SHA512 cf3606fff678074c0e0434a20f69f2903e7379059c64a05d0ad798474c9379b2a4b5cbef9df9e6c498ec82165da013c02e03c2bca28e007837f5ff5595a08dd4
+EBUILD opencl-headers-2022.01.04.ebuild 527 BLAKE2B d6c4c3f5cdaa282127263466e5fcb7769a5e357cfbc10201dfec1bab449a3dd86c77e3220f53fad3e76abdb54d229a216a535d91a399bb70c14c99952aa4d13b SHA512 85706fff6cf1276179c87677d90bfc5a4fefe21aa4bcbfb3eb7f2592b50657399ba5b5aa96a63b8ddd8f7f7040d9b81035a060a112f0d0ecbdc4ca3ea2f08410
MISC metadata.xml 1055 BLAKE2B ac96e1bf07e353236170d3678541555b7d901984266dfd1356456db90effe430e6a042afc0b9b5a7f51d0e9cfbcef0fbf66fb46de82fdc8cc1cfa29c6cfd61d0 SHA512 6233610591851e415ab0354ca900dfdfa14fa2442e56094d547420ce710942be86c701820c3a63e2c6f070b74c0801f92bbe9ed6c7f2a5cae406f74b81acd86a
diff --git a/dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild b/dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild
deleted file mode 100644
index b2c250d351b7..000000000000
--- a/dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="OpenCL-Headers"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Unified C language headers for the OpenCL API"
-HOMEPAGE="https://github.com/KhronosGroup/OpenCL-Headers"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# To avoid file collisions in /usr/include/CL/
-DEPEND="!app-eselect/eselect-opencl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- insinto /usr/include
- doins -r "${S}"/CL
-}
diff --git a/dev-util/opencl-headers/opencl-headers-2022.01.04.ebuild b/dev-util/opencl-headers/opencl-headers-2022.01.04.ebuild
index d800a8f4b2f5..916a0e75b49e 100644
--- a/dev-util/opencl-headers/opencl-headers-2022.01.04.ebuild
+++ b/dev-util/opencl-headers/opencl-headers-2022.01.04.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.g
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
S="${WORKDIR}"/${MY_P}
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index c2acbd2599ed..d1a96c6c48e5 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,4 +1,6 @@
DIST pkgdev-0.1.9.tar.gz 57093 BLAKE2B 5f5d9b4956cdc949d5e37c24160c692c32cf7e5d9fe90c167adc364993370dc42291edca048db3b0a2f17b199003aea61bd6b541bc58de1c1a084365ce517660 SHA512 78c117163549cb021e8cb9bd65e9a7752633506f3db825133fc3c4c515549c6e10dc974164489c06f94c1a1e25acb8fe050a57754353b907d6026892ef034cb2
+DIST pkgdev-0.2.0.tar.gz 59836 BLAKE2B 89de7179b1365f7f4bf1359720200bc8dba53e3b3133fead12b224db8d9a6cf7accbed3c5ed89760030efd3a992d46cf525756a522ac4d9128376e4c03b2a5e9 SHA512 6bf17e8188c809e8862c1a39ce4c0c2e60ed0a261f00bf93707257df0395b03120838247bdc7f5a3375111797564a5a6b16bb8f7e571ce957efe92e173a6ed11
EBUILD pkgdev-0.1.9.ebuild 1588 BLAKE2B 85333c27c4d55c4e226dcfee8402614336e15964b0e9c72a0707fba1ec147dddd1bea9097d729f1e445da6aca6161778a1ecf193149d8fdd341823f9b710cbc4 SHA512 89b7752b01592d67c7ee4d49fd14de38a436fe4ef05dedd6aacfa7aec830b9a48a841aacd0d9148516f0b47c4b4d776f17fba7d61da6f245a8b2f66af1467f0b
+EBUILD pkgdev-0.2.0.ebuild 1595 BLAKE2B d5cf70f42f56cdca89c88952b8c21937fc0b59dc931b77513c88770f0a5a2d5460c99b913e2bf00edb3c720afddb73601a31dbdbd6af0eb0f4fa1f891a092511 SHA512 b6a5a45a6c8642fcbfcaf884c0a20817d7a7e36f208ec3b0730d21e3be237e13625a1c430c02ae37870d3bfe686ca73408d23e0cc05a937748078f98bc4e710e
EBUILD pkgdev-9999.ebuild 1574 BLAKE2B dab1ff6de45f7b63c8907ec5f64e36ef67d0f5e3d9560917f7ffda2ec9051a46ec1e425c1eaf6b1ab6e0e771b2562902adb6ab0260026746773441a4591c36c1 SHA512 e055493097823f7a837db0b33524c1cdc93ae9a755f0755c7ffadce3740c76a6e95882570bd53a75c8fb64bd68404a32f0e718e81fdf21b0c98b3db4fc7f7448
-MISC metadata.xml 427 BLAKE2B cfc5af84db1d37fb76a89d107ff022c011ff6aa65d6a0b98cd36b5c0134a0f1ba05ef63866425834393bca03e3a02bc3dea5a0429e83558ce726c3f199e569bd SHA512 eeb4debf1083db5d37ff042a448b7220d5384101b477cc3afdf471195cd17fc3bc76c7a1cd6540609c96a9cd56d48221cef72342e643113b4060f168040501b5
+MISC metadata.xml 538 BLAKE2B 856860c07254a3a7d051773121d85d1e227e69dc70373a1adcef4ebe08b48e48ab5f225f528fad5cb5d82c96b9a93a9bc88c5d00248598d39954f7dabfa2972b SHA512 3ec400568986c34edd550d3f55c76fa046e43b83a95c4c302c04b9707319db42424fb4bf6a06cf6c431decada9434feb80e0c6375a2e217a56e9da4f40e97ac3
diff --git a/dev-util/pkgdev/metadata.xml b/dev-util/pkgdev/metadata.xml
index 399bdc29cf92..fea86a0ce71e 100644
--- a/dev-util/pkgdev/metadata.xml
+++ b/dev-util/pkgdev/metadata.xml
@@ -1,6 +1,10 @@
+
+ arthurzam@gentoo.org
+ Arthur Zamarin
+
sam@gentoo.org
Sam James
diff --git a/dev-util/pkgdev/pkgdev-0.2.0.ebuild b/dev-util/pkgdev/pkgdev-0.2.0.ebuild
new file mode 100644
index 000000000000..f69eaca7e6a0
--- /dev/null
+++ b/dev-util/pkgdev/pkgdev-0.2.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Collection of tools for Gentoo development"
+HOMEPAGE="https://github.com/pkgcore/pkgdev"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]] ; then
+ # https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
+ RDEPEND="
+ ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+ ~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
+ ~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
+ "
+else
+ # https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
+ RDEPEND="
+ >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+ >=dev-util/pkgcheck-0.10.0[${PYTHON_USEDEP}]
+ >=sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
+ "
+fi
+
+# Uses pytest but we want to use the setup.py runner to get generated modules
+BDEPEND+="test? ( dev-python/pytest )"
+RDEPEND+="dev-vcs/git"
+
+distutils_enable_sphinx doc
+distutils_enable_tests setup.py
+
+python_install_all() {
+ # We'll generate man pages ourselves
+ # Revisit when a release is made
+ # to pregenerate them, making USE=doc
+ # for generating the real HTML docs only.
+ if use doc ; then
+ cd doc || die
+ emake man
+ doman _build/man/*
+ fi
+
+ cd .. || die
+
+ # HTML pages only
+ sphinx_compile_all
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-util/uglifyjs/Manifest b/dev-util/uglifyjs/Manifest
index ad13eaca0e74..6652f10f0254 100644
--- a/dev-util/uglifyjs/Manifest
+++ b/dev-util/uglifyjs/Manifest
@@ -1,3 +1,3 @@
-DIST uglifyjs-3.15.3.tar.gz 511292 BLAKE2B 405112e7898c743cddf036527e9add28cd570f53a43959b514711683efca7e26bfb34fccadb7d63dcb540ed7a4a6b9aa7f3fa28faa66623b2b7c290758feb47a SHA512 c36b41dfe2bc323c189926f4caff67980be13ad14286b109e7f3a326a5e2b4fe4c7e864d2fcee91d1c0a9799ab7941f2c9d17b6c04d4b399b4ddb1f69c32f2fa
-EBUILD uglifyjs-3.15.3.ebuild 776 BLAKE2B 02765a0ccff1ed52a7242f972f701066f2c397d7aaebfb18edf8c86511549d2cfc3b9c2e1aef19734a27491231760db7cae2c788a3220177a8dccb670fd018c6 SHA512 f54336748ca69b332555aa90283c8bf5105d70536e31bfb7e513f277198e7b3093c65e4bf231f07805a98f9387e358e9142dee62d3b1e6c3f1c8e66fc4ed29f5
+DIST uglifyjs-3.15.4.tar.gz 512680 BLAKE2B 428d18b412a7b30fb9fd0491e0bca1f8ad0d176726885bba9afe155622860abfd2d723d11c03b2381cb500074f3c1041f7ae4d35c3f1f3b8e3713c39ee3d5069 SHA512 203d06eeda62ce0810c0188640b88ae08e567610bb0573f962341c4cd4b39ca63ce0d0fcd1e4749384afbc6f64079db6bc101eab31af95caefc1088c2e0dca59
+EBUILD uglifyjs-3.15.4.ebuild 776 BLAKE2B 02765a0ccff1ed52a7242f972f701066f2c397d7aaebfb18edf8c86511549d2cfc3b9c2e1aef19734a27491231760db7cae2c788a3220177a8dccb670fd018c6 SHA512 f54336748ca69b332555aa90283c8bf5105d70536e31bfb7e513f277198e7b3093c65e4bf231f07805a98f9387e358e9142dee62d3b1e6c3f1c8e66fc4ed29f5
MISC metadata.xml 328 BLAKE2B 74d4d808f158dcb49e996da74b67d65fe12956d7486b91941b03f3bb237d7d13387ac629b9689ebce8bd0580b0ce24d359a788911134fef6f006546c5365f2d8 SHA512 3db3efc0f0f5f0f3c7d453d4edae27d0ddfc62aa7cb778684d58460cfd55187fdd90c06bfb2629fb0d84874ff378dbccbc7ef182a10e35fd4b85991c5777a213
diff --git a/dev-util/uglifyjs/uglifyjs-3.15.3.ebuild b/dev-util/uglifyjs/uglifyjs-3.15.4.ebuild
similarity index 100%
rename from dev-util/uglifyjs/uglifyjs-3.15.3.ebuild
rename to dev-util/uglifyjs/uglifyjs-3.15.4.ebuild
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 481994d3f807..127f601e0da0 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,7 +1,9 @@
DIST umockdev-0.17.6.tar.xz 486668 BLAKE2B 973c195b8fccd1c080665b65ffd47f8fe110118de9c541d5dda383e51e4dbcc36f77eeda6af5c774f4570a7b839190130fe95559fb3148e9937dae19dace6331 SHA512 05a86e2a583972d02fb3cfa26b017d44600831b6ed1415769d7cc7344357f484d34228b1593de2cfbfcce302611c0c22f045ee9fbd7fea76d8ae0b4ccd28d6ef
DIST umockdev-0.17.7.tar.xz 486964 BLAKE2B f3c4021198c8adea47383f3d0c111f921c35550ca9b70c0711e71799ba89a44031356a687b88cc80aa51b1bf4606cfcf48a1d24d16501b0ea08f805e4e30cf83 SHA512 6fc611787c9679f450ce7cdf7dccb93a5d7435470b0b5f5cb1803036cf3c8ce73521af9e7777bec68485834cddfddba0ed9379a0818bfb072bb643cf6419c17d
DIST umockdev-0.17.8.tar.xz 487220 BLAKE2B 6a5cb31462ef5836f6a4329fe0e612dd6bb6f00ecc899cb3d1b093771727361bfbc952c7cf7acb7943b78989cacb1faa2d7a2ee62d9c752ed959ac7b1931333c SHA512 e5e6ba2934e1df9323a4e64ee1fc066ab4abeaf75ad0d7f1f6d387b06315f30877f48664e5992f4b138fe1b76d08860359599249d5b9de516777cf8bdb1b228f
+DIST umockdev-0.17.9.tar.xz 487592 BLAKE2B 9b96ab26d31d927de240fcbbc3139f86ca3108240cbcc4d330a7793472b8b716aa3a573a7ee6a899562411192a6cffed707118a4e648802c84089c211dd870c3 SHA512 f56cc9a1513d05747eda2d36cd7c632502d7f70ccc612e11bdcd1610c96a2be9cf8e883282d024406485c44fb3cedc80dc803a12216ed61f593030d12ece21c9
EBUILD umockdev-0.17.6.ebuild 1136 BLAKE2B 7e0cd8feada039c7012bb371c21afcf09de79d13d6a66f44caa6254d51a5144d185e0973d97009462028761a615a5c3294966b4613e8d09f3cfd62dae64e3532 SHA512 393815b0d56229ada097d84c2ca78726b1679dfc6d9f295eee260cf783573269c860898ebcc4a9af51dada2a14471477beda9172265870ffe5e4ddbf16d76a1a
EBUILD umockdev-0.17.7.ebuild 1143 BLAKE2B af1e7ce8e0adee72f52fefc186b2c920fcfe681153d0ad288c2a1c8dfa0695569f8b1280a5369f6b95301b36cfd68a1bdaa61ff34a3154f903c551e355ea8624 SHA512 22fe773dd3be79e64eb45130b8852e4f305c4005c99d96dba3238ef6bed00ad1cf4335042ea8296031161b9d669e3ea0f6ddf088cbf62959d694b60167e4f835
EBUILD umockdev-0.17.8.ebuild 1137 BLAKE2B b3f02d4752d54e1398b03df38ce2c786500d1f6c907b477d93cbfb9c8e08bd792f9fe8936002a3dd4198fa4db17f77d8dae03bfd378d32d30e67b6c1a1d9f0b1 SHA512 348bf94ed27295c28b7296c59b21dd33bfca009a33930e1fbb40150d5c83123d6919dc6fbd7593a93aaa72dcf3fb265ec2f50a3038bd10ad30868ce983f44cce
+EBUILD umockdev-0.17.9.ebuild 1137 BLAKE2B b3f02d4752d54e1398b03df38ce2c786500d1f6c907b477d93cbfb9c8e08bd792f9fe8936002a3dd4198fa4db17f77d8dae03bfd378d32d30e67b6c1a1d9f0b1 SHA512 348bf94ed27295c28b7296c59b21dd33bfca009a33930e1fbb40150d5c83123d6919dc6fbd7593a93aaa72dcf3fb265ec2f50a3038bd10ad30868ce983f44cce
MISC metadata.xml 389 BLAKE2B 83313795741d7a5ece22e39de4d8b138c484a7f298f64d7e87bf44a9c04b6733c80f407ca15eb2b4bd71205eaa51b6b814227f4df730ba77e3b54a27735e7484 SHA512 6aff7de0eb974f8ddc4a7190b06b8e3ad406a410f618935cb0b757fa2bc22b6a33ecf33510ae9fc2d4a03f676905faa5561d030fb5e5065f8dc3e7320820cda1
diff --git a/dev-util/umockdev/umockdev-0.17.9.ebuild b/dev-util/umockdev/umockdev-0.17.9.ebuild
new file mode 100644
index 000000000000..c1f80ba0b6d7
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.17.9.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson-multilib python-any-r1 vala
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/"
+SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ net-libs/libpcap[${MULTILIB_USEDEP}]
+ virtual/libudev:=[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+ >=dev-libs/gobject-introspection-1.32:=
+"
+DEPEND="${RDEPEND}
+ test? (
+ ${PYTHON_DEPS}
+ dev-libs/libgudev:=[${MULTILIB_USEDEP}]
+ )
+"
+BDEPEND="
+ $(vala_depend)
+ app-arch/xz-utils
+ virtual/pkgconfig
+"
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ vala_setup
+}
+
+multilib_src_configure() {
+ export VALAC="$(type -P valac-$(vala_best_api_version))"
+ meson_src_configure
+}
+
+multilib_src_test() {
+ meson_src_test --no-suite fails-valgrind
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index d40895c617af..9aa7cb74420e 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/cdrom.eclass b/eclass/cdrom.eclass
index 5d90a11eab77..bae3888c6c53 100644
--- a/eclass/cdrom.eclass
+++ b/eclass/cdrom.eclass
@@ -79,11 +79,11 @@ fi
cdrom_get_cds() {
unset CDROM_SET
export CDROM_CURRENT_CD=0
- export CDROM_NUM_CDS="${#}"
- local i
- for i in $(seq ${#}); do
- export CDROM_CHECK_${i}="${!i}"
- done
+ export CDROM_NUM_CDS="${#}"
+ local i
+ for i in $(seq ${#}); do
+ export CDROM_CHECK_${i}="${!i}"
+ done
# If the user has set CD_ROOT or CD_ROOT_1, don't bother informing
# them about which discs are needed as they presumably already know.
diff --git a/eclass/common-lisp-3.eclass b/eclass/common-lisp-3.eclass
index 5314e391db8f..df624d51607c 100644
--- a/eclass/common-lisp-3.eclass
+++ b/eclass/common-lisp-3.eclass
@@ -127,7 +127,9 @@ common-lisp-install-sources() {
if [[ -f ${path} ]] ; then
common-lisp-install-one-source ${fpredicate} "${path}" "$(dirname "${path}")"
elif [[ -d ${path} ]] ; then
- common-lisp-install-sources -t ${ftype} $(find "${path}" -type f)
+ local files
+ readarray -d '' files < <(find "${path}" -type f -print0 || die "cannot traverse ${path}" )
+ common-lisp-install-sources -t ${ftype} "${files[@]}" || die
else
die "${path} is neither a regular file nor a directory"
fi
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 2766f04f1dfa..b2f8465a5bf5 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 6015cffff207..7caf8b6b88e1 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,10 +1,11 @@
AUX devilutionx-1.1.0-no_bundled_font.patch 2134 BLAKE2B 90ab8f267f0a1cb337b3d5432e757931b434eb6ee3915270253daae061400c1425b004f23e3f528daa82ee591d1d7acf7013a2657c01bf387b30976828ec66c8 SHA512 2a9fa26bff1776fc7a8617dd6467b18fea94b0c2b8a651c74cf1dd9f29eff8ea09b4fa188e215264ff622a9aebb597c59299fa489f19328712ce3ec9073a1127
AUX devilutionx-1.2.0_pre-no_bundled_font.patch 1181 BLAKE2B 004e58c8fb6d29be37ee6471dbecef52b0503ea6b2ad7d892236805f5f8fe42e2247bd94af65fa54a6f53c223d9fae2aee76a6e0959e3266490e954301bd3ced SHA512 7f1823283015f6d2f7c9f34c3b0c9a06e1127d82370ce1d7f5fcf5e429c2bd24e32620871e5eaf1dc7e598da17b73f21205a74f3488ba8a35b4cd258b9bc221a
+AUX devilutionx-1.2.1-disable-ccache.patch 423 BLAKE2B 31667a36f230a885871ffd11d2ef5088c17553b20fcf71640d02d1b0acea77f02b2a0e50cf1e988fd3c98f48b38d6c869ab92b1c9440a3a9563d6fe9fb87902e SHA512 f1194792389a395b92fc1c415fc87f0b3a653bebd5dfd23530a24b4b39f4594d1d265cf202f46e02e2e2b43a10fed179976db30146397dd061348ef8a620bf2c
DIST devilutionx-1.1.0.tar.gz 2271614 BLAKE2B 8afdffafd86477bdeb62c2c3abb96d35dcccde7f7c44cb5ca5bbd8b46ae5f3998262eae4fa23f5c84a3ffdbcbdfc27cf91dc758cb69bfe24b301959085fbe31e SHA512 341e7f2e74e7af4a7b42054b58b6518c2f286f2fdcb21c5553a15912c044ea08f6c7b07a2079e7e795a5146e7a301789fe32b6fda5ff9fbec0654d886d423b38
DIST devilutionx-1.2.0.tar.gz 3571940 BLAKE2B 26001a8dc594777dbf6822c41ce89ad08e6cdff5621c04083ede1398cd12d4c4496da91e4cfed674e73c5411b2c569539a37102c4a418d552bb383a71527a4f2 SHA512 30ae94feacb9125345f877981c0e23ccbc3a0db96be6c5b1a402c7c5685b5f60f825c9dcde91dbf344b845c03b0b77358e5c656aac7869b5c450b72457da02c9
DIST devilutionx-1.2.1.tar.gz 3573200 BLAKE2B c3055bfa8ae0a670e21561673e23277fb76e2b24d269fdd86d13510f68a0e841ec96ab06cf98739913870884d82037b5297ce168e6cba1f8795de6ea72620649 SHA512 9327b127d0ad22d640b1a13fad9bfa00ba0fc512dd7ed362a9e84a80278d84634cd039cba7c98f15425715b11a35dc6ac07d75c816c3cbc818e6ab8c4437cf18
EBUILD devilutionx-1.1.0-r2.ebuild 1503 BLAKE2B 3bccbae2d574a7d9747710e9c80770740a0d65cbf437ed460d09694e65ee3cc910dc8e337a19caa4cb237acf2202ce39bbd8cb05cbe1d7c1afb0b1bc68d6cb1d SHA512 3489ce76dbe9e8b6c98d4c2c3e3589dd9386dca815eb0d6f07fd4515c818a3f11afe68c26ccaf600f7be4ee8978c9ce69b4351d00b0a69b9752538b52ddc3ffa
EBUILD devilutionx-1.2.0.ebuild 1445 BLAKE2B d5b2ef602c063c69d64ae0da168a7fd603c5accb0ce1b4bea8ee4a718aadf3e21b7d92b502ec153bb6a1563d1a562ee6129c544394c2a7bcae62ae54b0772349 SHA512 99d624bb30eae10eb1131d6ffa1f186e3b610e1bcb2785923813d140b0855215f10f6f4b46e05a514ba85da3323c202a43e54d3efeb770ba60a3e4f21cbc1137
-EBUILD devilutionx-1.2.1-r1.ebuild 1538 BLAKE2B 0cfdd70d72dd2b46dc0c8a4c2451c6f481872d7a91bee18f165ce201c74412967c1130de560b4317f4658707e10e4f338bebec4195b741fb4fe2fc9e064bb81b SHA512 69101ea1c5d481e0ff326ff85469857be96a319b8ad32c7cb43956b566a9fc639249f2d47ab1dc0300b7146f0a3197d20c651edd5dea86d7bd54e9fc0c5ce4fe
-EBUILD devilutionx-9999.ebuild 1538 BLAKE2B 0cfdd70d72dd2b46dc0c8a4c2451c6f481872d7a91bee18f165ce201c74412967c1130de560b4317f4658707e10e4f338bebec4195b741fb4fe2fc9e064bb81b SHA512 69101ea1c5d481e0ff326ff85469857be96a319b8ad32c7cb43956b566a9fc639249f2d47ab1dc0300b7146f0a3197d20c651edd5dea86d7bd54e9fc0c5ce4fe
+EBUILD devilutionx-1.2.1-r1.ebuild 1594 BLAKE2B 067a470df39d2a88ba19ea20d5ae43529a969606ec2db320cf150756dd4b94e8ec6c8d0dc5aaf1717d518120b40e7026a5c9460facebc10b1e86fb54ac38c5b7 SHA512 679c91d6faaa73711a67107514445f71a1e401e08e71ed7d1fa3c7148a4b8fb5f7b0b706d8bd1f166f73cac8bb13cc9183c92ceb9b8e60fcb7fa0300d986d90a
+EBUILD devilutionx-9999.ebuild 1594 BLAKE2B 067a470df39d2a88ba19ea20d5ae43529a969606ec2db320cf150756dd4b94e8ec6c8d0dc5aaf1717d518120b40e7026a5c9460facebc10b1e86fb54ac38c5b7 SHA512 679c91d6faaa73711a67107514445f71a1e401e08e71ed7d1fa3c7148a4b8fb5f7b0b706d8bd1f166f73cac8bb13cc9183c92ceb9b8e60fcb7fa0300d986d90a
MISC metadata.xml 437 BLAKE2B defb57e1816a73c361baba921636dde54fc5908a5da8da909db7dfd6e765ba95f59ec9f78cad4812d0c8bd0436e28bd4a0fba41da3f74d9c55f7181ba2f0e647 SHA512 8f9ca87d3a78b5334f352b20f77c2ede8ac25dfefa673d749eff31275f4e3c9f643e4071659cc179ea8d74acea771fc78b46e99b6b72787889ac96f7a5b4c073
diff --git a/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
index 9dd19f639bcb..2a2abba3eba0 100644
--- a/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
+++ b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -41,6 +41,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-1.2.0_pre-no_bundled_font.patch" #704508
+ "${FILESDIR}/${PN}-1.2.1-disable-ccache.patch" #813768
)
DOCS=( docs/CHANGELOG.md )
diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 9dd19f639bcb..2a2abba3eba0 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -41,6 +41,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-1.2.0_pre-no_bundled_font.patch" #704508
+ "${FILESDIR}/${PN}-1.2.1-disable-ccache.patch" #813768
)
DOCS=( docs/CHANGELOG.md )
diff --git a/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch b/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch
new file mode 100644
index 000000000000..a89b53e63d34
--- /dev/null
+++ b/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch
@@ -0,0 +1,17 @@
+We let users enable ccache by themselves. Avoids sandbox violation.
+
+https://bugs.gentoo.org/813768
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -54,11 +54,6 @@ if(NOT VERSION_NUM)
+ endif()
+ endif()
+
+-find_program(CCACHE_PROGRAM ccache)
+-if(CCACHE_PROGRAM)
+- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+-endif()
+-
+ if(VERSION_NUM MATCHES untagged)
+ project(DevilutionX
+ LANGUAGES C CXX)
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 6949852dce03..6854e1c0a375 100644
Binary files a/games-simulation/Manifest.gz and b/games-simulation/Manifest.gz differ
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index c7103b81ea91..dbfe1a59f842 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,4 +1,4 @@
-DIST FlightGear-2020.3.11-data.txz 1736954520 BLAKE2B d5f3fd8facc93fab140171fad04ee0c331c4ab35c893ee762bb0b6250ee632c820e7570de57d2dfd6348fb9aaefdba209e845d00f67737b24eff17b025b30aa4 SHA512 b46193d4e9138ec58da048d9c3a36d47ae7204673fb9524f23b3d52dab02db8ef52fe8d67b7fd648222aac8585dd7e2fa5484317fdd07e07a58f3816f1378702
-EBUILD flightgear-data-2020.3.11.ebuild 409 BLAKE2B f818a83911a28b22811e65c4eb154ce1a23056a2c5a226954c461c0041df94fde90ccde3f8f0b3872b47c624943f071cb70c7534a689a68a036c2d7edd944e4c SHA512 4ae3615be1a1e0c96c27b6853f81315286295371f2481487b6aa42853cc573ebe71105832a322c8e70b90b56105aebbf6393a6e324a9c6777fab027538278128
+DIST FlightGear-2020.3.12-data.txz 1787955196 BLAKE2B 648994bb8a70416d9fbf9fbb71c91d6652db4f915ce39938ad870f6de4a745c7f6df36025726fe29d67a598f1ce64718d12b7be5b81ebb83318246cd991fac1a SHA512 7bb97c0b2ee59b300a95f331bfd12e39aaaa7d3320e33cc4e72ea3c5fae196af52e97d9ed7f6af274162ecdd00642e729d96165df5dcbcb95e2853cf7c1df463
+EBUILD flightgear-data-2020.3.12.ebuild 409 BLAKE2B f818a83911a28b22811e65c4eb154ce1a23056a2c5a226954c461c0041df94fde90ccde3f8f0b3872b47c624943f071cb70c7534a689a68a036c2d7edd944e4c SHA512 4ae3615be1a1e0c96c27b6853f81315286295371f2481487b6aa42853cc573ebe71105832a322c8e70b90b56105aebbf6393a6e324a9c6777fab027538278128
EBUILD flightgear-data-9999.ebuild 441 BLAKE2B abb508976894bf77fe2fa60c817920481a5dc0487a1379e71ff3104b9ca8cbe19953adc5f4a14ff5a74a0e6900fea89741b446137664104daf8eb119508225da SHA512 f0c40c5eff961a0d8680cf844a1fae4eff777469ae0fbbf9aed6ff088db1ae85a95b6494c7d06539b697d317a4567c534fd8bbe2173f6516e7747d58baded284
MISC metadata.xml 446 BLAKE2B 47c1c761df5dc2bbbf1972f9541aae416b6758b520f429309fd81e91bc332d78e497c9e6b2504c979fbf6a79287452ba86f060746c57436ec22bba65f177f283 SHA512 f1dc6aa3888410f471884143f136178c890a7bf31c67d61ab049587dca205b966a21a57c670d4c047703264f470955899ccc5f42d8cde5412be8bfc6f52abcaa
diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.11.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.3.12.ebuild
similarity index 100%
rename from games-simulation/flightgear-data/flightgear-data-2020.3.11.ebuild
rename to games-simulation/flightgear-data/flightgear-data-2020.3.12.ebuild
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index bcbb8c4b5f7e..1032673ca064 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,8 +1,7 @@
AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2dd7aae8f23f1cd853d29d071a0b9691cf5b8e8b262355b40752f43bccaa318065992d709b SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da
-AUX flightgear-2020.3.11-fix-assert.patch 490 BLAKE2B 4bfeaa11b36568080a0e68787899eeb7e9f9737c8fd15beb5e3346a9bddf04d0d92d00722986eff791fd485de577c15efadd390814851299e7c410e9ab1cfad9 SHA512 595f63fd7ccaab8ea38ce0367f2cbde765154ef0ae1d104f439d15eb5e1ec49480ea48c469f194ae0e3d156ebf6a1d976f0f2b581d218f95870aacad5750ac09
AUX flightgear-2020.3.8-cmake.patch 2050 BLAKE2B 8fa39bd0041556620f79088b6f9ff29eec4b445911f664ac1d3b4a71af479292538d0c44d55b71fa1fbb87771ad9d4917b8c874d5270f716ac63406ec62098aa SHA512 5c1c744c135f422786cab37c0425a143b5e5f078442a051122586fd9fe299bdc953cc6cf9c9c7ab9fb1e5731f3e1f1dac33653e132b95d5ef390a6bc06a1ed2a
AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
-DIST flightgear-2020.3.11.tar.bz2 8926212 BLAKE2B 03b3203fb688fe842247f8ac11957f438f02154cbc992bb98076ab3dd6fcac5f3241509cc1c621f3b647487b772257763d154c756792ce8ff738ff5396fe07ef SHA512 9a7c6f262da8daf3d954df7a2a8a96e555f3212c1d949211d0dbddd08a8f7380fa8f4986d60f48e17db563154d250184ee772b79b10277a2c5819fabec3930ee
-EBUILD flightgear-2020.3.11.ebuild 4346 BLAKE2B c414a8fecdbe98d83d8d97fc4b8dbca8f4826861fad41b4256fb1c41c6db0356124ffa78b6766d1109f68c35d001501da0dab47d114c9a89bc0df55e84089a9a SHA512 0bf78c006c2fe16c9b873968bd406b30a316cedebed3512673bb1f6fac5b97cdec315ef6eaab98ba61fd07ca99450d7a3fd4cb73240eebe5a643f5abb4bdc02f
+DIST flightgear-2020.3.12.tar.bz2 8929319 BLAKE2B e84b0519d69f46d5951372deed59f9b1219739710b3374d0bc0041127f8e4b7869c43b20169a9ac3a89d4e121f9da27d01c6db98e683bc3f80da6b1930e1a7c0 SHA512 91e04ae6dc5d12e799bab10b3c4321e77f8d995469453453fdff26a9858f40056dbe8c095423397fcbef307994042c377eb37532af2732674f39e5624c950e9c
+EBUILD flightgear-2020.3.12.ebuild 4298 BLAKE2B 971ff3d8fe90368bc9f4280087937930749adeab00610626c7283823eeffc9682324f2704960e428d49e248f638da04a03d5c8a0256d07f18a67b165d76f2730 SHA512 e05b7835a46c0e837572ae00eb0b990c2998eb869ef19669dbaca646143603f9a8ba935c3cb5caf73a31e9c1452a83027e4c46ea0db05319bb23195ee564c814
EBUILD flightgear-9999.ebuild 4348 BLAKE2B 0f084f038d9b973fc9fa1fb652e1388d31ecfdc9740e9b6ce83aeca262809fa7c8acbe1fff7a16fb08cfd77fc4d46249b01efcc6ad21e27d6692b385bcdd786c SHA512 764f056eb4935d2562df4dab29d393aed0884f3568c414ed36e55ab647747c039151a5d9353747cd1aa4e86479df9097e9a4ffbf698fa63a53adcced270139b5
MISC metadata.xml 868 BLAKE2B 304c520696a5a370762f5748b0e90282e7faed02afd2771805f4e842c10e26e7979456e7141caa407edbeead252c3fc959c50aaebe82bdad65d1509b447f7dea SHA512 56373af9228b7943e6be81ca73b1660a4818aaf800f9d3ad02cafe85bdd8e02f3f939a7d5f397396d78f1fe1207f05cdce70da883613c546040e5a7921e2548f
diff --git a/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch b/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch
deleted file mode 100644
index f35cf2c426a4..000000000000
--- a/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN flightgear-2020.3.11/src/Navaids/PositionedOctree.cxx fgfs-my/src/Navaids/PositionedOctree.cxx
---- flightgear-2020.3.11/src/Navaids/PositionedOctree.cxx 2021-07-29 11:35:40.000000000 +0200
-+++ fgfs-my/src/Navaids/PositionedOctree.cxx 2021-09-16 23:01:20.989931176 +0200
-@@ -148,7 +148,7 @@
-
- void Leaf::insertChild(FGPositioned::Type ty, PositionedID id)
- {
-- assert(childrenLoaded);
-+ assert(_childrenLoaded);
- children.insert(children.end(), TypedPositioned(ty, id));
- }
-
diff --git a/games-simulation/flightgear/flightgear-2020.3.11.ebuild b/games-simulation/flightgear/flightgear-2020.3.12.ebuild
similarity index 98%
rename from games-simulation/flightgear/flightgear-2020.3.11.ebuild
rename to games-simulation/flightgear/flightgear-2020.3.12.ebuild
index 5467dd59b859..baafbbda8846 100644
--- a/games-simulation/flightgear/flightgear-2020.3.11.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.12.ebuild
@@ -65,7 +65,6 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-2020.3.8-cmake.patch"
- "${FILESDIR}/${PN}-2020.3.11-fix-assert.patch"
)
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 9cea8ebb6d2a..0ed120d6c70a 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -10,6 +10,6 @@ DIST openrct2-objects-1.2.4.zip 3392474 BLAKE2B 5f539cbbdd93828cebfa6977c6c11ac8
DIST openrct2-replays-0.0.57.zip 1623894 BLAKE2B 0bc7b6862632140f0ef8122828a022424cb1b78d76d7a28db5fd706afd2d77af4b4feba0e5838c97204a906ac2b38f2330dd04eeef0c5c6c285568d793efebdd SHA512 eae0e60c92c4e21c03444cb0c9b597c575b2b0ad9d744ca3bf98f46e33e241012b18d92167c58e582481b963c6e602eacd0fc40d59730c31d77ade40cc1bba57
DIST openrct2-replays-0.0.62.zip 1466858 BLAKE2B 651e46a554e90d7692c2dc0f8dcffaadb58ffaf7f9a282d499f4c032c8412730da58f660d03b0e73d26893ce7b9a3a437029893acd7f3fd4e9267ce85eb0ee68 SHA512 69705858ebde1dc9a698915c0d5ed56e1c9d5cb29b919d99eebefe81fdb68d9c17acc58431618410b69cf67ad14e1994ec9ac86530127ca87cdc5603de899137
DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
-EBUILD openrct2-0.3.5.1.ebuild 3949 BLAKE2B ff1e50c299ddd02b2023d64a88936bd6bab8275d4eb741254b2c950f9fa7d3b637142329c87e387deb0f52f58ddf55f460ef16bde68a9072df6ebf9b0408551c SHA512 1db0260e13881475f4740bbeb3521c437ef64335795f971b77bae001301e559b72d75944a841b1660df7e1885089e2db83a71e7792ad81bc95ac8986bb0d7717
-EBUILD openrct2-9999.ebuild 3865 BLAKE2B ccfed3406c145a9388d9a954a3f24473f1d24411c66b9fd2678137e911621a7dd43db6e56755783f35e44cbd4cfee04e62e3d66d74c14aa1a392de960325d8ef SHA512 98a3d805bb6b5283fd28d0397171938c54e9ee2ff801a321fe50d3e62c67074b3daff6ca788cdcf88795db848cc7403d40e4064daeda8456a86a39efc27220a7
+EBUILD openrct2-0.3.5.1-r1.ebuild 3968 BLAKE2B e489d7be25d664fd73efdb62e3551cb3eb537545ec8f4f83b1ca06f073872bfc56ff343e08725a33a8fa5ef4918daf40dc3710c04e0fb4ac57d9e54a07721158 SHA512 951b457cde394a64c7cacb05b854312855a6b4b3ff06fb7c2777019a79c7b4f18b8b6de52da5eddc77e935ad13990189ea24c5a624e499a8c66dd38f5b7c6721
+EBUILD openrct2-9999.ebuild 3884 BLAKE2B ef9bcdba674eee668c0ceaeea3d2ba5f817754d0e480c90a3beda641777a19b31638581ef039ac0af4a8e83647be50dcf80e3f115ae19ee881f433ad83821e0a SHA512 bc77222dcbe772579566cc5e677bdc54748e88681e45ac50a53f6765ee620600c2eb576bfb47570377cf44c32d4ed93f76c57d042fce14401a0eeec4b11aea3d
MISC metadata.xml 1276 BLAKE2B 23704f52521432dde611251039fdefc1d1ed97615fb4dac1e137c309ee6b11d91ea25e4368e6d0d2520a2755b3c15eb2eb129ad4aa1593466ccd2168dbae0ed0 SHA512 c9ed6b7f79f32996d65309a70d850d1e4a8f1a46f805774a5dc7007d34a126f51b543392dc1248ad6d93c82854de942e3e68a1516c5ed84287108a0c337db395
diff --git a/games-simulation/openrct2/openrct2-0.3.5.1.ebuild b/games-simulation/openrct2/openrct2-0.3.5.1-r1.ebuild
similarity index 98%
rename from games-simulation/openrct2/openrct2-0.3.5.1.ebuild
rename to games-simulation/openrct2/openrct2-0.3.5.1-r1.ebuild
index da1cbb9b5e25..e02fe6c1811b 100644
--- a/games-simulation/openrct2/openrct2-0.3.5.1.ebuild
+++ b/games-simulation/openrct2/openrct2-0.3.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -107,6 +107,7 @@ src_configure() {
-DDISABLE_GOOGLE_BENCHMARK=ON
-DDISABLE_GUI=$(usex dedicated)
-DDISABLE_HTTP=OFF
+ -DDISABLE_IPO=ON
-DDISABLE_NETWORK=OFF
$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
-DDISABLE_TTF=$(usex !truetype)
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index a6613207075e..293da48f84c1 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -108,6 +108,7 @@ src_configure() {
-DDISABLE_GOOGLE_BENCHMARK=ON
-DDISABLE_GUI=$(usex dedicated)
-DDISABLE_HTTP=OFF
+ -DDISABLE_IPO=ON
-DDISABLE_NETWORK=OFF
$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
-DDISABLE_TTF=$(usex !truetype)
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index bbede09cdfaa..639fe2a0fc38 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest
index 4b6954414615..b86c919fb2a4 100644
--- a/gnome-base/gnome-extra-apps/Manifest
+++ b/gnome-base/gnome-extra-apps/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnome-extra-apps-40.0.ebuild 2512 BLAKE2B 90b4eaa54c624a83a7cbec974404575fe17a5f874cdcb0004c87974e89b78450ab83f7e324bc53645fd557dd832f4ac24f5f4645fc12a36a9941a7302862b68f SHA512 450def13c7185c511d055e9ba1ec9cb3ba39ab1b9fbd2bbadd393372e1d16b36686630558aefebdb6960f49ad88decb66e3d103438afa2837baf1cba05f379be
+EBUILD gnome-extra-apps-41.0.ebuild 2476 BLAKE2B 4af25c5835b0cdd3bb1c7fbadb59815d9e775ac9e27b5be59375e4cb75b2427b31152c8328d143ec45acffd1e95020031f5e84c4e2c25d7e224538157d474848 SHA512 b17e5a48d79c27172afc0ba8b6824f1cd8a72816a1483c2d4ce6d45ab77c69cca0d011feb95a2efd3945cd6bae71de256aef7eb43958dd05bc59647415d9fecc
MISC metadata.xml 618 BLAKE2B b0e3eb484cf4fd6251b59d9be7cd5d150cff79379cdc61bac77eb17e4cdcdfb7f93be57976d6a47e331a44829d30e6f9075e490b2ac9eb557728135bbbd89071 SHA512 0688fb4552c6c1de4b493cb8f7194dd08665441c9c7f06c873bffe0ab1f58d2441c14d13d28073c89577eafc522bf535a72a72a66b9f4bb3f3fbf403a0acbf2f
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-41.0.ebuild
similarity index 96%
rename from gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild
rename to gnome-base/gnome-extra-apps/gnome-extra-apps-41.0.ebuild
index a4a9a775ec58..b0f7954f7b5e 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-41.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DESCRIPTION="Sub-meta package for the applications of GNOME"
HOMEPAGE="https://www.gnome.org/"
@@ -14,7 +14,7 @@ KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
# Note to developers:
# This is a wrapper for the extra apps integrated with GNOME
# Keep pkg order within a USE flag as upstream releng versions file
-# TODO: Should we keep these here: gnome-dictionary, gucharmap, sound-juicer, vinagre; replace gucharmap with gnome-characters?
+# TODO: Should we keep these here: gnome-dictionary, gucharmap, sound-juicer; replace gucharmap with gnome-characters?
# TODO: Add gnome-remote-desktop as replacement for vino that was removed from meta in 3.36?
# gnome-documents removed for now, as it didn't find a good place upstream and is getting dropped from default sets for distros for 3.30 (and for 3.26 it required newer tracker than we had at the time)
RDEPEND="
@@ -41,7 +41,6 @@ RDEPEND="
>=mail-client/evolution-3.${PV}
>=gnome-extra/gnome-tweaks-40.0
>=gnome-extra/nautilus-sendto-3.8.6
- >=net-misc/vinagre-3.22.0
games? (
>=games-puzzle/five-or-more-3.32.2
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index eb816d66e3fa..878c4a7f1c17 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest
index 1a3a379fc82a..7d06fc7b24f2 100644
--- a/gnome-extra/gnome-utils/Manifest
+++ b/gnome-extra/gnome-utils/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnome-utils-3.8.0.ebuild 588 BLAKE2B beb04b0af7422f3c34dd16b3d372c5f79cab1a3488b6bb6133e172ed8361ffe95b766b35a9712c826a490f2c6d8cda8a1f598b7e6f7349de457ed304697688a0 SHA512 af95ec9edea6fd3bd351e711009144cb1f7d60592af116d6b69b7507d71db902628c3a7b9ef26013f1470fb4bc0178ac055d00a7ce45b11e97a7ac721bf52028
+EBUILD gnome-utils-3.8.0-r1.ebuild 568 BLAKE2B ab8276d519d84cf7d3b4b125c8ff5c2c26a793164ff5d05ebf56a9956992cf57280dba6b4ffb76ad3933e72c04998ac864677b78e6bc84a7c9aebea4cbb30612 SHA512 d6f39e837a286ab6146af7ca037dfa8aebf9a638cd8eecf4d491cac74102e8cb75a6e93452f746f0d261d18a6ba05b4e7545f0377634cc49f034a5d02df81b21
MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.8.0-r1.ebuild
similarity index 89%
rename from gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
rename to gnome-extra/gnome-utils/gnome-utils-3.8.0-r1.ebuild
index f2bf05a95df4..adf4dba36c74 100644
--- a/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-3.8.0-r1.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=8
DESCRIPTION="Meta package for utilities for the GNOME desktop"
HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
LICENSE="metapackage"
SLOT="0"
-IUSE=""
KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-DEPEND=""
RDEPEND="
>=app-admin/gnome-system-log-${PV}
>=app-dicts/gnome-dictionary-${PV}
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 275df62008de..90b6b7501f1e 100644
Binary files a/gui-apps/Manifest.gz and b/gui-apps/Manifest.gz differ
diff --git a/gui-apps/nm-tray/Manifest b/gui-apps/nm-tray/Manifest
index 1574f49945b4..1b2bf465dd27 100644
--- a/gui-apps/nm-tray/Manifest
+++ b/gui-apps/nm-tray/Manifest
@@ -1,4 +1,6 @@
AUX nm-tray-0.4.3-missing-include-qmetaenum.patch 565 BLAKE2B 7542d3f95acb8157216d3526df0ee37c24b58316e1a044212ac5355c4030992e6169cf645fe283d00c4d52dd87739889b318b4e3692698628ed500b7453460f5 SHA512 0a11ec9013d1730ce593a17393ed32a76b072480c577bca6219fece1a1a77b1ebe50ef692d6cee93b9ab8fd8f3d83beb5f79cd3e4653218f8cf833f7dd21824b
DIST nm-tray-0.4.3.tar.gz 44705 BLAKE2B 590e8b3a08e7543a1275d7e5e3264570fe78b6020435783b2b36d6acd1df36b0106f4537035d8b61c0d571451d27277874ec3ddc93cd6163c047666e7013ab2a SHA512 480511a6e5b075ff98b53e91b08f37b9344c81e89c0f580c74f4424b1657c156300c31cc85cc8f82478eec9efdf53589352c3757c16e386d6985828b9dfa819d
+DIST nm-tray-0.5.0.tar.gz 53854 BLAKE2B e83c31606905909a62df57b2e744ff133a5cff91673ff229bd53ca1cca17840989efb6d813053700562dc8b434a6676a9310ff4d50b39fde7daf580986a19cad SHA512 ba118f7fd07a60af5ed6b7b53cf771f339c89f9bef02aeb2f59bfbddd3e896bdc31aa506437e33cb8fe2ef921c595b76527d61cefd202e9e1f5197762b69ab51
EBUILD nm-tray-0.4.3-r1.ebuild 775 BLAKE2B 260aa0a956dee9089325637cf0ccdba3a7edd2214f0b44f6eabae514dec9ba916266db42cb1c0c7d21e07af9877bc55f387ae377fcd7d4512e46a6a4cd0deb39 SHA512 a5ebb139dcc6487bd38df7a645e0d9ed096379414c9276afa5c7b43561b4dee038211f63b40c4f95adceeb11376bf2efec0a17f1c7e3fd16e638620f8e0352d6
+EBUILD nm-tray-0.5.0.ebuild 702 BLAKE2B 20d30362da00607c020065b5b1dbb67ff8a55df24e59d02cdaa35e33b246d0ed973b94f1621e55a4e41a83b0623af782f4b96099ec3127fadb6d2f460e398567 SHA512 d56022932669ea269b9ca323c157e9964cd6348e0beb9c70d6b4c433f0e3d6322271821d66cfb497268f32b351903e6e2583cee11d776256127c996b2c5b803b
MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/gui-apps/nm-tray/nm-tray-0.5.0.ebuild b/gui-apps/nm-tray/nm-tray-0.5.0.ebuild
new file mode 100644
index 000000000000..5747346924d3
--- /dev/null
+++ b/gui-apps/nm-tray/nm-tray-0.5.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A simple Qt-based NetworkManager front-end"
+HOMEPAGE="https://github.com/palinek/nm-tray"
+SRC_URI="https://github.com/palinek/nm-tray/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND=">=dev-util/cmake-3.10"
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/networkmanager-qt
+"
+DEPEND="
+ ${RDEPEND}
+ dev-qt/linguist-tools:5
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DNM_TRAY_XDG_AUTOSTART_DIR=/etc/xdg/autostart
+ )
+
+ cmake_src_configure
+}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 41da97a72c00..ecca096c073b 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index de0e48ab330a..f8efdaa44176 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,5 +1,5 @@
DIST incidenceeditor-21.08.3.tar.xz 545508 BLAKE2B b2fd75e0830a56f5b81468e3f4796c2c38d19399c2a5d53d4d1f24420856163281d7d5f1c49a18ad19709dc914390ab5895dfdbafb5da3b99a8c3597118d0e78 SHA512 1ab847bdbb14b68ad3d3dc65a43006082fb0bddefa10048c9f7f909976d6cf975d69645a3d81e2018850679fa963c619eb92d41694cf6104495e341dbc8f972c
DIST incidenceeditor-21.12.3.tar.xz 545880 BLAKE2B 08e58c6e10ca4ccd804faed84a33a86651f984498e763a60710e0dbe02304f2d41a75736725d279fd22ef448bd2a6aa327f5febacf173dce6ffdac3a5586ccc1 SHA512 cb6300fbd857344fc4f07d75da730674a49321552a8b2ab0a6e45bb169e6ac3a02c8772c7ae17b28da5c11578e2619862eacfe71f4fb4b973de1b067231f2828
EBUILD incidenceeditor-21.08.3.ebuild 2048 BLAKE2B 80ad2e99e9b88c64e0df37e7c89e4c771d83a214e5cb33974d31c5645a76ace04e931ce4e5ccc95f1e4d4240865f305b7ad1aaae29aceab2f8ea732e1dc3860e SHA512 1bc7d1a3f95c4225554a627b34f4ce2b763dfe2b36865cbbca113ed4d37d6aa698b55a3a4685745047b4bc755b78cbbc40bc6ddd26773188744de38ee4713185
-EBUILD incidenceeditor-21.12.3.ebuild 1897 BLAKE2B 4e5c753a5ee13f30472a4b260c47613fd8ef73447aa146506585a71d6fe7b01c370f8625af53d77751cd309ae49c27cafad10f8aa0bbf4712cfdbef3c3912234 SHA512 195a16d9eb594e86758f7795201972b530387bcca2a552b9f11ac7f35f6ef4d4dc16f39cd974121f786462ccbdda7bbc74c197cedad5a920206b7e53ddfef36a
+EBUILD incidenceeditor-21.12.3.ebuild 1951 BLAKE2B 94fe422d87f609f2ec2d7f16c744a7b89ab1018a28b3629e339bfb3e74819240e5cc58e0cef1d9d781935b13e1f08552f121aeeb56e2d3647854eb56abb370a9 SHA512 56d5f99572d40bfcf570517c443fd4a20411bec85325467cfae16072c4e86cd9ed4af90076a37d273b3c9b58d6bfbda64c97651194c86193fc71f9133dd38822
MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/incidenceeditor/incidenceeditor-21.12.3.ebuild b/kde-apps/incidenceeditor/incidenceeditor-21.12.3.ebuild
index 1cb545e833ed..63d271e4df7e 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-21.12.3.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-21.12.3.ebuild
@@ -54,16 +54,16 @@ RDEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
"
DEPEND="${RDEPEND}
- test? ( >=kde-apps/akonadi-${PVCUT}:5[postgres,sqlite] )
+ test? ( >=kde-apps/akonadi-${PVCUT}:5[mysql,postgres,sqlite] )
"
BDEPEND="
test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
"
src_test() {
- # Paths exceed unix domain socket limit, bug 770775
+ # Paths exceed unix domain socket limit, bugs 770775 and 837182
local myctestargs=(
- -E "(akonadi-pgsql-incidencedatetimetest|akonadi-sqlite-incidencedatetimetest)"
+ -E "(akonadi-mysql-incidencedatetimetest|akonadi-pgsql-incidencedatetimetest|akonadi-sqlite-incidencedatetimetest)"
)
ecm_src_test
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index a03fffcc89b4..303143122afb 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 8c3323da032a..85f282d0adf1 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -3,7 +3,7 @@ AUX extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch 1636 BLAKE2B 8aa070
AUX extra-cmake-modules-5.90.0-disable-qmlplugindump.patch 3129 BLAKE2B 9bc0c5c8312ff14fbf8b58efea9d2f7c629b20fb8aca7e17ccf5c1425348ffe52e9c8862cd9308924892076d2361a74ac00e1a69fac5288bead037f0fb1309ac SHA512 881ddf5eb2432d402ffd6f1076353a4d903b7165b792ddda2ff8f60e1bf026cb471e6675325356df88c0b882d9f5a9cdcba0d1dba99ac652198e14a9783f54e3
AUX extra-cmake-modules-5.91.0-disable-qmlplugindump.patch 3155 BLAKE2B f01348bebd4aa0498495dc140b623bc132e45ba1b0b596b55eddb4fda2420a28a4ee2e54d06820a5c855e74b7161024c2b771d595b3ab5d8548c6edcb73c8262 SHA512 5c8bd46ef8e702d14b8984e308c58fc7f060cc44072ea53e1a544ffad270c79ea0df79b41025b9c95796bb96400a7ee8b9dcc944d6b3c207b4797f972513c6f1
AUX extra-cmake-modules-5.93.0-disable-qmlplugindump.patch 3151 BLAKE2B e202be33de10a33c150aad553ada59b97084cd8e60adcdec0ead12f523f05a3563762454cf1b76fdc8a8e4b323f7b2d92860c43b6ca2340d431094ef98c232ab SHA512 d531e66a2a7dc01b799eb2019f671390ebaca408e27a8c5bf78115e953acd9fd08318667722254d1c95c1c210388b83ca384147b22ed731fb1db93e6846dae55
-AUX extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch 1674 BLAKE2B dee32f3b0642595a49ca729bed6244ceda3f0ff54e736bfbd625b1bffb5e5275487a302966480929168d8e5607a2e23ff329016e2254f2be6d9564bd61ce6aea SHA512 457e6335c359b43b8dab83846369ecb243a39fe9a68e0c5c6e77e30d65a7d5bcef84952060828129cd84d6d15502a9c55c401e643b1fe0338f8afee40570a27f
+AUX extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch 1703 BLAKE2B 71d07fcfb3a93caf5f73f818cff7f0139c4866ef3a1abaede189e171217ec9a4e6825ec6d37c344ab8d94989493647f4d7b5749d3db1767b54bb9c6e328ca571 SHA512 8b015810e455aa0a54535f594668595900b0b2d700685c952cbb9a2dd46e3c413815b33fef69f4251bb20c93e4c3a4e6b9691680b3ffcf1bac5cf48931bb5e3b
DIST extra-cmake-modules-5.90.0.tar.xz 323352 BLAKE2B 00df6be76989e0730b8b0be66ea68d979c22ee66f115720218b80eb6a06f2d471b24c08e4db2b5a4febdc3e44481adce522c4e62cf86bbe0c10d07cd40ae0cab SHA512 1f1257a8b9d0a7ba088d5da3bb96070c6cd18d19a17224249e886d7a4aa9bda8192be54607908b1cbcbea57366649cebde173e5bce64ea16ed3b60d1a5ba04a5
DIST extra-cmake-modules-5.92.0.tar.xz 329884 BLAKE2B e2d6bb7ff492f916f2e276faf452c2b02adfed8133096cff17c76992d11255f93a55cfc8140dc1b577facdb03cbbcddfefcbbe5242a006aa4c5786a0c64bf329 SHA512 c4adc98a5d3ff0844165fc5f51f9a1a4ff04ef8e8d8b87b87b094d0601577c239f87f05dd461270563d5160af7248ee064984275223a48e931b1761450dcaf20
DIST extra-cmake-modules-5.93.0.tar.xz 331192 BLAKE2B 9977570536104297424b201842ffe13a9fc9b3c4859067b65e145b60ffd1cec57308bc316bd485c79fff5d94e6648515567a27bb2c273df19f8c2b663f475c72 SHA512 a7b79a3db555e7a140ebc49f6b987c5950a2a002cfb4641b30be823dd39b97d3239ce0892c31c8f41463d3a40f6ba9183343a65d52d087bd464289fa93bca882
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
index f9eef600724c..84e192919c78 100644
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
@@ -1,4 +1,4 @@
-From 9b53dd107af153b88658ffa246de728a8a6fbd9d Mon Sep 17 00:00:00 2001
+From 36e435f059ee44da78e6900fded348709ea865df Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner
Date: Sat, 11 Jul 2020 23:04:16 +0200
Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt::Test is not
@@ -7,8 +7,8 @@ Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt::Test is not
Signed-off-by: Andreas Sturmlechner
---
modules/ECMAddTests.cmake | 9 +++++++++
- tests/ECMAddTests/CMakeLists.txt | 4 ++++
- 2 files changed, 13 insertions(+)
+ tests/ECMAddTests/CMakeLists.txt | 5 +++++
+ 2 files changed, 14 insertions(+)
diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake
index 58c78d05..994ed1e4 100644
@@ -38,20 +38,21 @@ index 58c78d05..994ed1e4 100644
ecm_add_test(${_test_source}
NAME_PREFIX ${ARG_NAME_PREFIX}
diff --git a/tests/ECMAddTests/CMakeLists.txt b/tests/ECMAddTests/CMakeLists.txt
-index aa7e73a1..5fbc1cc7 100644
+index aa7e73a1..f9fb10cb 100644
--- a/tests/ECMAddTests/CMakeLists.txt
+++ b/tests/ECMAddTests/CMakeLists.txt
-@@ -2,6 +2,10 @@ if (QT_MAJOR_VERSION EQUAL "6")
- set(QT_VERSION_OPT "-DBUILD_WITH_QT6=ON")
- else()
+@@ -4,6 +4,11 @@ else()
set(QT_VERSION_OPT "-DBUILD_WITH_QT6=OFF")
-+
+ endif()
+
+if(NOT TARGET Qt::Test)
+ message(STATUS "WARNING: skipping tests that require Qt::Test")
+ return()
- endif()
-
++endif()
++
macro(add_check NAME)
+ string(REPLACE "." "/" dir "${NAME}")
+ string(REGEX REPLACE "[^.]*\\." "" proj "${NAME}")
--
2.35.1
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index 7c8562374681..b8dcbce7eddf 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -2,7 +2,6 @@ DIST kimageformats-5.90.0.tar.xz 1223124 BLAKE2B 64a4eea197f1164ff3c46c7c6fac54d
DIST kimageformats-5.92.0.tar.xz 1223892 BLAKE2B e7ac90e29715560237d0458946f1b135b84c9b8869ca3003e80b7655d7c5c9c872400e4e102015f054a26423babc7fa334b237012b88c4771f95bc7aeaa24f80 SHA512 e07521fa2b566df38baeaad2ab213c683c4fb36b5218dc63302d8e9b52ce7e0d4341b59339b3181d6b1157fda1060e645e0f043d2a187d0662f8f8a43a2e7447
DIST kimageformats-5.93.0.tar.xz 1228820 BLAKE2B e773069328ed334f24b08d9c3783108c71a3fdc6d908ec5f78c46362f1c7d807896daca2d5b759c5dd6488ad6aaca1867c1d8be28acdc21e2b697616a3f1ed6e SHA512 b10fc976b90b2eb01e73917639e292c8d3a0236acca716b32fc131cd81ee8c26ff6922e02390cdf2ac00ee686c3b97ff07aa2e61dd284e3424d9dc8b463dc274
EBUILD kimageformats-5.90.0-r1.ebuild 980 BLAKE2B 8d337645f4eb50c1d3a63801b71b9b4fbcb7daa31ecb869807af33f133fe7e00f6dc958c8fec776338387154e0418552428afafa839901f1c6b83adddee0eabf SHA512 6f063cde97e13783413ce5f8d7009c94890325c1409880dfb1a875a73ee5bf84acd791a91a1dfaf4fe56a091852898ad2354b2ca9fc59433651d69de3972d95e
-EBUILD kimageformats-5.90.0.ebuild 977 BLAKE2B 64ca4c60bdf65ebf97cb8be7aada841669a37ea88d3e77e151c76f156a80344ec2cb6620bec54f74e0c2c0d29149428ef9a61f86b7cd9b26ce5f638de65cdb9f SHA512 846323cf4ba1c0c87786f836b9488c8d5421e79c68f055919b66bfc1dc6af380f0a003650c7e89b064cc4583fc164746659fba4a3a32dcd4dffea831392ec161
EBUILD kimageformats-5.92.0-r2.ebuild 1000 BLAKE2B 0da325930128d7a9b4694a7a800df2cdd1564d1f3c929c460e6220b8e1f3a4062fe55eb007d12a679546f4a73308a00de6a4c239f13740cb341c86212b5b3a1d SHA512 6c8bf5134c2645bd4c35b55a31b5ca7406bf935379e2565407471aec41207e86a5a73faf5353e5f6698d0d11faaa487e68dbdca7dfaaa2cf85e0514283b99f9c
EBUILD kimageformats-5.93.0.ebuild 1000 BLAKE2B 0da325930128d7a9b4694a7a800df2cdd1564d1f3c929c460e6220b8e1f3a4062fe55eb007d12a679546f4a73308a00de6a4c239f13740cb341c86212b5b3a1d SHA512 6c8bf5134c2645bd4c35b55a31b5ca7406bf935379e2565407471aec41207e86a5a73faf5353e5f6698d0d11faaa487e68dbdca7dfaaa2cf85e0514283b99f9c
MISC metadata.xml 714 BLAKE2B 2b4fd4b370285820e2c7966aa910cf57ec94ae4c7daa7f44d9421554d57149d696e751db8020b128321494027d1e4142b42b1b9ce1538d3c8cf93a6e72c93892 SHA512 0a44aa8d3dd4cc2fe1d73938792daec37af80c72d70da0a3ec8a1d6f610a54f5fea85008dcb9187b0a77671467eef52547e8bdb61bcfcfb4742df61f9da921d3
diff --git a/kde-frameworks/kimageformats/kimageformats-5.90.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.90.0.ebuild
deleted file mode 100644
index eb80c2046adc..000000000000
--- a/kde-frameworks/kimageformats/kimageformats-5.90.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="avif eps heif openexr"
-
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- =kde-frameworks/karchive-${PVCUT}*:5
- avif? ( >=media-libs/libavif-0.8.2:= )
- eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 )
- heif? ( >=media-libs/libheif-1.10.0:= )
- openexr? ( media-libs/openexr:3= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( src/imageformats/AUTHORS )
-
-src_configure() {
- local mycmakeargs=(
- -DKIMAGEFORMATS_JXL=OFF # TODO: libjxl not packaged yet
- $(cmake_use_find_package avif libavif)
- $(cmake_use_find_package eps Qt5PrintSupport)
- -DKIMAGEFORMATS_HEIF=$(usex heif)
- $(cmake_use_find_package openexr OpenEXR)
- )
-
- ecm_src_configure
-}
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index e1dd9bd5f811..a2959fdd5fb2 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index 603e7de8f395..c057d07477f6 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,5 +1,8 @@
+AUX kwayland-server-5.24.4-fix-crash-on-screen-setup-change.patch 4276 BLAKE2B 4620ba8b9469fb04e83feb0e6c898f3015652859878e238c8e5fad6390eda2d047d56e65f62748f13cd446abe39f127496d823216a314f8185ecdd1eed0a8700 SHA512 431b3da95dcd79b38deeff2b111e60af9b5c28ebedca682804572b79835840ce967e7125367c97b85bebf7001591df3dd7cd381cfe6ad6cd7b13a279be18f4b6
+AUX kwayland-server-5.24.4-fix-layer-shell-reset.patch 1974 BLAKE2B 16041ba840f43e137ed2143c7d0abb0a2b70cee49ab6e2a8d3e077382a09837c47dd68a5285ee4400b9c21860db203ee5604f297ed567d9b3ca1237f1351435f SHA512 89f000937a3b7aaa366043948200ea8fa01e70cdcfd42e499c7dd10097486dbd36852ac702cc79a9d5f7d8d643cea8de4a23f3bf2f600a266e6edb96fd569d92
+AUX kwayland-server-5.24.4-guard-subsurface-parent-access.patch 1324 BLAKE2B 60d40a919cc68c340e7e67e4dc0701fddaa375fde87f4feacc03c97c1a3fb9c7b3b9f981a4363db9759af45e0bc136162cf7490035d79b82b2357a2412547872 SHA512 449f3c5f7ff7826110307f7d5938bf8bdc132d9057f39764d39fedd2487877bf1611502ba983e5723ee94e4cea18732b9162587f6567d042e74becd22de20e4c
DIST kwayland-server-5.23.5.tar.xz 217524 BLAKE2B 0bc2f6b3137ba9620e7c37fa381fea3037d06cfabb8921ad5417589e6408ebfc603c6a7d73e550b40d7c00f0d8a97f1d946df730358fd6b1758a29183d3779c3 SHA512 bb5305e823d60612f79863de02337855c96de1ba908bf19ad14d0d67c8a199e9f4215faaf5251974cf1f012337a71c444d831a307d112bf5e7fd5b7156c384cd
DIST kwayland-server-5.24.4.tar.xz 221412 BLAKE2B efc970b7f7d99e5195e74a71480039b6a6de15d23f4af9ea776a5b4f45494d8323fee8729e8b2633ed0e25167c99c2a73b63f08ce4e1cdd75d0870258e8d65ea SHA512 9281261b96ceccfb59b1d4eef247572424a196951cf927ae2d65eb6153cb0a9409059e789c7479ef04d8df750c109abfe202395a0a1f49010c40b1190cc2e640
EBUILD kwayland-server-5.23.5.ebuild 902 BLAKE2B 230c8c66a5483186af6e0ae4051b2304080dfdcfb206717f1d189ce2f2ef41b6b615c9ad9d88331b1df763bdb974d0db3eea2c3469f9f89e4ca33d0d0c47eca1 SHA512 5436b3b036a23f002852f407aa2cf412f843da2febd9b9af15deb9f76d3ffb6af05f29f9aa33d783c4e0e730ad808417ef62f356e98c943574bf778920f693cf
-EBUILD kwayland-server-5.24.4.ebuild 905 BLAKE2B c895c5797a17978fc3c1e0313e08db1b9628eda574136ae0f0f661ffc612374e31b7cc0307371a0c87e24a4b2380eb87cbc1a23da993b1b74c2cae8e5a533822 SHA512 6b355421aeaf4414658d85078b07a59728398a29308ae9bc87e97dcc6f8f788410f62dbf9a2cf2f5888584d15b4324f48c873fddfbe5e4fe1e9639da3413fd41
+EBUILD kwayland-server-5.24.4-r1.ebuild 1108 BLAKE2B 12fd2d62d2e1e553c55634853c7c08ad0c75f83deeb51fa33e95d065c03478f33dbc27ac159f63641b999264dc8d85398a82302d51e4fcef55219a0b7210e700 SHA512 d1de0f06b1c4b58c69bbcb41b80df1a63e0a74ff66e83bbd3e97d79b2e0436c174b4b1189043a668424a8f0ff84575eae37601021e87b0dc43cbe9feec51242d
MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-crash-on-screen-setup-change.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-crash-on-screen-setup-change.patch
new file mode 100644
index 000000000000..4ddd9737e759
--- /dev/null
+++ b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-crash-on-screen-setup-change.patch
@@ -0,0 +1,109 @@
+From 40364d2ee670a5a74318ef96c643762293ca95f0 Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii
+Date: Fri, 8 Apr 2022 12:44:33 +0300
+Subject: [PATCH] Simplify code that announces available modes and current mode
+
+If no mode has the current flag set, the first mode object will be
+announced twice.
+
+There's also no benefit from sending the current mode as last. If the
+current mode changes, the compositor will send the current_mode event,
+not the mode event.
+
+BUG: 452318
+
+
+(cherry picked from commit b40c4e3f4108b9a0be9b4f5d437e72f7c2aa3fea)
+---
+ src/server/outputdevice_v2_interface.cpp | 35 ++++++++----------------
+ 1 file changed, 11 insertions(+), 24 deletions(-)
+
+diff --git a/src/server/outputdevice_v2_interface.cpp b/src/server/outputdevice_v2_interface.cpp
+index 31ab16ca..9093bd2f 100644
+--- a/src/server/outputdevice_v2_interface.cpp
++++ b/src/server/outputdevice_v2_interface.cpp
+@@ -31,7 +31,7 @@ public:
+
+ void sendGeometry(Resource *resource);
+ wl_resource *sendNewMode(Resource *resource, OutputDeviceModeV2Interface *mode);
+- void sendCurrentMode(Resource *resource, OutputDeviceModeV2Interface *mode);
++ void sendCurrentMode(Resource *resource);
+ void sendDone(Resource *resource);
+ void sendUuid(Resource *resource);
+ void sendEdid(Resource *resource);
+@@ -180,7 +180,7 @@ void OutputDeviceV2Interface::setCurrentMode(OutputDeviceModeV2Interface *mode)
+ const auto clientResources = d->resourceMap();
+ for (auto it = clientResources.begin(); it != clientResources.end(); ++it) {
+ auto resource = *it;
+- d->sendCurrentMode(resource, d->currentMode);
++ d->sendCurrentMode(resource);
+ d->sendDone(resource);
+ }
+ d->updateGeometry();
+@@ -257,22 +257,10 @@ void OutputDeviceV2InterfacePrivate::kde_output_device_v2_bind_resource(Resource
+ sendName(resource);
+ sendSerialNumber(resource);
+
+- auto currentModeIt = modes.end();
+- for (auto it = modes.begin(); it != modes.end(); ++it) {
+- auto &mode = *it;
+- if (mode->flags().testFlag(OutputDeviceModeV2Interface::ModeFlag::Current)) {
+- // needs to be sent as last mode
+- currentModeIt = it;
+- continue;
+- }
++ for (OutputDeviceModeV2Interface *mode : std::as_const(modes)) {
+ sendNewMode(resource, mode);
+ }
+-
+- if (currentModeIt != modes.end()) {
+- auto modeResource = sendNewMode(resource, *currentModeIt);
+- send_current_mode(resource->handle, modeResource);
+- }
+-
++ sendCurrentMode(resource);
+ sendUuid(resource);
+ sendEdid(resource);
+ sendEnabled(resource);
+@@ -296,9 +284,9 @@ wl_resource *OutputDeviceV2InterfacePrivate::sendNewMode(Resource *resource, Out
+ return modeResource->handle;
+ }
+
+-void OutputDeviceV2InterfacePrivate::sendCurrentMode(Resource *outputResource, OutputDeviceModeV2Interface *mode)
++void OutputDeviceV2InterfacePrivate::sendCurrentMode(Resource *outputResource)
+ {
+- const auto modeResource = OutputDeviceModeV2InterfacePrivate::get(mode)->findResource(outputResource);
++ const auto modeResource = OutputDeviceModeV2InterfacePrivate::get(currentMode)->findResource(outputResource);
+ send_current_mode(outputResource->handle, modeResource->handle);
+ }
+
+@@ -506,12 +494,12 @@ void OutputDeviceV2Interface::setModes(const QListmodes << outputDeviceMode;
+ outputDeviceMode->setParent(this);
+
++ for (auto resource : clientResources) {
++ d->sendNewMode(resource, outputDeviceMode);
++ }
++
+ if (outputDeviceMode->flags().testFlag(OutputDeviceModeV2Interface::ModeFlag::Current)) {
+ d->currentMode = outputDeviceMode;
+- } else {
+- for (auto resource : clientResources) {
+- d->sendNewMode(resource, outputDeviceMode);
+- }
+ }
+ }
+
+@@ -520,8 +508,7 @@ void OutputDeviceV2Interface::setModes(const QListsendNewMode(resource, d->currentMode);
+- d->sendCurrentMode(resource, d->currentMode);
++ d->sendCurrentMode(resource);
+ }
+
+ qDeleteAll(oldModes.crbegin(), oldModes.crend());
+--
+GitLab
+
diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-layer-shell-reset.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-layer-shell-reset.patch
new file mode 100644
index 000000000000..a3a0b2067f5d
--- /dev/null
+++ b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-layer-shell-reset.patch
@@ -0,0 +1,57 @@
+From 97df88c6c8af925382bb1f59b7c6ad75f28142a0 Mon Sep 17 00:00:00 2001
+From: David Edmundson
+Date: Tue, 5 Apr 2022 13:26:26 +0100
+Subject: [PATCH] Fix layer shell reset
+
+In the current form any client committing multiple times without
+attaching a buffer would unset the cached state and trigger an error.
+
+It's legal (though weird) to commit multiple times before attaching a
+buffer.
+
+We should only reset the state if we commit an empty buffer after having
+committed an existing buffer. This brings us in line with XdgShell.
+
+
+(cherry picked from commit a5c55b68589a8771cde0bf4ce552702da6fca41c)
+---
+ src/server/layershell_v1_interface.cpp | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/server/layershell_v1_interface.cpp b/src/server/layershell_v1_interface.cpp
+index 17086334..19fcd68e 100644
+--- a/src/server/layershell_v1_interface.cpp
++++ b/src/server/layershell_v1_interface.cpp
+@@ -69,6 +69,7 @@ public:
+ bool isClosed = false;
+ bool isConfigured = false;
+ bool isCommitted = false;
++ bool firstBufferAttached = false;
+
+ protected:
+ void zwlr_layer_surface_v1_destroy_resource(Resource *resource) override;
+@@ -290,8 +291,10 @@ void LayerSurfaceV1InterfacePrivate::commit()
+ return;
+ }
+
+- if (!surface->isMapped() && isCommitted) {
++ // detect reset
++ if (!surface->isMapped() && firstBufferAttached) {
+ isCommitted = false;
++ firstBufferAttached = false;
+ isConfigured = false;
+
+ current = LayerSurfaceV1State();
+@@ -303,6 +306,9 @@ void LayerSurfaceV1InterfacePrivate::commit()
+ const LayerSurfaceV1State previous = std::exchange(current, pending);
+
+ isCommitted = true; // Must set the committed state before emitting any signals.
++ if (surface->isMapped()) {
++ firstBufferAttached = true;
++ }
+
+ if (previous.acceptsFocus != current.acceptsFocus) {
+ Q_EMIT q->acceptsFocusChanged();
+--
+GitLab
+
diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-guard-subsurface-parent-access.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-guard-subsurface-parent-access.patch
new file mode 100644
index 000000000000..e40189ab2744
--- /dev/null
+++ b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-guard-subsurface-parent-access.patch
@@ -0,0 +1,44 @@
+From 6dcf73adaafeaa40c05e22df5f1c10af88df362b Mon Sep 17 00:00:00 2001
+From: David Edmundson
+Date: Wed, 30 Mar 2022 14:57:12 +0100
+Subject: [PATCH] Guard subsurface parent access.
+
+Whilst a subsurface must have a parent at the time of creation, the
+lifespan is not guaranteed afterwards.
+
+It's a weird thing for a client to do, but we need to not crash
+afterwards.
+
+If the parent surface is destroyed we should consider the surface
+unmapped.
+
+BUG: 452044
+
+
+(cherry picked from commit 1d2424a56a13dc55aeab699a38234a7cafa091d8)
+---
+ src/server/surface_interface.cpp | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/server/surface_interface.cpp b/src/server/surface_interface.cpp
+index ef2584f4..8bfac95f 100644
+--- a/src/server/surface_interface.cpp
++++ b/src/server/surface_interface.cpp
+@@ -678,7 +678,13 @@ void SurfaceInterfacePrivate::commitFromCache()
+
+ bool SurfaceInterfacePrivate::computeEffectiveMapped() const
+ {
+- return bufferRef && (!subSurface || subSurface->parentSurface()->isMapped());
++ if (!bufferRef) {
++ return false;
++ }
++ if (subSurface) {
++ return subSurface->parentSurface() && subSurface->parentSurface()->isMapped();
++ }
++ return true;
+ }
+
+ void SurfaceInterfacePrivate::updateEffectiveMapped()
+--
+GitLab
+
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.24.4.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.24.4-r1.ebuild
similarity index 81%
rename from kde-plasma/kwayland-server/kwayland-server-5.24.4.ebuild
rename to kde-plasma/kwayland-server/kwayland-server-5.24.4-r1.ebuild
index 01f58af88ddf..033b2c03dc1c 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.24.4.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.24.4-r1.ebuild
@@ -40,3 +40,9 @@ BDEPEND="
)
dev-util/wayland-scanner
"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-layer-shell-reset.patch
+ "${FILESDIR}"/${P}-guard-subsurface-parent-access.patch # bug 452044
+ "${FILESDIR}"/${P}-fix-crash-on-screen-setup-change.patch # bug 452318
+)
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 00a4bf168775..f5fe179b8493 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 84e4bfd49828..5cf7c09cd8ee 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -12,5 +12,5 @@ DIST darktable-usermanual-3.8.fr.pdf 33479509 BLAKE2B 988824b60277ea0264fec61a11
DIST darktable-usermanual-3.8.pt_br.pdf 33648057 BLAKE2B afb6d3c1ea6b709e535e10ae2a491fb6a87c84dcfe17823a518931bda0cd8595cda72905cffc01698e60c3df991451a5cccbfcdea82966a506b2d29d61298f09 SHA512 8734a9e6c57ba37f32966873b85584c50968c1c895fa4e9d953e129bb5834f254ca46e20741d5664429ef7d6379e5a35e59f8ecb517ca88ff536b49a8216b603
DIST darktable-usermanual-3.8.uk.pdf 33663424 BLAKE2B abeb7a04b58e7ef508b415fe11073396c78964e91fbd3face8481cd6b09cf88525b1b6bdd2988bd57d25112cd59c8c05e209931f94004349cf5b8a7a3ca59e39 SHA512 e1a81771006f5d6b7e4088455b6b444ea87b27a788cc196c2bc0b0b5d0afde241ea9e2bdbd3ffe79871f39d756d710d8e16c082a21b1194efb71f78e8724af9a
EBUILD darktable-3.8.0-r2.ebuild 5157 BLAKE2B 02f49ff54e774848d4d4b3dc81db1559f66b1550e8fe590ae15ea6859c938ed0e27f21619fc3652eb3ca465b2cbc49a56ea8453c5b002d3cd2e1da5b2b5b2899 SHA512 5d8acf4c1c7d5ce1d17e3c737c63417b766c7dbef73c8766841502ae0bce48b35eb0fd1ff39780a6e72f1eaaed3ec6fc8cb0d2c35157a966d26045deb9e319f9
-EBUILD darktable-3.8.1.ebuild 5157 BLAKE2B 02f49ff54e774848d4d4b3dc81db1559f66b1550e8fe590ae15ea6859c938ed0e27f21619fc3652eb3ca465b2cbc49a56ea8453c5b002d3cd2e1da5b2b5b2899 SHA512 5d8acf4c1c7d5ce1d17e3c737c63417b766c7dbef73c8766841502ae0bce48b35eb0fd1ff39780a6e72f1eaaed3ec6fc8cb0d2c35157a966d26045deb9e319f9
+EBUILD darktable-3.8.1.ebuild 5173 BLAKE2B f46b2bc8db594b896d10127a7f4d1535b6c4d5b17d09502a93d8717e8ff5c7c833152a51d5178b0e78eaa118774f0f1e75006ab0784d732884d7c6e21a85efb8 SHA512 5a7d928b92d08d5f48e9f362aa1e65bddff5eabeb97924182a5ab075189a9052538d3124b29e2ad23a8ad3651603133958611dd53e88ff1bb6cc16d5f3f06d89
MISC metadata.xml 1378 BLAKE2B 7373550c5362c32832830bd94dbd712f963246805af5119214a43cfe4dfb1aac9e7bb03d4af6f4f1dfae3cc44e09d6ba8baff53d67b5ddd96115c460b5e19ad9 SHA512 ffdc1ff8eb068372b1f24691bb0832d5a845e49b41adf211dec1c2faf0d1a573a0e4c62c38e97758a8f87de15569ce6f3cd2c7a768c95eb0d2b166e30b20ae3a
diff --git a/media-gfx/darktable/darktable-3.8.1.ebuild b/media-gfx/darktable/darktable-3.8.1.ebuild
index 1b30a127d1b2..74c68cfeb38d 100644
--- a/media-gfx/darktable/darktable-3.8.1.ebuild
+++ b/media-gfx/darktable/darktable-3.8.1.ebuild
@@ -47,6 +47,7 @@ BDEPEND="dev-util/intltool
nls? ( sys-devel/gettext )
test? ( >=dev-python/jsonschema-3.2.0 )"
DEPEND="dev-db/sqlite:3
+ dev-libs/icu:=
dev-libs/json-glib
dev-libs/libxml2:2
>=dev-libs/pugixml-1.8:0=
diff --git a/media-gfx/solvespace/Manifest b/media-gfx/solvespace/Manifest
index a729ae9c9dd7..78a3059dde16 100644
--- a/media-gfx/solvespace/Manifest
+++ b/media-gfx/solvespace/Manifest
@@ -2,4 +2,4 @@ AUX solvespace-3.0-use-system-mimalloc.patch 2152 BLAKE2B 242a4aefcf2ebf985503b6
DIST libdxfrw-0.6.3-0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz 691804 BLAKE2B 84c90a591fac71144e9e13aace7c1a00dfc1bd6f27b0bcde6b60541f5b5d3ccc04ae1c759f60cb467445cc884840d04bf4613b5cc553fbbf6951cac33a084d50 SHA512 9ab498aa7f369be79d800e8ca5ec55fa54be79d0778937b81d4c8da776b3419cb8a75400b54b205efc338da32e2e781afd0bed1bd8efed1a0b212dc8682a2615
DIST solvespace-3.0.tar.gz 2734860 BLAKE2B 2efc9d98723c60abdb1c76ac086c40ff2f9b8bc9c315978731493d115fa55a080176ef48d930e3b503c0de0604dbfd2bc3bd99a581f359eb07a23034d09f84bf SHA512 b07b41fac1d67c5350082600a2f09e3fa611a1273e0c93ff93d11a7a1dbf550ff33465686eaff04fdb8350d1fe854ab0301d8723ef31cc65c687ba59cb89187f
EBUILD solvespace-3.0-r2.ebuild 1779 BLAKE2B 9ac561521b7855fcba7b38927dc2462d0fd8d0c57b0b2a83bf70d23cb931acff0c0aa2d58dc2d8aae3a191ef94630e3d460d4e4b0508b73af86df37667532ec0 SHA512 efc9140670390479eaed870dd8692e22971fde34ec237dc8103ffe83bbf51d3c75eee56f68fdcd5c14bd55a72a4b81150613e75b45d5242954b8284c08af448e
-MISC metadata.xml 1412 BLAKE2B 9e8d28887adc01031dcda861ff81f3305ccec16dac607507e5bf6709224a8a5ce386747aac79a3751f7f53705be33df437dca0a537e6c9ba0ac7970ec0d387c6 SHA512 3a45ceecede799ac90d01444561fb204e4f0b44fe9d5a309c00373e970b42a9f776a50fd5f54af744fb94fe28507b91686b5e9e3dda6175c93a8971710b7af1d
+MISC metadata.xml 1123 BLAKE2B e9b80ae49c4d1861fac55a6a933563cb8b532fb8ccbdc3a4becb37e1150d2a100614dab283a9cf6b8476bf19a57f690849ca4e1cf0be2e7f59cbb33e598ae61c SHA512 cdb9bbea6e382fb18bd604a2816884c6f8d6c03f899689626b428610e62367931f2cdbd5d8e3a8f44f6ae7a39f23323d1057bcb2f17a478386b08d28d20795d7
diff --git a/media-gfx/solvespace/metadata.xml b/media-gfx/solvespace/metadata.xml
index b4f0df25e5ad..d39d759d5cca 100644
--- a/media-gfx/solvespace/metadata.xml
+++ b/media-gfx/solvespace/metadata.xml
@@ -1,18 +1,10 @@
-
- ktrace@yandex.ru
- Victor Kustov
-
matthew@gentoo.org
Matthew Smith
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
Solvespace is a parametric 2D/3D CAD tool. Applications include:
- modeling 3d parts — draw with extrudes, revolves, and Boolean (union / difference) operations
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index c5d511f87561..80ae9334b4bd 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -11,5 +11,5 @@ AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a65571
DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18f07e8af778a63d46b94c894d9e827ed71bd89060898ecbdaebc5b4bb6e638939d7bc0dede390f7137770049f SHA512 ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b
DIST zbar-0.23.90.tar.gz 1005314 BLAKE2B 5d0c193509602dfb55741b421e1d28f1424ecec50aa3be584912544a587922c053284c41cf14ff0b4824095d0d376381ed055e7faf9ff394bd8d44fd9ed2971d SHA512 d73d71873bec68ee021997512a9edbd223f5f5fe43c66c4dd3502224ba6009be2e5e1714766cb8e1056244673e87e0939ed0319116f61d7371b5ab79fb5e04eb
EBUILD zbar-0.23.1.ebuild 5372 BLAKE2B f9dc36d7e2418baf676c04b565581800750d3da8aaf830a21b1445358522b391f7a22a8b06c76c171402a79ef3a94763316c134cdf6d8fdf5d02d3f34833677b SHA512 41142df60af20c0a6e83731f029c2e77f8b9b2a046f1ac9f52a0c97209fb35441101182a1f18d122ec6a7185681470a8327cba0efd5b8993339a3028494d4275
-EBUILD zbar-0.23.90.ebuild 5283 BLAKE2B 690468149ecd353a0477ff874215621f86be0468cd2c38624f5a52c672950be6a535d0e8f70cf04ec3afac0f464b742806196fb8a42e171dc078d3b184179044 SHA512 3974e1eccd6c2c2cf80c635c5d4fa2002f886d619ae1dc31cdfe326d62b4f89b1cc871a6060f11fd48d609971920125c2d8ad9da87f6d482ed87b628e2e7ad87
+EBUILD zbar-0.23.90.ebuild 5281 BLAKE2B 34bd1339b94f540bbcb53581fad678514437d6e9f60da233a6ab8e06a61035358641913062e61c81ebad7960aa86e018da0338c8d080fbadf5c4738c5ef91208 SHA512 aa351ab9b6dac1787e8dd21cd0406a6e3fb64e36e30c773c2d06a95dfa52b52d9f477fef2be40a28e7f1a7747230ed6f456365e1c266b0a637f2b53de7710b17
MISC metadata.xml 738 BLAKE2B a5f5f0f157f7339f3dd39dde18b79427b35c6ce0b079b1ed03a0f2de821bc14f3a9c76fbd68bfd836444a4750a604be0012e4501207e75dfe4fc39aef7e65827 SHA512 334a091fc54d950a8b3e7572af7ae9766d20fd0d49aaa9fd18f5ea75966b45a53a861e290bcf9ca0fd8cc160cba669185aa01a9c8e77a585f2cb84d10f3b1e80
diff --git a/media-gfx/zbar/zbar-0.23.90.ebuild b/media-gfx/zbar/zbar-0.23.90.ebuild
index 91cdcabb9f33..46b85c382176 100644
--- a/media-gfx/zbar/zbar-0.23.90.ebuild
+++ b/media-gfx/zbar/zbar-0.23.90.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mchehab/zbar/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg nls python qt5 static-libs test +threads v4l X xv"
REQUIRED_USE="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index c0ad6da34e13..73fa9cce3872 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 408c151859e6..c794ae5a769a 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,16 +1,9 @@
AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857
AUX openexr-2.5.7-0001-disable-testRgba-on-sparc.patch 937 BLAKE2B e2e432649100457a3273b50aa6725625ac50f48bf95bb04b85a2587a44d4c9e87662a36b68c3b7ac0c741068223e439fb51c1b69d5ae8f852794b0a7ee238d4a SHA512 8c640d67f2db6ed2789b8e25dd25e6ba8db6b3ed0ddb2138027ca579b3fe5db43b60d5bffc4de3f31ba60521c6479cf89f1ff7a8b2bbba97dd22c13279b92f81
AUX openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch 687 BLAKE2B 49aaf9d5282ad878ec415413106540d4a92aecceebbc9a03e30a4289377ec1d8ec4e1bacf49e0cec80a44e75f7f345c885c4746092c4dc3d57b03b317631d4d5 SHA512 9bcb62eec3bdf05ba54dff037ccd71e5e1dcd37831246f95d7803f1710b7335d930292dd27b5a6ddd927c45e7734d61d3a42a637fdf7e83724830f21b3d3db9e
-AUX openexr-3.1.1-0001-changes-needed-for-proper-slotting.patch 6243 BLAKE2B 7c2d2f23153c098027f9edf2671dfa86d7b5924c3e1256db1dc9d3925e4e1f2b354e5524da25d90ef9f7123103947856820f426e51dd6e977fd098e6f35311ee SHA512 3a79c3eb66ff63b92fe45d51b2fbf25c2b4c863e12b4f59a8ea2e8275e3647d23af66d8133dc49dd935e5b5c4383455ce02bac767a4b84c8999285d57573b3a0
-AUX openexr-3.1.1-0002-add-version-to-binaries-for-slotting.patch 10834 BLAKE2B e789a55f14968089b27648e7989bfcb29e4fe634417348dffa8c24a6faafb85bdd9f9f523dc31a2ed26ec2e9d0ff2a2a3f5869317a20014b142085a6720c92f9 SHA512 b187ab8a4c25ffb865293eabb489232d151bfb9260cf2fd4700011e240029b91faa1d072e2f3c5865f79de7d5facfb5bb32fd53ece9f7338f9164c63d5d442f9
AUX openexr-3.1.1-0003-disable-failing-test.patch 1193 BLAKE2B d4a40151e2c0b2278bfbec06b88d1a2b1a0caccb651a53aa4d54945524e3c79fb03d9031540ed0f423be4503fff0881b2185cc33b614a2508135cec3113f9384 SHA512 e07602d78d15ab0f1076d7b5d3f3d16912e9d0ad792703af1b1d3d8fcf472eef2e410efc2abed2da70e39a97f4dd9194a47c6de50484da799d49cf44e62c9167
DIST openexr-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
-DIST openexr-3.1.2.tar.gz 20315253 BLAKE2B d11f26d3e2bb098c4c009271b40da1eca97b120e5683137a0b38f64e2862c226aebff7c17e79344da4a1be5a1967fb8ab0493ff919a7fb5bec16b34e494e49e2 SHA512 34fb28f149e49bb23b2dc230dd5277229f2c780de66aff0acc819601e6802a1dbf83110b5df455dffd63be6eaa286d4aedb4b0af559b8b034d98c3208ee9d969
-DIST openexr-3.1.3.tar.gz 20322346 BLAKE2B e65cb00d1d9ae7544f6d1adf9c6f05193986b8de7b657fa22d20466f2b6dfccf244b5aa3dbe7f2abb0c934aec68d2007dd9edb3eeee91b2bbd8aab331eea7e90 SHA512 12a8f3660104e68ccea0856caf334d1fafbf0ee79115aae23cdce5b835299294ab8a23bafed282acfacd159ce9bc7f6ffc620b1e0df0d40f9ca0eb15a288964d
DIST openexr-3.1.4.tar.gz 20323658 BLAKE2B d3726023f920fa719b1832d3be2df36a95cac8c67fdd4b23a7166398a282fa01d5c07065afd92f7b28f178c47843f82eb7a0f2b77742725b359c8f275d2ef1d0 SHA512 612ab3467f9ccf2779e1592361cb07459571122e10c0a0b3020430cfa34fa3b91ca1d63cc12a5f85d5b53b277b3f7a88862e6477f0f3566a4196b8245f6bfe12
EBUILD openexr-2.5.7.ebuild 2171 BLAKE2B fb59902ef509b75d58b1df078d3bb7ef9bf866fc55ee5de8211721745fbf048d2431aba65d1627ed9748862e751c04f58c51b50355fa34f3d22f163fbdde2a14 SHA512 4a91fa4d593dfc94aba295d5572ed9f7c73e9ccdba52b4f38053a0431bd4a89e1b195aa50aed4f5297464838815d62dbe388b24f72ff29ff40bcb0396c8c6e09
-EBUILD openexr-3.1.2.ebuild 2163 BLAKE2B 70e443af57f3f044be3e47030919b273b673a0c22f2d871ec9cfbb602dc0aa725f37704cc3d0a35c3a781c12c0dd6a780b386ed844094b0a6a3179c3962f9f41 SHA512 8c7e0d1ad8c15b11c5f6d8126dfcf648bf8f2b6a8b810a01856f26a8f65e49605b3941bd48e14539800114a49164c12fec71ae5f857bdf6f4496fa67139c16de
-EBUILD openexr-3.1.3.ebuild 2173 BLAKE2B 08e48ceac80017c6fdcf10bffc832cf6b2d5249b78a156c551ac14336a9c06cd8f950a3d6d3689d1babc8b9641a86641d0486a421da34ccf074aba945067eb8e SHA512 76908e459cd81c57d678f52b6d3cceb6da8a2b2c1748af20bc2fcbddd9d3483fd0b90804ecc447d818c6cbd8bdf6b99daa842904f033413d80109ef71fe6b193
EBUILD openexr-3.1.4-r1.ebuild 1910 BLAKE2B 2eb8cad3ae2a3951a534b5d3173f0788ba8a3792eb0bf4462321fe073580b3b71c04b99669e1a2ab6d599c9e0ed2062ceeb9185d0b48fb8c307c670123272bcd SHA512 b65c849f91b3226cc751052511f517e10607ad2c64eb7f17f80ad4e0cb8b2e9b28767741057095ef661787c327815cae16b1d15dc49c330522203d3b38b41c21
-EBUILD openexr-3.1.4.ebuild 2170 BLAKE2B 1765dcd4eb7c504912301f59403d45195ac3a93cb72d1178e4f26f0f4bdfb6f68c9efdce16bef3f3a30ba60dd1de74977f3d9704f4bd92fe3d26d91fac57d473 SHA512 ded503632f4a0b75d3a15267c52d1ed37e652b4664d81260f071cadab4dd8a70d3c8ce6a3c5c289765afa11c805f1c9a44789ac9d9b305a9c891c2e6b0a7e7f0
MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee
diff --git a/media-libs/openexr/files/openexr-3.1.1-0001-changes-needed-for-proper-slotting.patch b/media-libs/openexr/files/openexr-3.1.1-0001-changes-needed-for-proper-slotting.patch
deleted file mode 100644
index 29aef05acf5a..000000000000
--- a/media-libs/openexr/files/openexr-3.1.1-0001-changes-needed-for-proper-slotting.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From: Bernd Waibel
-Date: Tue, 3 Aug 2021 19:50:40 +0200
-Subject: [PATCH 1/2] changes needed for proper slotting
-
-Signed-off-by: Bernd Waibel
----
- cmake/CMakeLists.txt | 8 ++++----
- cmake/LibraryDefine.cmake | 8 ++++----
- cmake/OpenEXR.pc.in | 4 ++--
- cmake/OpenEXRLibraryDefine.cmake | 8 ++++----
- 4 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index 79497d9..a22afd1 100644
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -205,7 +205,7 @@ if(OPENEXR_INSTALL_PKG_CONFIG)
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
- )
- endfunction()
-- openexr_pkg_config_help(OpenEXR.pc.in)
-+ openexr_pkg_config_help(OpenEXR-${OpenEXR_VERSION_MAJOR}.pc.in)
- else()
- message(STATUS "-- pkg-config generation disabled")
- endif()
-@@ -225,7 +225,7 @@ include(CMakePackageConfigHelpers)
- if(OPENEXR_INSTALL)
- configure_package_config_file(${PROJECT_NAME}Config.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR}
- )
- write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
- VERSION ${PROJECT_VERSION}
-@@ -234,11 +234,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR}
- )
-
- install(EXPORT ${PROJECT_NAME}
-- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR}
- FILE ${PROJECT_NAME}Targets.cmake
- NAMESPACE ${PROJECT_NAME}::
- EXPORT_LINK_INTERFACE_LIBRARIES
-diff --git a/cmake/LibraryDefine.cmake b/cmake/LibraryDefine.cmake
-index 5696f3f..b4787b1 100644
---- a/cmake/LibraryDefine.cmake
-+++ b/cmake/LibraryDefine.cmake
-@@ -79,8 +79,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
- install(TARGETS ${libname}
- EXPORT ${PROJECT_NAME}
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
- PUBLIC_HEADER
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR}
-@@ -90,8 +90,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
- set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
-- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
-- install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_LIBDIR}/${baselibname} -> ${verlibname}\")")
-+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
-+ install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}/${baselibname} -> ${verlibname}\")")
- set(verlibname)
- set(baselibname)
- endif()
-diff --git a/cmake/OpenEXR.pc.in b/cmake/OpenEXR.pc.in
-index a74979b..e124b8f 100644
---- a/cmake/OpenEXR.pc.in
-+++ b/cmake/OpenEXR.pc.in
-@@ -5,9 +5,9 @@
-
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=@libdir@/@OPENEXR_OUTPUT_SUBDIR@
- includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+OpenEXR_includedir=@includedir@/@OPENEXR_OUTPUT_SUBDIR@
- libsuffix=@LIB_SUFFIX_DASH@
-
- Name: OpenEXR
-diff --git a/cmake/OpenEXRLibraryDefine.cmake b/cmake/OpenEXRLibraryDefine.cmake
-index c6ddd2e..0dc3663 100644
---- a/cmake/OpenEXRLibraryDefine.cmake
-+++ b/cmake/OpenEXRLibraryDefine.cmake
-@@ -54,8 +54,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
- install(TARGETS ${libname}
- EXPORT ${PROJECT_NAME}
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
- PUBLIC_HEADER
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR}
-@@ -65,8 +65,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
- set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
-- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
-- install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_DIR}/${baselibname} -> ${verlibname}\")")
-+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
-+ install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_DIR}/${OPENEXR_OUTPUT_SUBDIR}/${baselibname} -> ${verlibname}\")")
- set(verlibname)
- set(baselibname)
- endif()
---
-2.32.0
-
diff --git a/media-libs/openexr/files/openexr-3.1.1-0002-add-version-to-binaries-for-slotting.patch b/media-libs/openexr/files/openexr-3.1.1-0002-add-version-to-binaries-for-slotting.patch
deleted file mode 100644
index d2f6dcd4bc33..000000000000
--- a/media-libs/openexr/files/openexr-3.1.1-0002-add-version-to-binaries-for-slotting.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-From: Bernd Waibel
-Date: Tue, 3 Aug 2021 20:00:34 +0200
-Subject: [PATCH 2/2] add version to binaries for slotting
-
-Signed-off-by: Bernd Waibel
----
- src/bin/exr2aces/CMakeLists.txt | 10 +++++-----
- src/bin/exrenvmap/CMakeLists.txt | 10 +++++-----
- src/bin/exrheader/CMakeLists.txt | 10 +++++-----
- src/bin/exrinfo/CMakeLists.txt | 10 +++++-----
- src/bin/exrmakepreview/CMakeLists.txt | 10 +++++-----
- src/bin/exrmaketiled/CMakeLists.txt | 10 +++++-----
- src/bin/exrmultipart/CMakeLists.txt | 10 +++++-----
- src/bin/exrmultiview/CMakeLists.txt | 10 +++++-----
- src/bin/exrstdattr/CMakeLists.txt | 10 +++++-----
- 9 files changed, 45 insertions(+), 45 deletions(-)
-
-diff --git a/src/bin/exr2aces/CMakeLists.txt b/src/bin/exr2aces/CMakeLists.txt
-index 72c4e1c..01b806f 100644
---- a/src/bin/exr2aces/CMakeLists.txt
-+++ b/src/bin/exr2aces/CMakeLists.txt
-@@ -1,14 +1,14 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
-
--add_executable(exr2aces main.cpp)
--target_link_libraries(exr2aces OpenEXR::OpenEXR)
--set_target_properties(exr2aces PROPERTIES
-+add_executable(exr2aces-${OpenEXR_VERSION_MAJOR} main.cpp)
-+target_link_libraries(exr2aces-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exr2aces-${OpenEXR_VERSION_MAJOR} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
-- install(TARGETS exr2aces DESTINATION ${CMAKE_INSTALL_BINDIR})
-+ install(TARGETS exr2aces-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
-- target_compile_definitions(exr2aces PRIVATE OPENEXR_DLL)
-+ target_compile_definitions(exr2aces-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrenvmap/CMakeLists.txt b/src/bin/exrenvmap/CMakeLists.txt
-index c798a65..3d35a19 100644
---- a/src/bin/exrenvmap/CMakeLists.txt
-+++ b/src/bin/exrenvmap/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
-
--add_executable( exrenvmap
-+add_executable( exrenvmap-${OpenEXR_VERSION_MAJOR}
- blurImage.cpp
- EnvmapImage.cpp
- main.cpp
-@@ -11,13 +11,13 @@ add_executable( exrenvmap
- resizeImage.cpp
- )
-
--target_link_libraries(exrenvmap OpenEXR::OpenEXR)
--set_target_properties(exrenvmap PROPERTIES
-+target_link_libraries(exrenvmap-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrenvmap-${OpenEXR_VERSION_MAJOR} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
-- install(TARGETS exrenvmap DESTINATION ${CMAKE_INSTALL_BINDIR})
-+ install(TARGETS exrenvmap-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
-- target_compile_definitions(exrenvmap PRIVATE OPENEXR_DLL)
-+ target_compile_definitions(exrenvmap-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrheader/CMakeLists.txt b/src/bin/exrheader/CMakeLists.txt
-index c427445..8cdbb8e 100644
---- a/src/bin/exrheader/CMakeLists.txt
-+++ b/src/bin/exrheader/CMakeLists.txt
-@@ -1,14 +1,14 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
-
--add_executable(exrheader main.cpp)
--target_link_libraries(exrheader OpenEXR::OpenEXR)
--set_target_properties(exrheader PROPERTIES
-+add_executable(exrheader-${OpenEXR_VERSION_MAJOR} main.cpp)
-+target_link_libraries(exrheader-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrheader-${OpenEXR_VERSION_MAJOR} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
-- install(TARGETS exrheader DESTINATION ${CMAKE_INSTALL_BINDIR})
-+ install(TARGETS exrheader-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
-- target_compile_definitions(exrheader PRIVATE OPENEXR_DLL)
-+ target_compile_definitions(exrheader-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrinfo/CMakeLists.txt b/src/bin/exrinfo/CMakeLists.txt
-index 19ace5f..07aee1a 100644
---- a/src/bin/exrinfo/CMakeLists.txt
-+++ b/src/bin/exrinfo/CMakeLists.txt
-@@ -1,12 +1,12 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright Contributors to the OpenEXR Project.
-
--add_executable(exrinfo main.c)
--target_link_libraries(exrinfo OpenEXR::OpenEXRCore)
--set_target_properties(exrinfo PROPERTIES
-+add_executable(exrinfo-${OpenEXR_VERSION_MAJOR} main.c)
-+target_link_libraries(exrinfo-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXRCore)
-+set_target_properties(exrinfo-${OpenEXR_VERSION_MAJOR} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
--install(TARGETS exrinfo DESTINATION ${CMAKE_INSTALL_BINDIR})
-+install(TARGETS exrinfo-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- if(WIN32 AND (BUILD_SHARED_LIBS OR OPENEXR_BUILD_BOTH_STATIC_SHARED))
-- target_compile_definitions(exrinfo PRIVATE OPENEXR_DLL)
-+ target_compile_definitions(exrinfo-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrmakepreview/CMakeLists.txt b/src/bin/exrmakepreview/CMakeLists.txt
-index bb8b548..8b5e441 100644
---- a/src/bin/exrmakepreview/CMakeLists.txt
-+++ b/src/bin/exrmakepreview/CMakeLists.txt
-@@ -1,17 +1,17 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
-
--add_executable(exrmakepreview
-+add_executable(exrmakepreview-${OpenEXR_VERSION_MAJOR}
- main.cpp
- makePreview.cpp
- )
--target_link_libraries(exrmakepreview OpenEXR::OpenEXR)
--set_target_properties(exrmakepreview PROPERTIES
-+target_link_libraries(exrmakepreview-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrmakepreview-${OpenEXR_VERSION_MAJOR} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
-- install(TARGETS exrmakepreview DESTINATION ${CMAKE_INSTALL_BINDIR})
-+ install(TARGETS exrmakepreview-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
-- target_compile_definitions(exrmakepreview PRIVATE OPENEXR_DLL)
-+ target_compile_definitions(exrmakepreview-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrmaketiled/CMakeLists.txt b/src/bin/exrmaketiled/CMakeLists.txt
-index 1bc6cf4..6e70cf6 100644
---- a/src/bin/exrmaketiled/CMakeLists.txt
-+++ b/src/bin/exrmaketiled/CMakeLists.txt
-@@ -1,18 +1,18 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors (c) to the OpenEXR Project.
-
--add_executable(exrmaketiled
-+add_executable(exrmaketiled-${OpenEXR_VERSION_MAJOR}
- Image.cpp
- main.cpp
- makeTiled.cpp
- )
--target_link_libraries(exrmaketiled OpenEXR::OpenEXR)
--set_target_properties(exrmaketiled PROPERTIES
-+target_link_libraries(exrmaketiled-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrmaketiled-${OpenEXR_VERSION_MAJOR} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
-- install(TARGETS exrmaketiled DESTINATION ${CMAKE_INSTALL_BINDIR})
-+ install(TARGETS exrmaketiled-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
-- target_compile_definitions(exrmaketiled PRIVATE OPENEXR_DLL)
-+ target_compile_definitions(exrmaketiled-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrmultipart/CMakeLists.txt b/src/bin/exrmultipart/CMakeLists.txt
-index 7f8fc1b..3770506 100644
---- a/src/bin/exrmultipart/CMakeLists.txt
-+++ b/src/bin/exrmultipart/CMakeLists.txt
-@@ -1,14 +1,14 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
-
--add_executable(exrmultipart exrmultipart.cpp)
--target_link_libraries(exrmultipart OpenEXR::OpenEXR)
--set_target_properties(exrmultipart PROPERTIES
-+add_executable(exrmultipart-${OpenEXR_VERSION_MAJOR} exrmultipart.cpp)
-+target_link_libraries(exrmultipart-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrmultipart-${OpenEXR_VERSION_MAJOR} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
-- install(TARGETS exrmultipart DESTINATION ${CMAKE_INSTALL_BINDIR})
-+ install(TARGETS exrmultipart-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
-- target_compile_definitions(exrmultipart PRIVATE OPENEXR_DLL)
-+ target_compile_definitions(exrmultipart-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrmultiview/CMakeLists.txt b/src/bin/exrmultiview/CMakeLists.txt
-index 05ad081..9e535ad 100644
---- a/src/bin/exrmultiview/CMakeLists.txt
-+++ b/src/bin/exrmultiview/CMakeLists.txt
-@@ -1,18 +1,18 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
-
--add_executable(exrmultiview
-+add_executable(exrmultiview-${OpenEXR_VERSION_MAJOR}
- Image.cpp
- main.cpp
- makeMultiView.cpp
- )
--target_link_libraries(exrmultiview OpenEXR::OpenEXR)
--set_target_properties(exrmultiview PROPERTIES
-+target_link_libraries(exrmultiview-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrmultiview-${OpenEXR_VERSION_MAJOR} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
-- install(TARGETS exrmultiview DESTINATION ${CMAKE_INSTALL_BINDIR})
-+ install(TARGETS exrmultiview-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
-- target_compile_definitions(exrmultiview PRIVATE OPENEXR_DLL)
-+ target_compile_definitions(exrmultiview-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrstdattr/CMakeLists.txt b/src/bin/exrstdattr/CMakeLists.txt
-index 79205fc..3ad0ffe 100644
---- a/src/bin/exrstdattr/CMakeLists.txt
-+++ b/src/bin/exrstdattr/CMakeLists.txt
-@@ -1,14 +1,14 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
-
--add_executable(exrstdattr main.cpp)
--target_link_libraries(exrstdattr OpenEXR::OpenEXR)
--set_target_properties(exrstdattr PROPERTIES
-+add_executable(exrstdattr-${OpenEXR_VERSION_MAJOR} main.cpp)
-+target_link_libraries(exrstdattr-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrstdattr-${OpenEXR_VERSION_MAJOR} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
-- install(TARGETS exrstdattr DESTINATION ${CMAKE_INSTALL_BINDIR})
-+ install(TARGETS exrstdattr-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
-- target_compile_definitions(exrstdattr PRIVATE OPENEXR_DLL)
-+ target_compile_definitions(exrstdattr-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
---
-2.32.0
-
diff --git a/media-libs/openexr/openexr-3.1.2.ebuild b/media-libs/openexr/openexr-3.1.2.ebuild
deleted file mode 100644
index 5fb127134ee7..000000000000
--- a/media-libs/openexr/openexr-3.1.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PN=OpenEXR
-MY_PV=$(ver_cut 1)
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3/30" # based on SONAME
-# -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/imath-3.1.0:=
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? ( dev-python/breathe )
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.1-0001-changes-needed-for-proper-slotting.patch
- "${FILESDIR}"/${PN}-3.1.1-0002-add-version-to-binaries-for-slotting.patch
- "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch
-)
-
-DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )
-
-src_prepare() {
- # Fix path for testsuite
- sed -e "s:/var/tmp/:${T}:" \
- -i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests"
-
- cmake_src_prepare
-
- mv "${S}"/cmake/${MY_PN}.pc.in "${S}"/cmake/${MY_P}.pc.in || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=$(usex !static-libs)
- -DBUILD_TESTING=$(usex test)
- -DDOCS=$(usex doc)
- -DOPENEXR_BUILD_TOOLS=$(usex utils)
- -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
- -DOPENEXR_ENABLE_THREADING=$(usex threads)
- -DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
- -DOPENEXR_INSTALL_PKG_CONFIG=ON
- -DOPENEXR_INSTALL_TOOLS=$(usex utils)
- -DOPENEXR_OUTPUT_SUBDIR="${MY_P}"
- -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy
- )
-
- use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON )
-
- cmake_src_configure
-}
-
-src_install() {
- use examples && docompress -x /usr/share/doc/${PF}/examples
- cmake_src_install
-
- newenvd - 99${PN}3 <<-EOF
- LDPATH=/usr/$(get_libdir)/${MY_P}
- EOF
-}
diff --git a/media-libs/openexr/openexr-3.1.3.ebuild b/media-libs/openexr/openexr-3.1.3.ebuild
deleted file mode 100644
index afd43341887c..000000000000
--- a/media-libs/openexr/openexr-3.1.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PN=OpenEXR
-MY_PV=$(ver_cut 1)
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3/30" # based on SONAME
-# -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/imath-3.1.0:=
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? ( dev-python/breathe )
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.1-0001-changes-needed-for-proper-slotting.patch
- "${FILESDIR}"/${PN}-3.1.1-0002-add-version-to-binaries-for-slotting.patch
- "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch
-)
-
-DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )
-
-src_prepare() {
- # Fix path for testsuite
- sed -e "s:/var/tmp/:${T}:" \
- -i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests"
-
- cmake_src_prepare
-
- mv "${S}"/cmake/${MY_PN}.pc.in "${S}"/cmake/${MY_P}.pc.in || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=$(usex !static-libs)
- -DBUILD_TESTING=$(usex test)
- -DDOCS=$(usex doc)
- -DOPENEXR_BUILD_TOOLS=$(usex utils)
- -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
- -DOPENEXR_ENABLE_THREADING=$(usex threads)
- -DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
- -DOPENEXR_INSTALL_PKG_CONFIG=ON
- -DOPENEXR_INSTALL_TOOLS=$(usex utils)
- -DOPENEXR_OUTPUT_SUBDIR="${MY_P}"
- -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy
- )
-
- use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON )
-
- cmake_src_configure
-}
-
-src_install() {
- use examples && docompress -x /usr/share/doc/${PF}/examples
- cmake_src_install
-
- newenvd - 99${PN}3 <<-EOF
- LDPATH=/usr/$(get_libdir)/${MY_P}
- EOF
-}
diff --git a/media-libs/openexr/openexr-3.1.4.ebuild b/media-libs/openexr/openexr-3.1.4.ebuild
deleted file mode 100644
index de5d41a68c51..000000000000
--- a/media-libs/openexr/openexr-3.1.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PN=OpenEXR
-MY_PV=$(ver_cut 1)
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3/30" # based on SONAME
-# -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/imath-3.1.0:=
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? ( dev-python/breathe )
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.1-0001-changes-needed-for-proper-slotting.patch
- "${FILESDIR}"/${PN}-3.1.1-0002-add-version-to-binaries-for-slotting.patch
- "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch
-)
-
-DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )
-
-src_prepare() {
- # Fix path for testsuite
- sed -e "s:/var/tmp/:${T}:" \
- -i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests"
-
- cmake_src_prepare
-
- mv "${S}"/cmake/${MY_PN}.pc.in "${S}"/cmake/${MY_P}.pc.in || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=$(usex !static-libs)
- -DBUILD_TESTING=$(usex test)
- -DDOCS=$(usex doc)
- -DOPENEXR_BUILD_TOOLS=$(usex utils)
- -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
- -DOPENEXR_ENABLE_THREADING=$(usex threads)
- -DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
- -DOPENEXR_INSTALL_PKG_CONFIG=ON
- -DOPENEXR_INSTALL_TOOLS=$(usex utils)
- -DOPENEXR_OUTPUT_SUBDIR="${MY_P}"
- -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy
- )
-
- use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON )
-
- cmake_src_configure
-}
-
-src_install() {
- use examples && docompress -x /usr/share/doc/${PF}/examples
- cmake_src_install
-
- newenvd - 99${PN}3 <<-EOF
- LDPATH=/usr/$(get_libdir)/${MY_P}
- EOF
-}
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 6ce67e41494b..1275c535b354 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,14 +1,11 @@
DIST openimageio-2.2.18.0.tar.gz 29246567 BLAKE2B cb7297028b39b1616962b94aff61f0240b88beeae216c6e39f450cb860660b2c844393a759302dfd325ba95336e06944ad72acfb0e87aa2b1cadfe658bd6bdaa SHA512 22a61e8b1ca098c2293e972372d02f0ac8ce54b46eb957b1ffcacb9e0ca4ff13f560d67804e0db0a898d8bec2fdb73f3cdcd1ee1867f92f97f84c1c111e535be
DIST openimageio-2.2.19.0.tar.gz 29252399 BLAKE2B f90b330944885271e117a01235a48f11e88960f5825d0c84e6e2c994479e76a26bf90e66afec4aae6a5c7164510963027bef79fe0265676ce0993235824d461d SHA512 63951d958daaa4bc62fc210efaeced51affd207be21c938ecd5da70217060bb9c8197bf95813e2fddb728a641e69d2889f9445b7d16653a110e45adf3cb86541
-DIST openimageio-2.3.11.0.tar.gz 32439595 BLAKE2B 6e64284c36de87fc077e839db808d4fab0cb6ea4951639cfed21e68900782c03ef6c2e64dcae5c1bf9360ad0a838ee36396d31634ad0ddd20f8fc9f683fc9dc8 SHA512 7e973f4f1b00dfc2486d074f5fdd03aa612a650411c7440868a4846ecfda8b172be33110fce35801dfed92d80f338b989f3ee001191938c48edef5ca760eff3c
DIST openimageio-2.3.12.0.tar.gz 32452689 BLAKE2B f5fd428c597b573586a4749b56225ad3c035ab1c2122ff3e93df8e90be5796cc57978aa9fc5b102f2cf64d2407e70a11683b5bbee118c9fac3536b965ed044cc SHA512 c8ec0ead8396717b218d937b9193ef9162c68446f6f1d477f3f0ee4b5656c3d7d53b58bf55aa300fbf57d367a47d795861b5683157e0d0271e0ea56f0460c58d
DIST openimageio-2.3.13.0.tar.gz 32456755 BLAKE2B 897a7db0eabb9a7cc29ab8fea368c32fc70b63b5ecebbcfa8d1fffe55c2435d9638f8a1f69069c45fad3723a2b7dc40e83971f48892afc631a7593a7629fb92a SHA512 fbefa341a11fd502ec9313ca48a0fe433c5822699e4934f6a14089f670314cbe1c9c0b9a491b1d1927bda0223e38a62192c6ddeec6c4c5e6215a8b3fb6900dd8
DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f
DIST openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz 137513393 BLAKE2B ebde02d57daaa58c08c7aab2251c39eefd5b736e1cc4a6d28603d8ee52b7828fa7529c9616207b8b0bcb04d88cd4c60c6325e6f09b4f3410dd6e61c5532b04ad SHA512 840a6785779d85f5da052cb635a92c27451e464414fefd2faaf5fc7a6b78936ff05a6a960c07bb968d7c18e753053ff0f425505de54577d30620fbff9be043fb
EBUILD openimageio-2.2.18.0-r1.ebuild 4192 BLAKE2B 00a910784e52d4d50a2920641278b41a53847963d9cc0d31badea2e3a3497242f3af9fe6acec43efce043f7acd724ac8f30f475d7697cdfd73b0f39a59e09fcd SHA512 ba24aa74cbe44ab72f8f33397d0d29409d90b8c0263d4551970cb8e35bae4f28fb975414cddf35cb777597c671a8474e81f4b3157194f9c60b3df9bff265a4f8
EBUILD openimageio-2.2.19.0.ebuild 4205 BLAKE2B ef7cdd667669625a80665df60a203498603704ebdfd8b55eb9f7d4a81dbd62e94401d3e89c086d72f44ee8b82930d89714fdce4a9362925200627220df08365c SHA512 19ed3037b747b83a11ba5bb26f286545db12cb4eda9ac94ce3803f77b45ea37f87f6aa38deea87cf0ae6c955b7dcd34f13881e884254a6ae048111a2b3d5107d
-EBUILD openimageio-2.3.11.0-r2.ebuild 5138 BLAKE2B 047c02e1765c1bc1ada09fd7a7b84b2cc9ba0683634e8a8f09d31c776cde68ae82361b38816ab23b6e40fc9a81950ce47e421b5a2227cabeb617b1d8d789d56c SHA512 66b8150acb3cad204ba55b01a6353ce94c8da4bfda734b1481b003a980f925aab1fb078d1bf0371de920bf11635332ee3a657072f73cedbe2e198da4ce1a6c8a
-EBUILD openimageio-2.3.11.0.ebuild 4994 BLAKE2B bc098946528cdfc437abdcfdb18cc8c61910f7d9c32733c4d3052c6ae1d8e38eb0f59b7aebe751294980d54ac8bb70bab369ceb51a53e1c3fb40c3d50de030da SHA512 192508d42a4510817d7a2771a4391ef1c1f45e1f469e21b01a82ed2ac752a6edc978ce8e749f5a94d20eb18d935351001aa49378e7c161d3546c6f647d56eebe
EBUILD openimageio-2.3.12.0-r3.ebuild 4640 BLAKE2B 7eeca5be1bd3c8e1fc81bf0fd1116aa5448df61d8cacab682a68472171e430c3cc9e1e30640972a927f76770954b5d2491abcde1a1b552bce4695d177971386f SHA512 0bf5d25e8a636a7c1a670d4481d46258f1ed3b6bb33ad64f5203bb0d0f32abf75ab35870f54311b5c4285ef87c383ce88747806269d7659646ff97fa6ea5bd0e
EBUILD openimageio-2.3.13.0.ebuild 4642 BLAKE2B 74fa8fee521c7fc17e340b5c3932d3a119fb39a76e908a5d48654650651940f0cce2a7cdbe406da51c57e631301d105df4da59fb9c62765f0758abc6fa6eeee5 SHA512 901764f59f9482769688c5bd5fb1a18592197c6cee09889a88dd190206cd84a0028d40355fd8e46e16953ab4e055ed4ff834734283ade41c2354bafb51e2ab5a
MISC metadata.xml 820 BLAKE2B fd092484e492bc042f5cfdbb717963a12596a00514f986cddccd5b8956891c95b996ac1f5831ab2314f0ee3fbe3fa1905e7601a7b017a9a91f2f7c1aba3a9d8f SHA512 5dfc9f4ab3300f94c611822d1b1badb785cfaeab90bdadf5db5e36d1eb6eff8851123470a1863e1a137f94ea4ce286d2b67f6c3a28cb18d65bb177e1d570b7b4
diff --git a/media-libs/openimageio/openimageio-2.3.11.0-r2.ebuild b/media-libs/openimageio/openimageio-2.3.11.0-r2.ebuild
deleted file mode 100644
index 79438a824283..000000000000
--- a/media-libs/openimageio/openimageio-2.3.11.0-r2.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{8..10} )
-
-TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
-TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
-inherit cmake font python-single-r1 flag-o-matic
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" test? (
- https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
- https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
- )"
-S="${WORKDIR}/oiio-${PV}"
-
-LICENSE="BSD"
-# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
-# for changing to openexr 3 which broke ABI.
-SLOT="0/$(ver_cut 1-2).1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-X86_CPU_FEATURES=(
- aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
- avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Not quite working yet
-RESTRICT="!test? ( test ) test"
-
-BDEPEND="
- doc? (
- app-doc/doxygen
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
-"
-RDEPEND="
- >=dev-libs/boost-1.62:=
- dev-cpp/robin-map
- dev-libs/libfmt:=
- dev-libs/pugixml:=
- >=media-libs/libheif-1.7.0:=
- media-libs/libpng:0=
- >=media-libs/libwebp-0.2.1:=
- dev-libs/imath:=
- >=media-libs/opencolorio-2.1.1-r3:=
- media-libs/openexr:3=
- media-libs/tiff:0=
- sys-libs/zlib:=
- virtual/jpeg:0
- dicom? ( sci-libs/dcmtk )
- ffmpeg? ( media-video/ffmpeg:= )
- gif? ( media-libs/giflib:0= )
- jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
- opencv? ( media-libs/opencv:= )
- opengl? (
- media-libs/glew:=
- virtual/glu
- virtual/opengl
- )
- openvdb? (
- dev-cpp/tbb:=
- media-gfx/openvdb:=
- )
- ptex? ( media-libs/ptex:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pybind11[${PYTHON_USEDEP}]
- ')
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- raw? ( media-libs/libraw:= )
- truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3.11.0-imath-openexr-3.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Note: on bumps, please try again with OpenEXR 3 + ilmmath!
- # Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2
- # (because it mix and matches which version it uses; sed this to
- # make sure it'll use OpenEXR 3 if it can, but it won't.)
- # bug #821193
- #sed -i \
- # -e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \
- # src/cmake/modules/FindOpenEXR.cmake || die
-
- cmake_src_prepare
- cmake_comment_add_subdirectory src/fonts
-
- if use test ; then
- mkdir -p "${BUILD_DIR}"/testsuite || die
- mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
- mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
- fi
-}
-
-src_configure() {
- # Build with SIMD support
- local cpufeature
- local mysimd=()
- for cpufeature in "${CPU_FEATURES[@]}"; do
- use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
- done
-
- # If no CPU SIMDs were used, completely disable them
- [[ -z ${mysimd} ]] && mysimd=("0")
-
- append-cppflags -DOIIO_USING_OPENEXR_3
-
- local mycmakeargs=(
- -DVERBOSE=ON
- -DBUILD_TESTING=$(usex test)
- -DOIIO_BUILD_TESTS=$(usex test)
- -DINSTALL_FONTS=OFF
- -DBUILD_DOCS=$(usex doc)
- -DINSTALL_DOCS=$(usex doc)
- -DSTOP_ON_WARNING=OFF
- -DUSE_CCACHE=OFF
- -DUSE_DCMTK=$(usex dicom)
- -DUSE_EXTERNAL_PUGIXML=ON
- -DUSE_JPEGTURBO=ON
- -DUSE_NUKE=OFF # not in Gentoo
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_GIF=$(usex gif)
- -DUSE_OPENJPEG=$(usex jpeg2k)
- -DUSE_OPENCV=$(usex opencv)
- -DUSE_OPENGL=$(usex opengl)
- -DUSE_OPENVDB=$(usex openvdb)
- -DUSE_PTEX=$(usex ptex)
- -DUSE_PYTHON=$(usex python)
- -DUSE_QT=$(usex qt5)
- -DUSE_LIBRAW=$(usex raw)
- -DUSE_FREETYPE=$(usex truetype)
- -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
- )
- if use python; then
- mycmakeargs+=(
- -DPYTHON_VERSION=${EPYTHON#python}
- -DPYTHON_SITE_DIR=$(python_get_sitedir)
- )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- # can't use font_src_install
- # it does directory hierarchy recreation
- FONT_S=(
- "${S}/src/fonts/Droid_Sans"
- "${S}/src/fonts/Droid_Sans_Mono"
- "${S}/src/fonts/Droid_Serif"
- )
- insinto ${FONTDIR}
- for dir in "${FONT_S[@]}"; do
- doins "${dir}"/*.ttf
- done
-}
diff --git a/media-libs/openimageio/openimageio-2.3.11.0.ebuild b/media-libs/openimageio/openimageio-2.3.11.0.ebuild
deleted file mode 100644
index 9de77bbf5c52..000000000000
--- a/media-libs/openimageio/openimageio-2.3.11.0.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{8..10} )
-
-TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
-TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" test? (
- https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
- https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
- )"
-S="${WORKDIR}/oiio-${PV}"
-
-LICENSE="BSD"
-SLOT="0/2.3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-X86_CPU_FEATURES=(
- aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
- avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Not quite working yet
-RESTRICT="!test? ( test ) test"
-
-BDEPEND="
- doc? (
- app-doc/doxygen
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
-"
-# 2.3.8.0 should support OpenEXR 3 but it seems to prefer OpenEXR 2
-# when installed, so let's stick with that for now.
-RDEPEND="
- >=dev-libs/boost-1.62:=
- dev-cpp/robin-map
- dev-libs/libfmt:=
- dev-libs/pugixml:=
- >=media-libs/libheif-1.7.0:=
- media-libs/libpng:0=
- >=media-libs/libwebp-0.2.1:=
- media-libs/ilmbase:=
- media-libs/opencolorio:=
- media-libs/openexr:0=
- media-libs/tiff:0=
- sys-libs/zlib:=
- virtual/jpeg:0
- dicom? ( sci-libs/dcmtk )
- ffmpeg? ( media-video/ffmpeg:= )
- gif? ( media-libs/giflib:0= )
- jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
- opencv? ( media-libs/opencv:= )
- opengl? (
- media-libs/glew:=
- virtual/glu
- virtual/opengl
- )
- openvdb? (
- dev-cpp/tbb:=
- media-gfx/openvdb:=
- )
- ptex? ( media-libs/ptex:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pybind11[${PYTHON_USEDEP}]
- ')
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- raw? ( media-libs/libraw:= )
- truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Note: on bumps, please try again with OpenEXR 3 + ilmmath!
- # Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2
- # (because it mix and matches which version it uses; sed this to
- # make sure it'll use OpenEXR 3 if it can, but it won't.)
- # bug #821193
- sed -i \
- -e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \
- src/cmake/modules/FindOpenEXR.cmake || die
-
- cmake_src_prepare
- cmake_comment_add_subdirectory src/fonts
-
- if use test ; then
- mkdir -p "${BUILD_DIR}"/testsuite || die
- mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
- mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
- fi
-}
-
-src_configure() {
- # Build with SIMD support
- local cpufeature
- local mysimd=()
- for cpufeature in "${CPU_FEATURES[@]}"; do
- use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
- done
-
- # If no CPU SIMDs were used, completely disable them
- [[ -z ${mysimd} ]] && mysimd=("0")
-
- local mycmakeargs=(
- -DVERBOSE=ON
- -DBUILD_TESTING=$(usex test)
- -DOIIO_BUILD_TESTS=$(usex test)
- -DINSTALL_FONTS=OFF
- -DBUILD_DOCS=$(usex doc)
- -DINSTALL_DOCS=$(usex doc)
- -DSTOP_ON_WARNING=OFF
- -DUSE_CCACHE=OFF
- -DUSE_DCMTK=$(usex dicom)
- -DUSE_EXTERNAL_PUGIXML=ON
- -DUSE_JPEGTURBO=ON
- -DUSE_NUKE=OFF # not in Gentoo
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_GIF=$(usex gif)
- -DUSE_OPENJPEG=$(usex jpeg2k)
- -DUSE_OPENCV=$(usex opencv)
- -DUSE_OPENGL=$(usex opengl)
- -DUSE_OPENVDB=$(usex openvdb)
- -DUSE_PTEX=$(usex ptex)
- -DUSE_PYTHON=$(usex python)
- -DUSE_QT=$(usex qt5)
- -DUSE_LIBRAW=$(usex raw)
- -DUSE_FREETYPE=$(usex truetype)
- -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
- )
- if use python; then
- mycmakeargs+=(
- -DPYTHON_VERSION=${EPYTHON#python}
- -DPYTHON_SITE_DIR=$(python_get_sitedir)
- )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- # can't use font_src_install
- # it does directory hierarchy recreation
- FONT_S=(
- "${S}/src/fonts/Droid_Sans"
- "${S}/src/fonts/Droid_Sans_Mono"
- "${S}/src/fonts/Droid_Serif"
- )
- insinto ${FONTDIR}
- for dir in "${FONT_S[@]}"; do
- doins "${dir}"/*.ttf
- done
-}
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 90f1e6632b08..1232f93be147 100644
Binary files a/media-tv/Manifest.gz and b/media-tv/Manifest.gz differ
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 0de40943abe8..a2c45255db96 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -11,6 +11,6 @@ AUX mythtv.logrotate.d-r4 235 BLAKE2B 4f6df360f5191aaf4a2b55bd3edc7bc4aab92c46db
AUX xinitrc-r1 234 BLAKE2B 0227ea065f1c43e1b2f1583bcbc798db76e9a08d345bbd8ed8837a6ba424b187c814e3ff0d7690d2d9f7a7617f4fbcce20df926e43bc6e89aec3e352aab6de8f SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188
DIST mythtv-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56e95a86627473d52613e62f0acf3bd0c4bb37afb340ab874c222899f9d3c219ded470785d27960db9b39d784ceb SHA512 d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e
DIST mythtv-31.0_p20210731.tar.gz 102637029 BLAKE2B 0ca6124d20d428c8b9999813c819c01a97c4806fbd2f70f5b50d698c5f9c3cafd3141ee1379b2b63510705e2083109d91362c3fcc6277f58d461f2138d1604fd SHA512 e262ce91fd8a523daa772d13675ff6639f95202f66be67b2a405e9ea9204d6663128621c5142752f2a889e25cbc8be6d92b3759508767e94207326343a91f092
-EBUILD mythtv-31.0-r6.ebuild 12347 BLAKE2B 619330a3762961639f26f6899f53b15ce950a2b6e31b8345df9751be230dda076ac9f304840bcb26d5dae218228e3b05acb14653f6a440e4e593ea458bef7e49 SHA512 d8a1732e25c6fea59a7066b2ac7051021801fd6dca55b4990ed57127de5efd8589ff51622105776b4ba9131e1b85b354a952179b3be2b0783a29f11be6dd07ec
-EBUILD mythtv-31.0_p20210731-r1.ebuild 12456 BLAKE2B 96c9dab397bcdbbc3967329e98fc4a5bef837db458a45ace6f03e9eb7e3a84c981783b0dd73979baa11bd38d20635617d18be136f6d430f1d314295befef7c92 SHA512 e113f79ea739474062c570e756d7014dc493a5128d0d1497464e63abe7580dc79710797d2b99aad34406435c7dc0c6a3883c5a49ef7f83da11b9b616be2e0ee7
+EBUILD mythtv-31.0-r7.ebuild 12374 BLAKE2B 6c600b224133332d4de4fd514c24fdeac16a3d1da45fd4d9c85a7ce513df68d82454ab1f1cf2fcf472ca73360edbc9bb55bd01522e30b3630c2154b885502fdd SHA512 a6f0dc3c43434779caba73cdd4febd1d579d533607cb9b7088a3c75f6090bb9d2bdf8b6a28552b63055c42cd1f47a255b6ced79da59e4ad7b980a6f2c8a93e4a
+EBUILD mythtv-31.0_p20210731-r2.ebuild 12483 BLAKE2B 447bd3ffe16676ccd8da114e94436f359cc522a6a25334a5548e263e6fe949f6b09e5ef1ba2c95b5b42e81279a18a024c906eb5dbdb3e4ae5f6c95b93e5aa7b4 SHA512 cc3bc0bbae0dc41b56b000cd35a601ba2a3e449c7c2a546af89e004cbb6e88dcfbf165cacc2fcbc4d871dad0bbf6cd44d04bf23a90a0435aa6d15c138a298b6e
MISC metadata.xml 2239 BLAKE2B b8b2c890bec1edfdc46ed53ddfc694af63ed762996759b7dd0a03c0d743874256deb0cae4cad36f9ce28388f349a023528536f828e86e51b93ffdc50597d55d6 SHA512 1b6abf1bafa4a34cc91209b23d8b8957852f7efda3013f2868086faf3d14f28b8c9e84edc1a07f09e952723dc406c5ea8be809935f45750be7155970d165c421
diff --git a/media-tv/mythtv/mythtv-31.0-r6.ebuild b/media-tv/mythtv/mythtv-31.0-r7.ebuild
similarity index 99%
rename from media-tv/mythtv/mythtv-31.0-r6.ebuild
rename to media-tv/mythtv/mythtv-31.0-r7.ebuild
index 3c56430412b7..ff8b1ff4dbd2 100644
--- a/media-tv/mythtv/mythtv-31.0-r6.ebuild
+++ b/media-tv/mythtv/mythtv-31.0-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -48,6 +48,7 @@ RDEPEND="
media-fonts/liberation-fonts
media-fonts/tex-gyre
media-gfx/exiv2:=
+
- ktrace@yandex.ru
- Victor Kustov
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
samboy/MaraDNS
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index f241e0bca5e0..8a5a147e830a 100644
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
diff --git a/net-ftp/cmdftp/Manifest b/net-ftp/cmdftp/Manifest
index 8f5ce5246105..aa420fec38c9 100644
--- a/net-ftp/cmdftp/Manifest
+++ b/net-ftp/cmdftp/Manifest
@@ -1,3 +1,3 @@
DIST cmdftp-0.9.8.tar.gz 145985 BLAKE2B cc5869cc8c43208161886020b2a3c4df9151d48053ab3c6d4e7d0759bb47a23a687c09eda2c202ac93167f26c33a6c4ac49568f356a9fe16ef09237d499f04c8 SHA512 8c8bb670988c439838493f1c6d31e47ae01e3fd6a1521602267dc8cb8dcc6ed18605277bdbf22a06b3af61e33a676ff3f188648f54af5d0839c7039eaab6b262
-EBUILD cmdftp-0.9.8.ebuild 425 BLAKE2B 6c87d265242ba1c41c10032d14cfe69f8442583061c4571775400d80b6faf1ebc5941af454a2c8cc05733d728ed160ba689391236f7c6380645da533e897e027 SHA512 f6b3df51a0cac100c65d5f9ad0b0755046647a1b28a03e9f07b2b66d87544cf603599a1e48f7b227af4c74671d57544e219464e910c891ec0c34fe972e75ae7e
+EBUILD cmdftp-0.9.8.ebuild 432 BLAKE2B 2388cd9dbd1de899298e14e42bdc411d85dd1263ab8621839342e51306e4da2c8148eecd42ec4a8154ef0976a7339af4b63e2788ddd3f1c14d18b422832d316a SHA512 0c39f9ca2cdcc84084b1fcf9140b1747aa11c5627b614d0e210f8d51e01c57729a2916f2a7916ea39b3eeb1877aad2d7ac5b6e40add1d6b9ac25dd1d068303af
MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-ftp/cmdftp/cmdftp-0.9.8.ebuild b/net-ftp/cmdftp/cmdftp-0.9.8.ebuild
index 0e11dd145c5e..c25a8815551c 100644
--- a/net-ftp/cmdftp/cmdftp-0.9.8.ebuild
+++ b/net-ftp/cmdftp/cmdftp-0.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
DOCS=( NEWS README AUTHORS )
diff --git a/net-ftp/tnftp/Manifest b/net-ftp/tnftp/Manifest
index c2932f509d97..f0b4f6ca5bbd 100644
--- a/net-ftp/tnftp/Manifest
+++ b/net-ftp/tnftp/Manifest
@@ -1,7 +1,3 @@
-DIST tnftp-20141104.tar.gz 613180 BLAKE2B d9882b7793873abcd0cd00273a29adb2427ea5cdab822c744b02de08ccc88fb62a064ff42ceeec3ea20df68101a2ac5c8cb34bda8c9948078aab2f19f4206fab SHA512 e3d99215d36d27d3d841d946975c2a2723c6ca227cc7d9469f30dbc398f32bdd5c0922933dd12d9e822d7e85826a74619fb7712a6c5a97d1ee721c79d5728d55
-DIST tnftp-20151004.tar.gz 613482 BLAKE2B 3f63a4a57d11b4bfa871fdcac0de6cd4f20743f0e4e02c2b36d341c72dd12d45227ab813c59704b5da07cfed35f2e6e7777c9f34896960bc8f2acbb8ed46acbd SHA512 0702dc26c072599eebbe8731924452575eab93ab72245d4703497daa6e5e4a2c050b28278c0a20b4dbb86cee25949f216fc80a581ed73457a78c1616f484ed6e
DIST tnftp-20210827.tar.gz 699171 BLAKE2B fe1d4f9f972f349c18e98dbc40305c867511339cb661936fbd255c4a76d9df61f1eae7e723479ef67a96dd05886a079daa4b7367d0c8768d33bc08faa743e5e8 SHA512 9b33f48e237ff49fe3cf502635b948cf7d5e20e2f38a6a429288e3f4374099ac9fb910a9e5b88de4420f1570f6f92ec1fc7ab16f0b93dfe8c6f32d11f0fc0e47
-EBUILD tnftp-20141104.ebuild 739 BLAKE2B 3b8f4756e5389f28175a3c8aa9c18fe69da00efed9d332c980c08951b43887a1d5118ca0d26bdf7b9edaadb140e42b10693d82a911c92f5fc9ca62e3bfbcd714 SHA512 3669ebb2ab0ad5375635b2dd95bac8877c9f42d2f563d46152f8c54d43b735d70a850f049b2bed3d22f5b8d460534c95de934bf8be25eae652059a4f6fca00c9
-EBUILD tnftp-20151004.ebuild 742 BLAKE2B f5c528e41a668414456e61cc7e6e0b4fea33c806e7c0cc868e022e7c52e6e3e050940597b126d2d61b8818bf51bfbdf978311e5e2bffd2ad51a4cd0978dfa6ac SHA512 391bc2f036516de650609c25a87658ba4fb4051f8991ff8b7a6308f66db3267b9b2b4937a41de930a09c5789b0cbcd363d461bce391ed8ce215541d2b3a6792d
-EBUILD tnftp-20210827.ebuild 796 BLAKE2B 9f702085bb6f4f7cd4562f5de53b0e184093cfda21f8afe92c493fdf26b4f38a4fad5d1975555e95a97c284a874ae7580d487b1082279e3b6495238a437de2e8 SHA512 f460584d2b448e96922476b10232e717bb0d72d2ac4b019e7a9090432cd372e4bc3c89444dd59d4b203370c11aa320fdd9659f771480d54bf22e94338e86c2ae
+EBUILD tnftp-20210827.ebuild 827 BLAKE2B 11d07e0873d7539687576b4b95a301fba6257e5ebedf61b123b93ff82802a39481b84234717dfca40c00ef54daefab7f737fe1e6bc517e0488d2d08a7ff6f683 SHA512 a525852f56618fe4bc67cd72e7259a1716c4a530e848e382300d8b198b03f2105f546c4e4f44c72b45e93abd259f462c6b1e4eb75980e3a6b119392551e70e33
MISC metadata.xml 245 BLAKE2B 6458c0b0aca10d6fe15ed3c72599e6144d86236c49c69d8fa210ea09790b43658adadd645b98f3444fd2a097894c8b7da37de1728fbe0f1cb49f311e6a3968cb SHA512 abec8962af24666c9c0c3d373d94d951504906d03e83bfc474bd4906b7c45b731d4c711588ff4156bb526e6303715abbbe1afebb5537a76ce9b05393800a524b
diff --git a/net-ftp/tnftp/tnftp-20141104.ebuild b/net-ftp/tnftp/tnftp-20141104.ebuild
deleted file mode 100644
index c83cf2e1b931..000000000000
--- a/net-ftp/tnftp/tnftp-20141104.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="NetBSD FTP client with several advanced features"
-SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/${P}.tar.gz
- ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/old/${P}.tar.gz"
-HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
-
-SLOT="0"
-LICENSE="BSD-4 BSD ISC"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6 socks5"
-
-DEPEND=">=sys-libs/ncurses-5.1
- socks5? ( net-proxy/dante )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- econf \
- --enable-editcomplete \
- $(use_enable ipv6) \
- $(use_with socks5 socks)
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- dodoc ChangeLog README THANKS
-}
diff --git a/net-ftp/tnftp/tnftp-20151004.ebuild b/net-ftp/tnftp/tnftp-20151004.ebuild
deleted file mode 100644
index a6e7d8ae08d3..000000000000
--- a/net-ftp/tnftp/tnftp-20151004.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="NetBSD FTP client with several advanced features"
-SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/${P}.tar.gz
- ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/old/${P}.tar.gz"
-HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
-
-SLOT="0"
-LICENSE="BSD-4 BSD ISC"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6 socks5"
-
-DEPEND=">=sys-libs/ncurses-5.1
- socks5? ( net-proxy/dante )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- econf \
- --enable-editcomplete \
- $(use_enable ipv6) \
- $(use_with socks5 socks)
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- dodoc ChangeLog README THANKS
-}
diff --git a/net-ftp/tnftp/tnftp-20210827.ebuild b/net-ftp/tnftp/tnftp-20210827.ebuild
index bd41b125d602..0c915cffcf44 100644
--- a/net-ftp/tnftp/tnftp-20210827.ebuild
+++ b/net-ftp/tnftp/tnftp-20210827.ebuild
@@ -10,8 +10,9 @@ HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
SLOT="0"
LICENSE="BSD-4 BSD ISC"
-KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="ipv6 socks5 ssl"
+REQUIRED_USE="socks5? ( !ipv6 )"
DEPEND=">=sys-libs/ncurses-5.1
dev-libs/libedit
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index a915ef8e1718..e4d97c88b11e 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/poezio/Manifest b/net-im/poezio/Manifest
index 2ee58be60d66..10c183bde22a 100644
--- a/net-im/poezio/Manifest
+++ b/net-im/poezio/Manifest
@@ -1,5 +1,7 @@
-AUX Do-not-install-man-pages-and-files-in-usr-share-poez.patch 1171 BLAKE2B e9b4e52563be878b51556df03d63f12abc5cab1029a4ef37ee342247aa8fdbcfc6d4b92a8c87c5ec1186892e987ed899bce721a767f27e57ce1259eae67e2fa1 SHA512 25dd661bd43016381c0360b3039fdc1e0b93515869310579a7e22ea265e966ff0433ce59cc42e43192741a38e4bad52d9d0d1b7522287f74f3d6fb98d1eac6de
+AUX Do-not-install-man-pages-and-files-in-usr-share-poez.patch 1030 BLAKE2B 5ce807a6a3346a980f6fc5aa2da1d5df6f5c3cc1ea5a2743f39a64f81830387e8388cbf0791b1f21de60136f6b53cb072917b86c365c3c01460c06a4814abc0b SHA512 9b878fae63f108b54726805aa123ce6a361a67a44a02a8bdf3af3ef22e37a6770b4827ec9d83f507d3973b1c8df741cc956fba1d06e6c14a125f54c0b2028b6a
DIST poezio-0.13.1.tar.gz 632572 BLAKE2B e8d3d34c5ca8d236a5a434b4b339cab5ea7286c60db3ef5a6012d406848537b587e834b86f7b6049ee8e637a82e883b2d874134bc1f7d64106e0b0f81aab218f SHA512 6c211ef0fa2fc4bd4cce6ab896166eec6bcdc16ad9e774f4d6bf261b404c9ef68b18d934097da0e165b0cce9bd7779da520ac9c3eac30ccf8280f98ef6aa19c6
+DIST poezio-0.14.tar.gz 662379 BLAKE2B 467741d82945c084c79811d41ff85358ad236d0dcefca7e6f1f8ed5d78aa127f800d2370d624ebaf9e2eb20e1038f280c2e874694ea2b86965fe329b82c4b7d8 SHA512 6e68954a918c645592e2d2f8a265e2f2445a39e256c0525a5517e758a90cc404e066cc08d67ad0f8a3c7d6f3efd61f13a776737d110dd23df7a5f7fab54fc6b5
EBUILD poezio-0.13.1-r2.ebuild 1412 BLAKE2B cc4c82be986be3adcbdd51617585c3a4b36212332ae12f70225494b7ef564b5acf548a24c3ec0aa8cc458f0c3220ed4b71f32e6c4e238e71988c7647948c6da3 SHA512 56158c6f8958ccc150b3d2c2b46d1aa781e389647c735b1296521c8b5bcbeb6a015b44025c4eeaffa5e64870edc75b5e80336a7cc8239c54e4a6522c32d19847
-EBUILD poezio-9999.ebuild 1414 BLAKE2B 6259c3f7ce2e922c0f2f080e3800d97a0514458c8fc3dc4566fc7a55e5f1666a604006daf4db116f31734dcf04759ce4979a60cdab81d6297f31ab9313b21ec2 SHA512 e39dd8db7ca0760b18fab75003ba91a8ed0831ba4dd04d37fd58419b31ced344b1a8d6923a2faf2d0c4063f734e0310f5105193cf57fc94b8a474ef3074874d7
+EBUILD poezio-0.14.ebuild 1673 BLAKE2B 453f9cb83349950e01b0a2219b834d97dde47aeb69be2360934cb1982196a9606f6e132e49b32e5773a4df53271093c791c7d950488edd544eeda448bca0a9f6 SHA512 703ca18cb28caefc3c0010d0737fa34cb6e87a59f5aad3dae3fc5feec8696e9f66a2205df82e3b1bb0ecb32fb1a5cf8b51676e42a0ac5dcab0cb518f2994420d
+EBUILD poezio-9999.ebuild 1673 BLAKE2B eeba0a2331ae0a77c90643282a79c1a1b4ef31d24756ec7f16676a51389bd32d51f882f37b0721d591806e45f7f800ba6541d90468f6bdb98c2d2bb2874a4f8d SHA512 148c09904886410923724af0f5a6647b36fdaa0abd7aecbdfc070133f8f4041030e999ab7a78fda3dabb13dc6ea23f0d9bea1ba2873479c83513f65480bce487
MISC metadata.xml 428 BLAKE2B 5d7a1de0e7b2f64145d14f351cf7969e0176e8644a094b40dc0b041de2c0d1e90726958a59d96159a2fc38f708a2dc6b99e7445f233e9855de9d4058cc3e313a SHA512 b647074d78bb2a802a166101e53b2ac0bcba50f8504fbb563820641b26ac5f7725357d33a7f19105735a51bf3bf6adbeacefbdfd830442c4c22886c92b22c89b
diff --git a/net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch b/net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch
index 9506cdb14908..7b85ba892c43 100644
--- a/net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch
+++ b/net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch
@@ -4,12 +4,6 @@ Date: Mon, 12 Jul 2021 15:08:30 +0200
Subject: [PATCH] Do not install man pages and files in /usr/share/poezio
Signed-off-by: Florian Schmaus
----
- setup.py | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index d1dde4d2f02f..bee8e4834b81 100755
--- a/setup.py
+++ b/setup.py
@@ -156,13 +156,9 @@ setup(
@@ -26,6 +20,3 @@ index d1dde4d2f02f..bee8e4834b81 100755
+ sphinx_files_found
),
install_requires=['slixmpp>=1.6.0', 'aiodns', 'pyasn1_modules', 'pyasn1', 'typing_extensions', 'setuptools'],
---
-2.31.1
-
diff --git a/net-im/poezio/poezio-0.14.ebuild b/net-im/poezio/poezio-0.14.ebuild
new file mode 100644
index 000000000000..81e2f3ab9a0b
--- /dev/null
+++ b/net-im/poezio/poezio-0.14.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 optfeature xdg
+
+DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
+HOMEPAGE="https://poez.io/"
+LICENSE="GPL-3+"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git"
+ inherit git-r3
+
+ # We build the html documentation using sphinx.
+ BDEPEND="dev-python/sphinx"
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+RDEPEND="
+ dev-python/aiodns[${PYTHON_USEDEP}]
+ dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ >=dev-python/slixmpp-1.8.2[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+ "${FILESDIR}/Do-not-install-man-pages-and-files-in-usr-share-poez.patch"
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ default
+ # Delete unmaintained plugin which requires an excessive external dep
+ rm plugins/mpd_client.py || die
+}
+
+src_compile() {
+ distutils-r1_src_compile
+
+ if [[ -n "${EGIT_REPO_URI}" ]]; then
+ emake -C doc html
+ fi
+}
+
+# Poezio provides its own Python C extension 'poopt', which needs to be
+# correctly discovered to run the tests. See
+# https://projects.gentoo.org/python/guide/test.html#importerrors-for-c-extensions
+python_test() {
+ cd "${T}" || die
+ epytest "${S}"/test
+}
+
+src_install() {
+ distutils-r1_src_install
+
+ doman data/poezio.1 data/poezio_logs.1
+
+ if [[ -n "${EGIT_REPO_URI}" ]]; then
+ docinto html
+ dodoc -r doc/build/html/*
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ optfeature "screen autoaway support" dev-python/pyinotify
+}
diff --git a/net-im/poezio/poezio-9999.ebuild b/net-im/poezio/poezio-9999.ebuild
index 608644fde1b2..162044b8bbf3 100644
--- a/net-im/poezio/poezio-9999.ebuild
+++ b/net-im/poezio/poezio-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{7..10} )
inherit distutils-r1 optfeature xdg
DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
HOMEPAGE="https://poez.io/"
-LICENSE="ZLIB"
+LICENSE="GPL-3+"
SLOT="0"
if [[ "${PV}" == "9999" ]]; then
@@ -28,7 +28,7 @@ RDEPEND="
dev-python/aiodns[${PYTHON_USEDEP}]
dev-python/pyasn1-modules[${PYTHON_USEDEP}]
dev-python/pyasn1[${PYTHON_USEDEP}]
- >=dev-python/slixmpp-1.7.1[${PYTHON_USEDEP}]
+ >=dev-python/slixmpp-1.8.2[${PYTHON_USEDEP}]
"
PATCHES=(
@@ -51,6 +51,14 @@ src_compile() {
fi
}
+# Poezio provides its own Python C extension 'poopt', which needs to be
+# correctly discovered to run the tests. See
+# https://projects.gentoo.org/python/guide/test.html#importerrors-for-c-extensions
+python_test() {
+ cd "${T}" || die
+ epytest "${S}"/test
+}
+
src_install() {
distutils-r1_src_install
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index ffca22ccfd4a..814934e7bc36 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libomemo/Manifest b/net-libs/libomemo/Manifest
index e5463b6a456d..35d5971add81 100644
--- a/net-libs/libomemo/Manifest
+++ b/net-libs/libomemo/Manifest
@@ -1,6 +1,8 @@
AUX libomemo-0.7.1-so-symlinks.patch 1055 BLAKE2B 9dac207e32fb339f52e25571eb3381f2486f5427857dd238f619a841b01db34c9b79708119724af7d2aad2fe5f285925e3be174350f934b166dd3a4794585052 SHA512 d7bf4c51fde4de7e478e44cbc63b8f90f2d6fc357d66ac5d8e8999f03e411257a392284944164d5dfa5388a191c1aba11b8d551c611403a026f1ed0dacdfbca6
DIST libomemo-0.7.1.tar.gz 23770 BLAKE2B a3909650e399075f62026bd048a667a276a6cd7197ac18ddf9e3c12f57e5fd9cb2f5532ba69d0836af87e1415a5ffdc1746cf90a596dcf255265a64e921f039d SHA512 e5769dee4db7be246853e47e29ded9eefad2f62422951ce5dd0c1acee3bb92131c0423f09bc716be0f55fb02c747f07a6d5b2c656bdfeee0ee148252c51a1050
DIST libomemo-0.8.0.tar.gz 25743 BLAKE2B 9b13aaaa21f16425fcecf963e187c5b686986e6bb01255c78042ea64e48d2c75a06729d1ad6e6b26d62d191e7d99305b7a8f1e07078221c6d14a12f587bf0743 SHA512 ff90de81928754f56bd2c6f3fcc83c13bb87d346e9bbedd6327bec33aab61a79061a709d541082723840205eb631b1a5493a43a5824e9e87e257d370692a606b
+DIST libomemo-0.8.1.tar.gz 28648 BLAKE2B b75ad298946dff680705ba0927293ea30cb8bf616a417c6584cef9f84e0894c5581462782a4b1003bf9e530695eea10bba9f37ae94e957a0008a35c862f17f62 SHA512 452c7ff9eb809de37df24bd0857c30c1e1ed1d4638c8338bb101f6d5a31be700f174f4fe65fb8ccd5358a674f8397a0eb54d8e03abfdce57cea60bcd4959f40a
EBUILD libomemo-0.7.1-r2.ebuild 1084 BLAKE2B d257336bba275514d635cede0eb7abab6fefc1e007cf4b401905be77edecd2b7da012f23d1ccf1604daeca715d83f04cbe3c884a754de6ab23929f5e551e7eae SHA512 13ac6984937e4f5281435d8992b99708fbc7115f61c22393058285d346467bd60d45bd569c38cc3c99d8163b0e1167589a1739779b8ff8e9bd57432cdd5ed260
EBUILD libomemo-0.8.0.ebuild 1035 BLAKE2B dbf36bd07e5f88bf339869dfb03362e445dde0ccc7fe14379a44c1064430c89472e469d824e583d099b6324e38482b66b9260274ccf25bb275310d4676a21fe2 SHA512 371134fddd152dd0bdfbc25abd4c27ccc3a5b23aee302f1b44ff43df43d5e0685cd1d362655e7529036e8ca18858ae3e01e5b7089f67cde3afaf16e5df4abaae
+EBUILD libomemo-0.8.1.ebuild 575 BLAKE2B 7f67097a3c906ba27c48f2895e5946ad205cb61a87c8987d5b2ba062ad724c09cf3c3c8c077e249438c06c797850ef772278d8c027f0780e7005e1c7e4fdfdb3 SHA512 b7a230b0cb3102a3d2682a03df39433f58a41b33826867cc8023fc57c80c10d7eb99a2259d57708786767ec854bb8d1478d90dd29c3ff1f37bb8c12e31c1e61c
MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/net-libs/libomemo/libomemo-0.8.1.ebuild b/net-libs/libomemo/libomemo-0.8.1.ebuild
new file mode 100644
index 000000000000..ba4a9ee43a58
--- /dev/null
+++ b/net-libs/libomemo/libomemo-0.8.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Implementation of OMEMO (XEP-0384) in C"
+HOMEPAGE="https://github.com/gkdr/libomemo"
+SRC_URI="https://github.com/gkdr/libomemo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-db/sqlite
+ dev-libs/glib
+ dev-libs/libgcrypt
+ dev-libs/mxml
+ "
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ test? ( dev-util/cmocka )
+ "
+
+RESTRICT="!test? ( test )"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c00aa10f7c11..5fa944223d2a 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/downloader-cli/Manifest b/net-misc/downloader-cli/Manifest
index 8e36239b4fac..7d176a46b908 100644
--- a/net-misc/downloader-cli/Manifest
+++ b/net-misc/downloader-cli/Manifest
@@ -1,3 +1,3 @@
DIST downloader_cli-0.3.3.tar.gz 10881 BLAKE2B 489e49d679be3570ee348ec73091cc3458953d4b37c552a9a417af2421e9c032624214300418ff8c93decda6bad7622e6208a08dc216f40d1195f849dc11d0d3 SHA512 4210cc3c09f4c9d07c3ea7335b6ea356393f539ef26e3a231b3278359e853165b8145c1f6186b657e2cee02b515748f7ffc87966cc30e082b0d2b282b9557c72
EBUILD downloader-cli-0.3.3.ebuild 504 BLAKE2B e2cad4ad0b06078e0bed492ea279b206688090d75f3eec3c53c477587e22d1802bfd377c9f19b9cd595fe828c7976bd2a99b424555fe777e1895feba9534d269 SHA512 e50e84f2b5c14502eaa695830218ec281ea4162f0342b6bfae21642dfbe1ed59d149ecc7b485163ee00cc94426ef2804e7e29c629191622361b43f2add19f58d
-MISC metadata.xml 423 BLAKE2B edb59675dce904aa2808cb3986d28d5f57347937438107f608379e33a48a3432495c3f230d562345431e5cd47da045cae3f83f29a6b7ce582786df698210d0d0 SHA512 463af333a9bc72c5b0e98fe0b42703eafe565a6744ed24be935c91830285754513f0ce05ad6abe953d34c81521fabbb04f41564d78be26268c022671fdced58c
+MISC metadata.xml 477 BLAKE2B 4b2e74ef3c28a676745976feecdc1f6f0d341ce223b1d92a25a44eb0bf81d3f3d091145f7fef901dc49b6f8d157419408b1e203965c294b48a42be40853113ae SHA512 92893a29b67aabc13badbf69f3ad8147faff5d65d235f487a744719a9002a968581b2a2aebe64776dcba3ddeb8ba849a72e3a96d6551a22c72a0e0866ab16a90
diff --git a/net-misc/downloader-cli/metadata.xml b/net-misc/downloader-cli/metadata.xml
index 31fd36227c7b..4b324089ce25 100644
--- a/net-misc/downloader-cli/metadata.xml
+++ b/net-misc/downloader-cli/metadata.xml
@@ -9,5 +9,6 @@
https://github.com/deepjyoti30/downloader-cli/issues/
deepjyoti30/downloader-cli
+ downloader-cli
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index fc4b22035e9b..bedcbfa0a5b4 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -5,4 +5,4 @@ EBUILD gallery-dl-1.20.5.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559
EBUILD gallery-dl-1.21.0.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559cd01ae1ea89183e9515e36d0c87926b4275dd7b2ff5fd2fa9fe4d7e75870743f9bd32b9c8aafd3915ebe7c7410c1 SHA512 c2127643d9829404d17114457dbaac1b3ca392a0c51958367fe0dd3a34e8d964589ef8835714ad7be35c0391c32f3f02409176dbe66fe6d56654e0bb889ac394
EBUILD gallery-dl-1.21.1.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559cd01ae1ea89183e9515e36d0c87926b4275dd7b2ff5fd2fa9fe4d7e75870743f9bd32b9c8aafd3915ebe7c7410c1 SHA512 c2127643d9829404d17114457dbaac1b3ca392a0c51958367fe0dd3a34e8d964589ef8835714ad7be35c0391c32f3f02409176dbe66fe6d56654e0bb889ac394
EBUILD gallery-dl-9999.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559cd01ae1ea89183e9515e36d0c87926b4275dd7b2ff5fd2fa9fe4d7e75870743f9bd32b9c8aafd3915ebe7c7410c1 SHA512 c2127643d9829404d17114457dbaac1b3ca392a0c51958367fe0dd3a34e8d964589ef8835714ad7be35c0391c32f3f02409176dbe66fe6d56654e0bb889ac394
-MISC metadata.xml 606 BLAKE2B 231314cca96ba14b3da1d9876ae9096f321ffd7803dee9c9242b87c7fad20977d9e3a8c5d0fb9060583eea95ec8726c58b9d4a4074972eabd4e6dd34bd263c94 SHA512 8401ded38af47ac11b6a11a1847e6ec5ff4609aef50ec96bca539a2d0601c53d46913decc0a03ffc757f79dc6284072ffd29e2cdab4504e7e1a91a03e006f160
+MISC metadata.xml 722 BLAKE2B d44c3a3cc18ecaceb2e112a314c63bb913448516eec1118a86a4c0e770ed6dca322d4653358bd78b0b3c0dcf10007e1c5d1033dd9d5996f6d6f3dc5659280f74 SHA512 7a95345138c738aec445af215a3381308a40bcc1475d2718880cc124795237bff6bbc4312e63b5a135815b17b37b1b130da90b81b895c16f3f86de4b51fd3f40
diff --git a/net-misc/gallery-dl/metadata.xml b/net-misc/gallery-dl/metadata.xml
index fb14489e739b..a84cb7bedb41 100644
--- a/net-misc/gallery-dl/metadata.xml
+++ b/net-misc/gallery-dl/metadata.xml
@@ -7,7 +7,9 @@
Maciej Barć
+ https://github.com/mikf/gallery-dl/issues/
mikf/gallery-dl
+ gallery-dl
gallery-dl is a command-line program to download image-galleries
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index bd9f8ba71dcc..a06f30e681cb 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,5 +1,5 @@
DIST yt-dlp-2022.3.8.2.tar.gz 2454754 BLAKE2B f07c1eb8d0e1f936298d6516e518f366558107ba9ae65f7c0b52bdcd185b27e501d0d0ffb20e923a94ce5f42c88ae335069876946c411232b9dfc1309ae796ca SHA512 bd6c105f65415e2229781bb1e859167686a5f5f6886e98f9693acc127d4f9124aa2d55f32835f82509f6ab5a82601a5d612ac608063ef9041769fa91e3539c44
DIST yt-dlp-2022.4.8.tar.gz 2257195 BLAKE2B 1d83ef14900789d0af0fc80bafcd6d80ca3162ede818d74382598161014c1a4c4450c0cdf57cdc79f3c5e2970a46004619eeffa9dfdb0d7af128bbe2a023ebf8 SHA512 b2d865682ba44dbd168cd76089105fc1d7ff2d79ba884c9626b3a4009c05f07eccaed2b8801318e89e3e197affc70aad68c1813590eef2a5148ded9c037bf0ce
EBUILD yt-dlp-2022.3.8.2.ebuild 1877 BLAKE2B b682b846467304818b83ebadee7a23701f1802a70f2e8e7a3e656dda920c2544e60fbf5b99563bc1011fda1d63c52cc311c9471d35ad5231da822c5fc4e0bc52 SHA512 27e1676e2d53594e8441570bfe0eaaf2faed67c73a430a959da43cf42e39971f592bcdd3d7d09101993511246f02c06424c547fb9b4423444f9a4ccf75d120c5
-EBUILD yt-dlp-2022.4.8.ebuild 1890 BLAKE2B c1c2230b5cfbb39ff1c2562951642826f6e35db08390e946e3f36cbb35dc7f8940a31cc87d95e1883dfea89a837109cc8c48ab6a609bcaec07ef0070da86b30c SHA512 8fc19572dbc793a41493c9b8f388f10d7a0ea63e2c37c513ed987cb4558f682bbf10040a94bc55bdc81541ed578205874eeb8fb5238637f1cf51021f3558ea3f
+EBUILD yt-dlp-2022.4.8.ebuild 1885 BLAKE2B f3f160e116976414a446feaa719a6da7bc4a046044a0e7731776322b27a1b2f999c498ff03fde4ae275fae29af08147abad25b93845700bbf63d5543ed46fc68 SHA512 805bda576fb2a811bb92820bafda501b02e2365bafdd9454957cfb0757547a769869475adb39eab666d2168ffe4151c9ad99bfb9e9539201c4dd8151d7969239
MISC metadata.xml 505 BLAKE2B 520725078c47caf245904b10aab8929bf9a9a357a70315fda67e7dd59b77cb0c1614e7de03029772288aefa76678c7c4c97c7153364552f5ebe0f951df651e9f SHA512 af72cc5782fe5ed5a6748dcd7ebe7c9393ff7a9ad6d5a1a3a8c2824d323e86f1a97036745570790898fe9a51047601f9a4d95befc0e02b8c16822b7cc94e0734
diff --git a/net-misc/yt-dlp/yt-dlp-2022.4.8.ebuild b/net-misc/yt-dlp/yt-dlp-2022.4.8.ebuild
index 21bf3acbffa4..2ffa0d03e5d3 100644
--- a/net-misc/yt-dlp/yt-dlp-2022.4.8.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2022.4.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
LICENSE="Unlicense"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-macos"
RDEPEND="
dev-python/pycryptodome[${PYTHON_USEDEP}]
diff --git a/net-misc/ytmdl/Manifest b/net-misc/ytmdl/Manifest
index 3fd9f51740f3..d4bb5aad0a6c 100644
--- a/net-misc/ytmdl/Manifest
+++ b/net-misc/ytmdl/Manifest
@@ -1,4 +1,4 @@
AUX ytmdl-2022.3.16-setup.py-beautifulsoup4.patch 236 BLAKE2B 9dcd72217ed175c09cda8417e84892f2eff00737bb5bd6b0ac62492c021200cfffa490863b0bbb9eb141f94a8d809dfc7a3788624a93cfe82c454e792a4b56f9 SHA512 196959aec3f7da3fd00f23d30c9fc4a7659ca380358dacec886972371804bed666b19e3b17dda067a8e0053f621439a0105a2dd137cfb23e9774610937353bab
DIST ytmdl-2022.3.16.tar.gz 51115 BLAKE2B 504d0d0de299c8989bb289769cd43645199a7f47b683885efc6eafde5643ed070cc66eeaf7b1c8f42d547b25f830c3bd8feb9abc0124b28d4d1900e5cf785c9d SHA512 5ad67fb981d5f3ea42d2f097cecf982f0971e824c5971aa8fbc664303f436c623ab03a9f0e31dba060b27eb7eb57b88452ba1ede9eb3385dc6acead9fa43e0d0
EBUILD ytmdl-2022.3.16.ebuild 1356 BLAKE2B e9b341e2ab404ac72e99eaa148af4a4a46a49a228d3c66a8d730bca91bdc30d15317ad094aa8999d7b4b7de220e3bc3bca656ba16a8c401f8bdb396f20591130 SHA512 fdfc127fa39e8a9e47fe16aba3ec220f8903e055db343fa8dd17064737d237492c36c7e864953cbddf8e54c6db0c5efced19fb47d1fc191f9751094d2eb1d814
-MISC metadata.xml 405 BLAKE2B 2e8fe5e8225bfeb5ef0aaae903561ffa5cff5c1b58b10795965428b6bd100d5199eb0d8af3fb690bab5c71a0fb422480a4bcea68e03aa46c26109a05c04eaa77 SHA512 1bfeef632124aaffcc9f08527b701538c7f3dafe4eb8a10b5ebdf4ea4a1ae4899075b2a9ff9e8c298007e3e20f24a8d7f543bf2485ce5a27e5d396d2c69ebf30
+MISC metadata.xml 450 BLAKE2B 9901cfebf346a8874315680cdef3ff19d49a84a812358aa122b99645ccde78f8c3b3ea42b1d16bdfcf9f670a694ebcbd9ce50cbcaefcef11c97eeee85264b442 SHA512 32a761ea39aaf5654523a09bfd5bfc6f4052cd35248439bb46175409085cb13b5fbb0097269785ae11df5701fa785ee564d756af5b00b4ab8112cdf3381f45e3
diff --git a/net-misc/ytmdl/metadata.xml b/net-misc/ytmdl/metadata.xml
index d985beeda195..13eb5cd029c2 100644
--- a/net-misc/ytmdl/metadata.xml
+++ b/net-misc/ytmdl/metadata.xml
@@ -9,5 +9,6 @@
https://github.com/deepjyoti30/ytmdl/issues/
deepjyoti30/ytmdl
+ ytmdl
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 86ca25cb55b7..314953c7c261 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 7ad5654b7b59..99a9ae8ba162 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -9,7 +9,6 @@ DIST haproxy-2.2.21.tar.gz 2947789 BLAKE2B 3462f0a67070bd61266cc67d7d419dfb9e209
DIST haproxy-2.2.22.tar.gz 2949092 BLAKE2B 3dc7183f31cd0a95be516fbedab1eacae00761f8f2bee8478cd0c446f80c4f40c7012b64485bc598d124e3430611f6b9a748c68e1b6b379519af5308e3ed4c20 SHA512 4a99d196257fb3c99a1d76d6f9a714c673226821439b67f646fa04033f31af9ac8f783f5a984c143372d79d728476aa8b2b35d8a2f31b7fc86c09b8f9ad65615
DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B b45af8f62cefead1f471b0b61e9bc262dc25e0ca99898469d7702fb6e509cf2b9a9c201f8c6ecae948ef40c8fc8aec0351d8e10479752fdd5ccd66758f632799 SHA512 a4a5d449782dc2f1348d1f53ec266eef4ea4e1b0586e81730a01d818481c3a3cfb018ba1da5968d17bb6668e86017beccf7abefc563993b88a5af8cbd1da1943
DIST haproxy-2.4.15.tar.gz 3616441 BLAKE2B 425444a54e22cca8d15cb808283be3baefcd2ce56447d91bce3b4f4b7f6606e03d2eb8a242891c619cfd0fad9aba5bb84026c68d41f07cd55f083481df234899 SHA512 da6f6a4f021bfa719926f4c73dc559429357a77da2c560a4375d2edbb4f342a05548d39ce0a7e3346c305f1779e579a738d8442e8e9e01903f9c435a7b0b6d71
-DIST haproxy-2.4.4.tar.gz 3587306 BLAKE2B 983f5919b738419d616b35c1cad6aa2400b0b857160ecfac3bcdfcc14c15280283ae3f33036652a3a9b5bfff0fbb6a54912807ea7c83c828d2b5ba72274fe1a8 SHA512 a8987e8342fdbec7e48de09a4391a67e77e05493260e0e561e8c185b6457b8e1086cc45ce04ebf3365699c008dff81667490e2fe99c33c0ac3c7513df8ae025c
DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50 SHA512 95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
DIST haproxy-2.5.5.tar.gz 3821477 BLAKE2B 0680925026edf56f4369c71092c39f4ff3956a8cf04320326623b3031f719d62077acdca457a6cfd82f6bcbf510920113a0328a2d8cd4a208c3d9e49e1d431b5 SHA512 f68af2be330b0fa817f7611ff46e0d3e0cc52d024b20394a5f1eedf33e6774115ee6f35ecd82d33b9ecedea2fe5afcfa32270cee33a1f6ce1726d96cc8c0d821
EBUILD haproxy-2.0.25.ebuild 5356 BLAKE2B 3e66fd23b24ac10f251ca4c0b20b9fc7f51c55a7235ea362b22f71f9e581c36c93dcb4046cc14dcf687669eb64a71e221f7affd9e811cf94361e4e86754fb3bd SHA512 316ba774a164527afb0c56da9fe3433cc3c96becef081388b5756d819e0962d15a61d67388e9776ee194582a1e7dd97105ee58e194c94689047aad38b20509c1
@@ -22,7 +21,6 @@ EBUILD haproxy-2.2.22-r1.ebuild 5360 BLAKE2B d24fc1ded9025265f690e012f0faed1a820
EBUILD haproxy-2.2.9999.ebuild 5360 BLAKE2B d24fc1ded9025265f690e012f0faed1a820cd7b08b43b85617d6ccc2d6b57c05e9d14557327a6ce0fb524268d0a8784b62ac8dc582e0939225b4a7282aaf1526 SHA512 c845dd7919e180ec5fc36b90bb3c29d251cf5e679c93b926819eccac00377b676249db99288b8efa5277a6d021629208b30cad5ffc107f18651932681db21bef
EBUILD haproxy-2.4.14.ebuild 5595 BLAKE2B 2c7a17200dd15b6ef8bc59f42914e1dfe4ffd74ab8aec5c2d3d3ecd889bf253581df48455a0620e33cc0874913dc3ad77e93aef62a4472b98de927054091e286 SHA512 b69000bb71d34920f46d981750e840af9c2cb89dc42cec9c3201cfdf1e8f2bd7358fd78810d7fc6a5e1c0fc6c91688f1d427485d86a388e1d9aae36cbb0f6c7b
EBUILD haproxy-2.4.15-r1.ebuild 5597 BLAKE2B 4279dcf4971efc73c4e5b636e2d15fd4dfe754a62d1f197ce9f38e1626513df92f662e78c648a6c21c15ae623cf95b2b310b7ee61a70bee84b6822162ac60b19 SHA512 447c3ec8b502d8dbc0aa5b8134f7b0a7910b34815f2c819b1d6c1e2f480bcc2f5daf6a2f80398ddb0633f6bed34861557b4e9452cf928fa7d19a89c7691976ae
-EBUILD haproxy-2.4.4.ebuild 5593 BLAKE2B 002077766f498b95a45ebb5dca32e451635890bd2cb1ff531afa08df83e584448635070c1244ef718aa17965753ef7a11008b25a1bbd34ac36357507d57906ff SHA512 2ec3341505114a1be11c30b11d6a2c7658131393849f19e257e8cbb024a278bd656098b12b9c45a3c4c4e4aafe9edac18d39d67e288650a8b46261e039d5439f
EBUILD haproxy-2.4.9999.ebuild 5597 BLAKE2B 4279dcf4971efc73c4e5b636e2d15fd4dfe754a62d1f197ce9f38e1626513df92f662e78c648a6c21c15ae623cf95b2b310b7ee61a70bee84b6822162ac60b19 SHA512 447c3ec8b502d8dbc0aa5b8134f7b0a7910b34815f2c819b1d6c1e2f480bcc2f5daf6a2f80398ddb0633f6bed34861557b4e9452cf928fa7d19a89c7691976ae
EBUILD haproxy-2.5.4.ebuild 5595 BLAKE2B 2c7a17200dd15b6ef8bc59f42914e1dfe4ffd74ab8aec5c2d3d3ecd889bf253581df48455a0620e33cc0874913dc3ad77e93aef62a4472b98de927054091e286 SHA512 b69000bb71d34920f46d981750e840af9c2cb89dc42cec9c3201cfdf1e8f2bd7358fd78810d7fc6a5e1c0fc6c91688f1d427485d86a388e1d9aae36cbb0f6c7b
EBUILD haproxy-2.5.5-r1.ebuild 5597 BLAKE2B 4279dcf4971efc73c4e5b636e2d15fd4dfe754a62d1f197ce9f38e1626513df92f662e78c648a6c21c15ae623cf95b2b310b7ee61a70bee84b6822162ac60b19 SHA512 447c3ec8b502d8dbc0aa5b8134f7b0a7910b34815f2c819b1d6c1e2f480bcc2f5daf6a2f80398ddb0633f6bed34861557b4e9452cf928fa7d19a89c7691976ae
diff --git a/net-proxy/haproxy/haproxy-2.4.4.ebuild b/net-proxy/haproxy/haproxy-2.4.4.ebuild
deleted file mode 100644
index 08d54556db63..000000000000
--- a/net-proxy/haproxy/haproxy-2.4.4.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
- KEYWORDS="amd64 arm ~arm64 ppc x86"
-else
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
- EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
- pcre2-jit? ( pcre2 )
- pcre? ( !pcre2 )
- lua? ( ${LUA_REQUIRED_USE} )
- ?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
- crypt? ( virtual/libcrypt:= )
- pcre? (
- dev-libs/libpcre
- pcre-jit? ( dev-libs/libpcre[jit] )
- )
- pcre2? (
- dev-libs/libpcre2:=
- pcre2-jit? ( dev-libs/libpcre2:=[jit] )
- )
- ssl? (
- dev-libs/openssl:0=
- )
- systemd? ( sys-apps/systemd )
- zlib? ( sys-libs/zlib )
- lua? ( ${LUA_DEPS} )"
-RDEPEND="${DEPEND}
- acct-group/haproxy
- acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
- (( $# != 2 )) && die "${FUNCNAME}