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/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/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/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 75f5f2e0efaa..30a392c4df8a 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -1,4 +1 @@
-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
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 5b5df6d21fac..ac2ffc961d31 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,3 +1,5 @@
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
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 b21bd99ae860..eb25dcd6f82b 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,3 +1 @@
-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
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/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/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 2fb254f63dbf..f815a887e9ad 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -4,6 +4,6 @@ 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
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 d2c3f26acf14..b04cb68f33fc 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -4,6 +4,6 @@ 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
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..1cf78994a02c
--- /dev/null
+++ b/app-emacs/all-the-icons-dired/Manifest
@@ -0,0 +1 @@
+DIST all-the-icons-dired-2.0.tar.gz 61391 BLAKE2B 685213693ddf8e009565dc3dbb5b44b3b364553f07733346dfd77a261f1da46cedde11b0de5d87d6769cdca921984a445ab2e4ec79bad172fdae0c9f131f9e34 SHA512 1043f921d84da38fedd2abf140645d984bcc817cec7b1d608e8a08e4a828f8ddc4c977c28d35a67b9be3458147beb52b8364e6ffc8e1846eb10028fd53140f78
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..431b01aa7ce9
--- /dev/null
+++ b/app-emacs/all-the-icons-ibuffer/Manifest
@@ -0,0 +1 @@
+DIST all-the-icons-ibuffer-1.3.0.tar.gz 16247 BLAKE2B 43551d61aeff8f433ee087bd0361c443f95d12828fab7e8742522fd00d323430d3eb5c6205b580482df0be164dd636c151c30ddebdc36f4a2bc15117683748dd SHA512 f1fcde1cf97f02fef7b52d840296504ff621faa0fb35f530d7f20989545c5f24ba6a7762e0a76f5dca209f8e3c8b73a12c23c7f54d688680aa2b9805dcd2c8d2
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..21d798adac31
--- /dev/null
+++ b/app-emacs/all-the-icons-ivy-rich/Manifest
@@ -0,0 +1 @@
+DIST all-the-icons-ivy-rich-1.7.1.tar.gz 23806 BLAKE2B 28d85c0a4d486900b444e2aab25c6cb257d91ddb4839ab3e71dced02c7ad85e822f465d0d29404c55421c05a1e14002480f977c898a8374e4c51c66631413413 SHA512 526632f74a674bfcd6c2019649be6e305c0d817a1b29d8e5883b239cd97f8b40a63c34bc39e4f4e8ca2ff71ee3cd15e43e40827f40aa2f6579ec4c96eced40e5
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..3049ed4d9f57
--- /dev/null
+++ b/app-emacs/all-the-icons/Manifest
@@ -0,0 +1,2 @@
+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
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..53352a654391
--- /dev/null
+++ b/app-emacs/amx/Manifest
@@ -0,0 +1 @@
+DIST amx-3.4.tar.gz 33916 BLAKE2B b3b6f6d97e10dcb759bf38a812094de528aaeffd0b8fd0f1d055f67696889939a88622151123986bde42d4a1355a8a4d6cf95b286012bcb5245c1edc9b19a71c SHA512 146b8f6acbe4acca63391771fca73d22f5ce60872f4d18abc865d6cb07f4d12ea01fd59235e1e5987d33b169ea7792368b72e92f8c6409846121850efb75511f
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/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..01a00abc7179
--- /dev/null
+++ b/app-emacs/counsel/Manifest
@@ -0,0 +1 @@
+DIST swiper-0.13.4.tar.gz 245190 BLAKE2B c4da021b92fcedfec39cc60f670c97e4a421b8d4aef8183f50c4872bed835db79884cff113f58cf21dfa7ce33158218aa0cf25d72fc0081dc1c24a3b4376c60e SHA512 bf096a13f675f87af6ea68c974455896b64921ca4d7880c9ccc444aa3cea7c7e04c61be5deb2fd57d0568ff4d86f96ffcf94494b55d84d7a9f647f49b69aec9a
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..6897ccd3e95c
--- /dev/null
+++ b/app-emacs/ivy-rich/Manifest
@@ -0,0 +1 @@
+DIST ivy-rich-0.1.6_p20210409.tar.gz 606147 BLAKE2B a496ea10438dbe7c90b825b8c6874b277060d068ab8c8193a91f615c6e1719822032857b4b500346c8c40f9777bccd1554471f05cf37b7c3b1386b97d82b1b8e SHA512 cde5922829a1d53167bc2724ef10844c04c47380d380130efb04cc51efb99538e19acdea05bddbbf88e5cf9bf7da65710e85bd6287d4dbbe50d4009c8e696bd1
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..01a00abc7179
--- /dev/null
+++ b/app-emacs/ivy/Manifest
@@ -0,0 +1 @@
+DIST swiper-0.13.4.tar.gz 245190 BLAKE2B c4da021b92fcedfec39cc60f670c97e4a421b8d4aef8183f50c4872bed835db79884cff113f58cf21dfa7ce33158218aa0cf25d72fc0081dc1c24a3b4376c60e SHA512 bf096a13f675f87af6ea68c974455896b64921ca4d7880c9ccc444aa3cea7c7e04c61be5deb2fd57d0568ff4d86f96ffcf94494b55d84d7a9f647f49b69aec9a
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..01a00abc7179
--- /dev/null
+++ b/app-emacs/swiper/Manifest
@@ -0,0 +1 @@
+DIST swiper-0.13.4.tar.gz 245190 BLAKE2B c4da021b92fcedfec39cc60f670c97e4a421b8d4aef8183f50c4872bed835db79884cff113f58cf21dfa7ce33158218aa0cf25d72fc0081dc1c24a3b4376c60e SHA512 bf096a13f675f87af6ea68c974455896b64921ca4d7880c9ccc444aa3cea7c7e04c61be5deb2fd57d0568ff4d86f96ffcf94494b55d84d7a9f647f49b69aec9a
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/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/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/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/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/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 637148df657e..c250581b7256 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,2 +1 @@
-DIST gramps-5.1.4.tar.gz 17425713 BLAKE2B 9b3761906b70ed6b85112e502290013cf421669418355ed0dc54d00adbcc2af4cd74c596bacaad50cdac6457e7a3b7675d4afb7b471fd471af8b7a6adae3ad82 SHA512 f43fc250142968331db1875260577e022898cff2d1453ee6b74be760d798b75cfdf93492d8d823dbb094da2ddd96a4f249e813c603e7cd9d0585641424284734
DIST gramps-5.1.5.tar.gz 17425167 BLAKE2B f07fcb84c28f1def84c5568da6ac38a78def8657a0ee010163cb7e0899dd94ebb1c851e2c9d207fd9725754363ac7243a66f0de6e0d9708270d2d43c90485212 SHA512 8e36e8da7cfb41cc0c77881993cfc212a15bf9775dad3c8be131889b70360117e023b6837b91dad28fc03198080290a08c8089856c753246ff14c7fc3bca38be
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/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/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/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 9f6c77f7a8e7..e238f44f4387 100644
--- a/dev-perl/Tk-TableMatrix/Manifest
+++ b/dev-perl/Tk-TableMatrix/Manifest
@@ -1,2 +1 @@
-DIST Tk-TableMatrix-1.23.tar.gz 318954 BLAKE2B 9e6380cf0949aaf15861ad9a9209d7fb2cd69c3e1983f26b364aeaaa28143b00a063fc842da48c7d18ba1f9c69a60973519de07fdf91e39532b2347ddbcdd4fb SHA512 115eb2a71c3725392f2bcf5e468bc84844c8a5ad3db221205876d7de6486833a3fd4e98aa32e21f5dcf038a38f9d98721adeebb1f9cd0990359aec7d07f6f32e
DIST Tk-TableMatrix-1.26.tar.gz 410559 BLAKE2B d0a5763469b5abdd6eba92a6a3de05b1b07f7d09f851f6471d3953ef93b242e65be6bcbc00a72ff61c11a9b42b0cf10678c11efbbff91ca4cb209df9317a0874 SHA512 bd45e3c72e330de3722fe365989f6bd0bd938d72fad166c1a65a3667d07f8c10bf792742bf82a8154b43d3453a79e737788b0a4a288f318c370cc0c5fe94917f
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 5596f02b3b47..b019015d7974 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,2 +1,4 @@
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
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 da2d71c9c60d..c909e27a8844 100644
--- a/dev-php/pecl-zmq/Manifest
+++ b/dev-php/pecl-zmq/Manifest
@@ -1 +1 @@
-DIST zmq-1.1.3.tgz 82397 BLAKE2B 5c221abf614bcc33c4c69e64308508d544f790371549c421fe2fcdedd67f2e843b2b82d96f517ea9413ffedd128838725e9afc18f0d4048b270d4982571874d0 SHA512 0f03016e315a6c6a1e1d6eca1e20564834d2a924cef06af1b38693933f1e5a094c37e9c432705a64f61d95e82655f61358fc7783e7a6f06c7dd9ad84fc6f7bbc
+DIST pecl-zmq-1.1.3_p20211103.tar.gz 104608 BLAKE2B 5217c77353cf36eb10fbb4825a77e16293770b58ee92aeec3487816c713982c67e1964e3da40b152952abe7a1e2be1dab3e67f53798849bfa1a52f3c47f2884e SHA512 762ecc78fda2e94d7bec57dc329741e0a4a6442e76a8a0bb367576b961e96482f43698e36adc7c8e6a585c914e696e6a17056a1ea680caa96f69faefc604d873
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 bb54af954592..17e66aff6586 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1,2 +1,3 @@
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
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 4b5fb73d3a39..831be9648a39 100644
--- a/dev-python/ansi/Manifest
+++ b/dev-python/ansi/Manifest
@@ -1,3 +1 @@
-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
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/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/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/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 71a041cf46b4..01dc612d89fe 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,8 +1,14 @@
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
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 95a3c3c1830a..2e43bfbee7f3 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,3 +1 @@
-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
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/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/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 5d468a97cfeb..218062451e1a 100644
--- a/dev-python/fitsio/Manifest
+++ b/dev-python/fitsio/Manifest
@@ -1,2 +1 @@
-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
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/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/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 61e13c0135cf..5cd4f3495d11 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,3 +1,4 @@
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
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 c5d58cdb787e..6cd5fe3a9175 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,2 +1,3 @@
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
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 3401fe495722..11be5be2ebe5 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,4 +1,5 @@
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
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/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 2a8adda09ae7..fc9ef7acb6af 100644
--- a/dev-python/jsondiff/Manifest
+++ b/dev-python/jsondiff/Manifest
@@ -1 +1,2 @@
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
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 9913b49f2ecf..a825d572f0a9 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1 +1,2 @@
DIST jsonpointer-2.2.tar.gz 8292 BLAKE2B 837c6c8a87e0d19cbeed07769afb29fa56ddfb629f05d0f2de94f4e94af916358f71892e085c7c18b9c711ac8e604a0ff7d1fa7dfbf52836edb1a600e5ed390b SHA512 ce680e3915ea9db915095c4106e58acf7cc2148bdc67944e03e225a33b882964ed0c154fdbe8415f787c5aa5bfa007b9e1fd2a31689dcadc88b1560931ca6a6d
+DIST jsonpointer-2.3.tar.gz 9295 BLAKE2B 8a33c8ce21721b6c402a44d3d1572a767e3b7485fa1dd80baf98120c9822412841cc21e3bc2d6b7e058793ab4ade5993712c689631cb4a1237afc1d7f36e6bdf SHA512 e04da474a5ec376d1cd2c764c2d7a11ac296450df199449994cb1dedf02a49df3ae3a4e75b2963370dba1da166464602b849a79609f7a98d8246dab0b342c819
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/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/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/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 f8cb1542fffe..cc76311e5288 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,3 +1,4 @@
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
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 299d0166e621..3d4a51949a46 100644
--- a/dev-python/pdm-pep517/Manifest
+++ b/dev-python/pdm-pep517/Manifest
@@ -1,2 +1 @@
-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
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/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/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/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/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/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/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 b0b9f0bb7471..076cb42d1e8f 100644
--- a/dev-python/pyte/Manifest
+++ b/dev-python/pyte/Manifest
@@ -1 +1,2 @@
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
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 105ff77f9f34..f1d239e48ddf 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,3 +1 @@
-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
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 a3be10438c19..04449ed574f8 100644
--- a/dev-python/rcssmin/Manifest
+++ b/dev-python/rcssmin/Manifest
@@ -1,2 +1 @@
-DIST rcssmin-1.0.6.tar.gz 582894 BLAKE2B 64fcd9bd9ea96037acfcbb0edf5ddba45f0804cb1862fb60dffaa5b60a0ee2a0927fc237fd04cbf9be438a9468b54dfccb56729a6d191ee323d9ccb819857dbc SHA512 5129a6007755a5b1949256bba7ad3616a08034d7bfcf06a1f9d8143897dddc5d2f6b8a0ebde7abb2e8b12e5b1aee2e46260e59101a78f35026e15f9f6503db77
DIST rcssmin-1.1.0.tar.gz 580779 BLAKE2B 162ec087b791a4ee0c23994cea431e01f76c199c1d2118a75c9e49ebfc0d4f46fc4088126032851446acf2bd7b76b8f17095896100338636f4df8de75612f55d SHA512 9dc7fac0fef73c389baf8fc132e58599471517a2b77b13fe6bfabd30246b46bf859f7307ff1606d6634bdcdc472bdde0882fe7282018a34fba7b8fc80f6e9279
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 c6e4124e66c9..0c3af5a7d48b 100644
--- a/dev-python/sarge/Manifest
+++ b/dev-python/sarge/Manifest
@@ -1,2 +1 @@
-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
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 31a1e2d6d349..5f46d4fb7593 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -6,3 +6,4 @@ 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
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/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/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/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 f15517fc2285..3aa28c8d2a8c 100644
--- a/dev-python/sphinxcontrib-bibtex/Manifest
+++ b/dev-python/sphinxcontrib-bibtex/Manifest
@@ -1,2 +1,3 @@
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
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/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 1e820dd27853..06deed59195f 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1 +1,2 @@
DIST tempest-30.0.0.tar.gz 1110715 BLAKE2B b697ecbced21124719e6b1d7ebd2c4f8ba83528a84da0b8f8109c155b61124581b97c180bbdc6885ae53850fb28daed25772d12be5026c44ecc3fe4f0dad98a3 SHA512 fa9be713ccb130ad065628592f59bebda3dc1fa8222ab3c382ec5b299504dc0a730f2110ef80f98bbdd1288b5785ab745fe39b721b77f7343983c1bc0a036f19
+DIST tempest-30.1.0.tar.gz 1112219 BLAKE2B 864dbd01a843b9c480656788a3a673ea6c089af8bf67e66837fdb77ee46eef00f2caed3ee08722b113db45d1e39fee167dcb344676543ec82fe5f022ae8c713d SHA512 3c4469d5ab590fe2185dbe77cc1ca1179022b75b4da9f2fe0d43956b14598d56328dd4e62e8445197b25f93017c812edd75cb9fef2d81ae183aea478fd817b15
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 bb4c9d3b1e8c..48fb4950b406 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1 +1,2 @@
DIST tox-3.24.5.tar.gz 306305 BLAKE2B a6d3338d21068d9123505a29da3beec4fd5a15c263bcaf5ba62f65a253d04e11d453bef159d06e88b2cbac9a895d786d0d9444cc16cd3de7a868eac6919b82ea SHA512 4e1ef81c978977e905edbdc00ff971eb4132b9009ce21456fcebf95d8ee2c583e04e464f1db5ca6e5454f4f1ad0353ffc9df7898f6389fe8084dc5b9726ca59b
+DIST tox-3.25.0.tar.gz 307073 BLAKE2B 2dda34fc6d6518897bdc587ca6a31b92f2add463c3bcce9df3f4e511d2588dc75265b60809195c2d78a9c1b0d08d79c32811aab1e2c01934faf40019a1882042 SHA512 9c10524c5a67b32a01cb0dd4d25cc01d0641e46ca4e0c03a4c76eb8913f6038075aeb21e647a94d6b8d99c80edb7701b1c62893ebd6a20584121fdf33b9d9010
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 0cf381dc2d64..1f2f17157a06 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,3 +1,4 @@
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
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 d1d4d726f52a..687bf0c895a0 100644
--- a/dev-python/uri_template/Manifest
+++ b/dev-python/uri_template/Manifest
@@ -1 +1,2 @@
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
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 6085d7c7ebf6..16f61fec3287 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1,4 @@
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
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/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 1a181d73d22b..a424aa29bb11 100644
--- a/dev-python/youtube-search-python/Manifest
+++ b/dev-python/youtube-search-python/Manifest
@@ -1 +1,2 @@
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
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/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/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/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 1ff5f66c2547..7cb10aacbbfa 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,3 +1,2 @@
-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
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 3575ec4c426a..d43475210c20 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1 +1,2 @@
DIST pkgdev-0.1.9.tar.gz 57093 BLAKE2B 5f5d9b4956cdc949d5e37c24160c692c32cf7e5d9fe90c167adc364993370dc42291edca048db3b0a2f17b199003aea61bd6b541bc58de1c1a084365ce517660 SHA512 78c117163549cb021e8cb9bd65e9a7752633506f3db825133fc3c4c515549c6e10dc974164489c06f94c1a1e25acb8fe050a57754353b907d6026892ef034cb2
+DIST pkgdev-0.2.0.tar.gz 59836 BLAKE2B 89de7179b1365f7f4bf1359720200bc8dba53e3b3133fead12b224db8d9a6cf7accbed3c5ed89760030efd3a992d46cf525756a522ac4d9128376e4c03b2a5e9 SHA512 6bf17e8188c809e8862c1a39ce4c0c2e60ed0a261f00bf93707257df0395b03120838247bdc7f5a3375111797564a5a6b16bb8f7e571ce957efe92e173a6ed11
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 3cf3198e462d..2fd75be42f67 100644
--- a/dev-util/uglifyjs/Manifest
+++ b/dev-util/uglifyjs/Manifest
@@ -1 +1 @@
-DIST uglifyjs-3.15.3.tar.gz 511292 BLAKE2B 405112e7898c743cddf036527e9add28cd570f53a43959b514711683efca7e26bfb34fccadb7d63dcb540ed7a4a6b9aa7f3fa28faa66623b2b7c290758feb47a SHA512 c36b41dfe2bc323c189926f4caff67980be13ad14286b109e7f3a326a5e2b4fe4c7e864d2fcee91d1c0a9799ab7941f2c9d17b6c04d4b399b4ddb1f69c32f2fa
+DIST uglifyjs-3.15.4.tar.gz 512680 BLAKE2B 428d18b412a7b30fb9fd0491e0bca1f8ad0d176726885bba9afe155622860abfd2d723d11c03b2381cb500074f3c1041f7ae4d35c3f1f3b8e3713c39ee3d5069 SHA512 203d06eeda62ce0810c0188640b88ae08e567610bb0573f962341c4cd4b39ca63ce0d0fcd1e4749384afbc6f64079db6bc101eab31af95caefc1088c2e0dca59
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 eb580a622d7e..2a3c86777e57 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,3 +1,4 @@
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
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/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 7466237eb0db..dc86542310ac 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +1 @@
-DIST FlightGear-2020.3.11-data.txz 1736954520 BLAKE2B d5f3fd8facc93fab140171fad04ee0c331c4ab35c893ee762bb0b6250ee632c820e7570de57d2dfd6348fb9aaefdba209e845d00f67737b24eff17b025b30aa4 SHA512 b46193d4e9138ec58da048d9c3a36d47ae7204673fb9524f23b3d52dab02db8ef52fe8d67b7fd648222aac8585dd7e2fa5484317fdd07e07a58f3816f1378702
+DIST FlightGear-2020.3.12-data.txz 1787955196 BLAKE2B 648994bb8a70416d9fbf9fbb71c91d6652db4f915ce39938ad870f6de4a745c7f6df36025726fe29d67a598f1ce64718d12b7be5b81ebb83318246cd991fac1a SHA512 7bb97c0b2ee59b300a95f331bfd12e39aaaa7d3320e33cc4e72ea3c5fae196af52e97d9ed7f6af274162ecdd00642e729d96165df5dcbcb95e2853cf7c1df463
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 0d9ca261c9e9..50074be20454 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1 @@
-DIST flightgear-2020.3.11.tar.bz2 8926212 BLAKE2B 03b3203fb688fe842247f8ac11957f438f02154cbc992bb98076ab3dd6fcac5f3241509cc1c621f3b647487b772257763d154c756792ce8ff738ff5396fe07ef SHA512 9a7c6f262da8daf3d954df7a2a8a96e555f3212c1d949211d0dbddd08a8f7380fa8f4986d60f48e17db563154d250184ee772b79b10277a2c5819fabec3930ee
+DIST flightgear-2020.3.12.tar.bz2 8929319 BLAKE2B e84b0519d69f46d5951372deed59f9b1219739710b3374d0bc0041127f8e4b7869c43b20169a9ac3a89d4e121f9da27d01c6db98e683bc3f80da6b1930e1a7c0 SHA512 91e04ae6dc5d12e799bab10b3c4321e77f8d995469453453fdff26a9858f40056dbe8c095423397fcbef307994042c377eb37532af2732674f39e5624c950e9c
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/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/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/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 c9f1d27c94bf..6032d6480e4d 100644
--- a/gui-apps/nm-tray/Manifest
+++ b/gui-apps/nm-tray/Manifest
@@ -1 +1,2 @@
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
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/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/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/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/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/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/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/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 ea9445536baa..39b88ea65170 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,4 +1,2 @@
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
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 4338636531c0..507d4d6de120 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,6 +1,5 @@
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
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/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/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 3344a3b8d452..0ee664f58d93 100644
--- a/net-ftp/tnftp/Manifest
+++ b/net-ftp/tnftp/Manifest
@@ -1,3 +1 @@
-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
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 8c63c9fa1b81..02b8eba1a8a6 100644
--- a/net-im/poezio/Manifest
+++ b/net-im/poezio/Manifest
@@ -1 +1,2 @@
DIST poezio-0.13.1.tar.gz 632572 BLAKE2B e8d3d34c5ca8d236a5a434b4b339cab5ea7286c60db3ef5a6012d406848537b587e834b86f7b6049ee8e637a82e883b2d874134bc1f7d64106e0b0f81aab218f SHA512 6c211ef0fa2fc4bd4cce6ab896166eec6bcdc16ad9e774f4d6bf261b404c9ef68b18d934097da0e165b0cce9bd7779da520ac9c3eac30ccf8280f98ef6aa19c6
+DIST poezio-0.14.tar.gz 662379 BLAKE2B 467741d82945c084c79811d41ff85358ad236d0dcefca7e6f1f8ed5d78aa127f800d2370d624ebaf9e2eb20e1038f280c2e874694ea2b86965fe329b82c4b7d8 SHA512 6e68954a918c645592e2d2f8a265e2f2445a39e256c0525a5517e758a90cc404e066cc08d67ad0f8a3c7d6f3efd61f13a776737d110dd23df7a5f7fab54fc6b5
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 708dbeb43cff..5ca884943e14 100644
--- a/net-libs/libomemo/Manifest
+++ b/net-libs/libomemo/Manifest
@@ -1,2 +1,3 @@
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
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/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/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/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/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 eebce2291fff..293f553dfde3 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -6,6 +6,5 @@ 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
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}