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 - + Install Qt5 hex editor 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 - + Enables bluetooth support Enables curl support diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz index 52b26fc00962..8b451d3a2fff 100644 Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ diff --git a/dev-db/sqlcipher/Manifest b/dev-db/sqlcipher/Manifest index 713b2b37b7c8..17520fbdaba4 100644 --- a/dev-db/sqlcipher/Manifest +++ b/dev-db/sqlcipher/Manifest @@ -1,2 +1 @@ -DIST sqlcipher-4.0.1.tar.gz 17006324 BLAKE2B 44e8eb4e1230c3625b4fe1b4af608cd8edc25f3c6adf7e11450c8f9ddb7970fea92ff0823f3a1e631d1b0acfbab6cf078c80e4645c535d66de57f1d73b55ff47 SHA512 0fb48326860a10e9849b2f56fae0c310deae124c7203b54d51f92d346782be795d505c29eafbdfb7206f5e7be54c0f7228fe50c45bd9d2b23cca976b263264fc DIST sqlcipher-4.5.1.tar.gz 18132121 BLAKE2B 233ffbd9636eae78533553325f08fa3ceb1e01ce0d809be44ca8ed64d46478d6a70dd40f81c38a1f0524986932ebe8614e52fda9dfc1c2f20134692cac7d4b16 SHA512 157ab90e1b80ae9ae85c68c6b77008fe8ab5b526cbb2604297a5ba54279286b4cac1fecd0db552e0113a75ff61a198f649611b8bde4dec5156c443e7b7fbe0c3 diff --git a/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild b/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild deleted file mode 100644 index 9751b1c88489..000000000000 --- a/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic multilib-minimal - -DESCRIPTION="Full Database Encryption for SQLite" -HOMEPAGE="https://www.zetetic.net/sqlcipher/" -SRC_URI="https://github.com/sqlcipher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="debug libedit readline static-libs tcl test" - -# Tcl is always needed by buildsystem -RDEPEND=" - libedit? ( dev-libs/libedit[${MULTILIB_USEDEP}] ) - dev-libs/openssl:0=[${MULTILIB_USEDEP}] - readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) - tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - dev-lang/tcl:*" - -# Libedit and readline support are mutually exclusive -# Testsuite requires compilation with TCL, bug #582584 -REQUIRED_USE=" - libedit? ( !readline ) - test? ( tcl ) -" - -DOCS=( README.md ) - -# Testsuite fails, bug #692310 -RESTRICT="test" - -src_prepare() { - # Column metadata added due to bug #670346 - append-cflags -DSQLITE_HAS_CODEC -DSQLITE_ENABLE_COLUMN_METADATA - - default - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - --enable-fts3 \ - --enable-fts4 \ - --enable-fts5 \ - --enable-geopoly \ - --enable-json1 \ - --enable-memsys5 \ - --enable-rtree \ - --enable-session \ - --enable-tempstore \ - $(use_enable debug) \ - $(use_enable libedit editline) \ - $(use_enable readline) \ - $(use_enable static-libs static) \ - $(use_enable tcl) -} - -multilib_src_install_all() { - find "${D}" -name '*.la' -type f -delete || die - einstalldocs -} diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz index 3f2df05b9124..88ba981a39e9 100644 Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ diff --git a/dev-embedded/ponyprog/metadata.xml b/dev-embedded/ponyprog/metadata.xml index 9f9c91c43622..039abd0b4f50 100644 --- a/dev-embedded/ponyprog/metadata.xml +++ b/dev-embedded/ponyprog/metadata.xml @@ -5,14 +5,6 @@ embedded@gentoo.org Embedded Gentoo - - ktrace@yandex.ru - Victor Kustov - - - proxy-maint@gentoo.org - Proxy Maintainers - lancos/ponyprog ponyprog diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz index 0e45dfa32480..1cde6ea568cd 100644 Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest index e7fd9ec900ce..f1368969e3dd 100644 --- a/dev-games/simgear/Manifest +++ b/dev-games/simgear/Manifest @@ -1 +1 @@ -DIST simgear-2020.3.11.tar.bz2 1415047 BLAKE2B f41391d6d018e7c5bc00897fdbd7ce431b02b0e925a62a2ec8f09a217a79efc3d2a20f247b61c8164f0d154b1202620bd68e76847acfba0c41bdb0b56f284d30 SHA512 e7b7c73a574012f9ee33cc751eca9dc968339d0f8f5ec005386ed6863d96af6d17423dd68eb5180f1c6bf3b05a422de10ce03ea5e745029445edac7919fc1c99 +DIST simgear-2020.3.12.tar.bz2 1415062 BLAKE2B bed00dabb8d2ac937cb2fa7a8782c32568dc106d857dd2e9a7f3d2c99ad1372ffcd3c571b899920122e711ce1e561a9895762fb199f1cac947bb68769066b555 SHA512 2292c5c43b485fdf4b814b25eae8caa2ed16e043a159328aa5e35a27f9a4fd250219e8b506da1361916bd1d314bb857d3bd1343b1b6b34890bf06c63705c8dbc diff --git a/dev-games/simgear/simgear-2020.3.11.ebuild b/dev-games/simgear/simgear-2020.3.12.ebuild similarity index 100% rename from dev-games/simgear/simgear-2020.3.11.ebuild rename to dev-games/simgear/simgear-2020.3.12.ebuild diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index 1a162bf6064e..80b5e98a336a 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/antlr-runtime/Manifest b/dev-java/antlr-runtime/Manifest index 9315d8cda071..f03a9fd655f6 100644 --- a/dev-java/antlr-runtime/Manifest +++ b/dev-java/antlr-runtime/Manifest @@ -1,2 +1,3 @@ DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127 DIST antlr-runtime-3.5.2-sources.jar 206095 BLAKE2B 62b5ca08b13b80e1cdfe82d7354f75dcd3d82d7618bb2d20c4973c0b588d60cc034a8bc265d1cba6b3fc09f5583450a48948dc0beb86c4b13c6b9fdb32de37fd SHA512 fda8b0b1d6f779098c885360ea5f5e93eac5153f5bf761f3dbc954209b69b76edd21a8e4915bb9e567e5c095f1d173e19429bea34da9698bf241d17599858847 +DIST antlr-runtime-3.5.3-sources.jar 204572 BLAKE2B 8f4493497cbfef613028d4847d1a68a0fdd29f5bf80c3a72b33093aa048409fb740aa95e16e7ceb279b939fabf3a617ccc8046ef6b879eafdb4ae14599951799 SHA512 fbfb656b32aa40ce731996774c9a5df28e2dbf67d097a834b39ef137555ff618c26a881af599191fb75366dc3824e281e93a32dbed65d49cc39e2017d836ae95 diff --git a/dev-java/antlr-runtime/antlr-runtime-3.5.3.ebuild b/dev-java/antlr-runtime/antlr-runtime-3.5.3.ebuild new file mode 100644 index 000000000000..7d9d8d21d52c --- /dev/null +++ b/dev-java/antlr-runtime/antlr-runtime-3.5.3.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom antlr-runtime-3.5.3.pom --download-uri https://repo1.maven.org/maven2/org/antlr/antlr-runtime/3.5.3/antlr-runtime-3.5.3-sources.jar --slot 3.5 --keywords "~amd64 ~arm ~arm64~ppc64 ~x86" --ebuild antlr-runtime-3.5.3.ebuild + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.antlr:antlr-runtime:3.5.3" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="ANTLR 3 Runtime" +HOMEPAGE="https://www.antlr3.org/" +SRC_URI="https://repo1.maven.org/maven2/org/antlr/${PN}/${PV}/${P}-sources.jar" + +LICENSE="BSD" +SLOT="3.5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +# Common dependencies +# POM: ${P}.pom +# org.antlr:stringtemplate:3.2.1 -> >=dev-java/stringtemplate-3.2.1:0 + +CP_DEPEND=" + >=dev-java/stringtemplate-3.2.1:0 +" + +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:*" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +BDEPEND="app-arch/unzip" + +S="${WORKDIR}" diff --git a/dev-java/antlr-tool/Manifest b/dev-java/antlr-tool/Manifest index 165df95f41e4..1a983d2d2972 100644 --- a/dev-java/antlr-tool/Manifest +++ b/dev-java/antlr-tool/Manifest @@ -1,4 +1,6 @@ DIST antlr-3.5.2.tar.gz 6927126 BLAKE2B 1907229549434dfea6ef1fa915137a2f733bd61f0a40aacb131689df619d1c92e125453ec3d1febc5d92da1841ffbde060af196cff1ca8fb6f4684600375e161 SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99 +DIST antlr-3.5.3.tar.gz 6752328 BLAKE2B 8ebd098c9475122cddcadd5991b9f882b7fda5868ad979b29c9f4dab97e39cd31e7fc943476c3a854f3e3aee9c1c56384b7fcc893f87548482af5d5d0839fd30 SHA512 c565e1ade7a62bb127df707015afded9a9cea54cbf5488730a327671c57e8718f93f76c4fa28edd856810cb9c7ccbcb27b53a7c8f7e3efc8169e64cfcc535a4c DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127 DIST antlr-tool-3.5.2-sources.jar 957096 BLAKE2B 39b75824e129c8111f302eb71407a683c59e91e79a3fa13c5386c4ba4aa322e706deb10b36df3591ab0843faff5702091d543272ee85d63cd92cb36cc72e1ceb SHA512 50fece361b69299be0c0941e6fe2bfacfc39c0b3dad3320126a9a80cd0f053fbaa6332612e2bab2872db122025d6abfe4b35a4636ef1c101e9131bbd2cdf5e28 +DIST antlr-tool-3.5.3-sources.jar 949247 BLAKE2B f7afa52faae8324093206b7e56dfda58a79815cc2c13baca1cb93b3424c8b310325885ca8c86f0ca8a016a73e30740c2fa5f34ce71ed3a6cfc5fdeb6f2c4a9a7 SHA512 cfbc612c0257c4f0e09451cd76fe904680b6af132596696f2ef9c4e21dcfc53d53501e4d4d2b1c1cf4391355fa3766cf8dabc718dc3580728d24db3ebc14e696 DIST antlr-tool-4.9.3-sources.jar 961749 BLAKE2B 294c7ba6dff9a1039d3e570d7d49f46a564302d1e7a25ac9f662a2c293cbabadd6a5a4a94d026c4e5fcca37c407e104956badbd1cbbf71b957e464dc67cf823e SHA512 7d70e80714b673eb8301def5e66a7133b2ac477e3cc219e37877ef9df673e0599a1148a8c1929ca8eab081d4e7375c9079241765a1f38832b21cfe8608ef4429 diff --git a/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild b/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild new file mode 100644 index 000000000000..622181ef1f45 --- /dev/null +++ b/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Artifact ID for antlr-tool is 'antlr' +# https://github.com/antlr/antlr3/blob/3.5.3/tool/pom.xml#L4 +MAVEN_ID="org.antlr:antlr:3.5.3" + +JAVA_PKG_IUSE="doc source test" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +MY_PN="${PN%-tool}" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="The ANTLR 3 tool" +HOMEPAGE="https://www.antlr3.org/" +# Maven Central sources JAR for *.java sources pre-generated from *.g files; +# the source generation requires this package itself. +# Tarball for resources, the test suite, and DOCS files +SRC_URI=" + https://repo1.maven.org/maven2/org/antlr/antlr/${PV}/${MY_P}-sources.jar -> ${P}-sources.jar + https://github.com/antlr/antlr3/archive/${PV}.tar.gz -> ${MY_P}.tar.gz +" + +LICENSE="BSD" +SLOT="3.5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +CP_DEPEND=" + ~dev-java/antlr-runtime-${PV}:${SLOT} + dev-java/stringtemplate:4 +" + +BDEPEND=" + app-arch/unzip +" + +DEPEND=" + >=virtual/jdk-1.8:* + ${CP_DEPEND} +" + +RDEPEND=" + >=virtual/jre-1.8:* + ${CP_DEPEND} +" + +S="${WORKDIR}" +TARBALL_S="${S}/${MY_PN}3-${PV}" + +JAVA_SRC_DIR="org" +JAVA_RESOURCE_DIRS=( "${TARBALL_S}/tool/src/main/resources" ) + +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="${TARBALL_S}/tool/src/test/java" + +DOCS=( "${TARBALL_S}/tool/CHANGES.txt" ) + +src_prepare() { + java-pkg_clean + java-pkg-2_src_prepare + + # Some tests fail under Java 8 in ways that probably aren't limited + # to the tests. This is bad but upstream is never going to update + # 3.5. At the time of writing, we only use it to build 4 anyway. + rm -v "${JAVA_TEST_SRC_DIR}/org/antlr/test/"Test{DFAConversion,SemanticPredicates,TopologicalSort}.java || die +} + +src_install() { + java-pkg-simple_src_install + einstalldocs # https://bugs.gentoo.org/789582 +} diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest index 1de9662c4657..49def7a90a7c 100644 --- a/dev-java/antlr/Manifest +++ b/dev-java/antlr/Manifest @@ -2,4 +2,5 @@ DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34 DIST antlr-3.2.jar 1928009 BLAKE2B 9c56b0142abdb7d0caabebbae12618a665f91001e2f472519549a65b8601b81fcca485898c7420087a7b631351eb26e4b98589d7284960efcc3c65155919fd2a SHA512 25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6 DIST antlr-3.2.tar.gz 837320 BLAKE2B 3addcfed45e67a7f8f3841a890be418626d93229dc326fe4670c6b145a457203a26f01723695573692c65bb6c376349a8d8cd852b339b1f6da7b71a52e14bb4f SHA512 8984221cd89253c033a4596dd56cd51b297393a53b4682f5ab401172745d343371bf0d45417fa286ce972add1b4e474f1f3091fa1345158dbfc040702d61607c DIST antlr-3.5.2.tar.gz 6927126 BLAKE2B 1907229549434dfea6ef1fa915137a2f733bd61f0a40aacb131689df619d1c92e125453ec3d1febc5d92da1841ffbde060af196cff1ca8fb6f4684600375e161 SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99 +DIST antlr-3.5.3.tar.gz 6752328 BLAKE2B 8ebd098c9475122cddcadd5991b9f882b7fda5868ad979b29c9f4dab97e39cd31e7fc943476c3a854f3e3aee9c1c56384b7fcc893f87548482af5d5d0839fd30 SHA512 c565e1ade7a62bb127df707015afded9a9cea54cbf5488730a327671c57e8718f93f76c4fa28edd856810cb9c7ccbcb27b53a7c8f7e3efc8169e64cfcc535a4c DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127 diff --git a/dev-java/antlr/antlr-3.5.3.ebuild b/dev-java/antlr/antlr-3.5.3.ebuild new file mode 100644 index 000000000000..41ea8dc96c2b --- /dev/null +++ b/dev-java/antlr/antlr-3.5.3.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-pkg-2 + +DESCRIPTION="A parser generator for many languages" +HOMEPAGE="https://www.antlr3.org/" +# Reuse tarball for DOCS +SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="3.5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +CP_DEPEND=" + ~dev-java/antlr-runtime-${PV}:${SLOT} + ~dev-java/antlr-tool-${PV}:${SLOT} +" + +DEPEND=" + >=virtual/jdk-1.8:* + ${CP_DEPEND} +" + +RDEPEND=" + >=virtual/jre-1.8:* + ${CP_DEPEND} +" + +S="${WORKDIR}/${PN}3-${PV}" + +DOCS=( contributors.txt README.txt ) + +src_compile() { + : +} + +src_install() { + java-pkg_regjar "$(java-pkg_getjar "antlr-runtime-${SLOT}" antlr-runtime.jar)" + java-pkg_regjar "$(java-pkg_getjar "antlr-tool-${SLOT}" antlr-tool.jar)" + + java-pkg_dolauncher "${PN}${SLOT}" --main org.antlr.Tool + einstalldocs # https://bugs.gentoo.org/789582 +} + +pkg_postinst() { + # If upgrading from a version of this slot that installs JARs, + # display a message about submodule split + local changed_ver="3.5.2-r2" + local should_show_msg + for replaced_ver in ${REPLACING_VERSIONS}; do + if ver_test "${replaced_ver}" -lt "${changed_ver}"; then + should_show_msg=1 + break + fi + done + [[ "${should_show_msg}" ]] || return + elog "Since version ${changed_ver}, ${PN}-${SLOT} no longer installs JARs." + elog "Please find the JARs from files installed by submodule packages" + elog "antlr-runtime-${SLOT} and antlr-tool-${SLOT}." +} diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 8bca50b2a454..469a4f9c834f 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/liberasurecode/Manifest b/dev-libs/liberasurecode/Manifest index 3fc48722cd31..2ebfb88f4d2d 100644 --- a/dev-libs/liberasurecode/Manifest +++ b/dev-libs/liberasurecode/Manifest @@ -1 +1,2 @@ DIST liberasurecode-1.6.2.tar.gz 210331 BLAKE2B 174141a26872ce1cb57feaeed071f8b0740810a73ec4683e2661f908fc0d58264a01ed87e7a71185f0607cbd23ebfe0141154e082dd96478712f776b764a2631 SHA512 027def96275eac67b32b2e3e7144f3042acbcafe5b27b353eb5944e73b55d34931a11324018f131b2acb381007cc79e31a5afd7390fdc517ed30ee592d6f90d5 +DIST liberasurecode-1.6.3.tar.gz 210599 BLAKE2B d0e9ec0a28d99e109d7dd130283bf986d3fb2f2b0960567ca91b1380ce9c2a12eb14dee683cb2f994f5b3b4820b449c65f5b206f123101b4c2ed7f8910a44627 SHA512 d5daa962324ef19fd195cfa842ec375d9dd5e62e3391b4a1cbf49a850b852b18cfc9be929ab18786d6b839139f6260d5cb4c88a0ba440c06b0e54e04ffb1bee1 diff --git a/dev-libs/liberasurecode/liberasurecode-1.6.3.ebuild b/dev-libs/liberasurecode/liberasurecode-1.6.3.ebuild new file mode 100644 index 000000000000..b6d909c7d973 --- /dev/null +++ b/dev-libs/liberasurecode/liberasurecode-1.6.3.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Erasure Code API library written in C with pluggable Erasure Code backends" +HOMEPAGE="https://bitbucket.org/tsg-/liberasurecode/overview" +SRC_URI="https://github.com/openstack/liberasurecode/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc static-libs" + +DEPEND="doc? ( app-doc/doxygen )" + +src_prepare() { + eapply_user + eautoreconf +} + +src_configure() { + econf \ + --htmldir=/usr/share/doc/${PF} \ + --disable-werror \ + $(use_enable doc doxygen) \ + $(use_enable static-libs static) +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/libgit2/libgit2-1.4.2-r1.ebuild b/dev-libs/libgit2/libgit2-1.4.2-r1.ebuild new file mode 100644 index 000000000000..1e4d9b1196a3 --- /dev/null +++ b/dev-libs/libgit2/libgit2-1.4.2-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit cmake python-any-r1 + +DESCRIPTION="A linkable library for Git" +HOMEPAGE="https://libgit2.org" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S=${WORKDIR}/${P/_/-} + +LICENSE="GPL-2-with-linking-exception" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos" +IUSE="examples gssapi +ssh test +threads trace" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/libpcre2:= + net-libs/http-parser:= + sys-libs/zlib + dev-libs/openssl:0= + gssapi? ( virtual/krb5 ) + ssh? ( net-libs/libssh2 ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig +" + +src_prepare() { + cmake_src_prepare + # relying on forked http-parser to support some obscure URI form + sed -i -e '/empty_port/s:test:_&:' tests/network/url/parse.c || die +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -DUSE_SSH=$(usex ssh) + -DUSE_GSSAPI=$(usex gssapi ON OFF) + -DUSE_HTTP_PARSER=system + -DREGEX_BACKEND=pcre2 + ) + cmake_src_configure +} + +src_test() { + if [[ ${EUID} -eq 0 ]] ; then + # repo::iterator::fs_preserves_error fails if run as root + # since root can still access dirs with 0000 perms + ewarn "Skipping tests: non-root privileges are required for all tests to pass" + else + local TEST_VERBOSE=1 + cmake_src_test -R offline + fi +} + +src_install() { + cmake_src_install + dodoc docs/*.{md,txt} + + if use examples ; then + find examples -name '.gitignore' -delete || die + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/dev-libs/libjcat/libjcat-0.1.10.ebuild b/dev-libs/libjcat/libjcat-0.1.10.ebuild index 3690888f3c80..530eb115d6af 100644 --- a/dev-libs/libjcat/libjcat-0.1.10.ebuild +++ b/dev-libs/libjcat/libjcat-0.1.10.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" IUSE="+gpg gtk-doc +introspection +man +pkcs7 test vala" RDEPEND="dev-libs/glib:2 diff --git a/dev-libs/link-grammar/link-grammar-5.10.4.ebuild b/dev-libs/link-grammar/link-grammar-5.10.4.ebuild index c2ea2f81da76..aef4f10b4a0c 100644 --- a/dev-libs/link-grammar/link-grammar-5.10.4.ebuild +++ b/dev-libs/link-grammar/link-grammar-5.10.4.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0/5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86" IUSE="aspell +hunspell python" # pcre REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest index ab140542f1be..a44a5260f07c 100644 --- a/dev-libs/ocl-icd/Manifest +++ b/dev-libs/ocl-icd/Manifest @@ -1,3 +1,2 @@ -DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048 DIST ocl-icd-2.3.0.tar.gz 100848 BLAKE2B b9e5b78df63f4865bb4cb3623fbc6bd336c86b4a9e1f23a29fab1cf11f848cb20d6d8d4a480ff44e442b02d606247a923798143058256ef59c2b16c9daf7098d SHA512 003f3661b7086a7364e79d1058591f12a7095aa2c3decfc4b496f00a0863a91cd81080f33b9308e3948045f8aca5856868ed2725f478654230e51a60d654e613 DIST ocl-icd-2.3.1.tar.gz 102616 BLAKE2B f3e41d73e8cca7b42697a81f9d353341ba40ae67bb07ccbb7f6bd4fc9c8d16cbb4a9a9826ef81a381629cf1bd2c61d6ad9d7a02dcdb2871359041cfd8e9815b7 SHA512 3fa92dbcbe8ea2acf1ee967419d1b39ca7ace96e64261e3818984bd70831d62692e953c30e3e271fe74d59c634785055320f03c4d0516e2f53f7f700d3bcc76d diff --git a/dev-libs/ocl-icd/files/ocl-icd-2.2.12-gcc-10.patch b/dev-libs/ocl-icd/files/ocl-icd-2.2.12-gcc-10.patch deleted file mode 100644 index 64948d5b05e3..000000000000 --- a/dev-libs/ocl-icd/files/ocl-icd-2.2.12-gcc-10.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://bugs.gentoo.org/706098 - -From 4667bddd365bcc1dc66c483835971f0083b44b1d Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Wed, 22 Jan 2020 19:38:23 +0000 -Subject: [PATCH] icd_generator.rb: fix build failure against gcc-10 - -On gcc-10 (and gcc-9 -fno-common) build fails as: - -``` -libtool: link: gcc -shared -fPIC -DPIC .libs/libdummy_icd.o .libs/libdummy_icd_gen.o \ - -ldl -g -O2 -Wl,-soname -Wl,libdummycl.so.0 -o .libs/libdummycl.so.0.0.0 -ld: .libs/libdummy_icd_gen.o:/home/slyfox/dev/git/ocl-icd/libdummy_icd_gen.h:226: - multiple definition of `master_dispatch'; .libs/libdummy_icd.o:/home/slyfox/dev/git/ocl-icd/libdummy_icd_gen.h:226: first defined here -``` - -gcc-10 will change the default from -fcommon to fno-common: -https://gcc.gnu.org/PR85678. - -The error also happens if CFLAGS=-fno-common passed explicitly. - -Reported-by: Anthony Parsons -Bug: https://bugs.gentoo.org/706098 -Signed-off-by: Sergei Trofimovich ---- - icd_generator.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/icd_generator.rb -+++ b/icd_generator.rb -@@ -207,7 +207,7 @@ def self.generate_libdummy_icd_header - } - libdummy_icd_structures += "};\n\n" - libdummy_icd_structures += "#pragma GCC visibility push(hidden)\n\n" -- libdummy_icd_structures += "struct _cl_icd_dispatch master_dispatch; \n\n" -+ libdummy_icd_structures += "extern struct _cl_icd_dispatch master_dispatch; \n\n" - $use_name_in_test.each { |k, f| - libdummy_icd_structures += "typeof(#{f}) INT#{f};\n" - } diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild deleted file mode 100644 index 3cc734b6f736..000000000000 --- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby24 ruby25 ruby26 ruby27" -inherit autotools flag-o-matic multilib-minimal ruby-single - -DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders" -HOMEPAGE="https://github.com/OCL-dev/ocl-icd" -SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 x86" - -# Does nothing now but by keeping it here we avoid having to have virtual/opencl -# handle ebuilds both with and without this flag. -IUSE="+khronos-headers" - -BDEPEND="${RUBY_DEPS}" -DEPEND="~dev-util/opencl-headers-2020.06.16" -RDEPEND="${DEPEND} - !app-eselect/eselect-opencl - !dev-libs/opencl-icd-loader" - -PATCHES=("${FILESDIR}"/${P}-gcc-10.patch) - -src_prepare() { - replace-flags -Os -O2 # bug 646122 - - default - eautoreconf -} - -multilib_src_configure() { - # dev-util/opencl-headers ARE official Khronos Group headers, what this option - # does is disable the use of the bundled ones - ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers -} - -multilib_src_install() { - default - - # Drop .la files - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild index 9ba7d81ac7c0..be0c974d8632 100644 --- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild +++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}. LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml index e0b7df73655d..7aeb3cfc9e34 100644 --- a/dev-libs/openssl/metadata.xml +++ b/dev-libs/openssl/metadata.xml @@ -15,6 +15,7 @@ Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https Enable support for discouraged TLS compression Enable the Heartbeat Extension in TLS and DTLS + Build support for SSL/TLS ciphers that are considered "weak" 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}] + "${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} " - - usex "${1}" "USE_${2}=1" "USE_${2}=" -} - -pkg_setup() { - use lua && lua-single_pkg_setup - if use net_ns; then - CONFIG_CHECK="~NET_NS" - linux-info_pkg_setup - fi -} - -src_compile() { - local -a args=( - V=1 - TARGET=linux-glibc - ) - - # TODO: PCRE2_WIDTH? - args+=( $(haproxy_use threads THREAD) ) - args+=( $(haproxy_use crypt LIBCRYPT) ) - args+=( $(haproxy_use net_ns NS) ) - args+=( $(haproxy_use pcre PCRE) ) - args+=( $(haproxy_use pcre-jit PCRE_JIT) ) - args+=( $(haproxy_use pcre2 PCRE2) ) - args+=( $(haproxy_use pcre2-jit PCRE2_JIT) ) - args+=( $(haproxy_use ssl OPENSSL) ) - args+=( $(haproxy_use slz SLZ) ) - args+=( $(haproxy_use zlib ZLIB) ) - args+=( $(haproxy_use lua LUA) ) - args+=( $(haproxy_use 51degrees 51DEGREES) ) - args+=( $(haproxy_use wurfl WURFL) ) - args+=( $(haproxy_use systemd SYSTEMD) ) - args+=( $(haproxy_use prometheus-exporter PROMEX) ) - - # Bug #668002 - if use ppc || use arm || use hppa; then - TARGET_LDFLAGS=-latomic - fi - - # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} - emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin - - if use tools ; then - for extra in ${EXTRAS[@]} ; do - if [ "${extra}" = "admin/halog" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog - elif [ "${extra}" = "dev/hpack" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} - else - # Those two includes are a workaround for hpack Makefile missing those - emake -C ${extra} \ - CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]} - fi - done - fi -} - -src_install() { - dosbin haproxy - dosym ../sbin/haproxy /usr/bin/haproxy - - newconfd "${FILESDIR}/${PN}.confd" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r6" ${PN} - - doman doc/haproxy.1 - - systemd_dounit admin/systemd/haproxy.service - - einstalldocs - - # The errorfiles are used by upstream defaults. - insinto /etc/haproxy/errors/ - doins examples/errorfiles/* - - if use doc; then - dodoc ROADMAP doc/*.txt - #if use lua; then - # TODO: doc/lua-api/ - #fi - fi - - if use tools ; then - has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog - has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; } - has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop - has dev/hpack "${EXTRAS[@]}" && { - newbin dev/hpack/gen-rht haproxy_gen-rht - newbin dev/hpack/gen-enc haproxy_gen-enc - newbin dev/hpack/decode haproxy_decode - } - fi - - if use examples ; then - docinto examples - dodoc examples/*.cfg - dodoc doc/seamless_reload.txt - fi - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax - doins admin/syntax-highlight/haproxy.vim - fi -} - -pkg_postinst() { - if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then - ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." - ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." - ewarn "Make use of them with the \"user\" and \"group\" directives." - - if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then - einfo "Please consult the installed documentation for learning the configuration file's syntax." - einfo "The documentation and sample configuration files are installed here:" - einfo " ${EROOT}/usr/share/doc/${PF}" - fi - fi -} diff --git a/net-proxy/obfs4proxy/Manifest b/net-proxy/obfs4proxy/Manifest index b13fb830f896..a7e861df32c2 100644 --- a/net-proxy/obfs4proxy/Manifest +++ b/net-proxy/obfs4proxy/Manifest @@ -1,29 +1,2 @@ -DIST git.schwanenlied.me%2Fyawning%2Fbsaes.git%2F@v%2Fv0.0.0-20190320102049-26d1add596b6.mod 45 BLAKE2B 2eaf520004fc4a4a3283bba8b12bca561c042fa9ac35be8d152f232b71f8431b099f452edaa2ecdfc54e56d8de989eaa46f1d21428fbd1431d6e52fe353aaed4 SHA512 7f919bb78329c34c2e2c667fd4621885fe8ef3ed7b916de65ceaf4d6fa739fb540c2f453a16cf6f5add0f0540d06e0c7cf1eb92a2d3751bba2cc26ea285756a7 -DIST git.schwanenlied.me%2Fyawning%2Fbsaes.git%2F@v%2Fv0.0.0-20190320102049-26d1add596b6.zip 39367 BLAKE2B 451710920a0fb77caa7cc1a22284faced216d54eb0fe77d70e375ac063c91d7c5dde17a85bacecd06092f1dce7d28e19ddaa28408a95954e76c6c4d4fb4a2bf2 SHA512 6b0f5ab0b9d99f2bd1acf140a8d16ad247743a3989b1a69ef9377aefb860f6d73cae911aaf5c21a251aa668b45da946d6a82321bff9918efb8044794c69d5697 -DIST git.torproject.org%2Fpluggable-transports%2Fgoptlib.git%2F@v%2Fv1.0.0.mod 59 BLAKE2B c741382a34677abe777f42d88210a2da3ba6dfaebc557e28d1a49a5f46822d94838469b7d7b72476b45b55b0c557ec132cbee805173c5607a6cfcd2b2e090c1c SHA512 15340017e0579bd8d102bda61ea62c5b894fcaca9f320efabacd7a2158fc2beb28b686302a3002b53765004e9a0be08deee8618f8ad662ddc2430d0b2d78d91e -DIST git.torproject.org%2Fpluggable-transports%2Fgoptlib.git%2F@v%2Fv1.0.0.zip 32116 BLAKE2B c9d113cc09a7da3e8c6cb56001633dd31b793f275596d1fb46608929b4475a7787b68239f7044096ee9301fe7be3e55db61d42d88e870227ef2a8c37e294077f SHA512 81a1ea071d7561a631c55844395f8d8d8773f4d8a5ea25e2c66ee2bb17bde8f79ff29d5d87f2bfd7ba42a31907c923f8f8616cd8fdaf21d99217ba1bb4c117e7 -DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20170116200512-5312a6153412.mod 30 BLAKE2B e89977c245471f14f3e2e9434d08e9683a9d4ad350dfde2055098d913fa41ca92c4cd8f26345f3c5b07ffea825b4a87d5d06f1ca99105456aa63091f00cba1ac SHA512 ae14432db61f891b7a8d6d8e51c47675deba7a13f0bd392536cecb625f6f9eab5b253d6744957dd0cca3464f84bbbcc3a41fd0f2bc25fe47e6d6b4ce51858930 -DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20170116200512-5312a6153412.zip 104690 BLAKE2B 7c52d737b8bf2f9a4b4ad4a7b2a843b715cd991dc18d61b0c2c68ec25ef8f8bc00ee0b5cdc95b91a1c64715d1990597dafe29c070a090227b2b7d1244a8b80a0 SHA512 8d15276c2a6e82ae72d903946fbcb2adc6446b964492d8c5653fee885e4c1b1d75f119a3fdcb0a35044929810d31420ac218b7ec077d1d07acaf2f586d869854 -DIST github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.mod 33 BLAKE2B 8a7ad09e58eb232d947fee3583f03948dda02432dc94ae8916330347dbce328b9e1e445aa96b9ce00cb770583eda50344d160662eaee8f2d8290fe1c63511bdb SHA512 e9671d1c7e7aa422e139098e1977bdcd61f48b382d75a7234cdb3849eec4232b0cf7528ed37d534430317f7b2649b3c5b3476a23c0aca735279940f89fae11ef -DIST github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.zip 17069 BLAKE2B e70bcfb611691e43750b11f6e4e655ead44526d3c72a5bcbbb18732e0f23dd891da22b7f5961baae4cfb9d3d0e07af60f5a6afe48e3241bafef76333ef901f0f SHA512 fb9f43083ab6c28d26cf729ab56ca3e85a876fa50bd445f714da5de404578f35ae094b7619a6f10011f98b442137ebbc016b639138679fffff28bcc944e05e55 -DIST github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.mod 230 BLAKE2B 26d8e2a5e9603273dd84ed9aae1bcf49e1fece530a5dc41cae3b5d2ca8bb4288023ac8eeedd0ecc76fa355bc9dd808d06196db03ccda186df5184fc6134e121b SHA512 132067629eb47d7ba22dcedd81467693f7abda7b050244bac8b8ddc9f8dec5d1ff4fd64a6ed0ed1537f400c516594df0f3a2aa392258dfc817176e4030f81cac -DIST github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.zip 10103918 BLAKE2B d484c7a50585a27d9910c4f9c4c0f179346bea4f373c0fec5b6af24205f69ca6afc4dda6f9b069f23617487f8edd7422379478d88a5a1e113104098fb2476cf3 SHA512 5c16e51cd71051795ca20e338b3eb4fe17e423fa26c4e188d966761ee7d23cf5b21d37a6cca7faf8f31c3110289d2da4e18e6777b8b26cc69563b244d94fc17d -DIST github.com%2Fdsnet%2Fgolib%2F@v%2Fv0.0.0-20171103203638-1ea166775780.mod 30 BLAKE2B 3601cf72262d9c828eff3520a9375eb981b2a9193aee46e93406d491cb8db7b864c3eb32f65f02b75284170856b2264a1a24cc63196695e58365210b216cedbc SHA512 36ff5f52bec7fbf395cce04f20bc61cbe4e5f77ed550a5a869967d1e145e2dcd8e7bca23c3cf81882d8f7053e566dd95e78e97cdcf06c1556b78a5b9b51662d1 -DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec -DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887 -DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod 31 BLAKE2B f8ed4b103891625af3043d86905f693014b245198a180911efb7e33480d81b93babd35912c5768df62cd26199e3a742f94365a82de619a97385d7407baa22424 SHA512 33639405743ddf22f19ca03d348c47d9cf963aa151fdab9e7303679ccd5cec373ceebce456eb96ef52dcf933f96e4ef7d4a8099822dfc183996d8cd4f09cba2e -DIST gitlab.com%2Fyawning%2Futls.git%2F@v%2Fv0.0.11-1.mod 330 BLAKE2B 12d6ca5517b27cb05da57741c8bde2601c14a0fea76a8df627681038e03095cd3f9a6cc0975837271deaf469715b510ea8d04d943f8ded8a9b36198bdfcd5b1a SHA512 db40c5be3fa8f7320ec134b3b801022dbc1b5d80cc9eeeb9366724bcd0df479e702d72a42f28cd2c9353e35b2e78a2ad95c0b575bbb5cad0ed04fd1cb629c84c -DIST gitlab.com%2Fyawning%2Futls.git%2F@v%2Fv0.0.11-1.zip 818363 BLAKE2B ae79d47071ecded190c34851f4e82786d7db51cdd8cacf664fac543b95a77a55e7d1a308b2b9b09eb40ae0dfe8d55e00d4c8928ded0ec798e5a52ddd3f777f53 SHA512 dcb0ef6aa71b7d88fc2a5ee2b197e46c33d490dabb84a0a8cead68bbecb5b8bc36928eeae691754a7771f84c9a48975b0971c335d5b5086a013549b42cd87f44 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.zip 1781592 BLAKE2B 13d91c26bc1b3f13d8deb7ce2572853fae269db0f8384f94a8b59436d3351cb79f2e2b3ce3664b5c38e696be8ee67a7860aaedacf3019aa94079c160fb991fbd SHA512 42da234a20b3c6a8cfc83b3dce98d3fd11c07912e79d7943bfe6fd8baefae4756cadf5ec1688d4227d7151653fab29fc4a27fd562766f9fb10c758602d5b6f57 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.zip 1276380 BLAKE2B 95b24bac24917089c0140ff02154cdf170b1d459cf77b0ca11b15c778040d58e1b4369d7f7c5e913cb3b19b8cbedf202eca28b8045df054317a8a3bfdd14759e SHA512 ee4d522713f90dd3bd7942655b0b2e9a64b0f6b8cfa491be7f22216c9e016b3b1131da5dee2ff0eefbdef000ab041e64e0a9385239db20135cf6101e8d2c23fc -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190329044733-9eb1bfa1ce65.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190329044733-9eb1bfa1ce65.zip 1605582 BLAKE2B 35ea8cfc90f9986ee687b6f4d644d7af2ec786740e427534aefcbe8e5b7c725b4fec2d8323d09193aa4fdc98c8baa0ae42503164f6920e5de05bdb551e33bf35 SHA512 160668e809021d409e7447d83235b127275edd1601ed61f9975c585ea4b9900b2c3fb70c98d1a8addd0e5cae27840da3276caecd77bf168f1625641b03ed689f -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7 -DIST obfs4proxy-0.0.11.tar.gz 85557 BLAKE2B 9b56433fa4a1023ce2c2b75cec598a1f55fb8229659ee66604b636d2269b243d347e34eb1b539b71db5ac0cb45c868d249844a82e04b20faa6dc1785fe4b78dc SHA512 3eb50bc8067802f8260e0926999a659919e55cb34247f443f66a4852c9ceceacae361602a57ad1fd28a84e4ed54f3800c3258e67266eb23d45b1d09e31c5d869 DIST obfs4proxy-0.0.13-vendor.tar.xz 77920 BLAKE2B 72a41e4d103d55382d275f4e55915916c2f291a73052f519eebd3f7b864cbbe7784a8b1904a946f658e2a3f6ba3705ea1aa7149fdff5f4fbb5a2977e83ca6719 SHA512 7153130fdf13aefcd10d98a240d7f2f85e8ce1a5333ba2f68daee8fe03967b67f96442d5473804b9744ca782732c86265b3661378848669cb187938d8e1acdba DIST obfs4proxy-0.0.13.tar.gz 86593 BLAKE2B 1ac3adaa0c1c4169635abc511f3232d22c3164ec28305725c1b3d64b5d61b8f30296d3bd6633ad81030f017e32b0b49fc6487784d2c39b0ac7e8075504519b1b SHA512 5be0eacba6848ba89e7b7b873741e39e7807745f4648af63a81000ce1d2380fb0632d4b04e832071ca8051312360a0b79bb8d86f1e0f02a8bb5344fbfeeaf3fe diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild deleted file mode 100644 index 89d05eaa48ac..000000000000 --- a/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit go-module - -DESCRIPTION="An obfuscating proxy supporting Tor's pluggable transport protocol obfs4" -HOMEPAGE="https://gitlab.com/yawning/obfs4" - -EGO_SUM=( - "git.schwanenlied.me/yawning/bsaes.git v0.0.0-20190320102049-26d1add596b6" - "git.schwanenlied.me/yawning/bsaes.git v0.0.0-20190320102049-26d1add596b6/go.mod" - "git.torproject.org/pluggable-transports/goptlib.git v1.0.0" - "git.torproject.org/pluggable-transports/goptlib.git v1.0.0/go.mod" - "github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412" - "github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod" - "github.com/dchest/siphash v1.2.1" - "github.com/dchest/siphash v1.2.1/go.mod" - "github.com/dsnet/compress v0.0.1" - "github.com/dsnet/compress v0.0.1/go.mod" - "github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod" - "github.com/klauspost/compress v1.4.1/go.mod" - "github.com/klauspost/cpuid v1.2.0/go.mod" - "github.com/ulikunitz/xz v0.5.6/go.mod" - "gitlab.com/yawning/utls.git v0.0.11-1" - "gitlab.com/yawning/utls.git v0.0.11-1/go.mod" - "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" - "golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c" - "golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod" - "golang.org/x/net v0.0.0-20190328230028-74de082e2cca" - "golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod" - "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" - "golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65" - "golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65/go.mod" - "golang.org/x/text v0.3.0" - "golang.org/x/text v0.3.0/go.mod" - ) -go-module_set_globals -SRC_URI="https://gitlab.com/yawning/obfs4/-/archive/${P}/obfs4-${P}.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI}" - -# See https://gitlab.com/yawning/obfs4/-/issues/5#note_573104796 for licence clarification -LICENSE="BSD CC0-1.0 BZIP2 GPL-3+ MIT public-domain" -SLOT="0" -KEYWORDS="amd64 arm x86" - -S="${WORKDIR}/obfs4-${P}" - -DOCS=( README.md ChangeLog LICENSE-GPL3.txt doc/obfs4-spec.txt ) - -src_compile() { - go build -o ${PN}/${PN} ./${PN} || die -} - -src_install() { - default - dobin ${PN}/${PN} - doman doc/"${PN}.1" -} diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.13-r1.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.13-r1.ebuild index f26942f63e31..6036d84649ef 100644 --- a/net-proxy/obfs4proxy/obfs4proxy-0.0.13-r1.ebuild +++ b/net-proxy/obfs4proxy/obfs4proxy-0.0.13-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/yawning/obfs4/-/archive/${P}/obfs4-${P}.tar.gz -> ${ # See https://gitlab.com/yawning/obfs4/-/issues/5#note_573104796 for licence clarification LICENSE="BSD CC0-1.0 BZIP2 GPL-3+ MIT public-domain" SLOT="0" -KEYWORDS="amd64 arm ~riscv ~x86" +KEYWORDS="amd64 arm ~riscv x86" S="${WORKDIR}/obfs4-${P}" diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz index 5852ea2fa753..622c5ee7f013 100644 Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ diff --git a/net-vpn/ocserv/Manifest b/net-vpn/ocserv/Manifest index ef5564e00169..6ecf2f227674 100644 --- a/net-vpn/ocserv/Manifest +++ b/net-vpn/ocserv/Manifest @@ -1,2 +1,3 @@ DIST ocserv-1.0.1.tar.xz 787800 BLAKE2B 655a2a6e1434a5b31b157e0f73df3d6d04011c06fd5a1f39f1152752abdc837974c739bc0694a804a1e96b4e219c78c5cf1a58040bbcdcad3e326d0c9e584c7b SHA512 953e1b6084f68f8627b5383e28b5fcde987881e66feac645a40fa37d895f0711b171c9029c3703773dfbd5432d747f92c71af9240c2df3381599902a7d5fe880 DIST ocserv-1.1.3.tar.xz 833320 BLAKE2B bdf92683df55cd26bc102327b233703eefd58ea18ef71ccfc383e06b7fdd78ca59d605ef3517f430f3a20e8d4ab2c3f8abf2684cedd2eb0aeefe10c688faab15 SHA512 1138bd530e41f215f75e967aa293e80504a0ffc3384184832910b7bf8dc2049a637c1d8bef0221b6abb3e6510e51fba3c45d43901c0d2e4c0f180e72c0804628 +DIST ocserv-1.1.6.tar.xz 839744 BLAKE2B 3b3591588d9a5be4e723df739a5d8b4c33d78d536ecb169263c83cf8bedfdaab1a3d06e6dc11544acbede135626d37d98f2bc26b95ff80abb3f0e99f4688b7f6 SHA512 d1c5e5cf0e84aab168ed51516534df8b2968194dd1421f33563c61b3e47d5d79ebe9e6ffbf7cbcc9ff1242fae05151024f70ef586d063bec0b3eec00050bfdfa diff --git a/net-vpn/ocserv/ocserv-1.1.6.ebuild b/net-vpn/ocserv/ocserv-1.1.6.ebuild new file mode 100644 index 000000000000..b28feddc1b05 --- /dev/null +++ b/net-vpn/ocserv/ocserv-1.1.6.ebuild @@ -0,0 +1,96 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd + +if [[ ${PV} == 9999 ]]; then + inherit autotools git-r3 + EGIT_REPO_URI="https://gitlab.com/openconnect/ocserv.git" +else + SRC_URI="ftp://ftp.infradead.org/pub/ocserv/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Openconnect SSL VPN server" +HOMEPAGE="https://ocserv.gitlab.io/www/index.html" + +LICENSE="GPL-2" +SLOT="0" +IUSE="geoip kerberos +lz4 otp pam radius +seccomp systemd tcpd test" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig + test? ( + net-libs/gnutls[tools(+)] + net-libs/socket_wrapper + net-vpn/openconnect + sys-libs/nss_wrapper + sys-libs/uid_wrapper + pam? ( sys-libs/pam_wrapper ) + ) +" +DEPEND=" + dev-libs/libnl:3= + dev-libs/libev:0= + >=dev-libs/nettle-2.7:0= + dev-libs/pcl:0= + dev-libs/protobuf-c:0= + >=net-libs/gnutls-3.3.0:0= + net-libs/http-parser:0= + sys-libs/readline:0= + sys-libs/talloc:0= + virtual/libcrypt:= + geoip? ( dev-libs/geoip:0= ) + kerberos? ( virtual/krb5 ) + lz4? ( app-arch/lz4:0= ) + otp? ( sys-auth/oath-toolkit:0= ) + pam? ( sys-libs/pam:0= ) + radius? ( net-dialup/freeradius-client:0= ) + seccomp? ( sys-libs/libseccomp:0= ) + systemd? ( sys-apps/systemd:0= ) + tcpd? ( sys-apps/tcp-wrappers:0= ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + if [[ ${PV} == 9999 ]]; then + eautoreconf + fi +} + +src_configure() { + local myconf=( + --without-root-tests + --without-nuttcp-tests + + $(use_enable seccomp) + $(use_enable systemd) + + $(use_with geoip) + $(use_with kerberos gssapi) + $(use_with lz4) + $(use_with otp liboath) + $(use_with radius) + $(use_with tcpd libwrap) + ) + econf "${myconf[@]}" +} + +src_install() { + default + + dodoc doc/sample.{config,passwd} + use otp && dodoc doc/sample.otp + + doinitd "${FILESDIR}"/ocserv + + if use systemd; then + systemd_dounit doc/systemd/socket-activated/ocserv.{service,socket} + else + systemd_dounit doc/systemd/standalone/ocserv.service + fi +} diff --git a/net-vpn/ocserv/ocserv-9999.ebuild b/net-vpn/ocserv/ocserv-9999.ebuild index 1dd59ce1a337..b28feddc1b05 100644 --- a/net-vpn/ocserv/ocserv-9999.ebuild +++ b/net-vpn/ocserv/ocserv-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd @@ -29,6 +29,7 @@ BDEPEND=" net-vpn/openconnect sys-libs/nss_wrapper sys-libs/uid_wrapper + pam? ( sys-libs/pam_wrapper ) ) " DEPEND=" diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index 3938384a6964..d98ead0c1db1 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -1 +1,2 @@ DIST openconnect-8.10.tar.gz 2084534 BLAKE2B 98ad0e24e09bc565f359139540f60eb9b6b5ed2239a9c46c56889b8554fc3de3605c10f1bb4fa0b0b206ba35404ae90a389ab8dcee54cf05a24d984529d24c2a SHA512 a36a106cf5c637602fc5bd3cd12df8f6dfe55217c1aae93c66ca33208507f3f8cda15e3a46d75615c7fcea1859d1a04017a07674ad0246876154467305477356 +DIST openconnect-8.20.tar.gz 2651542 BLAKE2B 327b437993ee0d705c0194202f6fd7c2b330e69bfbb916ef004b0662c8b9aebc1252aa3c83bd41b4d1cf85b933878d37b1a7608f076d82b50e325a3efaea2dec SHA512 76f5e49948391397ea1f7d2fca5798731f4278fee74c3da9b0f0daba6c386ce79ec5d87d40b6d3d99bb2528a038b5a2076df4159bb29c52cba62efb2ca52c8ab diff --git a/net-vpn/openconnect/files/8.20-insecure-crypto.patch b/net-vpn/openconnect/files/8.20-insecure-crypto.patch new file mode 100644 index 000000000000..7644e1a264ba --- /dev/null +++ b/net-vpn/openconnect/files/8.20-insecure-crypto.patch @@ -0,0 +1,46 @@ +From e2b38313bbd5050acaac49a75f0a024d05b505e5 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sun, 10 Apr 2022 12:21:57 -0400 +Subject: [PATCH] openssl: allow ALL ciphers when allow-insecure-crypto is + enabled + +Previously, the cipher list was set to "DEFAULT:+3DES:+RC4". However, +according to ciphers(1), the DEFAULT keyword cannot be combined with +other strings using the + characters. In other words, ":+3DES:+RC4" gets +ignored. + +The user is opting into insecure behavior, so let's keep it simple and +just allow everything. + +This change fixes the obsolete-server-crypto test when openconnect is +built against openssl-1.1.x. + +Signed-off-by: Mike Gilbert +--- + openssl.c | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/openssl.c b/openssl.c +index 3205dbd7..2bf594e7 100644 +--- a/openssl.c ++++ b/openssl.c +@@ -1868,13 +1868,10 @@ int openconnect_open_https(struct openconnect_info *vpninfo) + struct oc_text_buf *buf = buf_alloc(); + if (vpninfo->pfs) + buf_append(buf, "HIGH:!aNULL:!eNULL:-RSA"); ++ else if (vpninfo->allow_insecure_crypto) ++ buf_append(buf, "ALL"); + else +- buf_append(buf, "DEFAULT"); +- +- if (vpninfo->allow_insecure_crypto) +- buf_append(buf, ":+3DES:+RC4"); +- else +- buf_append(buf, ":-3DES:-RC4"); ++ buf_append(buf, "DEFAULT:-3DES:-RC4"); + + if (buf_error(buf)) { + vpn_progress(vpninfo, PRG_ERR, +-- +2.35.1 + diff --git a/net-vpn/openconnect/files/8.20-rsa-securid.patch b/net-vpn/openconnect/files/8.20-rsa-securid.patch new file mode 100644 index 000000000000..57ab2d740707 --- /dev/null +++ b/net-vpn/openconnect/files/8.20-rsa-securid.patch @@ -0,0 +1,51 @@ +From 19417131895eb39aabf3641a9e4e0d7082b04f6d Mon Sep 17 00:00:00 2001 +From: Daniel Lenski +Date: Mon, 7 Mar 2022 08:50:13 -0800 +Subject: [PATCH] Bugfix RSA SecurID token decryption and PIN entry forms + +As of +https://gitlab.com/openconnect/openconnect/-/commit/386a6edb6d2d1d2cd3e9c9de8d85dc7bfda60d34, +all auth forms are required to have a non-NULL `auth_id`. + +However, we forget to make stoken.c set the `auth_id` for the forms that it +creates for RSA SecurID token decryption and PIN entry. Let's name these: + + - `_rsa_unlock`, for token decryption. + - `_rsa_pin`, for PIN entry. Also, rename the numeric PIN field to `pin` + rather than `password`; there can't be any existing users relying on + `--form-entry` to set its value, because that wouldn't work without the + `auth_id`. + +Fixes #388. + +Signed-off-by: Daniel Lenski +--- + stoken.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/stoken.c b/stoken.c +index 00a67625..45d849f5 100644 +--- a/stoken.c ++++ b/stoken.c +@@ -100,6 +100,7 @@ static int decrypt_stoken(struct openconnect_info *vpninfo) + + form.opts = opts; + form.message = _("Enter credentials to unlock software token."); ++ form.auth_id = "_rsa_unlock"; + + if (stoken_devid_required(vpninfo->stoken_ctx)) { + opt->type = OC_FORM_OPT_TEXT; +@@ -206,9 +207,10 @@ static int request_stoken_pin(struct openconnect_info *vpninfo) + + form.opts = opts; + form.message = _("Enter software token PIN."); ++ form.auth_id = "_rsa_pin"; + + opt->type = OC_FORM_OPT_PASSWORD; +- opt->name = (char *)"password"; ++ opt->name = (char *)"pin"; + opt->label = _("PIN:"); + opt->flags = OC_FORM_OPT_NUMERIC; + +-- +GitLab diff --git a/net-vpn/openconnect/openconnect-8.20.ebuild b/net-vpn/openconnect/openconnect-8.20.ebuild new file mode 100644 index 000000000000..005edaf647c5 --- /dev/null +++ b/net-vpn/openconnect/openconnect-8.20.ebuild @@ -0,0 +1,153 @@ +# Copyright 2011-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="xml" + +inherit linux-info python-any-r1 + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git" + inherit git-r3 autotools +else + SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" +HOMEPAGE="http://www.infradead.org/openconnect.html" + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0/5" +IUSE="doc +gnutls gssapi libproxy lz4 nls pskc selinux smartcard stoken test" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + dev-libs/libxml2 + sys-libs/zlib + app-crypt/p11-kit + !gnutls? ( + >=dev-libs/openssl-1.0.1h:0= + dev-libs/libp11 + ) + gnutls? ( + app-crypt/trousers + app-misc/ca-certificates + dev-libs/nettle + >=net-libs/gnutls-3.6.13:0= + dev-libs/libtasn1:0= + app-crypt/tpm2-tss + ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + lz4? ( app-arch/lz4:= ) + nls? ( virtual/libintl ) + pskc? ( sys-auth/oath-toolkit[pskc] ) + smartcard? ( sys-apps/pcsc-lite:0= ) + stoken? ( app-crypt/stoken ) +" +DEPEND="${COMMON_DEPEND} + test? ( + net-libs/socket_wrapper + sys-libs/uid_wrapper + !gnutls? ( dev-libs/openssl:0[weak-ssl-ciphers(-)] ) + ) +" +RDEPEND="${COMMON_DEPEND} + sys-apps/iproute2 + >=net-vpn/vpnc-scripts-20210402-r1 + selinux? ( sec-policy/selinux-vpn ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( ${PYTHON_DEPS} sys-apps/groff ) + nls? ( sys-devel/gettext ) + test? ( net-vpn/ocserv ) +" + +CONFIG_CHECK="~TUN" + +pkg_pretend() { + check_extra_config +} + +pkg_setup() { + : +} + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + fi + default +} + +src_prepare() { + local PATCHES=( + "${FILESDIR}/8.20-rsa-securid.patch" + "${FILESDIR}/8.20-insecure-crypto.patch" + ) + default + if [[ ${PV} == 9999 ]]; then + eautoreconf + fi +} + +src_configure() { + if use doc; then + python_setup + else + export ac_cv_path_PYTHON= + fi + + # Used by tests if userpriv is disabled + addwrite /run/netns + + local myconf=( + --disable-dsa-tests + $(use_enable nls) + --disable-static + $(use_with !gnutls openssl) + $(use_with gnutls) + $(use_with libproxy) + $(use_with lz4) + $(use_with gssapi) + $(use_with pskc libpskc) + $(use_with smartcard libpcsclite) + $(use_with stoken) + --with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script" + --without-java + ) + + econf "${myconf[@]}" +} + +src_test() { + local charset + for charset in UTF-8 ISO-8859-2; do + if [[ $(LC_ALL=cs_CZ.${charset} locale charmap 2>/dev/null) != ${charset} ]]; then + # If we don't have valid cs_CZ locale data, auth-nonascii will fail. + # Force a test skip by exiting with status 77. + sed -i -e '2i exit 77' tests/auth-nonascii || die + break + fi + done + default +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die + + dodoc "${FILESDIR}"/README.OpenRC + + newconfd "${FILESDIR}"/openconnect.confd openconnect + newinitd "${FILESDIR}"/openconnect.initd openconnect + + insinto /etc/logrotate.d + newins "${FILESDIR}"/openconnect.logrotate openconnect + + keepdir /var/log/openconnect +} diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild index e3936252095a..90982f02608c 100644 --- a/net-vpn/openconnect/openconnect-9999.ebuild +++ b/net-vpn/openconnect/openconnect-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 2011-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="xml" @@ -24,7 +24,7 @@ SLOT="0/5" IUSE="doc +gnutls gssapi libproxy lz4 nls pskc selinux smartcard stoken test" RESTRICT="!test? ( test )" -DEPEND=" +COMMON_DEPEND=" dev-libs/libxml2 sys-libs/zlib app-crypt/p11-kit @@ -48,7 +48,14 @@ DEPEND=" smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) " -RDEPEND="${DEPEND} +DEPEND="${COMMON_DEPEND} + test? ( + net-libs/socket_wrapper + sys-libs/uid_wrapper + !gnutls? ( dev-libs/openssl:0[weak-ssl-ciphers(-)] ) + ) +" +RDEPEND="${COMMON_DEPEND} sys-apps/iproute2 >=net-vpn/vpnc-scripts-20210402-r1 selinux? ( sec-policy/selinux-vpn ) @@ -57,11 +64,7 @@ BDEPEND=" virtual/pkgconfig doc? ( ${PYTHON_DEPS} sys-apps/groff ) nls? ( sys-devel/gettext ) - test? ( - net-libs/socket_wrapper - net-vpn/ocserv - sys-libs/uid_wrapper - ) + test? ( net-vpn/ocserv ) " CONFIG_CHECK="~TUN" @@ -119,7 +122,7 @@ src_configure() { src_test() { local charset - for charset in UTF-8 ISO8859-2; do + for charset in UTF-8 ISO-8859-2; do if [[ $(LC_ALL=cs_CZ.${charset} locale charmap 2>/dev/null) != ${charset} ]]; then # If we don't have valid cs_CZ locale data, auth-nonascii will fail. # Force a test skip by exiting with status 77. diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz index e33bfeae69dd..789a25554328 100644 Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ diff --git a/net-wireless/bluez/bluez-5.64.ebuild b/net-wireless/bluez/bluez-5.64.ebuild index c2f5f0bb7b02..9b4e71de94ac 100644 --- a/net-wireless/bluez/bluez-5.64.ebuild +++ b/net-wireless/bluez/bluez-5.64.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0/3" -KEYWORDS="~amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86" IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev" # Since this release all remaining extra-tools need readline support, but this could diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz index 5bbd9c3be4bb..b5d69dea4d28 100644 Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ diff --git a/profiles/package.deprecated b/profiles/package.deprecated index 8c4fc7132fba..a042a92495d6 100644 --- a/profiles/package.deprecated +++ b/profiles/package.deprecated @@ -31,6 +31,8 @@ dev-cpp/gtkmm:2.4 dev-cpp/libglademm dev-cpp/libgnomecanvasmm dev-libs/libcroco +dev-libs/libIDL +dev-libs/libunique:1 gnome-base/gconf gnome-base/libgnomecanvas gnome-extra/gconf-editor diff --git a/profiles/package.mask b/profiles/package.mask index 4a5a530a5097..8776784c7f54 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,53 @@ #--- END OF EXAMPLES --- +# Michał Górny (2022-04-11) +# Tests are broken once again. Last activity in Jan 2020, last release +# in Aug 2019. No revdeps. +# Removal on 2022-05-11. Bug #832317. +dev-python/ctypescrypto + +# Matt Turner (2022-04-10) +# Dead package upstream. Uses GTK+ 2. No reverse dependencies. +# Removal on 2022-05-10 +x11-misc/gcolor2 + +# Matt Turner (2022-04-10) +# Dead package upstream. No reverse dependencies. +# Removal on 2022-05-10 +net-misc/vinagre +net-misc/vino + +# Matt Turner (2022-04-10) +# Dead package upstream (last release in 2004). No reverse dependencies. +# Removal on 2022-05-10 +net-misc/grdesktop + +# Matt Turner (2022-04-10) +# Dead package upstream. EAPI 5. Only reverse dependency is gnome-extra/gnome-utils. +# Removal on 2022-05-10 +gnome-extra/gnome-search-tool + +# Matt Turner (2022-04-10) +# Dead package upstream. No reverse dependencies. +# Removal on 2022-05-10 +gnome-extra/filemanager-actions + +# Matt Turner (2022-04-10) +# Dead package upstream. No reverse dependencies. +# Removal on 2022-05-10 +app-office/pinpoint + +# Matt Turner (2022-04-10) +# Dead package upstream. Only reverse dependency is gnome-extra/gnome-utils. +# Removal on 2022-05-10 +app-admin/gnome-system-log + +# Matt Turner (2022-04-10) +# Dead (meta)packagesupstream. No reverse dependencies. +# Removal on 2022-05-10 +gnome-extra/gnome-utils + # David Seifert (2022-04-10) # Unmaintained, last release upstream 16 years ago, Fedora dropped it, # relies on sys-libs/db, low quality port to EAPI 6, removal on 2022-05-10. diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 53c4d000a962..e1a7942ba588 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -2208,6 +2208,7 @@ dev-libs/openssl:sslv2 - Support for the old/insecure SSLv2 protocol -- note: no dev-libs/openssl:sslv3 - Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https dev-libs/openssl:tls-compression - Enable support for discouraged TLS compression dev-libs/openssl:tls-heartbeat - Enable the Heartbeat Extension in TLS and DTLS +dev-libs/openssl:weak-ssl-ciphers - Build support for SSL/TLS ciphers that are considered "weak" dev-libs/openssl-compat:asm - Support assembly hand optimized crypto functions (i.e. faster run time) dev-libs/openssl-compat:bindist - Disable/Restrict EC algorithms (as they seem to be patented) -- note: changes the ABI dev-libs/openssl-compat:rfc3779 - Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers) @@ -8571,6 +8572,7 @@ www-apps/drupal:uploadprogress - Install dev-php/pecl-uploadprogress package www-apps/gitea:acct - User and group management via acct-*/git packages www-apps/gitit:plugins - enables optional plugin runtime loader www-apps/hugo:sass - Enable SASS/SCSS support +www-apps/hugo:test-full - Pull optional heavier test-dependency packages www-apps/icingaweb2:apache2-server - Adds support for the apache2-server www-apps/icingaweb2:fpm - Adds FPM support to php www-apps/icingaweb2:nginx - Adds support for nginx diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz index 885efb23ea11..e660713a110e 100644 Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ diff --git a/sci-electronics/drahnr-oregano/metadata.xml b/sci-electronics/drahnr-oregano/metadata.xml index 52c86d49fdbf..c3c62f45ee23 100644 --- a/sci-electronics/drahnr-oregano/metadata.xml +++ b/sci-electronics/drahnr-oregano/metadata.xml @@ -1,14 +1,7 @@ - - ktrace@yandex.ru - Victor Kustov - - - proxy-maint@gentoo.org - Proxy Maintainers - + Oregano is an application for schematic capture and simulation of electrical circuits. The actual simulation is performed by Berkeley Spice, or GNUcap or diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz index 04e775640c3f..bfbcbd592c24 100644 Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest index b6e485b2e6f6..a99b3c4c84bc 100644 --- a/sci-geosciences/gpxsee/Manifest +++ b/sci-geosciences/gpxsee/Manifest @@ -1,2 +1 @@ DIST gpxsee-10.5.tar.gz 5123489 BLAKE2B 9e7155adc340d3e8af708563cf2aba2e03a47c4180a144d79521913339020f20be416bd14d95b33041653135167d8123899f6008474beef8e1665924eaa0c339 SHA512 ee24a1555fc18f2aa21307e4fe255312d5e166b107bf0a9e10104cb977cb5d59888e7ec99aad83adf5fc36e7a9eb04a039450d96b4248ad52c08fce0dd76c035 -DIST gpxsee-9.12.tar.gz 4977257 BLAKE2B 30060478cef417f8d9fe87878ecc1338336e48906eaa3eb7735d086b47fa8a7cc2154e8719e0f92109d4e4f881d90f6ebe1f6088a9684fdde42672c4eef9d664 SHA512 47c414f5a6fd61b93119820b24f49a73575a260c986e3403776322f15ff514de82a23444369ef4803fa82c512f9af49f5acc28e719633173c7961f2d34b7cd4b diff --git a/sci-geosciences/gpxsee/gpxsee-10.5.ebuild b/sci-geosciences/gpxsee/gpxsee-10.5.ebuild index f37db04afe41..8777e1588391 100644 --- a/sci-geosciences/gpxsee/gpxsee-10.5.ebuild +++ b/sci-geosciences/gpxsee/gpxsee-10.5.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://www.gpxsee.org/" SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="dev-qt/qtcore:5 dev-qt/qtgui:5 diff --git a/sci-geosciences/gpxsee/gpxsee-9.12.ebuild b/sci-geosciences/gpxsee/gpxsee-9.12.ebuild deleted file mode 100644 index 0fa8bbb5eda4..000000000000 --- a/sci-geosciences/gpxsee/gpxsee-9.12.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PLOCALES="cs da de en eo es fi fr hu it nb pl pt_BR ru sv tr uk zh" -inherit desktop plocale qmake-utils xdg - -MY_PN="GPXSee" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" -HOMEPAGE="https://www.gpxsee.org/" -SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -RDEPEND="dev-qt/qtwidgets:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5" -DEPEND="${RDEPEND}" -BDEPEND="dev-qt/linguist-tools:5" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}"/${PN}-7.33.patch ) - -src_prepare() { - default - - plocale_find_changes lang "${PN}_" '.ts' - - rm_ts() { - sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro - } - - plocale_for_each_disabled_locale rm_ts -} - -src_compile() { - lrelease gpxsee.pro - eqmake5 gpxsee.pro - emake -} - -src_install() { - emake INSTALL_ROOT="${D}" install - dodoc README.md -} diff --git a/sec-policy/Manifest.gz b/sec-policy/Manifest.gz index 0df282baca1c..a1344a20981c 100644 Binary files a/sec-policy/Manifest.gz and b/sec-policy/Manifest.gz differ diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20220106-r3.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20220106-r3.ebuild index 7a7f78199fd8..3e55fff7394f 100644 --- a/sec-policy/selinux-abrt/selinux-abrt-2.20220106-r3.ebuild +++ b/sec-policy/selinux-abrt/selinux-abrt-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for abrt" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20220106-r3.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20220106-r3.ebuild index 43578222ebd3..605d9ed5d09c 100644 --- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for accountsd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} diff --git a/sec-policy/selinux-acct/selinux-acct-2.20220106-r3.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20220106-r3.ebuild index 8a33da95cdb9..8cb79c3bae96 100644 --- a/sec-policy/selinux-acct/selinux-acct-2.20220106-r3.ebuild +++ b/sec-policy/selinux-acct/selinux-acct-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for acct" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-afs/selinux-afs-2.20220106-r3.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20220106-r3.ebuild index 872bb84fa32a..8e30e05e1801 100644 --- a/sec-policy/selinux-afs/selinux-afs-2.20220106-r3.ebuild +++ b/sec-policy/selinux-afs/selinux-afs-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for afs" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-aide/selinux-aide-2.20220106-r3.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20220106-r3.ebuild index 0793f861e95f..a58a756ba498 100644 --- a/sec-policy/selinux-aide/selinux-aide-2.20220106-r3.ebuild +++ b/sec-policy/selinux-aide/selinux-aide-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for aide" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20220106-r3.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20220106-r3.ebuild index 53f73231409c..638d8bcdcde2 100644 --- a/sec-policy/selinux-alsa/selinux-alsa-2.20220106-r3.ebuild +++ b/sec-policy/selinux-alsa/selinux-alsa-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for alsa" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20220106-r3.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20220106-r3.ebuild index 9bff1463fa49..71ee659f636e 100644 --- a/sec-policy/selinux-amanda/selinux-amanda-2.20220106-r3.ebuild +++ b/sec-policy/selinux-amanda/selinux-amanda-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for amanda" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-inetd diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20220106-r3.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20220106-r3.ebuild index 8ad321142c93..afed385be86b 100644 --- a/sec-policy/selinux-amavis/selinux-amavis-2.20220106-r3.ebuild +++ b/sec-policy/selinux-amavis/selinux-amavis-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for amavis" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-android/selinux-android-2.20220106-r3.ebuild b/sec-policy/selinux-android/selinux-android-2.20220106-r3.ebuild index 91fda2fd825c..1d81b3d60612 100644 --- a/sec-policy/selinux-android/selinux-android-2.20220106-r3.ebuild +++ b/sec-policy/selinux-android/selinux-android-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for android" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} diff --git a/sec-policy/selinux-apache/selinux-apache-2.20220106-r3.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20220106-r3.ebuild index 53bce5d0dedb..504b4df20f56 100644 --- a/sec-policy/selinux-apache/selinux-apache-2.20220106-r3.ebuild +++ b/sec-policy/selinux-apache/selinux-apache-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for apache" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-kerberos diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20220106-r3.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20220106-r3.ebuild index 0df45f316e8b..0fa6040f2c2d 100644 --- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for apcupsd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-apache diff --git a/sec-policy/selinux-apm/selinux-apm-2.20220106-r3.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20220106-r3.ebuild index 97146fc67fc6..98cc5da87afc 100644 --- a/sec-policy/selinux-apm/selinux-apm-2.20220106-r3.ebuild +++ b/sec-policy/selinux-apm/selinux-apm-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for acpi" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi pkg_postinst() { diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20220106-r3.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20220106-r3.ebuild index 75f60fe0d929..88eee8c96d1c 100644 --- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20220106-r3.ebuild +++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for arpwatch" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20220106-r3.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20220106-r3.ebuild index 210ad1c63044..70ac4a56bbc2 100644 --- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20220106-r3.ebuild +++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for asterisk" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-at/selinux-at-2.20220106-r3.ebuild b/sec-policy/selinux-at/selinux-at-2.20220106-r3.ebuild index f0615197cc52..a5bf6f19537c 100644 --- a/sec-policy/selinux-at/selinux-at-2.20220106-r3.ebuild +++ b/sec-policy/selinux-at/selinux-at-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for at" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-automount/selinux-automount-2.20220106-r3.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20220106-r3.ebuild index 5ab17db44ce5..2e7907d062e9 100644 --- a/sec-policy/selinux-automount/selinux-automount-2.20220106-r3.ebuild +++ b/sec-policy/selinux-automount/selinux-automount-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for automount" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20220106-r3.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20220106-r3.ebuild index 3830ba8d0124..d1566d4d2ff9 100644 --- a/sec-policy/selinux-avahi/selinux-avahi-2.20220106-r3.ebuild +++ b/sec-policy/selinux-avahi/selinux-avahi-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for avahi" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20220106-r3.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20220106-r3.ebuild index 539e884341a4..d4043bf6b1eb 100644 --- a/sec-policy/selinux-awstats/selinux-awstats-2.20220106-r3.ebuild +++ b/sec-policy/selinux-awstats/selinux-awstats-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for awstats" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-apache diff --git a/sec-policy/selinux-backup/selinux-backup-2.20220106-r3.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20220106-r3.ebuild index 4e33836dadf9..8b8995ebb51f 100644 --- a/sec-policy/selinux-backup/selinux-backup-2.20220106-r3.ebuild +++ b/sec-policy/selinux-backup/selinux-backup-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for generic backup apps" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20220106-r3.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20220106-r3.ebuild index a37c76d6390f..10bab48e0774 100644 --- a/sec-policy/selinux-bacula/selinux-bacula-2.20220106-r3.ebuild +++ b/sec-policy/selinux-bacula/selinux-bacula-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for bacula" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20220106-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20220106-r3.ebuild index c6f79d31df40..612ab55a8ac5 100644 --- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20220106-r3.ebuild +++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20220106-r3.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then else SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2 https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2" - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux" diff --git a/sec-policy/selinux-base/selinux-base-2.20220106-r3.ebuild b/sec-policy/selinux-base/selinux-base-2.20220106-r3.ebuild index 659fad659691..16ffa2766f65 100644 --- a/sec-policy/selinux-base/selinux-base-2.20220106-r3.ebuild +++ b/sec-policy/selinux-base/selinux-base-2.20220106-r3.ebuild @@ -17,7 +17,7 @@ else SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2" - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi IUSE="doc +unknown-perms systemd +ubac +unconfined" diff --git a/sec-policy/selinux-bind/selinux-bind-2.20220106-r3.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20220106-r3.ebuild index 843b48cc5213..e250341de54b 100644 --- a/sec-policy/selinux-bind/selinux-bind-2.20220106-r3.ebuild +++ b/sec-policy/selinux-bind/selinux-bind-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for bind" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20220106-r3.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20220106-r3.ebuild index 69b91cb7c097..32c175a0db6e 100644 --- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20220106-r3.ebuild +++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for bitcoin" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20220106-r3.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20220106-r3.ebuild index d05b1f920b12..2476c23a2e81 100644 --- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20220106-r3.ebuild +++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for bitlbee" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20220106-r3.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20220106-r3.ebuild index 2d5883febb28..72337ccf49ff 100644 --- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20220106-r3.ebuild +++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for bluetooth" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20220106-r3.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20220106-r3.ebuild index fbafdd1e91f8..d097d7978672 100644 --- a/sec-policy/selinux-brctl/selinux-brctl-2.20220106-r3.ebuild +++ b/sec-policy/selinux-brctl/selinux-brctl-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for brctl" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20220106-r3.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20220106-r3.ebuild index 1e23e446adcd..4358c3dc1faa 100644 --- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for cachefilesd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20220106-r3.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20220106-r3.ebuild index e74ffd9e03c5..b22d2f7a8ee5 100644 --- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20220106-r3.ebuild +++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for calamaris" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-canna/selinux-canna-2.20220106-r3.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20220106-r3.ebuild index 0e69575efd52..e42f076dc5a7 100644 --- a/sec-policy/selinux-canna/selinux-canna-2.20220106-r3.ebuild +++ b/sec-policy/selinux-canna/selinux-canna-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for canna" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20220106-r3.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20220106-r3.ebuild index 50eda9b6fcb0..0394728fc983 100644 --- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20220106-r3.ebuild +++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for cdrecord" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20220106-r3.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20220106-r3.ebuild index 6de61d142b51..fd8d9e07dcb8 100644 --- a/sec-policy/selinux-ceph/selinux-ceph-2.20220106-r3.ebuild +++ b/sec-policy/selinux-ceph/selinux-ceph-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for ceph" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-certbot/selinux-certbot-2.20220106-r3.ebuild b/sec-policy/selinux-certbot/selinux-certbot-2.20220106-r3.ebuild index d5dbc4fbc7e6..d398f3190d28 100644 --- a/sec-policy/selinux-certbot/selinux-certbot-2.20220106-r3.ebuild +++ b/sec-policy/selinux-certbot/selinux-certbot-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for certbot" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20220106-r3.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20220106-r3.ebuild index 0f25b459ec96..f104c9440c46 100644 --- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20220106-r3.ebuild +++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for cgmanager" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20220106-r3.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20220106-r3.ebuild index 7deba6a588e9..419f144dd907 100644 --- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20220106-r3.ebuild +++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for cgroup" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20220106-r3.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20220106-r3.ebuild index cb075f198a34..8a40df70675a 100644 --- a/sec-policy/selinux-chromium/selinux-chromium-2.20220106-r3.ebuild +++ b/sec-policy/selinux-chromium/selinux-chromium-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for chromium" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20220106-r3.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20220106-r3.ebuild index fe35d8b52774..94f9303fe4db 100644 --- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for chronyd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20220106-r3.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20220106-r3.ebuild index ed45f5f9c45e..f641b989538b 100644 --- a/sec-policy/selinux-clamav/selinux-clamav-2.20220106-r3.ebuild +++ b/sec-policy/selinux-clamav/selinux-clamav-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for clamav" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20220106-r3.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20220106-r3.ebuild index 7e5966d4c17c..9d7769736d85 100644 --- a/sec-policy/selinux-collectd/selinux-collectd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-collectd/selinux-collectd-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for collectd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} diff --git a/sec-policy/selinux-colord/selinux-colord-2.20220106-r3.ebuild b/sec-policy/selinux-colord/selinux-colord-2.20220106-r3.ebuild index 4b5bd3877dd8..3537da516911 100644 --- a/sec-policy/selinux-colord/selinux-colord-2.20220106-r3.ebuild +++ b/sec-policy/selinux-colord/selinux-colord-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for colord" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-container/selinux-container-2.20220106-r3.ebuild b/sec-policy/selinux-container/selinux-container-2.20220106-r3.ebuild index e664a42c56f3..4455418ebe0f 100644 --- a/sec-policy/selinux-container/selinux-container-2.20220106-r3.ebuild +++ b/sec-policy/selinux-container/selinux-container-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for container" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20220106-r3.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20220106-r3.ebuild index c625057992dd..fb9e14e9693a 100644 --- a/sec-policy/selinux-corosync/selinux-corosync-2.20220106-r3.ebuild +++ b/sec-policy/selinux-corosync/selinux-corosync-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for corosync" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20220106-r3.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20220106-r3.ebuild index 4f62bbadba81..c023d594489b 100644 --- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20220106-r3.ebuild +++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for couchdb" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-courier/selinux-courier-2.20220106-r3.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20220106-r3.ebuild index 28f7db8d089e..3b7e28646c80 100644 --- a/sec-policy/selinux-courier/selinux-courier-2.20220106-r3.ebuild +++ b/sec-policy/selinux-courier/selinux-courier-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for courier" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20220106-r3.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20220106-r3.ebuild index 7e25e4d09506..ee78da18b848 100644 --- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20220106-r3.ebuild +++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for cpucontrol" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20220106-r3.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20220106-r3.ebuild index 5597c1e46849..bf5bdb409171 100644 --- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20220106-r3.ebuild +++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for cpufreqselector" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-cups/selinux-cups-2.20220106-r3.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20220106-r3.ebuild index d549fa052e99..e67bc76b24c5 100644 --- a/sec-policy/selinux-cups/selinux-cups-2.20220106-r3.ebuild +++ b/sec-policy/selinux-cups/selinux-cups-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for cups" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-lpd diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20220106-r3.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20220106-r3.ebuild index c5ceaa85e235..45e48163739e 100644 --- a/sec-policy/selinux-cvs/selinux-cvs-2.20220106-r3.ebuild +++ b/sec-policy/selinux-cvs/selinux-cvs-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for cvs" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-apache diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20220106-r3.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20220106-r3.ebuild index 1bef549e1011..f9c3789dabf2 100644 --- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20220106-r3.ebuild +++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for cyphesis" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20220106-r3.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20220106-r3.ebuild index 79e38eba5f25..1de4de9b32fd 100644 --- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20220106-r3.ebuild +++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for daemontools" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-dante/selinux-dante-2.20220106-r3.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20220106-r3.ebuild index d5483707430c..c004678ae273 100644 --- a/sec-policy/selinux-dante/selinux-dante-2.20220106-r3.ebuild +++ b/sec-policy/selinux-dante/selinux-dante-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for dante" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20220106-r3.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20220106-r3.ebuild index 96b36b252bd2..8bd8c3a3f720 100644 --- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20220106-r3.ebuild +++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for dbadm" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20220106-r3.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20220106-r3.ebuild index fb3fafc1aa64..8fe67b1a610a 100644 --- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20220106-r3.ebuild +++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for dbskk" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-inetd diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20220106-r3.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20220106-r3.ebuild index 85f13c61c0be..d8d567fc3af6 100644 --- a/sec-policy/selinux-dbus/selinux-dbus-2.20220106-r3.ebuild +++ b/sec-policy/selinux-dbus/selinux-dbus-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for dbus" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20220106-r3.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20220106-r3.ebuild index 5e4ddedf7823..a5b7953b3e9f 100644 --- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20220106-r3.ebuild +++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for ddclient" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20220106-r3.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20220106-r3.ebuild index a14985d1a7ff..edf2ce69032b 100644 --- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20220106-r3.ebuild +++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for devicekit" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20220106-r3.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20220106-r3.ebuild index 4a72ef801230..55dcd5ead897 100644 --- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20220106-r3.ebuild +++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for dhcp" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20220106-r3.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20220106-r3.ebuild index 4923003066d6..1abdff5270b5 100644 --- a/sec-policy/selinux-dictd/selinux-dictd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-dictd/selinux-dictd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for dictd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20220106-r3.ebuild b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20220106-r3.ebuild index 1adf4d19112f..560695886028 100644 --- a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20220106-r3.ebuild +++ b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for dirmngr" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20220106-r3.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20220106-r3.ebuild index 58816b4d9e42..b77e5860f59a 100644 --- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20220106-r3.ebuild +++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for dirsrv" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20220106-r3.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20220106-r3.ebuild index 2d538da698dc..f4f6b528cd0e 100644 --- a/sec-policy/selinux-distcc/selinux-distcc-2.20220106-r3.ebuild +++ b/sec-policy/selinux-distcc/selinux-distcc-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for distcc" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20220106-r3.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20220106-r3.ebuild index 8823bfa6007f..c84996aea63a 100644 --- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20220106-r3.ebuild +++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for djbdns" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-daemontools diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20220106-r3.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20220106-r3.ebuild index b7a918b0afd2..9bc236307562 100644 --- a/sec-policy/selinux-dkim/selinux-dkim-2.20220106-r3.ebuild +++ b/sec-policy/selinux-dkim/selinux-dkim-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for dkim" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20220106-r3.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20220106-r3.ebuild index 8b198fbc7c16..fdcb5ecb743d 100644 --- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20220106-r3.ebuild +++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for dmidecode" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20220106-r3.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20220106-r3.ebuild index b518418cd74b..c34abeb2a9ae 100644 --- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20220106-r3.ebuild +++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for dnsmasq" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-docker/selinux-docker-2.20220106-r3.ebuild b/sec-policy/selinux-docker/selinux-docker-2.20220106-r3.ebuild index 86cb6e1fc893..4f24f60953dc 100644 --- a/sec-policy/selinux-docker/selinux-docker-2.20220106-r3.ebuild +++ b/sec-policy/selinux-docker/selinux-docker-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for docker" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20220106-r3.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20220106-r3.ebuild index dde0b5e08390..4c01b14d840b 100644 --- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20220106-r3.ebuild +++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for dovecot" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20220106-r3.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20220106-r3.ebuild index f12be426e792..949b70ce2528 100644 --- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20220106-r3.ebuild +++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for dpkg" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20220106-r3.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20220106-r3.ebuild index 7a97a74717f1..8f6dc376036a 100644 --- a/sec-policy/selinux-dracut/selinux-dracut-2.20220106-r3.ebuild +++ b/sec-policy/selinux-dracut/selinux-dracut-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for dracut" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20220106-r3.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20220106-r3.ebuild index a738257c36eb..59c8a1d735d0 100644 --- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20220106-r3.ebuild +++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for dropbox" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-xserver diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20220106-r3.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20220106-r3.ebuild index d2fe8dd6f687..a62294ec2748 100644 --- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for entropyd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20220106-r3.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20220106-r3.ebuild index 19208e0840ce..4c4b0391579a 100644 --- a/sec-policy/selinux-evolution/selinux-evolution-2.20220106-r3.ebuild +++ b/sec-policy/selinux-evolution/selinux-evolution-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for evolution" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-xserver diff --git a/sec-policy/selinux-exim/selinux-exim-2.20220106-r3.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20220106-r3.ebuild index 95be5e49cddb..e5ab4bd257fd 100644 --- a/sec-policy/selinux-exim/selinux-exim-2.20220106-r3.ebuild +++ b/sec-policy/selinux-exim/selinux-exim-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for exim" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20220106-r3.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20220106-r3.ebuild index 5138b9e7d428..64479afeb42e 100644 --- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20220106-r3.ebuild +++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for fail2ban" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20220106-r3.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20220106-r3.ebuild index 3e5aa783d27f..34d493e51351 100644 --- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20220106-r3.ebuild +++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for fetchmail" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-finger/selinux-finger-2.20220106-r3.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20220106-r3.ebuild index 3020b65de3a5..1c33202139d1 100644 --- a/sec-policy/selinux-finger/selinux-finger-2.20220106-r3.ebuild +++ b/sec-policy/selinux-finger/selinux-finger-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for finger" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} diff --git a/sec-policy/selinux-flash/selinux-flash-2.20220106-r3.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20220106-r3.ebuild index 1909c9fbdfd5..9b172ef76051 100644 --- a/sec-policy/selinux-flash/selinux-flash-2.20220106-r3.ebuild +++ b/sec-policy/selinux-flash/selinux-flash-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for flash" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20220106-r3.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20220106-r3.ebuild index b208484e34c0..183bdf7cdef6 100644 --- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for fprintd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-dbus diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20220106-r3.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20220106-r3.ebuild index f2062624d95a..d1559d130897 100644 --- a/sec-policy/selinux-ftp/selinux-ftp-2.20220106-r3.ebuild +++ b/sec-policy/selinux-ftp/selinux-ftp-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for ftp" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-games/selinux-games-2.20220106-r3.ebuild b/sec-policy/selinux-games/selinux-games-2.20220106-r3.ebuild index 660fce2c206c..e5da90141ce0 100644 --- a/sec-policy/selinux-games/selinux-games-2.20220106-r3.ebuild +++ b/sec-policy/selinux-games/selinux-games-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for games" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20220106-r3.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20220106-r3.ebuild index 6d6e9da8a3b3..38ae98eeb5ee 100644 --- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20220106-r3.ebuild +++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for gatekeeper" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-git/selinux-git-2.20220106-r3.ebuild b/sec-policy/selinux-git/selinux-git-2.20220106-r3.ebuild index 34684274be7a..9cac0ce2ba0e 100644 --- a/sec-policy/selinux-git/selinux-git-2.20220106-r3.ebuild +++ b/sec-policy/selinux-git/selinux-git-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for git" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20220106-r3.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20220106-r3.ebuild index e51a6ef3731c..bcb83b154d04 100644 --- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20220106-r3.ebuild +++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for gitosis" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20220106-r3.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20220106-r3.ebuild index aae38b4527c2..ea77b39c394b 100644 --- a/sec-policy/selinux-gnome/selinux-gnome-2.20220106-r3.ebuild +++ b/sec-policy/selinux-gnome/selinux-gnome-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for gnome" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20220106-r3.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20220106-r3.ebuild index 9679ee142a08..46831dba2db0 100644 --- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20220106-r3.ebuild +++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for googletalk" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20220106-r3.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20220106-r3.ebuild index 93acde702bb9..3c82117bef63 100644 --- a/sec-policy/selinux-gorg/selinux-gorg-2.20220106-r3.ebuild +++ b/sec-policy/selinux-gorg/selinux-gorg-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for gorg" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20220106-r3.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20220106-r3.ebuild index d4ea1a4f0432..181f8dcfacfd 100644 --- a/sec-policy/selinux-gpg/selinux-gpg-2.20220106-r3.ebuild +++ b/sec-policy/selinux-gpg/selinux-gpg-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for gpg" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20220106-r3.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20220106-r3.ebuild index cf7997b4ceb4..13fa9def6258 100644 --- a/sec-policy/selinux-gpm/selinux-gpm-2.20220106-r3.ebuild +++ b/sec-policy/selinux-gpm/selinux-gpm-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for gpm" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20220106-r3.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20220106-r3.ebuild index b5e61caf8d74..b2532d7b4d9e 100644 --- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for gpsd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20220106-r3.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20220106-r3.ebuild index d28e252641c1..6df7916f1f09 100644 --- a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20220106-r3.ebuild +++ b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for gssproxy" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20220106-r3.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20220106-r3.ebuild index beed88513d11..ebb4be762979 100644 --- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20220106-r3.ebuild +++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for hddtemp" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-hostapd/selinux-hostapd-2.20220106-r3.ebuild b/sec-policy/selinux-hostapd/selinux-hostapd-2.20220106-r3.ebuild index d7fc57c20f98..415c37a1e55f 100644 --- a/sec-policy/selinux-hostapd/selinux-hostapd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-hostapd/selinux-hostapd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for hostapd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20220106-r3.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20220106-r3.ebuild index 038d819f20fa..e25ec26b0ea2 100644 --- a/sec-policy/selinux-icecast/selinux-icecast-2.20220106-r3.ebuild +++ b/sec-policy/selinux-icecast/selinux-icecast-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for icecast" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20220106-r3.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20220106-r3.ebuild index 39e21ea8d460..f6db1f263ec2 100644 --- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for ifplugd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20220106-r3.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20220106-r3.ebuild index d6b25e33f263..30d23a2c9e70 100644 --- a/sec-policy/selinux-inetd/selinux-inetd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-inetd/selinux-inetd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for inetd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-inn/selinux-inn-2.20220106-r3.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20220106-r3.ebuild index 3febf0dddaa5..8465b7c044d2 100644 --- a/sec-policy/selinux-inn/selinux-inn-2.20220106-r3.ebuild +++ b/sec-policy/selinux-inn/selinux-inn-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for inn" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20220106-r3.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20220106-r3.ebuild index f2d840cc9713..4089687edd22 100644 --- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20220106-r3.ebuild +++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for ipsec" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-irc/selinux-irc-2.20220106-r3.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20220106-r3.ebuild index ee7e0484b3df..b45ebbe909c8 100644 --- a/sec-policy/selinux-irc/selinux-irc-2.20220106-r3.ebuild +++ b/sec-policy/selinux-irc/selinux-irc-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for irc" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20220106-r3.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20220106-r3.ebuild index 30cb6e34ddb8..aeaa8bc660ae 100644 --- a/sec-policy/selinux-ircd/selinux-ircd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-ircd/selinux-ircd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for ircd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20220106-r3.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20220106-r3.ebuild index 7da8ffd5c16e..afe0816883bf 100644 --- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20220106-r3.ebuild +++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for irqbalance" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20220106-r3.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20220106-r3.ebuild index 6dd4b32d4cdc..174c88bd77ce 100644 --- a/sec-policy/selinux-jabber/selinux-jabber-2.20220106-r3.ebuild +++ b/sec-policy/selinux-jabber/selinux-jabber-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for jabber" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-java/selinux-java-2.20220106-r3.ebuild b/sec-policy/selinux-java/selinux-java-2.20220106-r3.ebuild index 67e17f351108..eb76901ffe99 100644 --- a/sec-policy/selinux-java/selinux-java-2.20220106-r3.ebuild +++ b/sec-policy/selinux-java/selinux-java-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for java" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20220106-r3.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20220106-r3.ebuild index 8e098fe5b59b..4370b96ae647 100644 --- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20220106-r3.ebuild +++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for kdeconnect" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20220106-r3.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20220106-r3.ebuild index 91c80d2ceba3..3d3fbd834ee3 100644 --- a/sec-policy/selinux-kdump/selinux-kdump-2.20220106-r3.ebuild +++ b/sec-policy/selinux-kdump/selinux-kdump-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for kdump" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20220106-r3.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20220106-r3.ebuild index 0af5c7d4dc61..506dc80d713c 100644 --- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20220106-r3.ebuild +++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for kerberos" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20220106-r3.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20220106-r3.ebuild index e297d53ad7de..7d1b70862cd7 100644 --- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20220106-r3.ebuild +++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for kerneloops" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20220106-r3.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20220106-r3.ebuild index f6ccb3d633aa..d6625648b948 100644 --- a/sec-policy/selinux-kismet/selinux-kismet-2.20220106-r3.ebuild +++ b/sec-policy/selinux-kismet/selinux-kismet-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for kismet" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20220106-r3.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20220106-r3.ebuild index 34d1717dcad3..308e17ba3a7b 100644 --- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20220106-r3.ebuild +++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for ksmtuned" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20220106-r3.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20220106-r3.ebuild index efd57f133c7d..d9bf25ff8663 100644 --- a/sec-policy/selinux-ldap/selinux-ldap-2.20220106-r3.ebuild +++ b/sec-policy/selinux-ldap/selinux-ldap-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for ldap" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-links/selinux-links-2.20220106-r3.ebuild b/sec-policy/selinux-links/selinux-links-2.20220106-r3.ebuild index f4d947d96b10..76d42d1fc338 100644 --- a/sec-policy/selinux-links/selinux-links-2.20220106-r3.ebuild +++ b/sec-policy/selinux-links/selinux-links-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for links" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20220106-r3.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20220106-r3.ebuild index 926dbc93984c..83844b0ac7c4 100644 --- a/sec-policy/selinux-lircd/selinux-lircd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-lircd/selinux-lircd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for lircd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20220106-r3.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20220106-r3.ebuild index 0c32514abc29..75636906313b 100644 --- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20220106-r3.ebuild +++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for loadkeys" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20220106-r3.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20220106-r3.ebuild index 16282086d14f..b6396949f003 100644 --- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20220106-r3.ebuild +++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for logrotate" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20220106-r3.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20220106-r3.ebuild index f6ed486c889f..a530fe652111 100644 --- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20220106-r3.ebuild +++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for logsentry" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20220106-r3.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20220106-r3.ebuild index 7947c3aa7755..93177de5e2af 100644 --- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20220106-r3.ebuild +++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for logwatch" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20220106-r3.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20220106-r3.ebuild index 0a7fbfceb062..2ba394de41ad 100644 --- a/sec-policy/selinux-lpd/selinux-lpd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-lpd/selinux-lpd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for lpd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20220106-r3.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20220106-r3.ebuild index 69ac92966605..8b7b974926a0 100644 --- a/sec-policy/selinux-mailman/selinux-mailman-2.20220106-r3.ebuild +++ b/sec-policy/selinux-mailman/selinux-mailman-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for mailman" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20220106-r3.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20220106-r3.ebuild index 0253b805eb35..13cbcab357e8 100644 --- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20220106-r3.ebuild +++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for makewhatis" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20220106-r3.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20220106-r3.ebuild index 0cfeb7363481..c5c6526a258d 100644 --- a/sec-policy/selinux-mandb/selinux-mandb-2.20220106-r3.ebuild +++ b/sec-policy/selinux-mandb/selinux-mandb-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for mandb" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20220106-r3.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20220106-r3.ebuild index 2303f953c7f0..266736456d6b 100644 --- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20220106-r3.ebuild +++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for mcelog" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20220106-r3.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20220106-r3.ebuild index 352e1599b0aa..707db3036b7a 100644 --- a/sec-policy/selinux-memcached/selinux-memcached-2.20220106-r3.ebuild +++ b/sec-policy/selinux-memcached/selinux-memcached-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for memcached" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-milter/selinux-milter-2.20220106-r3.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20220106-r3.ebuild index 18327180c1f6..2f3e83332197 100644 --- a/sec-policy/selinux-milter/selinux-milter-2.20220106-r3.ebuild +++ b/sec-policy/selinux-milter/selinux-milter-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for milter" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20220106-r3.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20220106-r3.ebuild index 4cf74711e90d..984d585d39c0 100644 --- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20220106-r3.ebuild +++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for modemmanager" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-dbus diff --git a/sec-policy/selinux-mono/selinux-mono-2.20220106-r3.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20220106-r3.ebuild index 24a9ae6d6acb..f13f9eb0727d 100644 --- a/sec-policy/selinux-mono/selinux-mono-2.20220106-r3.ebuild +++ b/sec-policy/selinux-mono/selinux-mono-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for mono" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20220106-r3.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20220106-r3.ebuild index 6898cce05e2b..545b3caec389 100644 --- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20220106-r3.ebuild +++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for mozilla" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-xserver diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20220106-r3.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20220106-r3.ebuild index d2bd42397e74..73f8d123a381 100644 --- a/sec-policy/selinux-mpd/selinux-mpd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-mpd/selinux-mpd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for mpd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20220106-r3.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20220106-r3.ebuild index e340f9c0f11b..686d3c1311ae 100644 --- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20220106-r3.ebuild +++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for mplayer" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20220106-r3.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20220106-r3.ebuild index af5b48d0b831..cfe89e3663ad 100644 --- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20220106-r3.ebuild +++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for mrtg" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-munin/selinux-munin-2.20220106-r3.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20220106-r3.ebuild index e7ec7e73717d..2ad35a1d53b4 100644 --- a/sec-policy/selinux-munin/selinux-munin-2.20220106-r3.ebuild +++ b/sec-policy/selinux-munin/selinux-munin-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for munin" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-apache diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20220106-r3.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20220106-r3.ebuild index 9bf3af54861b..be503c4a44ab 100644 --- a/sec-policy/selinux-mutt/selinux-mutt-2.20220106-r3.ebuild +++ b/sec-policy/selinux-mutt/selinux-mutt-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for mutt" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20220106-r3.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20220106-r3.ebuild index dd654488ebb9..ed48284893a8 100644 --- a/sec-policy/selinux-mysql/selinux-mysql-2.20220106-r3.ebuild +++ b/sec-policy/selinux-mysql/selinux-mysql-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for mysql" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20220106-r3.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20220106-r3.ebuild index 617e5be80a54..065e7b1ae1ef 100644 --- a/sec-policy/selinux-nagios/selinux-nagios-2.20220106-r3.ebuild +++ b/sec-policy/selinux-nagios/selinux-nagios-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for nagios" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-apache diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20220106-r3.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20220106-r3.ebuild index 9e7731ccff09..b60ba46f6077 100644 --- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20220106-r3.ebuild +++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for ncftool" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20220106-r3.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20220106-r3.ebuild index 8680234d0fda..420268a2c42e 100644 --- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20220106-r3.ebuild +++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for networkmanager" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20220106-r3.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20220106-r3.ebuild index fe043acf0f22..dd7081d1c85d 100644 --- a/sec-policy/selinux-nginx/selinux-nginx-2.20220106-r3.ebuild +++ b/sec-policy/selinux-nginx/selinux-nginx-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for nginx" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-apache diff --git a/sec-policy/selinux-node_exporter/selinux-node_exporter-2.20220106-r3.ebuild b/sec-policy/selinux-node_exporter/selinux-node_exporter-2.20220106-r3.ebuild index 5c81b8da8185..6822f27440de 100644 --- a/sec-policy/selinux-node_exporter/selinux-node_exporter-2.20220106-r3.ebuild +++ b/sec-policy/selinux-node_exporter/selinux-node_exporter-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for node_exporter" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20220106-r3.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20220106-r3.ebuild index 8ab2509be03f..adf43c510c5b 100644 --- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for nslcd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20220106-r3.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20220106-r3.ebuild index bdc357404c14..b1787cec63f7 100644 --- a/sec-policy/selinux-ntop/selinux-ntop-2.20220106-r3.ebuild +++ b/sec-policy/selinux-ntop/selinux-ntop-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for ntop" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20220106-r3.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20220106-r3.ebuild index 28a6614cc3eb..4d972884023b 100644 --- a/sec-policy/selinux-ntp/selinux-ntp-2.20220106-r3.ebuild +++ b/sec-policy/selinux-ntp/selinux-ntp-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for ntp" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-nut/selinux-nut-2.20220106-r3.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20220106-r3.ebuild index 7e2f5f4f2053..71846f426e4d 100644 --- a/sec-policy/selinux-nut/selinux-nut-2.20220106-r3.ebuild +++ b/sec-policy/selinux-nut/selinux-nut-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for nut" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-apache diff --git a/sec-policy/selinux-nx/selinux-nx-2.20220106-r3.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20220106-r3.ebuild index 541ac532c579..4740f9e2d598 100644 --- a/sec-policy/selinux-nx/selinux-nx-2.20220106-r3.ebuild +++ b/sec-policy/selinux-nx/selinux-nx-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for nx" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-2.20220106-r3.ebuild b/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-2.20220106-r3.ebuild index 392e40f46bd6..c4c6cae71f7c 100644 --- a/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-2.20220106-r3.ebuild +++ b/sec-policy/selinux-obfs4proxy/selinux-obfs4proxy-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for obfs4proxy" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20220106-r3.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20220106-r3.ebuild index 8fa1a432d1fa..d8014310007c 100644 --- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20220106-r3.ebuild +++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for oddjob" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-oident/selinux-oident-2.20220106-r3.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20220106-r3.ebuild index 1de3317b2feb..813429a04c79 100644 --- a/sec-policy/selinux-oident/selinux-oident-2.20220106-r3.ebuild +++ b/sec-policy/selinux-oident/selinux-oident-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for oident" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-openct/selinux-openct-2.20220106-r3.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20220106-r3.ebuild index 61e844a2107d..581f7c4f1643 100644 --- a/sec-policy/selinux-openct/selinux-openct-2.20220106-r3.ebuild +++ b/sec-policy/selinux-openct/selinux-openct-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for openct" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20220106-r3.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20220106-r3.ebuild index 6f28e775c1f5..7439e7d311d9 100644 --- a/sec-policy/selinux-openrc/selinux-openrc-2.20220106-r3.ebuild +++ b/sec-policy/selinux-openrc/selinux-openrc-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for openrc" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20220106-r3.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20220106-r3.ebuild index fac5d0756e0e..f824822ad280 100644 --- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20220106-r3.ebuild +++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for openvpn" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-pan/selinux-pan-2.20220106-r3.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20220106-r3.ebuild index 9b766ca526ee..7e53fdb94e13 100644 --- a/sec-policy/selinux-pan/selinux-pan-2.20220106-r3.ebuild +++ b/sec-policy/selinux-pan/selinux-pan-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for pan" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-xserver diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20220106-r3.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20220106-r3.ebuild index 924d8ac78f53..b7b809136483 100644 --- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for pcscd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20220106-r3.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20220106-r3.ebuild index a78aff8bb937..1c0fb2093292 100644 --- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20220106-r3.ebuild +++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for phpfpm" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-apache diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20220106-r3.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20220106-r3.ebuild index eee932601de6..3ed9d12fc2e3 100644 --- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for plymouthd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-podman/selinux-podman-2.20220106-r3.ebuild b/sec-policy/selinux-podman/selinux-podman-2.20220106-r3.ebuild index 86c074ff20d0..53fdda021118 100644 --- a/sec-policy/selinux-podman/selinux-podman-2.20220106-r3.ebuild +++ b/sec-policy/selinux-podman/selinux-podman-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for podman" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20220106-r3.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20220106-r3.ebuild index 1ede5819cb90..0477c205f392 100644 --- a/sec-policy/selinux-policykit/selinux-policykit-2.20220106-r3.ebuild +++ b/sec-policy/selinux-policykit/selinux-policykit-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for policykit" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20220106-r3.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20220106-r3.ebuild index e2e02f769a14..31ca4f18d754 100644 --- a/sec-policy/selinux-portmap/selinux-portmap-2.20220106-r3.ebuild +++ b/sec-policy/selinux-portmap/selinux-portmap-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for portmap" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20220106-r3.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20220106-r3.ebuild index daf81213125e..990a846581c0 100644 --- a/sec-policy/selinux-postfix/selinux-postfix-2.20220106-r3.ebuild +++ b/sec-policy/selinux-postfix/selinux-postfix-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for postfix" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20220106-r3.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20220106-r3.ebuild index 9214d5a64b55..d1da9a5cb21a 100644 --- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20220106-r3.ebuild +++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for postgresql" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20220106-r3.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20220106-r3.ebuild index 7aab3b4d7c67..7b12933f5758 100644 --- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20220106-r3.ebuild +++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for postgrey" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20220106-r3.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20220106-r3.ebuild index 27bf40dc4df1..ded321487074 100644 --- a/sec-policy/selinux-ppp/selinux-ppp-2.20220106-r3.ebuild +++ b/sec-policy/selinux-ppp/selinux-ppp-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for ppp" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20220106-r3.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20220106-r3.ebuild index 284d47186b16..628bffa06a0d 100644 --- a/sec-policy/selinux-prelude/selinux-prelude-2.20220106-r3.ebuild +++ b/sec-policy/selinux-prelude/selinux-prelude-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for prelude" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-apache diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20220106-r3.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20220106-r3.ebuild index 0e5d40071c08..2f6f50236f90 100644 --- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20220106-r3.ebuild +++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for privoxy" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20220106-r3.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20220106-r3.ebuild index a02352c2d42b..bbbbcaadef8f 100644 --- a/sec-policy/selinux-procmail/selinux-procmail-2.20220106-r3.ebuild +++ b/sec-policy/selinux-procmail/selinux-procmail-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for procmail" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-psad/selinux-psad-2.20220106-r3.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20220106-r3.ebuild index ee1007d7bb4d..ecbb5f037c61 100644 --- a/sec-policy/selinux-psad/selinux-psad-2.20220106-r3.ebuild +++ b/sec-policy/selinux-psad/selinux-psad-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for psad" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20220106-r3.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20220106-r3.ebuild index 4b31d0d186b7..14b07f862818 100644 --- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20220106-r3.ebuild +++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for publicfile" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20220106-r3.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20220106-r3.ebuild index 7fe2164cc88b..448be6370d01 100644 --- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20220106-r3.ebuild +++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for pulseaudio" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20220106-r3.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20220106-r3.ebuild index efc25df6ffcf..80b4c28acaf1 100644 --- a/sec-policy/selinux-puppet/selinux-puppet-2.20220106-r3.ebuild +++ b/sec-policy/selinux-puppet/selinux-puppet-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for puppet" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20220106-r3.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20220106-r3.ebuild index 7ed3ea7e10c7..7783a7cda941 100644 --- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20220106-r3.ebuild +++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for pyzor" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20220106-r3.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20220106-r3.ebuild index 5f5594656c5b..0ce98264094e 100644 --- a/sec-policy/selinux-qemu/selinux-qemu-2.20220106-r3.ebuild +++ b/sec-policy/selinux-qemu/selinux-qemu-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for qemu" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-virt diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20220106-r3.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20220106-r3.ebuild index 4ac214b844b7..8427e130dd37 100644 --- a/sec-policy/selinux-qmail/selinux-qmail-2.20220106-r3.ebuild +++ b/sec-policy/selinux-qmail/selinux-qmail-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for qmail" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-quota/selinux-quota-2.20220106-r3.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20220106-r3.ebuild index b0beca82bd27..74e7fe4dda9e 100644 --- a/sec-policy/selinux-quota/selinux-quota-2.20220106-r3.ebuild +++ b/sec-policy/selinux-quota/selinux-quota-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for quota" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-radius/selinux-radius-2.20220106-r3.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20220106-r3.ebuild index 883b5f1cb9cb..d468cba98b34 100644 --- a/sec-policy/selinux-radius/selinux-radius-2.20220106-r3.ebuild +++ b/sec-policy/selinux-radius/selinux-radius-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for radius" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20220106-r3.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20220106-r3.ebuild index 594eb76d08ff..4ecf360bef7f 100644 --- a/sec-policy/selinux-radvd/selinux-radvd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-radvd/selinux-radvd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for radvd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-razor/selinux-razor-2.20220106-r3.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20220106-r3.ebuild index e3cbc7c7550e..2a15d3c97bc1 100644 --- a/sec-policy/selinux-razor/selinux-razor-2.20220106-r3.ebuild +++ b/sec-policy/selinux-razor/selinux-razor-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for razor" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-redis/selinux-redis-2.20220106-r3.ebuild b/sec-policy/selinux-redis/selinux-redis-2.20220106-r3.ebuild index 170cd464171c..bf9b662927ec 100644 --- a/sec-policy/selinux-redis/selinux-redis-2.20220106-r3.ebuild +++ b/sec-policy/selinux-redis/selinux-redis-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for redis" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20220106-r3.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20220106-r3.ebuild index 72901de8c94b..7a1f9b985121 100644 --- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20220106-r3.ebuild +++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for remotelogin" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20220106-r3.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20220106-r3.ebuild index 510b2a5e0b30..eec87dea9f0c 100644 --- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20220106-r3.ebuild +++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for resolvconf" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20220106-r3.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20220106-r3.ebuild index 3e32b697831b..0736b5db21a8 100644 --- a/sec-policy/selinux-rngd/selinux-rngd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-rngd/selinux-rngd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for rngd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-rootlesskit/selinux-rootlesskit-2.20220106-r3.ebuild b/sec-policy/selinux-rootlesskit/selinux-rootlesskit-2.20220106-r3.ebuild index a367e61be69b..60378f661fd9 100644 --- a/sec-policy/selinux-rootlesskit/selinux-rootlesskit-2.20220106-r3.ebuild +++ b/sec-policy/selinux-rootlesskit/selinux-rootlesskit-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for rootlesskit" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20220106-r3.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20220106-r3.ebuild index f266d02915b2..97fad68438d9 100644 --- a/sec-policy/selinux-rpc/selinux-rpc-2.20220106-r3.ebuild +++ b/sec-policy/selinux-rpc/selinux-rpc-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for rpc" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20220106-r3.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20220106-r3.ebuild index 52d78be166e3..a9a31f98ac88 100644 --- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20220106-r3.ebuild +++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for rpcbind" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20220106-r3.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20220106-r3.ebuild index 309c381acd0a..bf594c5aaf35 100644 --- a/sec-policy/selinux-rpm/selinux-rpm-2.20220106-r3.ebuild +++ b/sec-policy/selinux-rpm/selinux-rpm-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for rpm" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20220106-r3.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20220106-r3.ebuild index 9c4ab20636c8..cbb315568da7 100644 --- a/sec-policy/selinux-rssh/selinux-rssh-2.20220106-r3.ebuild +++ b/sec-policy/selinux-rssh/selinux-rssh-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for rssh" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20220106-r3.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20220106-r3.ebuild index 5a2a4d3bd8fc..78435b5232ab 100644 --- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20220106-r3.ebuild +++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for rtkit" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-dbus diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20220106-r3.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20220106-r3.ebuild index f1220d8759d0..9fc0381f36c4 100644 --- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20220106-r3.ebuild +++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for rtorrent" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-salt/selinux-salt-2.20220106-r3.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20220106-r3.ebuild index 12cfc945b156..d076a3a059d3 100644 --- a/sec-policy/selinux-salt/selinux-salt-2.20220106-r3.ebuild +++ b/sec-policy/selinux-salt/selinux-salt-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for salt" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-samba/selinux-samba-2.20220106-r3.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20220106-r3.ebuild index 62fa59b893dc..fd3f07c3a19b 100644 --- a/sec-policy/selinux-samba/selinux-samba-2.20220106-r3.ebuild +++ b/sec-policy/selinux-samba/selinux-samba-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for samba" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20220106-r3.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20220106-r3.ebuild index 7a66efb88522..d00fb230fa9e 100644 --- a/sec-policy/selinux-sasl/selinux-sasl-2.20220106-r3.ebuild +++ b/sec-policy/selinux-sasl/selinux-sasl-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for sasl" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-screen/selinux-screen-2.20220106-r3.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20220106-r3.ebuild index 98109f1cfb37..d32292690a4c 100644 --- a/sec-policy/selinux-screen/selinux-screen-2.20220106-r3.ebuild +++ b/sec-policy/selinux-screen/selinux-screen-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for screen" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20220106-r3.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20220106-r3.ebuild index 1fdebf13c22f..669da58ac04e 100644 --- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20220106-r3.ebuild +++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for sendmail" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20220106-r3.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20220106-r3.ebuild index e2b70a975e0f..706e52a5750e 100644 --- a/sec-policy/selinux-sensord/selinux-sensord-2.20220106-r3.ebuild +++ b/sec-policy/selinux-sensord/selinux-sensord-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for sensord" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20220106-r3.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20220106-r3.ebuild index 2028165030ca..3b3b165de7b9 100644 --- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20220106-r3.ebuild +++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for shorewall" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20220106-r3.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20220106-r3.ebuild index 3c9b8980c4f7..a9630d9da649 100644 --- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20220106-r3.ebuild +++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for shutdown" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-skype/selinux-skype-2.20220106-r3.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20220106-r3.ebuild index d17609b17e81..54d85b9d1d13 100644 --- a/sec-policy/selinux-skype/selinux-skype-2.20220106-r3.ebuild +++ b/sec-policy/selinux-skype/selinux-skype-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for skype" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-xserver diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20220106-r3.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20220106-r3.ebuild index 20be97262f32..ed15fec7af40 100644 --- a/sec-policy/selinux-slocate/selinux-slocate-2.20220106-r3.ebuild +++ b/sec-policy/selinux-slocate/selinux-slocate-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for slocate" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20220106-r3.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20220106-r3.ebuild index 1c31aa66741b..c6f7eb681bfd 100644 --- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20220106-r3.ebuild +++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for slrnpull" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20220106-r3.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20220106-r3.ebuild index 5fd7a52e79c0..53ea0b2b4a28 100644 --- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20220106-r3.ebuild +++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for smartmon" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20220106-r3.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20220106-r3.ebuild index 4dc1c5f0547f..7e98b4acf136 100644 --- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20220106-r3.ebuild +++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for smokeping" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-apache diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20220106-r3.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20220106-r3.ebuild index 371bb7ff5aa7..d4aceb247e58 100644 --- a/sec-policy/selinux-snmp/selinux-snmp-2.20220106-r3.ebuild +++ b/sec-policy/selinux-snmp/selinux-snmp-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for snmp" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-snort/selinux-snort-2.20220106-r3.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20220106-r3.ebuild index acb2f0f8050d..d8981469cf02 100644 --- a/sec-policy/selinux-snort/selinux-snort-2.20220106-r3.ebuild +++ b/sec-policy/selinux-snort/selinux-snort-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for snort" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20220106-r3.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20220106-r3.ebuild index 5821db8265fb..f412ba0dfdb4 100644 --- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20220106-r3.ebuild +++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for soundserver" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20220106-r3.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20220106-r3.ebuild index 3abe0e7d7048..b36322cdb6c4 100644 --- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20220106-r3.ebuild +++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for spamassassin" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-squid/selinux-squid-2.20220106-r3.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20220106-r3.ebuild index dc8fc9c50556..9d53046f9a06 100644 --- a/sec-policy/selinux-squid/selinux-squid-2.20220106-r3.ebuild +++ b/sec-policy/selinux-squid/selinux-squid-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for squid" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-apache diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20220106-r3.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20220106-r3.ebuild index 6bb2ebbfe0b4..d0691f20a03b 100644 --- a/sec-policy/selinux-sssd/selinux-sssd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-sssd/selinux-sssd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for sssd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20220106-r3.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20220106-r3.ebuild index d7dacfdd2607..0d30e84ba227 100644 --- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20220106-r3.ebuild +++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for stunnel" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20220106-r3.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20220106-r3.ebuild index e82c7f8b670e..288f1a1ccd25 100644 --- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20220106-r3.ebuild +++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for subsonic" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20220106-r3.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20220106-r3.ebuild index d307bad670b1..6b7223355734 100644 --- a/sec-policy/selinux-sudo/selinux-sudo-2.20220106-r3.ebuild +++ b/sec-policy/selinux-sudo/selinux-sudo-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for sudo" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20220106-r3.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20220106-r3.ebuild index 3e3263270ecf..1eaf10bad750 100644 --- a/sec-policy/selinux-sxid/selinux-sxid-2.20220106-r3.ebuild +++ b/sec-policy/selinux-sxid/selinux-sxid-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for sxid" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20220106-r3.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20220106-r3.ebuild index 8ca09de2e5ff..e09b5ba4246c 100644 --- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20220106-r3.ebuild +++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for syncthing" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20220106-r3.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20220106-r3.ebuild index fc6c05f8012f..686258240dac 100644 --- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20220106-r3.ebuild +++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for sysstat" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20220106-r3.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20220106-r3.ebuild index 95fc5e1a909a..f5c7519252f0 100644 --- a/sec-policy/selinux-tboot/selinux-tboot-2.20220106-r3.ebuild +++ b/sec-policy/selinux-tboot/selinux-tboot-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for tboot" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20220106-r3.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20220106-r3.ebuild index f0720f34fb1e..e6db03b2ea87 100644 --- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for tcpd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-inetd diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20220106-r3.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20220106-r3.ebuild index 73db7f8ed8ff..c31748b51984 100644 --- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for tcsd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20220106-r3.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20220106-r3.ebuild index d2c25a7c6731..233831bebf60 100644 --- a/sec-policy/selinux-telnet/selinux-telnet-2.20220106-r3.ebuild +++ b/sec-policy/selinux-telnet/selinux-telnet-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for telnet" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-remotelogin diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20220106-r3.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20220106-r3.ebuild index aa6695919368..368207c66a9e 100644 --- a/sec-policy/selinux-tftp/selinux-tftp-2.20220106-r3.ebuild +++ b/sec-policy/selinux-tftp/selinux-tftp-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for tftp" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20220106-r3.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20220106-r3.ebuild index 0a3e75b7e89a..78e0fe12aa36 100644 --- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for tgtd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20220106-r3.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20220106-r3.ebuild index 12150c30dd4c..b2aa3d4229e2 100644 --- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20220106-r3.ebuild +++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for thunderbird" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-xserver diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20220106-r3.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20220106-r3.ebuild index 6f15dd196ad7..f00d8a217de9 100644 --- a/sec-policy/selinux-timidity/selinux-timidity-2.20220106-r3.ebuild +++ b/sec-policy/selinux-timidity/selinux-timidity-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for timidity" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20220106-r3.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20220106-r3.ebuild index f4719c0384e6..bee53ee2d8f3 100644 --- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20220106-r3.ebuild +++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for tmpreaper" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-tor/selinux-tor-2.20220106-r3.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20220106-r3.ebuild index af327ce9b87d..8c99c5b7195d 100644 --- a/sec-policy/selinux-tor/selinux-tor-2.20220106-r3.ebuild +++ b/sec-policy/selinux-tor/selinux-tor-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for tor" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20220106-r3.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20220106-r3.ebuild index a48a76d34daf..f3396b6c9ba5 100644 --- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20220106-r3.ebuild +++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for tripwire" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20220106-r3.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20220106-r3.ebuild index 06a2ece306e1..b1636212c469 100644 --- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20220106-r3.ebuild +++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for ucspitcp" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20220106-r3.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20220106-r3.ebuild index e85d27a3779a..63db84997abb 100644 --- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for ulogd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-uml/selinux-uml-2.20220106-r3.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20220106-r3.ebuild index 414286a79c06..a5d91a02ffa9 100644 --- a/sec-policy/selinux-uml/selinux-uml-2.20220106-r3.ebuild +++ b/sec-policy/selinux-uml/selinux-uml-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for uml" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20220106-r3.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20220106-r3.ebuild index 36e90163a529..ca2ad1523dfe 100644 --- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20220106-r3.ebuild +++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for unconfined" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20220106-r3.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20220106-r3.ebuild index 5a5cf1c05dd2..afe237b6a90e 100644 --- a/sec-policy/selinux-uptime/selinux-uptime-2.20220106-r3.ebuild +++ b/sec-policy/selinux-uptime/selinux-uptime-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for uptime" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-usbguard/selinux-usbguard-2.20220106-r3.ebuild b/sec-policy/selinux-usbguard/selinux-usbguard-2.20220106-r3.ebuild index 2306a3c6f0dc..3d3d2d64e49c 100644 --- a/sec-policy/selinux-usbguard/selinux-usbguard-2.20220106-r3.ebuild +++ b/sec-policy/selinux-usbguard/selinux-usbguard-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for usbguard" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20220106-r3.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20220106-r3.ebuild index fd42366f839a..4b48c3e95b8b 100644 --- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for usbmuxd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20220106-r3.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20220106-r3.ebuild index ac7d19d4eea7..8b122623d70c 100644 --- a/sec-policy/selinux-uucp/selinux-uucp-2.20220106-r3.ebuild +++ b/sec-policy/selinux-uucp/selinux-uucp-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for uucp" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-inetd diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20220106-r3.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20220106-r3.ebuild index 3a5b2f9b8996..e48ee0912985 100644 --- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20220106-r3.ebuild +++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for uwimap" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20220106-r3.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20220106-r3.ebuild index d7388134df95..4a426ecede0a 100644 --- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20220106-r3.ebuild +++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for uWSGI" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20220106-r3.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20220106-r3.ebuild index 5b50b8526f0f..c2b73e87df67 100644 --- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for varnishd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20220106-r3.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20220106-r3.ebuild index 9f076bc25f8e..b855066ff185 100644 --- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20220106-r3.ebuild +++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for vbetool" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20220106-r3.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20220106-r3.ebuild index f54bfe98bbf1..13ab23321791 100644 --- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20220106-r3.ebuild +++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for vdagent" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-vde/selinux-vde-2.20220106-r3.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20220106-r3.ebuild index 666735436bc2..98172568701b 100644 --- a/sec-policy/selinux-vde/selinux-vde-2.20220106-r3.ebuild +++ b/sec-policy/selinux-vde/selinux-vde-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for vde" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-virt/selinux-virt-2.20220106-r3.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20220106-r3.ebuild index 8d064c4f1d45..22b4a11f2b95 100644 --- a/sec-policy/selinux-virt/selinux-virt-2.20220106-r3.ebuild +++ b/sec-policy/selinux-virt/selinux-virt-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for virt" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20220106-r3.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20220106-r3.ebuild index 197ed006e049..2cf2e2067b5d 100644 --- a/sec-policy/selinux-vlock/selinux-vlock-2.20220106-r3.ebuild +++ b/sec-policy/selinux-vlock/selinux-vlock-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for vlock" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20220106-r3.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20220106-r3.ebuild index 3c5984ed4514..2edaeccb4ab6 100644 --- a/sec-policy/selinux-vmware/selinux-vmware-2.20220106-r3.ebuild +++ b/sec-policy/selinux-vmware/selinux-vmware-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for vmware" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-xserver diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20220106-r3.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20220106-r3.ebuild index 3fca4dbdcaac..761b1ff74222 100644 --- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20220106-r3.ebuild +++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for vnstatd" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20220106-r3.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20220106-r3.ebuild index 200dbc6e9ab0..02763a9b8fb9 100644 --- a/sec-policy/selinux-vpn/selinux-vpn-2.20220106-r3.ebuild +++ b/sec-policy/selinux-vpn/selinux-vpn-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for vpn" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20220106-r3.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20220106-r3.ebuild index 8043807eaa56..5f1b8f9256d4 100644 --- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20220106-r3.ebuild +++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for watchdog" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20220106-r3.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20220106-r3.ebuild index c5ec15c952f0..590150b2b2e0 100644 --- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20220106-r3.ebuild +++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for webalizer" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} diff --git a/sec-policy/selinux-wine/selinux-wine-2.20220106-r3.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20220106-r3.ebuild index cd0d9efbe51d..5ac239440b87 100644 --- a/sec-policy/selinux-wine/selinux-wine-2.20220106-r3.ebuild +++ b/sec-policy/selinux-wine/selinux-wine-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for wine" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-wireguard/selinux-wireguard-2.20220106-r3.ebuild b/sec-policy/selinux-wireguard/selinux-wireguard-2.20220106-r3.ebuild index e19a6174649f..a282da62bf7a 100644 --- a/sec-policy/selinux-wireguard/selinux-wireguard-2.20220106-r3.ebuild +++ b/sec-policy/selinux-wireguard/selinux-wireguard-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for wireguard" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20220106-r3.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20220106-r3.ebuild index 615c477833f6..115a46bd34c8 100644 --- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20220106-r3.ebuild +++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for wireshark" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-wm/selinux-wm-2.20220106-r3.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20220106-r3.ebuild index 10fabd1b2356..96def39ec654 100644 --- a/sec-policy/selinux-wm/selinux-wm-2.20220106-r3.ebuild +++ b/sec-policy/selinux-wm/selinux-wm-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for wm" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-xen/selinux-xen-2.20220106-r3.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20220106-r3.ebuild index d2653712e836..2a5c489c32e8 100644 --- a/sec-policy/selinux-xen/selinux-xen-2.20220106-r3.ebuild +++ b/sec-policy/selinux-xen/selinux-xen-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for xen" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20220106-r3.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20220106-r3.ebuild index 6c30073820a8..73cca602a884 100644 --- a/sec-policy/selinux-xfs/selinux-xfs-2.20220106-r3.ebuild +++ b/sec-policy/selinux-xfs/selinux-xfs-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for xfs" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20220106-r3.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20220106-r3.ebuild index 93b8afa1de83..7c24330bd00b 100644 --- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20220106-r3.ebuild +++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20220106-r3.ebuild @@ -11,7 +11,7 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for xscreensaver" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi DEPEND="${DEPEND} sec-policy/selinux-xserver diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20220106-r3.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20220106-r3.ebuild index 7d681b3bf01f..ed231bd120dc 100644 --- a/sec-policy/selinux-xserver/selinux-xserver-2.20220106-r3.ebuild +++ b/sec-policy/selinux-xserver/selinux-xserver-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for xserver" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20220106-r3.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20220106-r3.ebuild index 235932cd3e71..a8758fd5abbd 100644 --- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20220106-r3.ebuild +++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20220106-r3.ebuild @@ -11,5 +11,5 @@ inherit selinux-policy-2 DESCRIPTION="SELinux policy for zabbix" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="amd64 arm arm64 ~mips x86" fi diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 6c2cc589d4d2..342c5eaf7e9d 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest index 3010ddb97562..1a877520394b 100644 --- a/sys-apps/checkpolicy/Manifest +++ b/sys-apps/checkpolicy/Manifest @@ -1 +1,2 @@ DIST checkpolicy-3.3.tar.gz 69286 BLAKE2B f22cb1b0dae5a89c0abb500c2f091beda7960493bd0dc3b9cb5bc8d2d08d507870e5db46f53ad87d0ddea5e3bbdb6c721a5c5e6824b37f554049000392af6a6d SHA512 40e7ccd804aa19f229eb76bdaeb79c87ed19004ac7b91674ecfb92d543573dc26f9d456ea25ed1e0ef8e1a69538e41c68b386a0743023f3ea83aa4350fc3ce30 +DIST checkpolicy-3.4-rc1.tar.gz 69829 BLAKE2B 7d217c79b689b8d08a4d16b174ac01bbee48ced7cc0920792a7263f3143f77838ba9f75ce7a3919a7eaa5818ac7ebdd1890a5fdc050680e45341bfe06dec634b SHA512 9aac4bd862f6dcb654cdbc786e0f89f8eccf2f93e6368b3d458a4a15210a558552ffeb64be9daf57bf3309bf74661a4eb6a5a336e64357f6e99bf3b7946d9b45 diff --git a/sys-apps/checkpolicy/checkpolicy-3.4_rc1.ebuild b/sys-apps/checkpolicy/checkpolicy-3.4_rc1.ebuild new file mode 100644 index 000000000000..b699f09c01de --- /dev/null +++ b/sys-apps/checkpolicy/checkpolicy-3.4_rc1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit toolchain-funcs + +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux policy compiler" +HOMEPAGE="http://userspace.selinuxproject.org" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" + S="${WORKDIR}/${P}/${PN}" +else + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="debug" + +DEPEND=">=sys-libs/libsepol-${PV}" +BDEPEND="sys-devel/flex + sys-devel/bison" + +RDEPEND=">=sys-libs/libsepol-${PV}" + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + YACC="bison -y" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" +} + +src_install() { + default + + if use debug; then + dobin "${S}/test/dismod" + dobin "${S}/test/dispol" + fi +} + +pkg_postinst() { + if ! tc-is-cross-compiler; then + einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy." + fi +} diff --git a/sys-apps/checkpolicy/checkpolicy-9999.ebuild b/sys-apps/checkpolicy/checkpolicy-9999.ebuild index f2cee8075367..b699f09c01de 100644 --- a/sys-apps/checkpolicy/checkpolicy-9999.ebuild +++ b/sys-apps/checkpolicy/checkpolicy-9999.ebuild @@ -1,10 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit toolchain-funcs +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + DESCRIPTION="SELinux policy compiler" HOMEPAGE="http://userspace.selinuxproject.org" @@ -13,8 +16,9 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" S="${WORKDIR}/${P}/${PN}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86" + S="${WORKDIR}/${MY_P}" fi LICENSE="GPL-2" diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index c7fc8c92a4c5..c7c78912ca5c 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,3 +1,3 @@ -DIST fwupd-1.7.2.tar.gz 3922633 BLAKE2B aec40de0bbadba9a8688617bf2f1a79b8952b8a30ac011b3656a3dee312295250e370a09b4ea2fbf35992f0124a7aa78b6e17200dc57c768d75d9ce3a94f6f18 SHA512 9cf47d13e31eaf11e2ffddfd26a0fb23a18049bcd7a54a1cb4e96003db8134cf01bbe83e507b90d429df78e478cb3c97bdd3d2c0e194f02994ef4c5a15347521 DIST fwupd-1.7.5.tar.gz 4014523 BLAKE2B b7297bbf3358209464691b928b928fa029c68ae6a3bc413d514409e4382bf8a3b0d57f4febc29a24d6351481474dd8111406ffdcb11125139fbc04a33ea00321 SHA512 1c2d99d905f76ebfce65db310ba0f6c1305ecf662b58bd9f6f6597ccc79cbabed126c97f2142207c99d8373ed42575363a58d9f053f390780b7c9a19c614fb31 DIST fwupd-1.7.6.tar.gz 4054269 BLAKE2B dea4a37aea406e933f312fb809ee2ea972e3b017e5267d51bed835b6d440c15ca1d589f76a6c1906e616acc7cdd6c0f6dcec034e1460427057d8a1168583c4ce SHA512 f04ee78a6ec9e73ce0f3eb9c2dcbfc471ac88264451a378f1b0010fa528596052b4d3a63f5303074dd4fad55bf153fe5642d77adebd4ed805d74f57fbbff5b2b +DIST fwupd-1.7.7.tar.gz 4057638 BLAKE2B 197d7b8a8de64094d267bb4e2de30101373bcc52fd54d12dc2590a50f2bcebbcfe00847d19c0088d2c778743d219ee73c0237db711ad27e36f7126f7c615ccf7 SHA512 a787ffdff93f483ad97547d335c50a4db7b61bce1bc27d737b077bbedfa4676c8d6d37db94ac24083c50e3bfde8aefd4d1adb3d0e473303f454a46dde136df0a diff --git a/sys-apps/fwupd/fwupd-1.7.2-r2.ebuild b/sys-apps/fwupd/fwupd-1.7.7.ebuild similarity index 92% rename from sys-apps/fwupd/fwupd-1.7.2-r2.ebuild rename to sys-apps/fwupd/fwupd-1.7.7.ebuild index 03e200fc2781..0bdeddaad956 100644 --- a/sys-apps/fwupd/fwupd-1.7.2-r2.ebuild +++ b/sys-apps/fwupd/fwupd-1.7.7.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 PYTHON_COMPAT=( python3_{8..10} ) @@ -13,8 +13,8 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" -IUSE="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi" REQUIRED_USE="${PYTHON_REQUIRED_USE} ^^ ( elogind minimal systemd ) dell? ( uefi ) @@ -43,19 +43,17 @@ BDEPEND="$(vala_depend) " COMMON_DEPEND="${PYTHON_DEPS} >=app-arch/gcab-1.0 - dev-db/sqlite - >=dev-libs/glib-2.45.8:2 + app-arch/xz-utils + >=dev-libs/glib-2.58:2 dev-libs/json-glib - dev-libs/libgpg-error dev-libs/libgudev:= - >=dev-libs/libjcat-0.1.0[gpg,pkcs7] + >=dev-libs/libjcat-0.1.4[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] $(python_gen_cond_dep ' dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] ') >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl - virtual/udev archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) @@ -66,6 +64,7 @@ COMMON_DEPEND="${PYTHON_DEPS} lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) + sqlite? ( dev-db/sqlite ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( @@ -111,13 +110,16 @@ src_prepare() { src_configure() { local plugins=( + -Dplugin_gpio="true" $(meson_use amt plugin_amt) $(meson_use dell plugin_dell) $(meson_use fastboot plugin_fastboot) $(meson_use flashrom plugin_flashrom) + $(meson_use gusb plugin_uf2) $(meson_use logitech plugin_logitech_bulkcontroller) $(meson_use modemmanager plugin_modem_manager) $(meson_use nvme plugin_nvme) + $(meson_use sqlite) $(meson_use spi plugin_intel_spi) $(meson_use synaptics plugin_synaptics_mst) $(meson_use synaptics plugin_synaptics_rmi) diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest index e080416085d3..b150878307f9 100644 --- a/sys-apps/mcstrans/Manifest +++ b/sys-apps/mcstrans/Manifest @@ -1 +1,2 @@ DIST mcstrans-3.3.tar.gz 44621 BLAKE2B 624780c219d0b8f369def5ab334caf9d2ae847f9cfb4359ce38e240bcb72b7cfeef45d08cd6e7330cc90394f6c32bd622d2133e675036f98992145b1530ab1e2 SHA512 2157a0361bb5a2bc8e149373b2dd7d9b042f8c4c0aa845ae6967a23d9b875d2dcd6176d99d7f8f15e17eb5877fea60814e19aabfe76950d25b75c9c25df811c2 +DIST mcstrans-3.4-rc1.tar.gz 45128 BLAKE2B 90ef74de6db72005b17254a23673edca30c8441155947b0cd11e5a45b376a58f608eca38fc91184e33dd593551de48010bde1962849ad7d6427d310c4e2609e4 SHA512 7889b6b4a22d2b3b900b28fddfb09d32bcc8d4dfacb3ac75253aa812b35578907272b758c4050d52560cdb751cefca5f4bd46c8c2402b47f8833c63134b8e780 diff --git a/sys-apps/mcstrans/mcstrans-3.4_rc1.ebuild b/sys-apps/mcstrans/mcstrans-3.4_rc1.ebuild new file mode 100644 index 000000000000..75563498db4f --- /dev/null +++ b/sys-apps/mcstrans/mcstrans-3.4_rc1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit toolchain-funcs + +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux context translation to human readable names" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" + S="${WORKDIR}/${P}/${PN}" +else + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +DEPEND=">=sys-libs/libsepol-${PV}:= + >=sys-libs/libselinux-${PV}:= + dev-libs/libpcre2:= + >=sys-libs/libcap-1.10-r10:=" + +RDEPEND="${DEPEND}" + +src_prepare() { + default + + sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror" +} + +src_compile() { + tc-export CC + default +} + +src_install() { + emake DESTDIR="${D}" install + + rm -rf "${D}/etc/rc.d" || die + + newinitd "${FILESDIR}/mcstransd.init" mcstransd +} diff --git a/sys-apps/mcstrans/mcstrans-9999.ebuild b/sys-apps/mcstrans/mcstrans-9999.ebuild index 631d654a0a38..75563498db4f 100644 --- a/sys-apps/mcstrans/mcstrans-9999.ebuild +++ b/sys-apps/mcstrans/mcstrans-9999.ebuild @@ -1,30 +1,33 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit toolchain-funcs -IUSE="" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux context translation to human readable names" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" S="${WORKDIR}/${P}/${PN}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" fi -DESCRIPTION="SELinux context translation to human readable names" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" - LICENSE="GPL-2" SLOT="0" +IUSE="" DEPEND=">=sys-libs/libsepol-${PV}:= >=sys-libs/libselinux-${PV}:= - dev-libs/libpcre:= + dev-libs/libpcre2:= >=sys-libs/libcap-1.10-r10:=" RDEPEND="${DEPEND}" diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest index 05b2edfb4b33..71d9b732a14e 100644 --- a/sys-apps/policycoreutils/Manifest +++ b/sys-apps/policycoreutils/Manifest @@ -1,2 +1,3 @@ DIST policycoreutils-3.3.tar.gz 2818092 BLAKE2B 0ed9f128a774176ebadb71f448af8dee8c616a706314783b646869e7ea91892e358d5bb03e3aece3d0e6dc3203852e4e2925482727df1e5c71e075236ee43e5c SHA512 db658990355f99a8e43f53d20cc67bf9e557b0a7837d1927c80f325b7f93ad47876382278a980b818484d6e31712a9b03e279f947ebc88c4be60a9f395607f98 +DIST policycoreutils-3.4-rc1.tar.gz 771240 BLAKE2B 27f730c1f870be9175bef9d8c44ad74f737d5a185d369ceb84c609974423ffea5ce1f8a602af6d25253df963e37c7d2fd5a4cc4877782f6768cfaf5a544c4aa4 SHA512 bbe7b126f07b895d6bea4dfdbc6574a3f8ba08466979f8ed5009b54c68eb0c7f1786d175f52925d0e7e983ca799b846f50112b50c5d6d4edc1b03152593b68c1 DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f diff --git a/sys-apps/policycoreutils/policycoreutils-3.4_rc1.ebuild b/sys-apps/policycoreutils/policycoreutils-3.4_rc1.ebuild new file mode 100644 index 000000000000..91d0f1ac5ab7 --- /dev/null +++ b/sys-apps/policycoreutils/policycoreutils-3.4_rc1.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="xml" + +inherit multilib python-r1 toolchain-funcs bash-completion-r1 + +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" +EXTRAS_VER="1.37" + +DESCRIPTION="SELinux core utilities" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" + SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" + S1="${WORKDIR}/${P}/${PN}" + S2="${WORKDIR}/policycoreutils-extra" + S="${S1}" +else + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz + https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S1="${WORKDIR}/${MY_P}" + S2="${WORKDIR}/policycoreutils-extra" + S="${S1}" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="audit pam split-usr" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=">=sys-libs/libselinux-${PV}:=[python,${PYTHON_USEDEP}] + >=sys-libs/libsemanage-${PV}:=[python(+),${PYTHON_USEDEP}] + >=sys-libs/libsepol-${PV}:= + sys-libs/libcap-ng:= + >=app-admin/setools-4.2.0[${PYTHON_USEDEP}] + audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] ) + pam? ( sys-libs/pam:= ) + ${PYTHON_DEPS}" + +# Avoid dependency loop in the cross-compile case, bug #755173 +# (Still exists in native) +BDEPEND="sys-devel/gettext" + +# pax-utils for scanelf used by rlpkg +RDEPEND="${DEPEND} + app-misc/pax-utils" + +PDEPEND="sys-apps/semodule-utils + sys-apps/selinux-python" + +src_unpack() { + # Override default one because we need the SRC_URI ones even in case of 9999 ebuilds + default + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + fi +} + +src_prepare() { + S="${S1}" + cd "${S}" || die "Failed to switch to ${S}" + if [[ ${PV} != 9999 ]] ; then + # If needed for live ebuilds please use /etc/portage/patches + eapply "${FILESDIR}/policycoreutils-3.1-0001-newrole-not-suid.patch" + fi + + # rlpkg is more useful than fixfiles + sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \ + || die "fixfiles sed 1 failed" + sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \ + || die "fixfiles sed 2 failed" + + eapply_user + + sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror" + + python_copy_sources + # Our extra code is outside the regular directory, so set it to the extra + # directory. We really should optimize this as it is ugly, but the extra + # code is needed for Gentoo at the same time that policycoreutils is present + # (so we cannot use an additional package for now). + S="${S2}" + python_copy_sources +} + +src_compile() { + building() { + emake -C "${BUILD_DIR}" \ + AUDIT_LOG_PRIVS="y" \ + AUDITH="$(usex audit y n)" \ + PAMH="$(usex pam y n)" \ + SESANDBOX="n" \ + CC="$(tc-getCC)" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" + } + S="${S1}" # Regular policycoreutils + python_foreach_impl building + S="${S2}" # Extra set + python_foreach_impl building +} + +src_install() { + # Python scripts are present in many places. There are no extension modules. + installation-policycoreutils() { + einfo "Installing policycoreutils" + emake -C "${BUILD_DIR}" DESTDIR="${D}" \ + AUDIT_LOG_PRIVS="y" \ + AUDITH="$(usex audit y n)" \ + PAMH="$(usex pam y n)" \ + SESANDBOX="n" \ + CC="$(tc-getCC)" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + install + python_optimize + } + + installation-extras() { + einfo "Installing policycoreutils-extra" + emake -C "${BUILD_DIR}" \ + DESTDIR="${D}" \ + install + python_optimize + } + + S="${S1}" # policycoreutils + python_foreach_impl installation-policycoreutils + S="${S2}" # extras + python_foreach_impl installation-extras + S="${S1}" # back for later + + # remove redhat-style init script + rm -fR "${D}/etc/rc.d" || die + + # compatibility symlinks + use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles + + bashcomp_alias setsebool getsebool + + # location for policy definitions + dodir /var/lib/selinux + keepdir /var/lib/selinux + + # Set version-specific scripts + for pyscript in rlpkg; do + python_replicate_script "${ED}/usr/sbin/${pyscript}" + done +} + +pkg_postinst() { + for POLICY_TYPE in ${POLICY_TYPES} ; do + # There have been some changes to the policy store, rebuilding now. + # https://marc.info/?l=selinux&m=143757277819717&w=2 + einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)." + semodule -p "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}" + done +} diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild index e6ee13c43070..91d0f1ac5ab7 100644 --- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild @@ -2,16 +2,15 @@ # 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} ) PYTHON_REQ_USE="xml" inherit multilib python-r1 toolchain-funcs bash-completion-r1 +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" EXTRAS_VER="1.37" -IUSE="audit pam split-usr" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - DESCRIPTION="SELinux core utilities" HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" @@ -19,20 +18,22 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" - S1="${WORKDIR}/${PN}" + S1="${WORKDIR}/${P}/${PN}" S2="${WORKDIR}/policycoreutils-extra" S="${S1}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" - S1="${WORKDIR}/${P}" + S1="${WORKDIR}/${MY_P}" S2="${WORKDIR}/policycoreutils-extra" S="${S1}" fi LICENSE="GPL-2" SLOT="0" +IUSE="audit pam split-usr" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND=">=sys-libs/libselinux-${PV}:=[python,${PYTHON_USEDEP}] >=sys-libs/libsemanage-${PV}:=[python(+),${PYTHON_USEDEP}] diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest index 5823e3897be5..b14d5edab7e4 100644 --- a/sys-apps/restorecond/Manifest +++ b/sys-apps/restorecond/Manifest @@ -1 +1,2 @@ DIST restorecond-3.3.tar.gz 18970 BLAKE2B 41c0eed734ab1e89cdfd40fdb0ceff47e1c4bb66354ff78d548a9747c661fbf7ed4b6b3daa1e39325de2a2ca087aca803f073f942f3ac89b71d873e27a1d6712 SHA512 ea2b97d22c1d68aa4ea31d8850f8c9632c0db0d4d666e323c648da896554c6a6fdf6dfa3c105a1df3f1ede9da8cce5ba4c1533b05520846fcb2d584935e5d7cb +DIST restorecond-3.4-rc1.tar.gz 18961 BLAKE2B 7f5f41f9dd7e776c266818221706f5cfff2fbb3ce99550e4c679a52e1c7694ddf06a8cd686ed80787e2acbf4060bb6cb4c4c15b85eb3ee58355b560f3751e910 SHA512 5d526ceb314719400cfeecb3d28369f62ca8f29223c6eabe847f3565c27b6a7f74ef6f489750b80809df6b3227324c978e4aceca1cb2f4f6a28bcaa03f1f9db9 diff --git a/sys-apps/restorecond/restorecond-3.4_rc1.ebuild b/sys-apps/restorecond/restorecond-3.4_rc1.ebuild new file mode 100644 index 000000000000..92cd1c69200e --- /dev/null +++ b/sys-apps/restorecond/restorecond-3.4_rc1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit systemd toolchain-funcs + +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" + S="${WORKDIR}/${P}/${PN}" +else + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" +fi + +DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +DEPEND="dev-libs/glib:2 + >=sys-libs/libsepol-${PV}:= + >=sys-libs/libselinux-${PV}:=" + +RDEPEND="${DEPEND}" + +src_prepare() { + default + + sed -i 's/-Werror//g' "${S}"/Makefile || die "Failed to remove Werror" +} + +src_compile() { + tc-export CC + default +} + +src_install() { + emake DESTDIR="${D}" \ + SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \ + SYSTEMDUSERUNITDIR=$(systemd_get_userunitdir) \ + install + + rm -rf "${D}/etc/rc.d" || die + + newinitd "${FILESDIR}/restorecond.init" restorecond +} diff --git a/sys-apps/restorecond/restorecond-9999.ebuild b/sys-apps/restorecond/restorecond-9999.ebuild index f3e66897e8c1..92cd1c69200e 100644 --- a/sys-apps/restorecond/restorecond-9999.ebuild +++ b/sys-apps/restorecond/restorecond-9999.ebuild @@ -1,19 +1,21 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit systemd toolchain-funcs -IUSE="" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" S="${WORKDIR}/${P}/${PN}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" fi DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts" @@ -21,6 +23,7 @@ HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" LICENSE="GPL-2" SLOT="0" +IUSE="" DEPEND="dev-libs/glib:2 >=sys-libs/libsepol-${PV}:= @@ -40,9 +43,10 @@ src_compile() { } src_install() { - SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \ + emake DESTDIR="${D}" \ + SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \ SYSTEMDUSERUNITDIR=$(systemd_get_userunitdir) \ - emake DESTDIR="${D}" install + install rm -rf "${D}/etc/rc.d" || die diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest index 323fe32e0e87..b71bbe80d191 100644 --- a/sys-apps/secilc/Manifest +++ b/sys-apps/secilc/Manifest @@ -1 +1,2 @@ DIST secilc-3.3.tar.gz 181205 BLAKE2B ffccf2e6ea416f6e5a8270a488c6c6ed01b607af20fffed129f5d9b9957f2ab16e90a3fdbd57b597f1195987edf6a2ca1ae561cca62d176a01878fe24900f4b9 SHA512 11b2b6a56d588a71d8cc5b2e69e76579ddd3ea20e036bbfdbeefd8ed64a6dca3c8f963509a96231eb21807a195ec24e4807ef52dc2218ee0410ee0828ad77fa8 +DIST secilc-3.4-rc1.tar.gz 181269 BLAKE2B cc0bd0d6016833d64d615fe0f1ef59ab302b15238f10005412d3c2347056fbc5a0e587ac2e18f62f7cb1402a2749c117ac6b50e97df9677a0afc9b2270d9352d SHA512 d99e76c50395fcb20a4c08156b155f7411eab2ce3374899cc3cf6193d95ed3a5b2dae86d18ddfda838e6701aeddedbdb98f8faedeb4506ac5b19c7957763d22c diff --git a/sys-apps/secilc/secilc-3.4_rc1.ebuild b/sys-apps/secilc/secilc-3.4_rc1.ebuild new file mode 100644 index 000000000000..13b261011af0 --- /dev/null +++ b/sys-apps/secilc/secilc-3.4_rc1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +inherit toolchain-funcs + +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" + S="${WORKDIR}/${P}/${PN}" +else + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="GPL-2" +SLOT="0" + +DEPEND=">=sys-libs/libsepol-${PV}" +RDEPEND="${DEPEND}" +BDEPEND="app-text/xmlto" + +# tests are not meant to be run outside of the +# full SELinux userland repo +RESTRICT="test" + +src_compile() { + tc-export CC + default +} diff --git a/sys-apps/secilc/secilc-9999.ebuild b/sys-apps/secilc/secilc-9999.ebuild index 38dc82e0bcdd..13b261011af0 100644 --- a/sys-apps/secilc/secilc-9999.ebuild +++ b/sys-apps/secilc/secilc-9999.ebuild @@ -1,9 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit toolchain-funcs +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler" HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" @@ -12,8 +15,9 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" S="${WORKDIR}/${P}/${PN}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" + S="${WORKDIR}/${MY_P}" fi LICENSE="GPL-2" diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest index 9a42e89573e3..00f49d819ab3 100644 --- a/sys-apps/selinux-python/Manifest +++ b/sys-apps/selinux-python/Manifest @@ -1 +1,2 @@ DIST selinux-python-3.3.tar.gz 2101584 BLAKE2B 603aafbf316b744098bd34c79bf384d55624c086fd75147675a4a0715df3d61710a99d490f30b78d59a2c2a85fcc4db91772c24644a963b31e1a0d305c4bc83e SHA512 a69948a8b139a309f18632440e4204f49832a94b8b6be50e162d3dacb16698effeb1a77c44462e8cc7dc3dd600b887b9ab2fef618c31d3e0fe0de216a6aaebe3 +DIST selinux-python-3.4-rc1.tar.gz 3597175 BLAKE2B eb5c71b5a946978353dc023a799dd3e4063a8af460887a05dc9e852ef93e5794a4edb4c2fe909602c0bfd7a34d3c3d16b713ace822e610dc3a6c3c34929c3374 SHA512 b67baf60e95a5f7f1764b41e550665231639722e1a039f7f8d6b8eda3f70dd376f9e813fd755e5035018c8719069fc987e89b928c5cf7c9bd447d65af51e7656 diff --git a/sys-apps/selinux-python/selinux-python-3.4_rc1.ebuild b/sys-apps/selinux-python/selinux-python-3.4_rc1.ebuild new file mode 100644 index 000000000000..4f4a0a3c95d3 --- /dev/null +++ b/sys-apps/selinux-python/selinux-python-3.4_rc1.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="xml" + +inherit python-r1 toolchain-funcs + +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux core utilities" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" + S="${WORKDIR}/${P}/${PN#selinux-}" +else + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=">=sys-libs/libselinux-${PV}:=[python] + >=sys-libs/libsemanage-${PV}:=[python(+)] + >=sys-libs/libsepol-${PV}:= + >=app-admin/setools-4.2.0[${PYTHON_USEDEP}] + >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] + ${PYTHON_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND=" + test? ( + ${RDEPEND} + >=sys-apps/secilc-${PV} + )" + +src_prepare() { + default + sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror" + + python_copy_sources +} + +src_compile() { + building() { + emake -C "${BUILD_DIR}" \ + CC="$(tc-getCC)" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" + } + python_foreach_impl building +} + +src_test() { + testing() { + # The different subprojects have some interproject dependencies: + # - audit2allow depens on sepolgen + # - chcat depends on semanage + # and maybe others. + # Add all the modules of the individual subprojects to the + # PYTHONPATH, so they get actually found and used. In + # particular, already installed versions on the system are not + # used. + for dir in audit2allow chcat semanage sepolgen/src sepolicy ; do + PYTHONPATH="${BUILD_DIR}/${dir}:${PYTHONPATH}" + done + PYTHONPATH=${PYTHONPATH} \ + emake -C "${BUILD_DIR}" \ + test + } + python_foreach_impl testing +} + +src_install() { + installation() { + emake -C "${BUILD_DIR}" \ + DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + install + python_optimize + } + python_foreach_impl installation + + # Set version-specific scripts + for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do + python_replicate_script "${ED}/usr/bin/${pyscript}" + done + for pyscript in semanage; do + python_replicate_script "${ED}/usr/sbin/${pyscript}" + done + + # Create sepolgen.conf with different devel location definition + if [[ -f /etc/selinux/config ]]; + then + local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); + mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf; + else + local selinuxtype="${POLICY_TYPES%% *}"; + if [[ -n "${selinuxtype}" ]]; + then + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf; + else + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf; + fi + fi +} diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild index 8e1f90984a8b..4f4a0a3c95d3 100644 --- a/sys-apps/selinux-python/selinux-python-9999.ebuild +++ b/sys-apps/selinux-python/selinux-python-9999.ebuild @@ -1,15 +1,14 @@ -# 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=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="xml" inherit python-r1 toolchain-funcs -IUSE="test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" DESCRIPTION="SELinux core utilities" HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" @@ -19,12 +18,16 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" S="${WORKDIR}/${P}/${PN#selinux-}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" fi LICENSE="GPL-2" SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=">=sys-libs/libselinux-${PV}:=[python] >=sys-libs/libsemanage-${PV}:=[python(+)] diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest index 567a7b4cef98..a509f1a23988 100644 --- a/sys-apps/semodule-utils/Manifest +++ b/sys-apps/semodule-utils/Manifest @@ -1 +1,2 @@ DIST semodule-utils-3.3.tar.gz 14268 BLAKE2B 5b03dd731c28e29b146e9f75fa7ce5151e58df1ea6598356b1ad9ee6846d2ebf7ceb57c740aa0ae4b94e0a7356180bd8e608d6a9543b48251e553036f2b2833e SHA512 76aa0c9322889c7de100f3c5789bdf27b7073827fe2af371bd50a4517baa8442f35e53f16a93227dce93da0ceb054bea7e5ee17a46fe05e06f3c2d9925cf59dc +DIST semodule-utils-3.4-rc1.tar.gz 14270 BLAKE2B 7a0b5d060fc07ea71b71ccf2eaa6604cdc00afabaef1be8efb62a38bd401cfacd20f36af1a74324c2162b5fcdbcba6a3b3c5d98e33fccba99bc38ddfabd10ff8 SHA512 848354e95fcd6ae6be3e0ff5a32b26d78b2fbd04f463f063db796ff843dab44675eceb670f10c3ee602a6280e885ecc33242b37bb67ef77d467be030ddd4a72c diff --git a/sys-apps/semodule-utils/semodule-utils-3.4_rc1.ebuild b/sys-apps/semodule-utils/semodule-utils-3.4_rc1.ebuild new file mode 100644 index 000000000000..ce9f168c9c89 --- /dev/null +++ b/sys-apps/semodule-utils/semodule-utils-3.4_rc1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit toolchain-funcs + +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux policy module utilities" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" + S="${WORKDIR}/${P}/${PN}" +else + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +DEPEND=">=sys-libs/libsepol-${PV}:=" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror" +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + emake DESTDIR="${D}" install +} diff --git a/sys-apps/semodule-utils/semodule-utils-9999.ebuild b/sys-apps/semodule-utils/semodule-utils-9999.ebuild index 13fc0d86279e..ce9f168c9c89 100644 --- a/sys-apps/semodule-utils/semodule-utils-9999.ebuild +++ b/sys-apps/semodule-utils/semodule-utils-9999.ebuild @@ -1,29 +1,31 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit toolchain-funcs -IUSE="" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux policy module utilities" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" S="${WORKDIR}/${P}/${PN}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" fi -DESCRIPTION="SELinux policy module utilities" -HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" - LICENSE="GPL-2" SLOT="0" +IUSE="" DEPEND=">=sys-libs/libsepol-${PV}:=" - RDEPEND="${DEPEND}" src_prepare() { diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz index 2db5b0e61e67..a2a85a4be9e8 100644 Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ diff --git a/sys-devel/automake/automake-1.16.5.ebuild b/sys-devel/automake/automake-1.16.5.ebuild index 6cb82d4da12f..58bb5ddc2956 100644 --- a/sys-devel/automake/automake-1.16.5.ebuild +++ b/sys-devel/automake/automake-1.16.5.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else - 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" + 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" if [[ ${PV/_beta} == ${PV} ]]; then MY_P="${P}" SRC_URI="mirror://gnu/${PN}/${P}.tar.xz diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz index 77f1c64c2680..37735726d7f6 100644 Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild index 11560204ef56..5fe72ddfc805 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$ LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="cron fuse lto nls static-libs +threads +tools" RDEPEND=" diff --git a/sys-fs/fatsort/fatsort-1.6.4.625.ebuild b/sys-fs/fatsort/fatsort-1.6.4.625.ebuild index ac55f965194c..2c171133543c 100644 --- a/sys-fs/fatsort/fatsort-1.6.4.625.ebuild +++ b/sys-fs/fatsort/fatsort-1.6.4.625.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" src_prepare() { default diff --git a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild index 08d304b3eede..e3c9630e72cc 100644 --- a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild +++ b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.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 @@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86" IUSE="debug examples nls static-libs" DEPEND=" diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz index a386ab6a5ed5..66e60c036cf8 100644 Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest index 1ac9b2fcfd58..eb49fb6bf0c5 100644 --- a/sys-kernel/git-sources/Manifest +++ b/sys-kernel/git-sources/Manifest @@ -1,2 +1,3 @@ DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b DIST patch-5.18-rc1.patch 112419200 BLAKE2B 1a5b4ff89c28f3ef798b2c6f5019b6a7e04d466297d110eb7e7fb2eece3004cf514cd59ba069ba3bf8fd774d1b0f9d9708394fbab9e59f782ef01aaa6a75034b SHA512 17b29d40d56b1bf26f4cfc90c073fb588330ea1014576518bf9fdb4d71aa8eebbd0318b37616474f3b910aa5d6ac2be07cbce7493f9e4cfb88f492a9ab327053 +DIST patch-5.18-rc2.patch 112841658 BLAKE2B 8419291fadcf91225db3d946ab0aa4f312101ff85653c17422d338586342acb9ed7227899fd2b4f1b1771f907f822eadf8bcff15b6d62bb9784f455ba773861f SHA512 ebab6803bfd9c3312306e97577af8dcc166fabed0bdd8e76405ee0c9118ca7cf50f83b9d2c015d2644db9206f1843142c08245f4c428f4e78d7efd0fe6024684 diff --git a/sys-kernel/git-sources/git-sources-5.18_rc2.ebuild b/sys-kernel/git-sources/git-sources-5.18_rc2.ebuild new file mode 100644 index 000000000000..1b58d3fd64da --- /dev/null +++ b/sys-kernel/git-sources/git-sources-5.18_rc2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" +UNIPATCH_STRICTORDER="yes" +K_NOUSENAME="yes" +K_NOSETEXTRAVERSION="yes" +K_NOUSEPR="yes" +K_SECURITY_UNSUPPORTED="1" +K_BASE_VER="5.17" +K_EXP_GENPATCHES_NOUSE="1" +K_FROM_GIT="yes" +ETYPE="sources" +CKV="${PVR/-r/-git}" + +# only use this if it's not an _rc/_pre release +[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}" +inherit kernel-2 +detect_version + +DESCRIPTION="The very latest -git version of the Linux kernel" +HOMEPAGE="https://www.kernel.org" +SRC_URI="${KERNEL_URI}" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="" + +K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and +experimental nature. If you have any issues, try a matching vanilla-sources +ebuild -- if the problem is not there, please contact the upstream kernel +developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to +report the problem so it can be fixed in time for the next kernel release." + +RDEPEND="" +DEPEND="${RDEPEND} + >=sys-devel/patch-2.7.6-r4" + +pkg_postinst() { + postinst_sources +} diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest index 75710440fb19..9068db69ac73 100644 --- a/sys-kernel/pf-sources/Manifest +++ b/sys-kernel/pf-sources/Manifest @@ -8,6 +8,8 @@ DIST genpatches-5.16-1.base.tar.xz 3920 BLAKE2B e5749033cbb870b0fb43733b388a7b34 DIST genpatches-5.16-1.extras.tar.xz 3780 BLAKE2B 59d482903c1eab9800ca9e9dad75bf4cc54d5676e44693f23a48e138bba8dea157f1ca9eb23fb081f8287fc62cc74746ec73504456d544958ef8d1f992fe9a33 SHA512 1271830d5c99c17ad7b00b9305f0cc9b02aafd3c798b8d1cee8eafd755191b30530f75207108b50429410ed581a1327cea5b866b150725399fba63eab9972235 DIST genpatches-5.17-1.base.tar.xz 7588 BLAKE2B d0046364d4f26368f627d920552e1a67c6b5f25cf5b101ba6b04bf395482d3341deb65d2207159faab9028abc3a8e615746474072dec34d38732296a77d893f1 SHA512 b4f355f9006457374b212d5b79442d0d7fd371064943947ed2b64f0b1fd6357ac7e367249e11827444ea73f0ef1f015a7741d4ace38ae1d68fdcc67f00af0fd2 DIST genpatches-5.17-1.extras.tar.xz 3800 BLAKE2B 7c7c955dbbc2aa6fe8b39f84c993f76aa117b5f218a2de9ff15a165c2d15d253a5adca5c979e5fd887d9b76cbfd2c9c70cc6f2d6d493fad011337e7a941cb498 SHA512 c47a545e6ac510e87f8239afc5b23aefb2956de3446a0e16b79396fb1c335456638101fd615446220987278bc1f68d1154958018793056699270d2250731c47d +DIST genpatches-5.17-4.base.tar.xz 383992 BLAKE2B 2b3768d3095ed205a2a94494896cd4de9b516be63480bf67433a99819a783f52cd29862f1d5f513ec21dc7875a742a479648508ce5e3003ac6eab8d513b6cbbf SHA512 212bbcb00838b9910bb2da6bbae1579f575d0c9c5d4fcde0b401a685fa2004b21b606747e6bfea9f9d6e85d1fc54c62d75c7445f84e09466d3a32e2e0fcc3d3d +DIST genpatches-5.17-4.extras.tar.xz 3796 BLAKE2B 0a0582a245794ce8fd6a472ed59a54d0f1e033e5741b7e2f6b41aadf07f3e05433cc2b4daacb507866a3bdeccf5f3ae08b6bbef23258620f584dcb309ac394c7 SHA512 4ec2216dc22443a06efb9c55b18d6734ca4e922a0901ef271e1f44d540d7dfa9bfe7f1ca5840fe2bf30a6a0dad584130d24257dbd603a5507c388ac6c29b2980 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a DIST linux-5.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb SHA512 7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b @@ -18,9 +20,11 @@ DIST pf-sources-5.16_p4.patch 3065274 BLAKE2B 52254316c04676ea47aed373fe367f145e DIST pf-sources-5.16_p5.patch 3607099 BLAKE2B 4b8659457862fb7c86215b19558b06dc66f8fd94362ac6030428e8a0c2a4bb99855ea55305bd086b39700c755ef6b245c91c2d0d3c7bc6d95a0226184740f82a SHA512 677843b205699feca6c932ad08b300756506b8d603bc2c636c0e1cda1cc344041aeec979c5846dc247361073e62034d00feaa62decc465a01ae827ccd3a03afa DIST pf-sources-5.16_p7.patch 4150817 BLAKE2B fd4217294d296852e56e693b37f7f758a2578a94a320c915f393aab764fc705195ae80cdc6445f59a65f773d94679baab4cee42dc7e1381ecae3a54acd3e7537 SHA512 4eb43313f6d402c4c6b32e4e1daf0e0433392c1fc000b510b17594a60894f2c77cc2acc1e0994a5158938609f87d175bf70f89f6f5442e3af29107bd5764b5ae DIST pf-sources-5.17_p1.patch 693915 BLAKE2B 66e707caab57da20ba35bee3d4cb8b9bc4604f19069eaa21f0d1fc26243fe4b4accbacff721a51847b382f333e623bbe0dc4ab7fa0f8ebf68820fce9cfd54a5d SHA512 91e8fc0b66dc249f26ce9f115e47eaa2b02122e2281f4c92e9cfca589a1253be208552c7f77ba2d21a78ab2a574514ab313e38c7379a3b4f80fd5dba22a033b1 +DIST pf-sources-5.17_p2.patch 2393949 BLAKE2B a511e99bee3d80e74ea21aecb19019ba95b56083e99fa5f060667fd2d857db7befb520587c43789be6806074f055f61bdb0d2e534a64b501134ff58ca7b0d1e8 SHA512 98382087dff1ac280017a703ab4fca9ecd7a2c43d57f4efac39f1cb6168627229f42ca530a7709691af47e86a28f9ae254fe17400ac79cb8e5e627baae3ff140 DIST prjc-v5.16-1uo.patch 282840 BLAKE2B 9c6a27d999604febd831fb69d9722af3597096871d3330d750dd9ec3fefb79b7460d24c7713ce02aa8eba04222d0e112662fad21cdc1398b2e7e18f0a77ce629 SHA512 a18f38d7ac71159e0619f97665993eaeaf832bc08240aafd46a5c8a41a489de6b79bfbfe4bb104a655ca866174e79dbadae29a751e96864ebfb14e60756ab22a DIST prjc-v5.16-3uo.patch 270250 BLAKE2B b7ece53ae330499fa0da813428f1fd974fe540bf2cacb14122d50fde8a286c5edc3b5092a2316e38bd02c3ea3449932048ea35a10211f0008e5142aefcfd09a4 SHA512 5e86c21ac65effa184047c4e6238fc0f2c65d22d946d72f3325b75f7de80c0113f0380fcc1a9ba6219679895ecb74234bb13bb363573107d04315c83ef9cc68a DIST prjc-v5.16-4uo.patch 270113 BLAKE2B e88ec884ec8a539f9acc55844193d98c009d820bf18d8a6ca4dcb03d796897a15efc7006b35a736f31218895ffaf5cc83851a12f4db1b8e56b69ac8518347d02 SHA512 2f9eaef69d2125f6b23da3e597e2ed508266a93e3c3e1a0a04c1ba378448f8267a0985748b8de215c23fbbc62820a46da47671ff2e3ffd77f41bcca79cc11436 DIST prjc-v5.16-5uo.patch 268223 BLAKE2B 3c0b89e36abaa95889d00abdbc8f3151fdd6fe0ed1e496730ed066ae22b68e5989c643441c69d733a920bf20149da6633e6a9e0b0062e997788919b10770eea0 SHA512 b95591e917d0b7b6b7fa7af62aac8f850aad7717e76f7ba17edfdb7ecbd53e31cf2c9409e1225f0aa6636564249c23a7f5c2bfc1e521cd1eec25a6e081b2122c DIST prjc-v5.17-1uo.patch 324972 BLAKE2B 62b746407aa3d5d14c8107950a7b9b77026ab0a48e2441f3d6953988056a60d4ced3438b069212f32d5cc0675540fe04cfc01a0ce8eb59fd25aeb7cb6061af85 SHA512 65c80cfd1813ee563829f894a386da20baa0b2e686fe40ddbe9c4d8e6586683c7e853d0c1a83f3e8f6355bedb06fa4f399fa0815dc03a722469fffd820e3f54a DIST prjc_v5.15-r1.patch 266858 BLAKE2B 110a03b5658200f7414922cf4ed361b6127c08d99359111209c86d951907626c92ff1e50f6906a0f56534e24aa2f35520dae11fa0d148ade488b93a401cb706f SHA512 1abcd3f10941b6e342cabb5fcd3d2a097ceb2451acad09336d3b191ace0bccca23202d87cc916fc0bacaf977e96b26a85e2b6729a08117c4cbe40a470dbf6eaa +DIST prjc_v5.17-r1.patch 268834 BLAKE2B e8640372c4a3a180ee475e786466147dca3b5afe1a78f0346b63fb2654ef05cf7515626aa02b0949e43cb593477820b675c31459ba66cc40549eca1a5d33989b SHA512 83fd5708aaa03a3faf5eb183114f6d34cb44af2b0f66ac11abab92f02340639f772ec1b72add91db2f9b98dfd44b4b47fee771e24aca8af72e28d51bd57f50c1 diff --git a/sys-kernel/pf-sources/files/pf-sources-5.17.2-sched-uclamp-fix-functions.patch b/sys-kernel/pf-sources/files/pf-sources-5.17.2-sched-uclamp-fix-functions.patch new file mode 100644 index 000000000000..24404669add6 --- /dev/null +++ b/sys-kernel/pf-sources/files/pf-sources-5.17.2-sched-uclamp-fix-functions.patch @@ -0,0 +1,43 @@ +From 170a1f1454a4453c0053f87723fd15634c863e05 Mon Sep 17 00:00:00 2001 +From: Tor Vic +Date: Thu, 7 Apr 2022 14:54:10 +0200 +Subject: [PATCH] sched/alt: [Sync] sched/uclamp: Add dummy functions to + sched_alt.h + +Syncup of the following 5.17.2 commits: + sched/uclamp: Fix iowait boost escaping uclamp restriction + sched/sugov: Ignore 'busy' filter when rq is capped by uclamp_max + +Link: https://gitlab.com/alfredchen/linux-prjc/-/issues/56 +--- + kernel/sched/alt_sched.h | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/kernel/sched/alt_sched.h b/kernel/sched/alt_sched.h +index f2b9e686d6a6..55c2a4c0cb84 100644 +--- a/kernel/sched/alt_sched.h ++++ b/kernel/sched/alt_sched.h +@@ -654,6 +654,20 @@ static inline int sched_numa_find_closest(const struct cpumask *cpus, int cpu) + } + #endif + ++static inline ++unsigned long uclamp_rq_util_with(struct rq *rq, unsigned long boost, ++ struct task_struct *p) ++{ ++ return boost; ++} ++ ++static inline bool uclamp_rq_is_capped(struct rq *rq) { return false; } ++ ++static inline bool uclamp_is_used(void) ++{ ++ return false; ++} ++ + extern void swake_up_all_locked(struct swait_queue_head *q); + extern void __prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait); + +-- +GitLab + diff --git a/sys-kernel/pf-sources/pf-sources-5.17_p2.ebuild b/sys-kernel/pf-sources/pf-sources-5.17_p2.ebuild new file mode 100644 index 000000000000..ba8fd5f3c6bd --- /dev/null +++ b/sys-kernel/pf-sources/pf-sources-5.17_p2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Define what default functions to run +ETYPE="sources" + +# No 'experimental' USE flag provided, but we still want to use genpatches +K_EXP_GENPATCHES_NOUSE="1" + +# Just get basic genpatches, -pf patch set already includes vanilla-linux updates +K_GENPATCHES_VER="4" + +# -pf already sets EXTRAVERSION to kernel Makefile +K_NOSETEXTRAVERSION="1" + +# Not supported by the Gentoo security team +K_SECURITY_UNSUPPORTED="1" + +# We want the very basic patches from gentoo-sources, experimental patch is +# already included in pf-sources +K_WANT_GENPATCHES="base extras" + +# major kernel version, e.g. 5.14 +SHPV="${PV/_p*/}" + +# https://gitlab.com/alfredchen/projectc/ revision for a major version, +# e.g. prjc-v5.14-r2 = 2 +PRJC_R=1 + +# These is already patched via -pf patch set. +UNIPATCH_EXCLUDE="1000_linux-${SHPV}.1.patch 1001_linux-${SHPV}.2.patch" + +inherit kernel-2 optfeature +detect_version + +DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches" +HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README + https://dev.gentoo.org/~mpagano/genpatches/" +SRC_URI="${KERNEL_URI} + https://github.com/pfactum/pf-kernel/compare/v${SHPV}...v${SHPV}-pf${PV/*_p/}.diff -> ${P}.patch + https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz + https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz + https://gitlab.com/alfredchen/projectc/-/raw/master/${SHPV}/prjc_v${SHPV}-r${PRJC_R}.patch" + +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +S="${WORKDIR}/linux-${PVR}-pf" + +PATCHES=( "${DISTDIR}/${P}.patch" + "${DISTDIR}/prjc_v${SHPV}-r${PRJC_R}.patch" + "${FILESDIR}"/pf-sources-5.17.2-sched-uclamp-fix-functions.patch ) + +K_EXTRAEINFO="For more info on pf-sources and details on how to report problems, + see: ${HOMEPAGE}." + +pkg_setup() { + ewarn "" + ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way." + ewarn "If you need support, please contact the pf developers directly." + ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with" + ewarn "the ebuilds. Thank you." + ewarn "" + + kernel-2_pkg_setup +} + +src_prepare() { + # kernel-2_src_prepare doesn't apply PATCHES(). + default +} + +pkg_postinst() { + kernel-2_pkg_postinst + + optfeature "userspace KSM helper" sys-process/uksmd +} diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz index 6ef06d63613f..5b4c6d12c803 100644 Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest index e25476f7e88e..62d87d2493df 100644 --- a/sys-libs/libselinux/Manifest +++ b/sys-libs/libselinux/Manifest @@ -1 +1,2 @@ DIST libselinux-3.3.tar.gz 206826 BLAKE2B e4cd2bf7172db1dd7661dd7981f875eb45f3c123805618edd03d7258f4b1f7afc974020187ec2e9e50dd59b3581ee21a29012eaa90ddfa82e43db4b8e60c51b7 SHA512 9a89c05ea4b17453168a985ece93ba6d6c4127916e657c46d4135eb59a1f6408faa0802cc2e49187defbde5247d659037beee089877affbab3eab6af3433696c +DIST libselinux-3.4-rc1.tar.gz 208778 BLAKE2B b15c83149f213a44624285abe68972c0c7f8dcdaf13cd1ca089bd44951f14d30c73302433d68b7d59f0bc7add14315ba12e9f6e6062566c1bdb8f849c5884c28 SHA512 333907b3ed05d66e608ab16958e4e09e18848bf9aaf3d9216d08be2f6e483231c9455a8e6db56648d6704c0f0af7cd4c5c7ba468d678f8368d06b68a60693eb5 diff --git a/sys-libs/libselinux/libselinux-3.4_rc1.ebuild b/sys-libs/libselinux/libselinux-3.4_rc1.ebuild new file mode 100644 index 000000000000..90b74872231d --- /dev/null +++ b/sys-libs/libselinux/libselinux-3.4_rc1.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +PYTHON_COMPAT=( python3_{8..10} ) +USE_RUBY="ruby26 ruby27" + +# No, I am not calling ruby-ng +inherit python-r1 toolchain-funcs multilib-minimal + +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux userland library" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" + S="${WORKDIR}/${P}/${PN}" +else + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="public-domain" +SLOT="0" +IUSE="+pcre2 python ruby static-libs ruby_targets_ruby26 ruby_targets_ruby27" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=">=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}] + !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] ) + pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] ) + python? ( ${PYTHON_DEPS} ) + ruby? ( + ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) + ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) + ) + elibc_musl? ( sys-libs/fts-standalone )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + python? ( >=dev-lang/swig-2.0.9 ) + ruby? ( >=dev-lang/swig-2.0.9 )" + +src_prepare() { + eapply_user + + multilib_copy_sources +} + +multilib_src_compile() { + tc-export AR CC PKG_CONFIG RANLIB + + local -x CFLAGS="${CFLAGS} -fno-semantic-interposition" + + emake \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="/$(get_libdir)" \ + LDFLAGS="-fPIC ${LDFLAGS} -pthread" \ + USE_PCRE2="$(usex pcre2 y n)" \ + FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ + all + + if multilib_is_native_abi && use python; then + building() { + emake \ + LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="/$(get_libdir)" \ + USE_PCRE2="$(usex pcre2 y n)" \ + FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ + pywrap + } + python_foreach_impl building + fi + + if multilib_is_native_abi && use ruby; then + building() { + einfo "Calling rubywrap for ${1}" + # Clean up .lo file to force rebuild + rm -f src/selinuxswig_ruby_wrap.lo || die + emake \ + RUBY=${1} \ + LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="/$(get_libdir)" \ + USE_PCRE2="$(usex pcre2 y n)" \ + FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ + rubywrap + } + for RUBYTARGET in ${USE_RUBY}; do + use ruby_targets_${RUBYTARGET} || continue + + building ${RUBYTARGET} + done + fi +} + +multilib_src_install() { + emake DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="/$(get_libdir)" \ + USE_PCRE2="$(usex pcre2 y n)" \ + install + + if multilib_is_native_abi && use python; then + installation() { + emake DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="/$(get_libdir)" \ + USE_PCRE2="$(usex pcre2 y n)" \ + install-pywrap + python_optimize # bug 531638 + } + python_foreach_impl installation + fi + + if multilib_is_native_abi && use ruby; then + installation() { + einfo "Calling install-rubywrap for ${1}" + # Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions + rm src/selinuxswig_ruby_wrap.lo + emake DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="/$(get_libdir)" \ + RUBY=${1} \ + USE_PCRE2="$(usex pcre2 y n)" \ + install-rubywrap + } + for RUBYTARGET in ${USE_RUBY}; do + use ruby_targets_${RUBYTARGET} || continue + + installation ${RUBYTARGET} + done + fi + + use static-libs || rm "${D}"/usr/lib*/*.a || die +} + +pkg_postinst() { + # Fix bug 473502 + for POLTYPE in ${POLICY_TYPES}; + do + mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die + touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die + # Fix bug 516608 + for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do + if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then + sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \ + || die "Failed to recompile contexts" + fi + done + done +} diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild index ebe92ac34793..90b74872231d 100644 --- a/sys-libs/libselinux/libselinux-9999.ebuild +++ b/sys-libs/libselinux/libselinux-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" PYTHON_COMPAT=( python3_{8..10} ) -USE_RUBY="ruby25 ruby26 ruby27" +USE_RUBY="ruby26 ruby27" # No, I am not calling ruby-ng inherit python-r1 toolchain-funcs multilib-minimal @@ -20,13 +20,13 @@ if [[ ${PV} == 9999 ]]; then S="${WORKDIR}/${P}/${PN}" else SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86" S="${WORKDIR}/${MY_P}" fi LICENSE="public-domain" SLOT="0" -IUSE="pcre2 python ruby static-libs ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27" +IUSE="+pcre2 python ruby static-libs ruby_targets_ruby26 ruby_targets_ruby27" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=">=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}] @@ -34,7 +34,6 @@ RDEPEND=">=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}] pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] ) python? ( ${PYTHON_DEPS} ) ruby? ( - ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ) diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest index 501d9360dc86..afe07bc69cb9 100644 --- a/sys-libs/libsemanage/Manifest +++ b/sys-libs/libsemanage/Manifest @@ -1 +1,2 @@ DIST libsemanage-3.3.tar.gz 178890 BLAKE2B f1ff2d25f0c98e9794cb443365e6193db80a42104b645ef4edf783db2eb3d940d1f39cddfa59f9a86ba16957c77852159b3ced83c5d01ecb1811aa6255f8be83 SHA512 6026d9773c0886436ad801bc0c8beac888b6fb62034edeb863192dea4b6ef34a88e080758820fe635a20e048ac666beee505a0f946258f18571709cca5228aad +DIST libsemanage-3.4-rc1.tar.gz 185794 BLAKE2B 0e1d537eddf465cbe895a931340c46869dc152abf39fb7cdc21002c9a12b613ab297063704a0a01c0eb0676ee3410482267cdef3940f2cdf088ca4683d76f452 SHA512 65bcb569981bc45b5520829e7df79bd6de75cd1877b75233727aa89484b123c730fd4dca4f297cf85616597632ec3c4be36b6cca1178811ac8cc0d45465954ca diff --git a/sys-libs/libsemanage/libsemanage-3.4_rc1.ebuild b/sys-libs/libsemanage/libsemanage-3.4_rc1.ebuild new file mode 100644 index 000000000000..7ed5de5a42eb --- /dev/null +++ b/sys-libs/libsemanage/libsemanage-3.4_rc1.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{8..10} ) + +inherit python-r1 toolchain-funcs multilib-minimal + +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux kernel and policy management library" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" + S="${WORKDIR}/${P}/${PN}" +else + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="GPL-2" +SLOT="0/2" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=">=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}] + >=sys-libs/libselinux-${PV}:=[${MULTILIB_USEDEP}] + >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] + ${PYTHON_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-lang/swig-2.0.4-r1 + sys-devel/bison + sys-devel/flex + virtual/pkgconfig" + +# tests are not meant to be run outside of the +# full SELinux userland repo +RESTRICT="test" + +src_prepare() { + eapply_user + + echo >> "${S}/src/semanage.conf" + echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf" + echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf" + echo "# or debugging of policy." >> "${S}/src/semanage.conf" + echo "save-linked=false" >> "${S}/src/semanage.conf" + echo >> "${S}/src/semanage.conf" + echo "# Set this to 0 to disable assertion checking." >> "${S}/src/semanage.conf" + echo "# This should speed up building the kernel policy" >> "${S}/src/semanage.conf" + echo "# from policy modules, but may leave you open to" >> "${S}/src/semanage.conf" + echo "# dangerous rules which assertion checking" >> "${S}/src/semanage.conf" + echo "# would catch." >> "${S}/src/semanage.conf" + echo "expand-check=1" >> "${S}/src/semanage.conf" + echo >> "${S}/src/semanage.conf" + echo "# Modules in the module store can be compressed" >> "${S}/src/semanage.conf" + echo "# with bzip2. Set this to the bzip2 blocksize" >> "${S}/src/semanage.conf" + echo "# 1-9 when compressing. The higher the number," >> "${S}/src/semanage.conf" + echo "# the more memory is traded off for disk space." >> "${S}/src/semanage.conf" + echo "# Set to 0 to disable bzip2 compression." >> "${S}/src/semanage.conf" + echo "bzip-blocksize=0" >> "${S}/src/semanage.conf" + echo >> "${S}/src/semanage.conf" + echo "# Reduce memory usage for bzip2 compression and" >> "${S}/src/semanage.conf" + echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf" + echo "bzip-small=true" >> "${S}/src/semanage.conf" + + multilib_copy_sources +} + +multilib_src_compile() { + local -x CFLAGS="${CFLAGS} -fno-semantic-interposition" + + emake \ + AR="$(tc-getAR)" \ + CC="$(tc-getCC)" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + all + + if multilib_is_native_abi; then + building_py() { + emake \ + AR="$(tc-getAR)" \ + CC="$(tc-getCC)" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + "$@" + } + python_foreach_impl building_py swigify + python_foreach_impl building_py pywrap + fi +} + +multilib_src_install() { + emake \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + DESTDIR="${ED}" install + + if multilib_is_native_abi; then + installation_py() { + emake DESTDIR="${ED}" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ + install-pywrap + python_optimize # bug 531638 + } + python_foreach_impl installation_py + fi +} + +multiib_src_install_all() { + python_setup + python_fix_shebang "${ED}"/usr/libexec/selinux/semanage_migrate_store +} + +pkg_postinst() { + # Migrate the SELinux semanage configuration store if not done already + local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null) + if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${selinuxtype}/active ] ; then + ewarn "Since the 2.4 SELinux userspace, the policy module store is moved" + ewarn "from /etc/selinux to /var/lib/selinux. The migration will be run now." + ewarn "If there are any issues, it can be done manually by running:" + ewarn "/usr/libexec/selinux/semanage_migrate_store" + ewarn "For more information, please see" + ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration" + fi +} diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild index 85bbb04e90aa..7ed5de5a42eb 100644 --- a/sys-libs/libsemanage/libsemanage-9999.ebuild +++ b/sys-libs/libsemanage/libsemanage-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit python-r1 toolchain-funcs multilib-minimal diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest index 6e82f2b75799..eb73f8961d92 100644 --- a/sys-libs/libsepol/Manifest +++ b/sys-libs/libsepol/Manifest @@ -1 +1,2 @@ DIST libsepol-3.3.tar.gz 482546 BLAKE2B 977996f68807f73a5bc0bd3a07b605640eb02a7bc67971882d489def166539ff7cfd00e474adde7e923fbebebdfcdcb71d17a43e3396c3176e25fd7d3bd65238 SHA512 fb6bb69f8e43a911a1a9cbd791593215386e93cb9292e003f5d8efe6e86e0ce5d0287e95d52fe2fbce518a618beaf9b1135aea0d04eaebcdbd8c6d07ee67b500 +DIST libsepol-3.4-rc1.tar.gz 488545 BLAKE2B 9df7ba2e6f0275347d0170cf4115b6bc6f2d2a631100517d18a14d337ca12639632cdbfbd1060350c32ace8bbc33ef80bc962f4c9911e227f116e1cf595fd373 SHA512 9933e7c47d9f4018974d112499a2bea25667e31e673af3cee187c7120ed3b7aa425b2c81682ba14257744215f63216332c5cb61e788075fc50b33b9b44494cb8 diff --git a/sys-libs/libsepol/libsepol-3.4_rc1.ebuild b/sys-libs/libsepol/libsepol-3.4_rc1.ebuild new file mode 100644 index 000000000000..7a3db223026b --- /dev/null +++ b/sys-libs/libsepol/libsepol-3.4_rc1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit toolchain-funcs multilib-minimal + +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux binary policy representation library" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" + S="${WORKDIR}/${P}/${PN}" +else + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="GPL-2" +SLOT="0/2" + +# tests are not meant to be run outside of the full SELinux userland repo +RESTRICT="test" + +src_prepare() { + eapply_user + multilib_copy_sources +} + +multilib_src_compile() { + tc-export CC AR RANLIB + + local -x CFLAGS="${CFLAGS} -fno-semantic-interposition" + + emake \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="/$(get_libdir)" +} + +multilib_src_install() { + emake DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="/$(get_libdir)" \ + install +} diff --git a/sys-libs/libsepol/libsepol-9999.ebuild b/sys-libs/libsepol/libsepol-9999.ebuild index 141803b9f569..7a3db223026b 100644 --- a/sys-libs/libsepol/libsepol-9999.ebuild +++ b/sys-libs/libsepol/libsepol-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" @@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then S="${WORKDIR}/${P}/${PN}" else SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86" S="${WORKDIR}/${MY_P}" fi diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz index c6af6182c291..7dbfc4e8b715 100644 Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest index 344172428384..d9c3ee4c6a96 100644 --- a/www-apps/hugo/Manifest +++ b/www-apps/hugo/Manifest @@ -2,3 +2,5 @@ DIST hugo-0.93.3-vendor.tar.xz 4828092 BLAKE2B 4df3e876ffcc71f4caa089512510bec47 DIST hugo-0.93.3.tar.gz 27852078 BLAKE2B 8e21fcbacc55cb304314d24f7a1258c9192655cb603e33c2ac2cac5fcc21f83045c1fc3a3ee7bd227507fd08be54e15dcd9cc9629e320bae9b41f1c87d03e163 SHA512 c65cc776588604a6ca2fbe5c4081db252ec007311eae54ed81ea65e983f1787edf6e10774d8ace82284eb7c42f6cb70650135ec44b2ddc8994ed511ba2a7d55e DIST hugo-0.95.0-vendor.tar.xz 4781084 BLAKE2B ead2d42b615fa838995853df38c304c63baccb109f32b5034449cb64c8edacb78e5fac615f2018e8d4acb693f83df0abaa73bc511f5ba31b3a30bdec476420b1 SHA512 941061396433a20b524694c8dd2838d84454fbee98c48aa2860881fd9b31b6d480d22f6fd54bd2e17f1f90b1c9e6c3c5813682131fd01c7d3eabc063dcbb01b2 DIST hugo-0.95.0.tar.gz 27859168 BLAKE2B 3667ab14c19f586d0f45b76072786a49f2448367cdf4151df2b44a329a57047544dcbbe4db8774433cf2042024c17ccca3269f5eeb508392aed00d31955de55a SHA512 fbe43fc9698325c380d7e7499ee726aba448eebba087f7bdc7cdf14d01e0649869359c07fefaa9a0d9623c910523b82efc2a2b57e152d391443e2b890a29affb +DIST hugo-0.96.0-vendor.tar.xz 4721504 BLAKE2B d8516c848be292f2097961a599450b719b2d760ad3464036929a0937ae6b401ec4b7b90df3281f11a70c4f9a7e94d74e821d78639b9cb3a335a59c5f6e645e65 SHA512 d58cbded19c5e2595838725a181e5fcdad94888f1e140e8961d9815c17d7719644483bb9bb34141c26bfccd87412632b1c896c12b85abb76c6448de3d0c8642d +DIST hugo-0.96.0.tar.gz 27853655 BLAKE2B 8161eb31b66a9643e31967629852475496dcabd0ef04e806f0d004f3933de07553a10572c201f8b798c7c257d20d7e0e6381bb2892728f89fd3416cc768d76f2 SHA512 1dc5e9f433953a1ae378d0eeb24e0647a4c096db96a727ece39c1c4e5d3ef40033ca61aa7a9ed322234e41a116f118115e637c0342b52ee60fe47eea5718ffde diff --git a/www-apps/hugo/files/hugo-0.96.0-skip-some-tests.patch b/www-apps/hugo/files/hugo-0.96.0-skip-some-tests.patch new file mode 100644 index 000000000000..6f09d1c39660 --- /dev/null +++ b/www-apps/hugo/files/hugo-0.96.0-skip-some-tests.patch @@ -0,0 +1,120 @@ +From fb829c60a028067b940aaf268362017a73d40e84 Mon Sep 17 00:00:00 2001 +From: tastytea +Date: Tue, 29 Mar 2022 22:28:13 +0200 +Subject: [PATCH] Skip some tests + +Reasons: + - Needs to be in a git repo + - Needs special test dependencies + - Needs dart-sass-embedded +--- + hugolib/page_test.go | 1 + + modules/client_test.go | 4 ++++ + releaser/git_test.go | 3 +++ + .../resource_transformers/tocss/dartsass/integration_test.go | 1 + + .../resource_transformers/tocss/scss/integration_test.go | 1 + + 5 files changed, 10 insertions(+) + +diff --git a/hugolib/page_test.go b/hugolib/page_test.go +index d29a4f8..7cdff73 100644 +--- a/hugolib/page_test.go ++++ b/hugolib/page_test.go +@@ -1025,6 +1025,7 @@ func TestPageWithDate(t *testing.T) { + } + + func TestPageWithLastmodFromGitInfo(t *testing.T) { ++ t.Skip("We are not in a git repo") + if htesting.IsCI() { + // TODO(bep) figure out why this fails on GitHub actions. + t.Skip("Skip GitInfo test on CI") +diff --git a/modules/client_test.go b/modules/client_test.go +index 75e3c2b..235d6ed 100644 +--- a/modules/client_test.go ++++ b/modules/client_test.go +@@ -68,6 +68,7 @@ github.com/gohugoio/hugoTestModules1_darwin/modh2_2@v1.4.0 github.com/gohugoio/h + } + + c.Run("All", func(c *qt.C) { ++ c.Skip("Test dependencies not available") + client, clean := newClient(c, func(cfg *ClientConfig) { + cfg.ModuleConfig = DefaultModuleConfig + }, defaultImport) +@@ -107,6 +108,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor + }) + + c.Run("IgnoreVendor", func(c *qt.C) { ++ c.Skip("Test dependencies not available") + client, clean := newClient( + c, func(cfg *ClientConfig) { + cfg.ModuleConfig = DefaultModuleConfig +@@ -125,6 +127,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor + }) + + c.Run("NoVendor", func(c *qt.C) { ++ c.Skip("Test dependencies not available") + mcfg := DefaultModuleConfig + mcfg.NoVendor = "**" + client, clean := newClient( +@@ -144,6 +147,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor + }) + + c.Run("VendorClosest", func(c *qt.C) { ++ c.Skip("Test dependencies not available") + mcfg := DefaultModuleConfig + mcfg.VendorClosest = true + +diff --git a/releaser/git_test.go b/releaser/git_test.go +index ff77eb8..1f40a6f 100644 +--- a/releaser/git_test.go ++++ b/releaser/git_test.go +@@ -20,6 +20,7 @@ import ( + ) + + func TestGitInfos(t *testing.T) { ++ t.Skip("We are not in a git repo") + c := qt.New(t) + skipIfCI(t) + infos, err := getGitInfos("v0.20", "hugo", "", false) +@@ -58,6 +59,7 @@ Streets #20. + } + + func TestGitVersionTagBefore(t *testing.T) { ++ t.Skip("We are not in a git repo") + skipIfCI(t) + c := qt.New(t) + v1, err := gitVersionTagBefore("v0.18") +@@ -66,6 +68,7 @@ func TestGitVersionTagBefore(t *testing.T) { + } + + func TestTagExists(t *testing.T) { ++ t.Skip("We are not in a git repo") + skipIfCI(t) + c := qt.New(t) + b1, err := tagExists("v0.18") +diff --git a/resources/resource_transformers/tocss/dartsass/integration_test.go b/resources/resource_transformers/tocss/dartsass/integration_test.go +index a1ac1d5..fcd8bf5 100644 +--- a/resources/resource_transformers/tocss/dartsass/integration_test.go ++++ b/resources/resource_transformers/tocss/dartsass/integration_test.go +@@ -106,6 +106,7 @@ T1: {{ $r.Content | safeHTML }} + } + + func TestTransformThemeOverrides(t *testing.T) { ++ t.Skip("Needs dart-sass-embedded") + if !dartsass.Supports() { + t.Skip() + } +diff --git a/resources/resource_transformers/tocss/scss/integration_test.go b/resources/resource_transformers/tocss/scss/integration_test.go +index cbc7e19..f2a6034 100644 +--- a/resources/resource_transformers/tocss/scss/integration_test.go ++++ b/resources/resource_transformers/tocss/scss/integration_test.go +@@ -111,6 +111,7 @@ moo { + } + + func TestTransformThemeOverrides(t *testing.T) { ++ t.Skip("Needs dart-sass-embedded") + if !scss.Supports() { + t.Skip() + } +-- +2.35.1 + diff --git a/www-apps/hugo/files/hugo-0.96.0-unbundle-libwebp-and-libsass.patch b/www-apps/hugo/files/hugo-0.96.0-unbundle-libwebp-and-libsass.patch new file mode 100644 index 000000000000..f9efee48cc48 --- /dev/null +++ b/www-apps/hugo/files/hugo-0.96.0-unbundle-libwebp-and-libsass.patch @@ -0,0 +1,44 @@ +From 0a44245bf6cfe103bb163f51f230eeccd69ab8c7 Mon Sep 17 00:00:00 2001 +From: tastytea +Date: Tue, 29 Mar 2022 21:03:15 +0200 +Subject: [PATCH] Unbundle libwebp and libsass + +Use libwebp and libsass from the system instead of the bundled ones. +--- + .../github.com/bep/golibsass/internal/libsass/a__cgo.go | 8 ++++---- + vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go | 3 ++- + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go +index af51b92..6b5e78b 100644 +--- a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go ++++ b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go +@@ -5,9 +5,9 @@ + // + package libsass + +-// #cgo CFLAGS: -O2 -fPIC +-// #cgo CPPFLAGS: -I../../libsass_src/include +-// #cgo CXXFLAGS: -g -std=c++0x -O2 -fPIC +-// #cgo LDFLAGS: -lstdc++ -lm ++// #cgo CFLAGS: -fPIC ++// #cgo CPPFLAGS: -DUSE_LIBSASS_SRC ++// #cgo CXXFLAGS: -std=c++0x -fPIC ++// #cgo LDFLAGS: -lstdc++ -lm -lsass + // #cgo darwin linux LDFLAGS: -ldl + import "C" +diff --git a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go +index 4b105ab..33f429e 100644 +--- a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go ++++ b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go +@@ -2,5 +2,6 @@ + + package libwebp + +-// #cgo linux LDFLAGS: -lm ++// #cgo linux LDFLAGS: -lm -lwebp ++// #cgo CFLAGS: -DLIBWEBP_NO_SRC + import "C" +-- +2.35.1 + diff --git a/www-apps/hugo/hugo-0.96.0.ebuild b/www-apps/hugo/hugo-0.96.0.ebuild new file mode 100644 index 000000000000..50ae5b3634cf --- /dev/null +++ b/www-apps/hugo/hugo-0.96.0.ebuild @@ -0,0 +1,92 @@ +# Copyright 2018-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module bash-completion-r1 + +DESCRIPTION="Fast static HTML and CSS website generator" +HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo" +SRC_URI=" + https://github.com/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://tastytea.de/files/${P}-vendor.tar.xz +" + +# NOTE: To create the vendor tarball, run: +# `go mod vendor && cd .. && tar -cJf ${P}-vendor.tar.xz ${P}/vendor` + +LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc +sass test test-full" + +BDEPEND=" + >=dev-lang/go-1.18 + test? ( + dev-python/docutils + dev-ruby/asciidoctor + test-full? ( app-text/pandoc ) + ) +" +RDEPEND=" + media-libs/libwebp:= + sass? ( dev-libs/libsass:= ) +" +DEPEND="${RDEPEND}" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/${PN}-0.96.0-unbundle-libwebp-and-libsass.patch" + "${FILESDIR}/${PN}-0.96.0-skip-some-tests.patch" +) + +src_configure() { + export CGO_ENABLED=1 + export CGO_CFLAGS="${CFLAGS}" + export CGO_CPPFLAGS="${CPPFLAGS}" + export CGO_CXXFLAGS="${CXXFLAGS}" + export CGO_LDFLAGS="${LDFLAGS}" + + MY_BUILDFLAGS="$(usev sass "-tags extended")" + + default +} + +src_compile() { + mkdir -pv bin || die + ego build -ldflags "-X github.com/gohugoio/hugo/common/hugo.vendorInfo=gentoo:${PVR}" \ + ${MY_BUILDFLAGS} -o "${S}/bin/hugo" + + bin/hugo gen man --dir man || die + + mkdir -pv completions || die + bin/hugo completion bash > completions/hugo || die + bin/hugo completion fish > completions/hugo.fish || die + bin/hugo completion zsh > completions/_hugo || die + + if use doc ; then + bin/hugo gen doc --dir doc || die + fi +} + +src_test() { + ego test -race "./..." ${MY_BUILDFLAGS} +} + +src_install() { + dobin bin/* + doman man/* + + dobashcomp completions/${PN} + + insinto /usr/share/fish/vendor_completions.d + doins completions/${PN}.fish + + insinto /usr/share/zsh/site-functions + doins completions/_${PN} + + if use doc ; then + dodoc -r doc/* + fi +} diff --git a/www-apps/hugo/metadata.xml b/www-apps/hugo/metadata.xml index d3bce6b51931..c1a8bfb7f195 100644 --- a/www-apps/hugo/metadata.xml +++ b/www-apps/hugo/metadata.xml @@ -11,6 +11,7 @@ Enable SASS/SCSS support + Pull optional heavier test-dependency packages gohugoio/hugo diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz index 2419d502ce96..868bb983c545 100644 Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index e7e74bc9ae58..d1806bc91d8e 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -1,199 +1,3 @@ -DIST firefox-91.7.0esr-ach.xpi 453214 BLAKE2B 8c25467fec589b7f4a51bbbac582a3a522145b639e9b6660fd36b76855062a8c41733efefbb4f22eb055ce5b476e2f3a67a2ace0b62af18d929a22e229a79239 SHA512 b306ab4462da37e348eb6f2ff116da344e30f7cd59bce6e70fd69e539a451b9e2cc55e6fa6e3b8d1e223c1a21cab9a406bc96a16810e217160a33d4b5156f3f5 -DIST firefox-91.7.0esr-af.xpi 426915 BLAKE2B fc2d1e56af0bb2889f689d35d888b366f137f4756a2972a3ff0bc9b6cc1269753d497d69dbd64ef0fa7730097729d4acc3ccddaee6fb868d9dea0f29e9c66669 SHA512 110f3d593db204aff1b93904452d9d166948eeabbd7e6476297a462053b8096236181ea5d15c4734002cbd3ca8f5881be6574806349444b586829cf629e98774 -DIST firefox-91.7.0esr-an.xpi 499891 BLAKE2B 890d7bce3e82300b12f87e30ffdb89dcfc861cad49a42824ed7862603c2a40a212cd56366b9ed440869ef03ce8958d76f8e7a969da1ac624c853e4282ba5880c SHA512 569970d7aa033ce2cb8bae7184ae2bb70a0ba8d0c6ee899e695fb0d3aa6ddf129314adb78b847ecec4e0d2b8afc2ce7045368f1933ee6d285814cea962a0ce4d -DIST firefox-91.7.0esr-ar.xpi 559674 BLAKE2B fbaa7cd7c3a5694e7124be26496295f3d317520afaa5f394ecf5bcb346e0e4a99bfe2c9f7c99be8db37382d9126ef77cbcfa659600606df196e7397372859786 SHA512 0264ebaa5feb343610ae4f8cbe6e8a1fa6627ace74807176b33daf5e97fafc1852b4431a1960025e7e797fc1b43c9bbf48e12c6bd88e8ba9c398d06db39f00e1 -DIST firefox-91.7.0esr-ast.xpi 498579 BLAKE2B abba4aa5288534264609f5da57a8542d50d249a405f184620492343379479f51f13d0f14aacd1d99cc6c925b3ccad3fd3fa64e69b1fa1029b334ac3b192f0291 SHA512 eeb8cdb65bf6b165faf3b84fa7fbd84e18e6360cf507c3a7b50e632094332683c4a9a8fa29b4ac36018a53fdb91246c2c13a30eaef28320e80d31d331d97647e -DIST firefox-91.7.0esr-az.xpi 489435 BLAKE2B 783fe990f5bf2bb7398756bfc6330096df8fd97bf9cfd8f934c407a5045241e05c68d6c4954c938d82d2af0a5ee5f108d80fe1099bda5760f09b6e7e655f0ebd SHA512 d20a75ffbc16ed6db6e8240e1bb093ebfd33f49240e86bf2feb7ad4aaec0c3a7cff82eca97c31c39f80289065ba5cf593a8fc3b48f35569f9b5089af04ad6499 -DIST firefox-91.7.0esr-be.xpi 622609 BLAKE2B deb09addf833e2286e933ce01d337a07a1ca4c8f2f247f38b905c64af1da1b9d3144dc6bce4ac1e80a52a644f1f307de5b7dcb5115df508f28d0de0e1f4a5430 SHA512 928eab1a9097ea37c2b37a7f126d422c3e99c39e5089cb93acf615ae36d5a590a810eb5b489923c122bed654d9781d68139fae6012ee177e4f74bfda0f16ffee -DIST firefox-91.7.0esr-bg.xpi 567638 BLAKE2B d8f8fb2a891539ac769f58a60762a89264f09e49eb975b563351296f7c5f1b3907aac1a1d76d0271bca089a82f53788aca54f6b14d9dca27d571cc00dec8dce7 SHA512 dc9b3d2e77da127bfa8226c7953016a19ac918b715e62195e9ba689722ebf018ffab899e6d8bacd48b2c294ad55f7e67e9be6be2e983296d33295417c8f0985e -DIST firefox-91.7.0esr-bn.xpi 556819 BLAKE2B f82e26ea715c66484bd5919277a7e0798dbcf99a922d0c59ed20b922f44179ebb924af26bb3ba2990d223dbc54f1323c812f1743d381b10c21adaec4dc35e473 SHA512 cd12939477e0fbf139d0c7cf341c30f5e069dd0640e3ad632f40c877de8bd7905b9d082ae60a40b378cf34ee78b2347ec2bb913185c52f18a439ce80e26b39f7 -DIST firefox-91.7.0esr-br.xpi 526265 BLAKE2B 76e88ba5cbf8ae6bcacc8a2367d5517f1df83af7e9f3fdf2b03a017ea13bf41e1043a22a6cdf6a6d275d9f22adf0f01a529fa80723ae74d7e24aff1e202912b1 SHA512 fa66b787704ab31be8f3916c96b3838c8dc9a471840cb5d0481726c5e481c3731b919922838ac0031dfeb557c0f214145e4f0cc3a7904900935ec8f518e861c8 -DIST firefox-91.7.0esr-bs.xpi 463557 BLAKE2B 15ad82cdd25aab32c2aec00822354ffc936911184e1dbaf55a6ea0f25ab23ec546efae4e341e348fe372d479a4b2cc8ae9e5373ddca80fd643cab10fa43684c5 SHA512 8e62d0682ca09394ea5279ba9ea8456fac6273a2c55fc18ced8a96e91c40ce807ae20a6d7f71916f1f86c58d6774746f84edec351115c2c527e70fb716724ca2 -DIST firefox-91.7.0esr-ca-valencia.xpi 529390 BLAKE2B b5acda8b1aa5f93d4ac703c05591d806264931c7b7bdc248514299c883d9be59a83a5b7abbd322e516b88a12054852a1481b453dfe5c01504d8228c3a67dfe71 SHA512 95ae48232bb883f1cb946a917944768146576e1c12d58ee503d74d527895e1f49da3be5400a2cbab87344f640781c98d34b737b090e2c5846d6a8bb7178b0025 -DIST firefox-91.7.0esr-ca.xpi 532477 BLAKE2B 7788034bccc797792171e354b0e63f70df48ce78e4665ab7ab2789350f9b7f6a07fb4a58235e8568ec1be45b4fd878e09c73a3a24851d1bbd6988d6fc21d142d SHA512 16c2fcd378e3cb3c63f1a5f44332e40e36a5e179e7359831b99eb6128c127efcc43b4e2c5ffcfd8a641008a97d7093d909ee30ea9b49e617b1062476a2bedfa1 -DIST firefox-91.7.0esr-cak.xpi 552607 BLAKE2B a29851d04d5be164b6461d9715375493d62cff6d5eec89dcd071a977b041d4688458cf62fed08b51e5dbec38b72bf02069892637c69a72c7118e06d651553f85 SHA512 4f0b225d81461132be3ee8c4376283ba2d7382d131e760ecafadeb3ffaeae53a91ad08bac48e01ba25daeeea8a82b362bf8424fa8ded4edd3715db80384db17c -DIST firefox-91.7.0esr-cs.xpi 563181 BLAKE2B 8c601f18f69493cad242615f29dd1f2b9b26219a831069fbd2eb8cbda4af754e3ae46db6a4510468e6435cf9d6c3f64804d07f7bbe48a516b0bedabd24ab55cd SHA512 6149c11ff18d0b4855d36b7f55c97477aa8d5c2f5be337900a36245f7e34a3e213699257c2b9b985681ec0c201c97c9c5802e01b953c79c4150332ebc3a96fa0 -DIST firefox-91.7.0esr-cy.xpi 542213 BLAKE2B 65ecde5fff596a858685add7a6af104c010f245a9b2c5a6d1fe89c34d15f594380442cede215a24f5779a2c8ca43e884bae79d4d9b00dc3c15edc8b0ffb184af SHA512 f364d240c9c72120ba7659adba2ae41f89fdb94b7c307423c9ffdf285bb7be49ffaa918d5d2b588097d1b2c63d302952f02002e331a72fceb9bf689c8f6901df -DIST firefox-91.7.0esr-da.xpi 534146 BLAKE2B e6bca5e9f28ade3122d88a7bb1bd3c97dd9c252bcd3a7772a495cd74db25b527a2f9f9a341ca6e5c4e6c207e1085930633b3ad3348b886561cde8c7902dbf611 SHA512 c75df5a10e65205724fd32f12c863ab0140581b32a3c8d34410c2d20ecbe06da47d09317cc74766acd359d1f7fd18ab82f95a619b4da62a6d1c04d5c3491f86b -DIST firefox-91.7.0esr-de.xpi 553591 BLAKE2B 65471c43a9c2897022a449bb3fbc2cc196e24b46970c23f34b071656d9bd7c5836ba8c34c0fbaac138c8ad6010e2f348344c0cbaa7b68dfb69e53b5e089bde4e SHA512 05f84b8e7e336af5c9e18df65a052b9de79156e48524d6be7933c21be11f5cd73a9f07bacb96f8fcdfd4260f0ab39cb6a952ca76d1ef56256b08f6eb758837da -DIST firefox-91.7.0esr-dsb.xpi 566485 BLAKE2B dcbd86cf161f852a33dd35dc734b2fd09955b7a6a42b4ef65ff87901bb9ed6a8b09f3848d0d9e829660ac1adff88e252beea29fd2c1001d86da66a73d1c44cc3 SHA512 708cc003d9c6f0d78e5f91f2d4105ebc3114d83c6bd5e482ab6f4f46878e894097866ef403354cb02920539100445f1a9019890101d2e448a3151fa4221a083f -DIST firefox-91.7.0esr-el.xpi 639156 BLAKE2B efeeb71293cf39742e286cc883570f915c277fea51eda77db419fd0694b1adce3b67fe97841be7f973f88f4dfce490b382d7e37c0b095dc3b81fae795fcec6a8 SHA512 624587d7a451057d1935d3a71f03cff17a8d0c1328ea6717b8ac182a4b16c32d062cab675d80aa5ecea211e19e84f38cccf496d12f9d3adbecd3c986a9975d19 -DIST firefox-91.7.0esr-en-CA.xpi 509572 BLAKE2B 6d3e0f4403a59cb4803f0a4eea428a7ff294f1549e1ed52f5d7df658b1918b7bdca0952e939c6332250e2972002078e85ac766e00dde8357f93bb057256e38d2 SHA512 220753e4b372107f94ad2e0731eab68777e69aebf7756f691e87b1ccacc6292e77a0de13c6d127325f0e76dbef1641cc024a0f62c8b763ce76803ca84c77a982 -DIST firefox-91.7.0esr-en-GB.xpi 510588 BLAKE2B 860208880f1704d5ceb6fe76f198ab280d5777c28cb16c3ecf42645ccf86896370e31070092bb5b922992e06006b78c3e4e7d94faf5ba1fc514ddf4197d153fc SHA512 b89fbcbdb157eed266d8e82ce348c126294fd2ffd7cfa36eeae07cfae482784b67ef6768aae6024d9653dc1ac58047eb590e822ff170b4bd0d7912cd4bca3ea8 -DIST firefox-91.7.0esr-eo.xpi 534799 BLAKE2B 13a36fa6301a6ff97979d8e5eb15d5400953e0b54c046b00968a4209cf339c27963c8cbc4578e7199de531cfe339a9b97b6efdc4c5277cb4d364f3ae0d9e6a10 SHA512 9cc726b0d621be9116d2065d25964e15dfd0c9169a89ad982973876c71cbe72ed98f9d55158e3be23ba15ea86d68bbd95033ee3aa2e57770eff919bcdef651ed -DIST firefox-91.7.0esr-es-AR.xpi 546683 BLAKE2B b6e4c31f8594a8834dc79ebe6b82c3c12bf449d64a02248b46f576cce22a1c3265749f23dd378e2ab4141f1910aebe7916efde6a9eaa0abc16e971b17c5e93b5 SHA512 6ef0e19b01a6a6729fb9da1d7b108cb6250acdf0590b52360e92a9ac55887b24d998b98bd58f1336f0f6f50ca77659daf0ab1d4c957d27b8145000ea70ffdaa6 -DIST firefox-91.7.0esr-es-CL.xpi 546380 BLAKE2B 89ac357e742d2f14cf978f657a392d6aa1388771f689d9bbb79bb2ab4aa15bce4576ac53c2932feceb6347e2378d99042e448a87e0c3681d814dcdc9f451bb9c SHA512 0a349b18f74d1dc3f6b0c97269f07b895a2d6b83f6790a53e30d4007a3feb403790ac1bbce364f99ecdb700f9ba535bcecfe2f50590f609eb3e9ed5a63f98d94 -DIST firefox-91.7.0esr-es-ES.xpi 537061 BLAKE2B 7daad97d7e50816732f7e7ea634adea322d27ee8c54c22a93ee197dca2f989fb5c67d803c3efe91bebcf148ede7e940d325a7b4156e1c4255168269048e67213 SHA512 dc95e3183a6e10523949376608a6615222e1f79a9e2d14135ba8374b4e9294a8bd445a164042befc9f13e4046fb3a8378195ba625e47ad2d4a6baa225ffb29a4 -DIST firefox-91.7.0esr-es-MX.xpi 549995 BLAKE2B 8d53b0802a6353026afb02bff0768657c7d8df3d8bdffe3d857db9957b73da1762efb1ee99aac1200fafda266b743bb6cb109369f80cde9b87c4a4aba1b4e24a SHA512 ea8c9eaa05759a9622a2e0b7ebdb60791fcb2baee84136f1689071e52d941de02adc91356cb973dc7bd558d2a45a7a0c75f85becf859fa6f8f69a07e7d910958 -DIST firefox-91.7.0esr-et.xpi 506671 BLAKE2B a52cec5346d72efa811534b2ce5bc56a0954a091597f0418f2037282baaea67a327028b625381b8017c32b04c687087bca1915113570742da280c4e4ffcd13ad SHA512 75843bc1655254e821d9add5ff1bee9eb067766106a7f6bf6b65275123072605da0bebbc0b7db244711f45ac243b9f134faebfa380b2329fcb411dfc1a19dd45 -DIST firefox-91.7.0esr-eu.xpi 536331 BLAKE2B 3222c72e099276fcb501646a44f6e644dd1815bb30b053ebec6f03e65cdcb7aec4cf00f656886606081967d29967a8ce984b3104015c033569beafe4304cb1e3 SHA512 2de343414bcc0fadb37ca3a0ac4158edcee215ecfc1c232cd84ac6961dceceda0947d809c7437bc9546312b08bfdb644540b39ab45c5dc3c58369900eb26e642 -DIST firefox-91.7.0esr-fa.xpi 559377 BLAKE2B 2fd11177e33944f22df6d708e16b93dc31a367ed5c74aa7cbb1791c374c7fd81a938965ea9c110c33005fbf7b2ba57b76425abe93aa6c1ffbd9badc93ecfbe69 SHA512 24c08553d6328d257e41079950f1db3e6605ad35777b4585b26e6b02f51479332260812d84d0997ab59908705c3490feeda063ba8c82b7514c3b112c612f189e -DIST firefox-91.7.0esr-ff.xpi 471867 BLAKE2B ba9f51d082e7d7ba566bfd4d56e1d3205b83750555ec77bf68e706f50ca7ec3e71b5b74c14f975fb5b0c19ed0c8416417381b1e14deda0b51ef0fa6601d15cf0 SHA512 adeb46385b186649ba7c329d2881d81bb73211e2fefe83a41971a1dacc2ea08d84d108c5270236803b8d82518299084f8ffca8541e64a2da7c7bcf3fc7e0706a -DIST firefox-91.7.0esr-fi.xpi 531483 BLAKE2B 2aa9dca7c428d3fd2a18c0c2e02504769e5154ae4cb9334efe0aa6e5092161f686b23a69b7480ba04930807cf48d0f59c03b5c22dcdc2c1718aa7e75e5bf4b33 SHA512 2733805aaaa6d7e6b3417e7e1b2c32dde0eb8bc79a76cfc0668aad76c5e9493fbf1cd2f64b5280451b2efe89c16d3db8c937cf6e2592b63ef48bdac572b6e9e0 -DIST firefox-91.7.0esr-fr.xpi 557616 BLAKE2B 78d2cb1308b843da5f48cbf8b5bb94e832c2b4ac4cc8db1d486d8a2a02a935d04063027717f1386050acc1c4fcd8e738f67854e58ce89c07b00a8c7aea53ce92 SHA512 229c0bcb841b43f0d27018accd3eeb03d4838078102435407bdd43d4f66eb6175ef0d294004ecd448980e80e3706ac9532833f81cf5d1bb856915bb5fb368a42 -DIST firefox-91.7.0esr-fy-NL.xpi 543299 BLAKE2B b52724e7ee6ba10c0ee43a8107c79e7c7fa82ba503f6c6409c77c66c21d467f4384992cbedf836d464eb531769519f8cfb32641d8406b95f098d45360e55e1b0 SHA512 6589925046dd4cf8df0a221554d5897d773f349e1ed14635444dfed635572bd3badd5fad80737dd7bbf0fd0a4249042a4ba4869cf9540c9e7d0f413311651e81 -DIST firefox-91.7.0esr-ga-IE.xpi 459835 BLAKE2B 9738482ed116157c352d89d31aef4ddd36faf39a6c127b2dfa68725194c616003a987f627d890fe5dc924168bf2ea0006ad4cb7ff907c8eda0a89e3f1d01ce2a SHA512 1604a44d861c56d5379a20696f6f4d97c348df8e4939a584ad7c7f5fb72c6fd46dc825ae367430f44c92b7aadf84e92340bb8e4d8ad521982fe2e7006806db48 -DIST firefox-91.7.0esr-gd.xpi 530853 BLAKE2B fab38d06e4a11569b5ff1637ac256b8deff68f88eb658c1566f22adbeec092f17f7e865211bfe719f85853d451d2f4aceaa2db7ef26225660be81a9b762da4c9 SHA512 0cdf8d262a8e7c94dd129733938936648f67746217cbce85e7746efbd97985e4931a4109c09ac78d1ee596b619d86dd4e06b8c7500726de9001e79a9ccd39d19 -DIST firefox-91.7.0esr-gl.xpi 541298 BLAKE2B 4a09bbfb9e99d5e4ab6604cf94eff6d569c6337f2a7357dd1096420d8b561fc9f69506a618617ab5b048cc2f7564d8f891bc2fa7c07fc06297feb49e9416a512 SHA512 733a00e62c68b942f76d95505611bc04e9fb52e0d8ef9b687abddede34a5762d6b2e861f7e0589308963385d5d4db9cb7e0c5fe12a0dcb6086bade7c67fe1e3c -DIST firefox-91.7.0esr-gn.xpi 557600 BLAKE2B acb2895c4364e34cfff4db972c1f039512fe5f8bdc57f23a308076b2e56a6f24bb77f6dfeb41819cb9472a6dbd1b880fc8b0a7104f9c42e7a3a5366100f0b840 SHA512 25e9bd997cc2bc53f01d9e7491627320eca091427932a679f73404d743f373e338f643bdd14211d39d16f8b5048401926218977e37acbe3c2a6b52d4ef18c636 -DIST firefox-91.7.0esr-gu-IN.xpi 529555 BLAKE2B 64f135a86022e26e789785888f2b25cf51045a83e5c39a3ddf7b7e33095b83327463afc79afecfacb29d5863c356e8fa25491bf382d70534d34c498768203df0 SHA512 09a3328756e1449e9cdf366936681497c08948028fb811835a95476e50213dd3cd7756e29114d655a79faf5b5ea8bd28952a8ea3f1cb0b76fb9f5f3e845c70b0 -DIST firefox-91.7.0esr-he.xpi 557193 BLAKE2B ba4c56b4b3329c568fb9dc3f599db77b936b53036d705bb450905efc5a8aef65843ae4bae3c4eccec08a22d58b605e0c6e5ef0feffed6926eef061fc3ae7cc79 SHA512 8a1744b4cccffb1966ddbbce06ef5138fa219555a41862f9073d1396a855a1f18a3cd866a40202b3cd607c9c8d95a086e831c173df6d94a27b5b1213f9385e0a -DIST firefox-91.7.0esr-hi-IN.xpi 560650 BLAKE2B 2d9bc96156698726db2c7557896acad524c673eb2f7a3d0d8c01b1c0044df673be95e21fadd4a4f05e01398e1f6a5b51a15af5232079d335524bcfdaba4ca84a SHA512 5bf55ab40a1b20385032cd243c9155b3d490bb484c60f2fca0645632386ae6a48a36635d75b82d480039a28ea69b28bd14c9231e358a62f4c4b383db0779a35f -DIST firefox-91.7.0esr-hr.xpi 530058 BLAKE2B 613a5745ac290418f687859561e83e0aab58f2c822bf75c7a5473c2fa93f86335a409efedb99542bc2e2630301325e94a9f60cf33f64ee5937da0e8e730b5b14 SHA512 d07e588d594510a3084ae5951211769f2842677137482702bd1febd15a86e2ac794af480ffd9f1e0bc0cff3d453b8768989ad2f05aff4f9731e2fca499bff876 -DIST firefox-91.7.0esr-hsb.xpi 562634 BLAKE2B 2166e1b7ccea3ddff08be6489945951b4a43501fd62cc21bd28b74d874d1bee61900c594e2bd18f9349584dd3b2dc85ca60cf81557ee14e4cd69ee364753c2fa SHA512 884362e55f3442d3a4a47884d88125197ab43bc262d431c254c9d29619f6d77cf4b8870e9ba21a6c784dcfe45eb1ca2fc889565d9c83b58af1654c5770f716a4 -DIST firefox-91.7.0esr-hu.xpi 566072 BLAKE2B 84f7b22cbc44a58dba13dbb369c9c6ac3bb6218c092d5c97be2dd45a0c7df2e5771200dd63ccf8399f9115ada51ee7d4e2c8f7ebaf13849a84a92c961d7a23b7 SHA512 9fe49d6092fe15697398e8ddb81fcecd5334eaf702f56464372a502f9a6b5ae4b609daac46935ba76962767c70afead45eb6b20aa77918800e57ca4be0592c90 -DIST firefox-91.7.0esr-hy-AM.xpi 579766 BLAKE2B 1a17af12a232cb9325e02facb3a6bce953c9f59a0d42e3311848030be343d9759d2f5ab6a08ea4a98237f2c09efb1efb0681e772883219f4b2668fc49a2a2864 SHA512 c9d7114487a6f8e34676a480221ff5bab55abfaf86f9f72e14670ca971758e05a3731c603eb895ea55e830ed4be4ef6f4d9bf0e826f38cdbd551c6c14f6897cd -DIST firefox-91.7.0esr-ia.xpi 532146 BLAKE2B 00eee9c824fe15b3983f4b8581139df2927848c4685bb1b87b9bc15eb50a0a8dfdc412169fa09b91d4ccf6438181c3788371b2b777df19efb28b736d59c77cd6 SHA512 c6965e4f59f4ecbb29ca0daf1a6af3473cfe04a0ca2d6e478e5920382e78160ddf264bb6ca7ea0bba960d6c8ba9080a034c1e94c048d2034aa204cef45395f1e -DIST firefox-91.7.0esr-id.xpi 519834 BLAKE2B c1b5b2d4a742967f18f765b29d4fc1470e6f02d79a406340f732a2a4cc58cf4c6136095949a47cf34599f434b7afb29c5cd3905129b1b70f2e2e250a930ed8b4 SHA512 e38e8ea4a4f0aad0bf38e0114fbc6081ca122b05b67e13ad192fa1ced554f8c25818998d92eac54f12b3e97b422ec975dca56613bc79da16cf1875e82544ee23 -DIST firefox-91.7.0esr-is.xpi 470223 BLAKE2B a2f81908602ff4f311e805adc0834e367ffae4462346b5ee3108dcb58f31d5674b946de01984bfb10a19cda249171eb5167484406a1984fbc92633761448fd92 SHA512 04bc2f7c8fe4e12354120d8f981c6550986a4821850be2a761f00fd3f5bf02a6db17bc48b203eefd49bb69257b6a8be52ec5ee70baee6e5fd66d8614f258c61c -DIST firefox-91.7.0esr-it.xpi 459087 BLAKE2B 62d905aea1ded35e9115602e8803aa90f9e99789521d0448701d5d3588ceb96f3659ad3b84181db9174425ce8ceefaa5416db0ff4045eba19f47b945bd48f7a3 SHA512 04109783d45a5b2bc5ccfb5abfb17158931e87ec25eb233ab01bbdf22f46de8e361846d11030c5c29b1438a18c70a6ee789f91a576ca5e0b90768412441357f2 -DIST firefox-91.7.0esr-ja.xpi 588070 BLAKE2B 3ea567921603bde264dc36d1683ac46c82087e6a9d3eed62f4ddc7dcd183b6bcef5e150e63940f23dce9fae8bd0d4775c2f1ab111ed95016decde8eeac8a052c SHA512 b03aa58dd3acb79f025b455469df0540955c92331bb7e7802600857862f3151c0dccaaecb3c2b694d95416010004351ee9eaed72dab3a7c17145fafda82475f4 -DIST firefox-91.7.0esr-ka.xpi 592256 BLAKE2B 23f2f9c35627dd60b76c84f6ef3973141b31762432e4092e51ea97e16a848b030ec1c16fbc9e4610ddc7e5e320e179bff7bafab44578f287fafd5c557acf9c8e SHA512 5e41f2af4e17f26ab574befef3d1cea10b2dc486ccd314bc9745b5d4b777aead033b786a85f4978e7f5dc125b49fd98f135bdf55b08261d7166c127be22d21d2 -DIST firefox-91.7.0esr-kab.xpi 545013 BLAKE2B 0aaf5ed426866aceba5ef870d81a4da97d5b636d8042862f104a4bd3b38da0b08973b4ba493c47ccff3669bc2dd483cf4266c6ea31e5a8f3a18db674e7aa6504 SHA512 9631d80ebf16b97b2a40ee2adf9d3a55efe96924fa89e36cfd43baa69da39960a84981d163b69d3320603a4473d02fc5dbc792cb5ab505a1e16028a6eac501fc -DIST firefox-91.7.0esr-kk.xpi 605549 BLAKE2B 0b74a881e0bf7cf4835bb012d5b4f9a9f14570b632d211feeeeddca4e0de70db98a16e92ef815594495e7ee2d362b1d0812ab5bbd1fd1985ed216701ec519818 SHA512 4ba83b80a3e420ffa4ec0d0ee1f03bbddd594055e7adb3a505a0806f5b16032d7a5f84f513c7cc437a97571044fdc2dec36364cdd75eeb91b7bb15e6a71065ba -DIST firefox-91.7.0esr-km.xpi 533107 BLAKE2B aad6b2edaabf69fabb7588227b3a7e058b0fc195013284ce77193109db4095840baf151da29c322d23ea34240ac02241b7b576a17769d407a936889a7892ec39 SHA512 f6a4e954c5731def554897a790ae6cdc0373b71b22a461070e63892210c2e637499976d80d9f7ad70af394a4b7d1ea888a69b0b0a99a42eede97d03fb24dfba0 -DIST firefox-91.7.0esr-kn.xpi 498964 BLAKE2B 831bb6bca1e785c8ae1d8beddf101f4eed50d6d20e340c5fcf49c4431838eaf428497cf41e754772a8d569804a3215024d615e29eb15462fcc75a6b1dad6728c SHA512 838ba522a2a54ccac40d8091aad3e1201adec29ee1b4134d0231f7adcce922a026ce4f5cd0ebeb937dc99113fcbbddec46714b8e95dcfca1724d12d0f1733264 -DIST firefox-91.7.0esr-ko.xpi 579054 BLAKE2B 3dfc299e01963e5524d7a06e7ed5f2b1bd1339712dfdba0fec8f33684a24b11b5cdcdc22208148943ebb3b060efc4b54ea8f3c943cf779569f16db25eebb5198 SHA512 b212992ad82a302763880dfab1e4739686879154f9380d07b554bc46850684ee36b3048dbb869a831b4184c063a5cc257e54acb33d2ac4a78a8af8ad7f14d428 -DIST firefox-91.7.0esr-lij.xpi 470173 BLAKE2B 2d4ce2b94a498000228a162871b04bbf41a258b0b8e4e298a1498a32120e8fd9f6c729faf7c42566cdc2680b3a14ecaa4715680e5863647d2b60f23a9c531228 SHA512 6e0e221be7f1e7de0f2e7dc69c13d2e4a535bdea407e85e3a16ab353918765a66926149554d626c2861fea95512caf8094afb6a6d8547f434eee15ffb97afe27 -DIST firefox-91.7.0esr-lt.xpi 560107 BLAKE2B fce2af2097fb704283a6a835653f81a25764d4937c42eb5d7c9f709c46ab863025d11c173e71033117891d9ee57c2cd946317c63974bc3c1561c08ec1a1e3fef SHA512 afe867e225f2fb83dc323e2d24bec513c3b57c6722084fe37997984672ed3ce83aeea791c7b4d40d1c6aa89b27ed34858fdf7b5fb94b67b94acc3ff18aeb1ae4 -DIST firefox-91.7.0esr-lv.xpi 462458 BLAKE2B 02c10dbc71c1ac24255728b95445f35a17c28527f7f6b8a5fd816ac5d70a0a34607bbe245a4eba77fc7eac64584aba9b6d26d13a71ee8d041988431c7ffc635f SHA512 ea220da1b812c1b99e2f147aac9f330d67b857061fd8b272b49b0f4d60ac7bf69597828628b8ae31ac0434ded39d4dde5a6d1a2f6ba737fe0a995e93e671277e -DIST firefox-91.7.0esr-mk.xpi 465349 BLAKE2B 283d5c3005e53630d9857f22d5c58884be3b5f45e7c26cf5abbdb19c245a1f9f92b07316de077278afd287294efbc5ce4ebf0999ba716d762a34a622455cbc3e SHA512 e197f03cdd71a9ad5fdf41bd6ac3aad8343269899bd5fa17847c4224704ac90e35afa7d64986a89e194ae45226e0bfa70328c0b502e3d298955eba82a97b784e -DIST firefox-91.7.0esr-mr.xpi 532124 BLAKE2B ae34c8939bde666fcc1ff9019379bb69974eff9d60a6aa8dd74d5edb7168f592bb45d11a8c3fbb0ed227378add456fd0774000698862ad36cb7d85db3933e971 SHA512 a88b39f8a2b353509ee869777742469d5addc1c642855a1e6232411bb92a21d37d152bb659438c491b1ef42d411b2fb42b65a790aa8ebaa7b25b941b1a51066d -DIST firefox-91.7.0esr-ms.xpi 447338 BLAKE2B 7f3990f892d8622f3cff197cf6b7571b8620d000805d97c18ed67602c4bd8dac71eb2dd2d097866518b2622e3201abd50f16acda9f33d9de9b65aec017238766 SHA512 80fbaf0d4424ad62c7858d2d58bedca7e3478f8f93577bcea1128fd9e56f2f6a0e6ad8c1db78cdf13634affa6bb9aeac21506a1f0048ba808f4570da0ba96831 -DIST firefox-91.7.0esr-my.xpi 516302 BLAKE2B fe8520ba6cbdbd2385a1e779cd2abb944226b1349b6a7b0bd6c263027e2dbe0b3c5ace7fadb04875e82369fb2c10dfd5c6d368bee3acf8cfa983a06884f32e1f SHA512 ef58275eb4edacb9091d442cd186c6498cb19ba897d1f68156b2bfd79e0517c595ef1935f387687086d8b026339a2753be3456c873c89f204e8ec8cbbeaece23 -DIST firefox-91.7.0esr-nb-NO.xpi 529422 BLAKE2B 0f145ea167ff8c25dffd1a7b5c6bbbf108f5eec3cbf7175a240a735461f58681a857c11557b61b35450a7cb160f165fc925f5013bef3241df63bde5b5f52c333 SHA512 b467b53af2d3a43b8e36bc5b5efd561f73cfb9af4b73e095475e238e50e54cc409500fd16f67070c46acb0daeff2217743a18bce9efe1762069709f3d97fc162 -DIST firefox-91.7.0esr-ne-NP.xpi 485209 BLAKE2B b083379db44fd312778fef03e64323053597198221e2713fd90e4ffc274f811cc36b2d464b9ae04a6d4291e3cd364f64af16286807402d1732df730140377cb0 SHA512 f6f6b506268df80974326a7ed053524f6e329dc6a2068e30ce79b5c10301f18477a2798223ba66b976f33440de22e43128840d1eae0f35c34306199e442b38b5 -DIST firefox-91.7.0esr-nl.xpi 537385 BLAKE2B 415a3e2fb73be9f41a212bda2deaa838a11f34d85d0e071db0366e0a58ff8145b3902fae16c159feb4066de4284bc2d3491ed6a009c73800c2ddcc9f3e2b6a28 SHA512 4a970842fb415639b4f81b24a2b293e918aa83d754354c2fb9c488600f2a150c89f068d1556f283a4158e5d8a27f5f9dd9cdfbd06b8fa0fff65f666dfae07ca8 -DIST firefox-91.7.0esr-nn-NO.xpi 531678 BLAKE2B fc868fe799ce516dcb484c706efeac4f7a5216037c93b4e9d936f72fded9746d604186d24d046b310bfbeebfd5c36ee9b71bf61ecbe412867539a18ec7770bf9 SHA512 c7f6eeb98e82c297b5f31d92e80f0c144f25bf5fbf8b84f41c35d448be87cee807730f535ec5e8f271011c8c0a88e6439c105073706ae3b9590ddee0085f00c2 -DIST firefox-91.7.0esr-oc.xpi 552953 BLAKE2B c3e1a52b06890fd681f71d146924685b263ee76f69c67c6a3ee556cba74c8d3b9551cf73d63e2f8f16c01aa94fd8f59dfcf32d0ac54c94719e9ae18d7f68c83c SHA512 3189f5cd8611cb17df4c9547216ac6fddd8fd8b00f2de742dc3ba3506fd9220fe56969c9dc34d666b80195b1ce86eb303058ef8e98a08cefd0666b75309b3be8 -DIST firefox-91.7.0esr-pa-IN.xpi 595971 BLAKE2B 9285d137b45e33e5c1b8f17948dffb0c9a4f9e727bd56e738316917e08c037176f818fd23029e00861cf7a4ba47a8563bf9ba89f05466a31276cd3b1d57f2f22 SHA512 7827eb66c389352b2a86a79c0d1fb7f789955407b242fc78387593fa94abac3c63fb568fcc9133e0a398dfb806bfcdaa8397d6fb45e9f2395ee64262641b3b2d -DIST firefox-91.7.0esr-pl.xpi 555617 BLAKE2B 2b7f64ea259e7a33951101135d9d7e4cbb47f354ef7cf855bde582d848ec1febdfd334af33a0fd7e968a7a8d6a1c8e5caf0dbdba40a48686f196079586bebb88 SHA512 3ba3abf8856664465c0614b327e0843e014c82ed17411dfca2dbce3a1083398f649ce74288fa49672ab9bc5b66255da89d47b2bc26d67344b207daba6e2b10c7 -DIST firefox-91.7.0esr-pt-BR.xpi 542611 BLAKE2B d10d6e7bc56d41fff82e779334368462364d878034afd1379745c0e551befe5473e291685301761406e008d4957f089608d9bbc5a91a6ac2560071deff61a654 SHA512 be091ae491bf8d6e34a8a378239da56e8a3d570fc392385a8cd893ab643e2221a79e14e7a71e09cdf5622f252ba679b23699557c1352e4883e2bf34e61a54458 -DIST firefox-91.7.0esr-pt-PT.xpi 546345 BLAKE2B 63c3861e242060b6480b3b14e91882efeb2c9bd58cdcf8692f234c215196f8d0fbc651558f6821f01892a115bb205fb1e24279989f8d0fedf28afbffb605dcce SHA512 97529b5dbd321a9ab7136fd13ccf0e7aed8650caf5659c7e26410180ebb7332244b67c0e3793630378a5ce5b103db956f02bc9cbbedb465cb6a26f6b20e119ee -DIST firefox-91.7.0esr-rm.xpi 537358 BLAKE2B 8394ea9914a01cc9eb1a6b52d42d6f3ad9859d9723f5f1d0372e0833d941189d94cd6fecb276d01a52e16136854d06661295f34fcc234227d92afc9b7f4e4ab1 SHA512 c74c9217bd7a87b8ebd5aaffa538fb76c37f4ef23945a57f2bba990dae95613f74a0c27642c5e0738a948e19cb30f2019db25b64d106d8c5fd2d943792feef8a -DIST firefox-91.7.0esr-ro.xpi 529329 BLAKE2B baea3443ba7a3e7f9ace8b13f12d3a8e8ee67f89edc28b7833ee1ece0151c25730a75e8dd93503f0f7a6c7628a1dbdb562fd35ac60f1ae6a83a4bb517bb50bf6 SHA512 17f3984ead3d1c8685db83af199064c6d1efac26c0a054077f00df0a78c9918a1ac9098cccec944a422dbdb164046ed4645efa66df937c86e82a4c2f49177b12 -DIST firefox-91.7.0esr-ru.xpi 627121 BLAKE2B 48b560dd0aec44359087cc20b890c765212cf4d798e969d2f9966add04bc6bffeedb1a5f24150d3aa1505ac4289fcbee029891e7bdc6de685de29af95ab0ed98 SHA512 4b38273007ffe93f48e65056a4a34373c03639552db4c0a672af215cbcebcc1e50834900cb408224371cafbb246b11b8d56640fde3129b4eed3c245ff01715c7 -DIST firefox-91.7.0esr-sco.xpi 504854 BLAKE2B 041ca420090aba284a7db106d72f298ba872a512d98f28a9e0677db1b3c215b7abfad8254942b3aa4132d266954a3f5349b99bbd2e55f6a2dc2225421e59cd45 SHA512 4bda510810ef588659cdb6b9935d9b8b0d0ed5c75bda029eb6e56ac1608c4fc3883537a9fba14e46fe400e9fd083dced06860b37d3d4e1f8a27c26cc22d51766 -DIST firefox-91.7.0esr-si.xpi 487948 BLAKE2B d7c8c36ca2ee50f6d3d521e5b17aa34035b4ec0bc440887026f06164065590880e4b2a03e67324b83cf94cc4bae09cfb90c30e22bc4e587ca62252762d6799db SHA512 71e01a4beafd83fb5a42db74b64a26f5c21c97dda48dbb2d9c017bc748ecab6b286e99cfdb3944cbd0b1116d95a11b8254be9fb18729e4e8480be6e9cd3831c7 -DIST firefox-91.7.0esr-sk.xpi 566483 BLAKE2B 9404977a198b695e604ca4c5b9f2520a131142a9ab7a78ec1de1b3e30a21ffe74ab7c084a34c309193c0f0d377177d16da98bf957af16c539a22fdd0173a85b6 SHA512 17bd048dea7a509711780170d880d473ca3914dadf85d42d1271bf6121cfae4eb53582376e50ba4552657235164d8d445065d95550e1ed5f01cee2cd8d41ed94 -DIST firefox-91.7.0esr-sl.xpi 538010 BLAKE2B c95093c3a2d88fc9571f341dfc448fd322d3b293775a2c4c17ead8d2f8f700ed460589485779533416c11f6bf2cf68639d0ec0b1f8958332a6aba1be789f0c5e SHA512 a154e7468c9a4b87276f58a86c11c53eeead86315e1dd0aaeff1039c1f28989dfb232e23916a43b6bd8a2f435f6ba25a01d03c03ff6dfaaae25aa23c4850fb4d -DIST firefox-91.7.0esr-son.xpi 425999 BLAKE2B 9f7f2973951e68ed0c8d0990f08d2bc4bd95a6a2e112682b98e0ce4bbcc5912a9854f1ac6d437ed1d7e03b411a1b2e4a88490a54ca0e1509a10505da1041eff2 SHA512 aa3ad07223c9efbc5ac3ee983fb62c88a2e7c8bd5d8e47024d2ffcb4fa6c132a3117e938c4fe778fee84b1fb74b417538fdfc6d65b3172b6686e0d1bbc844a9b -DIST firefox-91.7.0esr-sq.xpi 555991 BLAKE2B 8c09de5bfad85b6e6fa394643a2a66d709c2b5e54785eefd961afe5c9e1183372e40b0e141532ec1ab5bef1c770744e9cabff553680673b6e6dd1c1ca083e20b SHA512 74f1858cb37bbeda955d6a02c25696cac2eec05d98e83a08c4eef67755c4b987ec9ea5302d733418c265cf4638c0821ce400399739891595f834956af886c93a -DIST firefox-91.7.0esr-sr.xpi 586075 BLAKE2B 5c2f6b938f8e9417703102c75154a45c0763250cac6efbbb201fe4e2621418d9bf7927f387a2cebe70fc825fc88d75a56304367c13f2972b400edec489b89ce5 SHA512 a6f526013a2ee0d35db0f0ba9910721980d1c080cfa15dde3eb25cc53943ca4dd3dda27a75daf52289ddeaa6a552dd6ff4cdd3c1b05857e67b1e4d5edaf6be69 -DIST firefox-91.7.0esr-sv-SE.xpi 539967 BLAKE2B 7d82a1b8fb0b52fc4fb7adc4e31d332c7dfba3a7b845969300082deb05947414381ad99d03f5ff74be9d4ff73c3deab3d5571d9c569ff64b1f982b7ffd83c761 SHA512 e03d3aa874e008b8e23ee266b142d144b06d5e1606f710e0b852971dfaf68356592469dd7b97e364374cd37ddd8cd7142ec5112c6fc48f86ebe470ad5a880ee5 -DIST firefox-91.7.0esr-szl.xpi 509813 BLAKE2B cbfee7f5b61e09ab86aac78b614f19b5aa9dde84013cd776dbcba60c23638946e6cb53485fc9dae525b3cf428d6c23b54c945a14cb7abf30fc95b2fc8f75c18a SHA512 70d144397c52d4e2253ccdd9a60965e6fb03f28ef2485ecbe5421c79139df14b537eb779b972f71d5b50d7c44a42bab014fb6b8acb5ef082cbb7db3eee9a4257 -DIST firefox-91.7.0esr-ta.xpi 513813 BLAKE2B e9d6c69ac15f24075cf2e7cd9ccff8d7967e3468e05dd1e5bc2f2986f0d8cd089e6e78731d0fbbdd7bb0340778608be14ec60937bc7e30bf779239d9dda6643a SHA512 77c09703824fffcaa55065608fde30a5f6a4c01f8b78e068f8751f92af0ba4e59df6ee3f8f7b22bbd07ea29f3762b47d093d62915bb868bd74e414026a4da58c -DIST firefox-91.7.0esr-te.xpi 549958 BLAKE2B ec6111d492d67eeda71cd264a53e8a0c1e93596869e13f53585da743a121b499c7deb9dffac1b7d140a304df3b38f30618895754c3bc3d924ed512c190da8ab8 SHA512 dc3be2bfc2be7c6959834a71ea8176bd14ac3ea78d235e70bdf40896953e1fb3e026d72452d55f58d8f57b2913cefdee902d96fc35c54f8282ab999dc9a0b633 -DIST firefox-91.7.0esr-th.xpi 607070 BLAKE2B 2da72b81380e133cd637f4ba0e5defee707eaacfe7c981c34fbddbdc93919fc06015fafdaa63620370e6af86c83d77308228e67c5254c12d5bb89ddf797ef51f SHA512 40f3c16c73595cbf7efe2be28595975432b604d2fe00d3b10aac9ec45f73787f592c4213177695b27da289688bad535775ae42b17cb743dbe3117da71c93f4b1 -DIST firefox-91.7.0esr-tl.xpi 516114 BLAKE2B fb20f2de867ed7d5c41235c6634c3f5eeba5245462e64e8870fd06a447ee9fa6fd121523a60d778e594a84132ef1e94265d0c96757a1c261d1b64005779dc9bc SHA512 02f5e23bbcb1583c0ffb101bfc774cfa74287f4ade1db93f1fbc0ef8339967ed4d388b7d1e4723c6f6b59b754ef10114047278724f9b68df3c5e4c91420d5058 -DIST firefox-91.7.0esr-tr.xpi 553686 BLAKE2B b52569cae207020aea592d2e119413126344a3b30019affc4fe4b426e7472a579ccf3458990ecf878c4fb09e786c1011ab69e779da6e1b822f9d4186ce68e495 SHA512 4779b0bc77672aa5193a9584e4fee1a84d28f534c6222edeb87a5a44876dd2d2606b7aab674954adf94da21b41108f7f79174fa5a174df721a2e7fcfd56e1813 -DIST firefox-91.7.0esr-trs.xpi 491083 BLAKE2B 61744e75694668b2b1c8ced0b181f2b65223735f7ec320afb648f3397df3e86a8458b207cc28e829b7cb2e0a2463db303aa7bcc5ea2b97289bac5976599575af SHA512 340917b70a0f9d2e9853ba5e98866e234a0ee8f3b42e8c447459893733312f1593de59c690163ace7eea43c499726e40245e3bfd8a09289daf8b7dd533254550 -DIST firefox-91.7.0esr-uk.xpi 620502 BLAKE2B 691a0572d93c9e2aeb9919c254b1af3e18ba63f921121531264b6abd3bdc3869a9f0cd0d0fbb15ae6d6d1da8485ca4549b2b5f3ea43cd2bef97e8bceb5dc1513 SHA512 ae9203639f3b9ffff9ed386456af9db10fec76bdf17ed8f460c3dc70cb4eeb1991b7530c8d4622f30582a81bd409469a616f32c5b3f5231abe608b0e4d9022e2 -DIST firefox-91.7.0esr-ur.xpi 557322 BLAKE2B 64a02aef49158ebcddcc5927c4e522472316aa1808527532a95121fa4bbf1f92ad566c2491ec80c7138f9ab666e478f8578dc308fb497540403a5b5c27d6822d SHA512 8b3913cab9ef3991495769c380b57d9a1f36de95ef6c48e4f5ac11b913e9da6c624e9336b777a287af3aabff2eab8533419a111c5bdfc1f5b403c7dda3105e24 -DIST firefox-91.7.0esr-uz.xpi 466866 BLAKE2B 0ce38ee3ecc2e9cadcdf3a9322011c80491eb5da7cc82e198032b9cdb03ef367f8cafc1a325d6cc34d7952b474d3f35d02e2297409638c065f382d4d44431568 SHA512 3534b6a768f7bcec63e159bc50c66be2a81913f2ac3f1c0e59c00a97c0501cb026c77496ea8ea3719f823761d211042f2a4b19ade164047bf1cefdab656fb083 -DIST firefox-91.7.0esr-vi.xpi 573481 BLAKE2B 9eccf31ff297b53285100aa2993f32453520879be86b9da431608710ba63f0e110d67d01cbc1c6eb1330dbcb1268b77536dd83ef4c8b26d238cbb5772275b268 SHA512 a7e593aafd7bda13d38474971b9acda8f0decb272e143c09a8e9654caac44d884c830733e08c8ec3381a0e50d76a4e53d8dc91e884635be5f716142a963a0007 -DIST firefox-91.7.0esr-xh.xpi 428171 BLAKE2B b649ea7ab56b50a72fe85c57191258ccfb33094a3917c85b138112250897b1aa51cb654e271e9725aa3a871d852d5b0144ba832d27eb911e3229d17b3c1ff451 SHA512 d811be845e77050cf8201a4cdd81d857c0c169e1daca54f9ed19eb2cefaccac2e8227d0a0bd14da03fae30fd994e6f73b01ecd3ddd1db80c93f161ae54de2afd -DIST firefox-91.7.0esr-zh-CN.xpi 575384 BLAKE2B 55c6dc2eb796b51590c2caed51055123ebec2a0c690c624804b9514a3f1ea6e657d6854aa32bc79de5ada3bd03c1c50ca50c5460dcc37c7808c4aec4e0579e73 SHA512 b226b3579ed1f9dfef85e3b9e312e53214f168a41e546370259e8d646ae8254973f09e1dcf983c53202ef9c7b4417a41e707e94eeff27330d25c5ae2bb0e2922 -DIST firefox-91.7.0esr-zh-TW.xpi 576223 BLAKE2B 7829cefb68361a1953632c769fc5f05bd740f4464f038093d7582ce64f16dc7361c4d11f802e3b4457c51567174b9cd3144c3e712f808a80f7e499c3a7a3b832 SHA512 1ec45793166ba742d49e9e16807132f97807dca9d76558d86db48ae73c64cfc39b66e9974d0d98b9a550bc58f4321bd1722b856fa81b5a6e7fa58da87d7b618a -DIST firefox-91.7.0esr.source.tar.xz 383133596 BLAKE2B 374da61d89d4b7b24d01e8101926056d6819e7c34c80630694cd2d95193dd6662ccfe3195361e7cd5a4167098e74bb7018d02d5af715fdcf95228bf8f54cb1c2 SHA512 925811989d8a91d826ba356bd46ac54be8153288ec0319c28d2bfbe89191e62e107691159dd7ca247253e2a4952eb59a5b9613e3feea3f5351238d4822e26301 -DIST firefox-91.7.1esr-ach.xpi 453224 BLAKE2B ce3c4c23387ddaebd66b94094342520f249a83cb332616d7d98ec76a9c0e319a591cb20c749f6d311228ddb190d3cc08695aed6fc9036142b5a0cb97ebbba49b SHA512 705de6139e648584fbb24394f51ef03901539377ea7a733d428be1e652ae46faaa34d0c198a1e5d127a2b713f469beef44d978634dba9c3fce974022f1cd8e57 -DIST firefox-91.7.1esr-af.xpi 426916 BLAKE2B 04fcf681395da5b48ed72eb66572481b7bc4447c857357dc66770ab68ada5b80618604d0e2d680a1fab2939fe5edb50bf7b48af19491b15fed9d02842b3863cf SHA512 a6a047fbc27c224e66a8cdd1d71174eec33608aabe85e23936335079fd9714b9a36406a8e569fad6f8c192759f7c77e2f8868724b2f60fabbe99ea1b952dd8b6 -DIST firefox-91.7.1esr-an.xpi 499893 BLAKE2B f2d17e1e8ea3f8cc7ff464a89a2bf296aa9114a6f9e3c8048787272bbee1c79abd44528f684730c9538267559af4727a0901d4846b8a3e8554bab6c5aea72801 SHA512 869daa909ad754f8019a78988899e0c39c0450a79143def73c209f91c28214d6c72dd5be1cb9517a2877f041cebcacafa04f21003b251195f2a6daa013846dc6 -DIST firefox-91.7.1esr-ar.xpi 559673 BLAKE2B f165c6a0e784b6c2f910a930a19a6ca4f146fbec66480c87ac3de57f07301979debf2a893fbbd3c151da01a70668f02adfe5793ca17e31ce451c6f83de357d2c SHA512 8f3ad29ca45cac3b468b3f37b2d407584b9b81d7daa76892466295e8cc243a3e3e4ec9c1062e3e730773954713b2a1c42ae94c2651bd1da7eccec677bc11cf47 -DIST firefox-91.7.1esr-ast.xpi 498583 BLAKE2B 83083c99dffd6afcc53d5c59e8204edbf33ca080f38223084f78e112aff8a69ba18eec1ae5e686a3e6a29110014a0397e6c064aaa9d806f88a6996dc659902d4 SHA512 008fa6a5545947faf1370a130c9e326e3507b44282ea576e9c2eb54127191dc9dbf35596d70e2658a6eb869ee01660413fd8f97dd12abc943ecd998833952349 -DIST firefox-91.7.1esr-az.xpi 489432 BLAKE2B a36d570da99449b1a3405c612038bcf3ef1460dbd45e460fefe9be360f142323492d3b2e4b4c871479f79e58b64859456e86b55f08dfe3f6fbbe64cbaf6e5579 SHA512 2a612fe6e3574ca9935c687da61d048a3f7e823bea363de8103704a854bfe3a9d491f916f2f8a1b46b3676ca73f46fc5c55639f42f7b66e6a91e4f47ad9b7d90 -DIST firefox-91.7.1esr-be.xpi 622597 BLAKE2B 2e0638d4e57141c8f4c07c215c26e98e56fa8355040b1f7aa0142fbad23bdd306b73f8cb3f9fe5acb9062f0ee746a75bdc3824867680bd777eb1c2bc1545bd6c SHA512 f52ddc61cf98b90af084cd3dc03d4125fad424f2bd453a1f69ca144e3ca55bcab4ea3b9bfdbbe35421621b3b05868c78021a20971d3f685340204b6649051636 -DIST firefox-91.7.1esr-bg.xpi 567641 BLAKE2B 5eb4598a44a5a35b743afd03631d7f6e02f9cb0811a8707256d2a401db57c8a86b5ff3b8f68e3f1e3034c39d0f3865b1c74f54771aac6777774f3a4923f618e8 SHA512 d88cba3e26cd5261a019f3bf3ec584752c5b7ca4ecd328521f8380ae286f6df9c7818a00ff72bfc4c8d20559c6f64b1167a2d6f003b1a2d48a6467428e784dc3 -DIST firefox-91.7.1esr-bn.xpi 556820 BLAKE2B ebd673720a45d764d7451b8f3896ef1cac6c030d4c588d70f44236fda00a113c6d4750bdd6ea59d063d2ea40663bb1de044723dd21f81137de90049ac18cb514 SHA512 99a17f7959ded38859a26d395cf8924c13cc1c580daf82b639fd0302043e4dbce45f23bf5afc9d30ee4a86b8933a41e787c98c85fc166a550262674018cd94be -DIST firefox-91.7.1esr-br.xpi 526246 BLAKE2B f6c8e19bca33fb8340a18b952bd7b5cb27d2fdf23fdba7a7d99dc7164c9e24d37dd5ec9df4f1f6b7ecb61b055fcb1dde1e18accba992b4f303d52cb6b4f8187f SHA512 4591290037c09011a2db5ba5e285dcd87f5d3891005fade8ee64f94dd8d41b74b5c0ebae23c344ed2692b15a954830abb099fad5a7323e15e86881ce96ee678f -DIST firefox-91.7.1esr-bs.xpi 463551 BLAKE2B 13d72a091586dbc9b057690e57f4ade18dd4a2f18675ff9e22428946db7c2027c8167e200c31900a1627f165e03ee17ea2fa3d9e059eea3bbb84dd8a6f0b17bd SHA512 70ed564ae380432af74bd20fddffc5cd5710ca18f579965d9954b4fd5221ef1888d4736258477c155ab7d6218338c8009759ec48788688c4c30f2e8e6fd6438e -DIST firefox-91.7.1esr-ca-valencia.xpi 529390 BLAKE2B a2f3a432ff70226727c33481c155d9658f0aca4d2bf2d0c7bc33df0a55740ee1240de61d6070a1a416c4c2defaaef98c271e03e76acc09db63c95b459426f1ee SHA512 4b28af0dc8ceb2cdbb680b2e863fc8ddff24be01c4113b13c03ae7c0d6f97c725f0185971acf0280e92652a25a951ae160d44e04dd6903afd3c72a9a5fc905d7 -DIST firefox-91.7.1esr-ca.xpi 532473 BLAKE2B cfd9a355fadd0e2750c22b00ec93d4421aed43b29cbd45b698bebe2f1c52aafe2aa8d723e2ff0491a2cc99e0c73dfb34318c592fa643c77d232070205511f839 SHA512 f3af65c2be7d61c14e7af73e5a8d29520856d2b2de182d19e0735091732b337aebd1b413602f190bd94f13139dce918d35c12fa8d74673954b5cca28d754b380 -DIST firefox-91.7.1esr-cak.xpi 552599 BLAKE2B 479c79e5a7d02d02ecd691ae36031179710f95bbe3c2f83d3737d2cbc8a2acf288d66f32dca90e5a6a31f2f5de66514a1c5b9b6f3e05c4c4b31a9adbbf7e9197 SHA512 54ab03060323a21c8c69ad5ec113a17a52eaeb312f8be416b7ee1a3fc0f553fd0adc4908f35fe7f2380077775ad0da4e4da01a7672aac635157be425cefda0f3 -DIST firefox-91.7.1esr-cs.xpi 563172 BLAKE2B bd03f4a47ccb8957e3f6cc187187d463551f2336c2fa59f21c67f3e6b0f3502ed5104da146c80841a0d7203b3d2dcd8fcadc1cbe4b65fbf05f2a642e868b1d17 SHA512 cf6a6d114464716aab4b776a7cb87bf0a41d87e52eefbaceba877a7bb154e5decfe7761110068805e6eaf3858377fb1c7d32ad75039e3421c9b794b4df30d936 -DIST firefox-91.7.1esr-cy.xpi 542221 BLAKE2B 6c149f1c2ec04fbd04e3c143f9c198baaaaf18f6117539449c40143685397333c44d81b12d02cda209af795ed68820e95d22d057071aa665e77b0d821424b8cb SHA512 fa02e95baa7606a26f6e720d94612d955a1a1e9ae1873a99911d73276105265ab75afbac6b28696b2dbe210c5874213f40afd248fcdeab61073738d083a8116b -DIST firefox-91.7.1esr-da.xpi 534158 BLAKE2B dfad92b8ae16888ea408f7fd802a333754e26f9e3650ad51e3baaa2be59f30ee37b9c2ae073033b816ddd99ed578bdf70e7f2c2303c67cd491874bd6bb7cc622 SHA512 178b1c67cb96c3d6aefe64cc4de1efe5003964fc3d7cd82ca99108df2fe26b3a5a88ae5ea98aa7956dde4a35c7b2585066f1e624ef1891ec1074111ecc0f8183 -DIST firefox-91.7.1esr-de.xpi 553587 BLAKE2B dea3ce519e14c82f194b02483c74dcf52cc5e9f0667e78cb20e263ee6bc671b9b0f35bf719945291edb2cea62f903c94a7e253eb4d040f7fe54f7ca06667d731 SHA512 c7820651508f4063af398746fc2a9082e539985a56f3b7fd0a42f8eed5a391d5e5e53e3486581679d2bdfe0b627ecf22dfae3728f9e46d79de083b2197f45512 -DIST firefox-91.7.1esr-dsb.xpi 566486 BLAKE2B e9856d629d1d49e705640fccf63cf853bb1dfe6d39844f6049ab574b5f0c0d3a76b6ed69200155c8cbb2e5748a36ca0e72196f3a959b0032cbf3dcbbbfa91850 SHA512 8edae657a588507b6ca03f0edd76f56ad8e9755e582b27082618baea0091ece109e4e68744e97655a054bd3f06d50dbf1593464b1ef79a3160ff19fb99b997f7 -DIST firefox-91.7.1esr-el.xpi 639147 BLAKE2B e6c9bd93b220738d18e60588db0828b03979c85b1418275f6d7f0ccfe61ad270f12f01e258c5aec67246f653fbd4dbf4ff578939623f76522193e3de4742266b SHA512 0ded52158fb853ed068b3a44037de166929e437437c1766e2af0a5ce46631381196ff1485e4f93972b5903234996e3c69cf8d0a912f9bc320a7f60f75e578f56 -DIST firefox-91.7.1esr-en-CA.xpi 509573 BLAKE2B 31bdf9b34769cafad0ff8b14f0ea5c5e2525f9b21363423e790022eb0723c57b9d1bc168b462643815854ef3719fa2072fa1725d2d961a6de27e3db5b06c0270 SHA512 ba690e6439f01dc1e64fa70ff5b185d03d2b0d7fc982b3deeaeb0183aba23a30631935240d8ebaafb60f2bf889cf334a2f4acd6ecf64df769c78380231131134 -DIST firefox-91.7.1esr-en-GB.xpi 510582 BLAKE2B 8979e4fe67b97a60013efb0f7714511c8305780a47b160b87a553962558bbe55be5462a74d530a1cb7fba69f63ff9820cef398a64dd1a01282365e75b2c3cf73 SHA512 3681b83f9a777454b8af6ed8e977e62acb4ed9fbf656e1bd88a2b5b1df4c47b6b0d1ee4e675d0c925bcbceeffa1ed2ac56b986ecba4dff57563676b74bc19123 -DIST firefox-91.7.1esr-eo.xpi 534793 BLAKE2B 293f909f3fb85d01238f7fc75d52fc139abbd1f8d7bbd2d98f0883d389506af2456a70cf307f7bd94669a3f79d0a666d5617b69c4b5eef795f830dc4887a86ef SHA512 51264bb6131133284909d793dfc83fe9fda809f30b33af82366b33a3dc59036e9746b933308ae473a7493c6e671a67a201ffcaa45da8db0ced1891d2b5c143f6 -DIST firefox-91.7.1esr-es-AR.xpi 546682 BLAKE2B 687b234a6f5b1986b2f0c85768693f37bca0378ec7e51c328d643af9780443407c1669b824ed2cf5d0fd954096619cd520f2d66a17848f59ed07daad07798680 SHA512 3b5f689ade0f03863ee2fc341f145e46e2b40b7c4bad6aa5428ed348fdcd0a6567e11f9ecf0abd4642c89f1d6facd6582c7e336045056cd517ad6fee73f861e2 -DIST firefox-91.7.1esr-es-CL.xpi 546381 BLAKE2B f7bc211af0cf65e6c228db685abc2aafe5a3a713c9c8dad85641f90c42f1f2d1a7ba02e17239ed3626678f231d4cffb03216bbca4364986e462c1862e73fbc18 SHA512 a0cdea380c01c8bc4cf9512cdc4141eef43bc98c9c0913a860efb896808cb32c9e79b6b34bd891e2ec5fbd7b332f20919ce4bba2d0c2a690a9935b97bc390e21 -DIST firefox-91.7.1esr-es-ES.xpi 537066 BLAKE2B dd72c39bc3d21d2172188cf3fd7fc1d5dd4d9fa894500bb30ca5e359c2d7a2261c4e299caddcc9d574b55c7f78b5eea85641d77f79e120cbe3b33107385e74e5 SHA512 5d99e6c1eb2a9e75b7a6941a57064bcb1bb183893324cf4fd9108b3a0e0a38730d85fdaa45b22ce108506dfebcf2f8c1e0cfe015738afc990b83214204e1b606 -DIST firefox-91.7.1esr-es-MX.xpi 549994 BLAKE2B 993ca918a97718b4371ae8ecc7d6cbc0746e9a7afdfc3f5db793b878f3fa1e2ecf33facd9f02cc57f2887bb6534adf044f9b13b83115a846c0935a7d92b873e5 SHA512 7f9b02bf941acc21481b9c6d8051709ec1b0584898179a8122277740847d0ffe192bc08b697ace1e0f243319a10e639d788a15da3b854cf1ecd057a83f64de41 -DIST firefox-91.7.1esr-et.xpi 506664 BLAKE2B c2bd4600e0e5081aa1c15b990389fc673d4f9c1aa5368fbe86dc17651ef07b3e417724c2b53e12f7c118550f4035b5afa9a20c7e94c0a71dd35c32d101dd779b SHA512 0f2d68ea424177f31868e9dad1426ae167709b436f73b1359b103cad9f58265cb4b082b04a436a9cd4bdfeedfe6f6e7ae69b834bd11d50fd074b510751adfab9 -DIST firefox-91.7.1esr-eu.xpi 536325 BLAKE2B fe38c83b5ed8ce1f992d1f8209e331552911654850f7f7e5a3dba63ac79be0b2f70cae4d4485cc7fafdfd059d7fa9e967d39fcf59f072ba23d4b713977b7426a SHA512 6081bd36fbf468a21a9caa91ba6826ae256f2290661884f18aefc170d9ca87b15da75076abc2ec07c282453ea904d2e26d5b2f8a6c6d2328c5be108826eee4ac -DIST firefox-91.7.1esr-fa.xpi 559375 BLAKE2B be2d0140baa9b087134ec5cdfed8d676a136de2605b2137f1cc06b492583a1c83ddee163312f5907772bbee9bf9f522767e6799692de22e764fed9eaf8d604f8 SHA512 a5bb0f4b59db29458788937dc8e3d40b8518b0e1145cdbd9a72253a90535b2dc4997fdb89fe0c709b4176685e7876ddfcb53bb67d1d09ac3e6cae0114a8b4962 -DIST firefox-91.7.1esr-ff.xpi 471860 BLAKE2B 33aef046168b2c2557ea7b1e82831e933291428f89324991efda801646208412da1731a1eaf6464041998c466a8b1c4e5be5d7185ce9bd5a1a6f36b0cf8a69f2 SHA512 8be68e800ead491bcad732216e19b711cc5b3f0f76e1c2fdad50e6f1ef0548dc6a72a5d0c6ae7051f51b266a66053934938d473793ff11d35ba2bf0448af0c2a -DIST firefox-91.7.1esr-fi.xpi 531492 BLAKE2B ad5ce6161a7772cbf33e137e17471a6c90043d0caedf0990af022b440c9ddffe1267c611d1346edbb3992ae2bfc8102e1af41dd4e1fd0da61ed70a764489b386 SHA512 a1194bca85b1a695254583cd92116014f0a095b4d99b2e194326764ab5ec3fe19e2706c30360ff790c412da4e4f6df8833da600eacf5eca538d31818c0b4c3ed -DIST firefox-91.7.1esr-fr.xpi 557622 BLAKE2B 95f4ae62071b4bdcbf156b5944dc6bc35779b655a64a86e5fd45f3ae8d3dd661e75824ed0c8f80f36ea5df4e911e25f19aeabdb37c98f9bc918cf13ade3a8e31 SHA512 74d46ba791b8cad0468fc31056779909c5d659178426c2849513070d1638557873e9183145faa347e9adccba7944538de330235680c52f0f7907e866af9439f7 -DIST firefox-91.7.1esr-fy-NL.xpi 543300 BLAKE2B 3493d6008b32a1d30bafde8af156cf48881ce781f21dd4cfdba18ba9b07dd32919ceb0faf349bce7448be123773c163cae75f279b24a8f2cb70bb5bc26e4e079 SHA512 d2b8206795a4264a75cf2033bb91ff5abcd62e2c5a9dc510d36713ce375463e2498117f061b322d55037c8bcb8ddbffc2341469fdf97476e07a845446b6d0245 -DIST firefox-91.7.1esr-ga-IE.xpi 459825 BLAKE2B 07f093c3bd3b0b02f6cb733243ad3a98af2adbc6a1681c7db6bd589193406e8bed738f2164baf256c170f2f752943c574c085f1c507904ee1485cb34e7de6402 SHA512 de38a8d11c35b759488f673e0b08e186f6e7017f142bb1eff17e5a07c606d74bb47d6eb478d52831f916c7c6749a86c5a46e489401b46dd6a329d69eac4750d6 -DIST firefox-91.7.1esr-gd.xpi 530846 BLAKE2B c5dc0a23963fcfdadc0afa5edde35accc60e97bd5fcb9e239562fed2f8c4d678bcd8f57fbcfd8cec91aaca12b104022116630bb7ccfceb8b498997cf689a33bd SHA512 3f20b75f6e176679c3959f9bf2f27cd33aa6b81253af4aabed828f4050bcd489b632fc5e1ee5174eb897a1ffd06ada5eafefc3064e5b4595da0d7bd532f39994 -DIST firefox-91.7.1esr-gl.xpi 541304 BLAKE2B c046cb6be301d660cc536eba87db7b933048372a535275e31b8dbd2ebe0d14ec78c7702aa2a865105909dbe3b0beec947761fd73760aa35d1191ed0f7c248719 SHA512 e5e9cf403e64867c7df4f5cac917c1d896f5b03c740872190598d43fba92a7cdc869d4699864bc8946191930c1721a9730d9592a1eb9027d044c03504623b3b1 -DIST firefox-91.7.1esr-gn.xpi 557605 BLAKE2B 6ef72491f3a155caa7c17ab1800cfd30797acd1a1d3ee7b1041400a6b4ca94487a21d6b4b51a70505644ce27e0117cd73bca05ec752ec606241799c54781808b SHA512 3f4202276f0f228c7447fba9f701cd770c246476a3fc529824fa8213eba0274d352f7daf558a3b09990a7ade7d83cb1871268ddc8eafd4b033d68965d8ece7ec -DIST firefox-91.7.1esr-gu-IN.xpi 529551 BLAKE2B 8a987ce24f070bfc774c0c73bf475778f7e82de128d5bca5016fe88ae4a15809ed27e0253dedf043d6d801167e93932742a3c7881b8545e7190f16104916fe65 SHA512 28a5b6c5e8832482fa776a4714f1fa971567db76adbed84103ab162f2f9fdc420ddc9a900b3ae0e3589f94b78ed78cc3d193ce258518aaf049ee7cb1ead8c68a -DIST firefox-91.7.1esr-he.xpi 557192 BLAKE2B 9682b12ef4d4836e45d7cb564b63e9fdcc010dd1a7960f8f9035a12c6350d95c8dbebf8b63ef20fb480763d8f9cf724b379dbbed7e3a1beaca53ff29309fbd8c SHA512 f8644f19ffc0d8dc20fe953773d50a2c8d03d9a98ffa5d447787835fb445ec19efd65a5e16d1efde6108edef3f71f9d3d66af30ef1915dc77fdcbbd1d746fb26 -DIST firefox-91.7.1esr-hi-IN.xpi 560660 BLAKE2B d8f8a24b2e4abaaf611d95a5e473a4893e8b04f3046d96c56eca07bfe102a589fd3854d6ecb76e4783fa73d593b71250d18f2f7a8fc78ca33128f21f6a904311 SHA512 96d818dd0d65b6dcac91c4f35eabf5752611313f90fa0e2250bc8d89b393b2e5ffbeec5db440c5b8e4873411d230d5bb056f8ac186531465c85f2a99fdd8e458 -DIST firefox-91.7.1esr-hr.xpi 530055 BLAKE2B 616d677c3a013a2ec9566a90351bd8d0336c0fbbbd48b4d1c94b283dd6b23c98f9a44dd22e876414247f78d333b63d1ed90f5e3cdb506bb5e82b0305256e1729 SHA512 6998c4103ca59eed94a5b771efc9e4c08348a305cc5557364ae72a2b3a5373851ff7df485fa142db4237ff1d4ab411e827bb0fe23a758ce2ce9c0b9370f453d8 -DIST firefox-91.7.1esr-hsb.xpi 562626 BLAKE2B 22dfedcede848e4ce6d41df6b6671a9432df741c058f8c4ac349ec2c66f51474f4b9a25bc351c5b839d07565c9e8e07b246a54919d2d2a258ba12d91ad91fe47 SHA512 b110623c4bae5076e9994a55891f0471d535f2a29e2c0e6efc95e6c2698821221e7797448f4b266c3b04dbdefef08173a5663bbbbe107e6bcd42d5b566db0cef -DIST firefox-91.7.1esr-hu.xpi 566074 BLAKE2B 44f10bce16fa94231cb02cb1631b8d4e8668d82664deaed5c743a7eac35e7fc532efe80dff9c978674e2e01f32848b9a6e650238eb296f56ca2716de21a64c08 SHA512 eae39fc68522a3557f1f04fc12d9f1ee36eb0b8ed2a5b8be19935ec64ea2ab1dfcbb377fc813fa9ebc94c41fff70711045b75f2c5a8a8e9c7ed0ce75f8e1bcbd -DIST firefox-91.7.1esr-hy-AM.xpi 579766 BLAKE2B 322b6ceeb7334c59f6fda25f9cb5372a70862edd65db50257f4984bc3e6d51beb7b5f8ac6fea5eacacc8bda84cb1efb49e97762e6d4921d25d47552f30b01d3f SHA512 47e59914915dd074b27c1d512efe22719df63ec3e1d7e4526282e459753d703cd4cf8a7bbd838ab9585e47530bb6672b48191267f07df9e7dd6aebdfc217e933 -DIST firefox-91.7.1esr-ia.xpi 532144 BLAKE2B 5b443fc851fb953dea002171feb930030d9bced5162f7dc3966b88e33e5c9a78cea43f9c402f3efddde08341f39372e5017c04f1582eb53beb91436ae6b49463 SHA512 e0c1afa2cd7dfe9140d08d4b523c8bf917946b80306f3a06cac425fb331724afdb0e49ec1dbc65b4b67ab4594bb23d0ba3b378f043486033d8683c566a3b946e -DIST firefox-91.7.1esr-id.xpi 519824 BLAKE2B 20f51cb59f11a7310f764a1590aff56aeada64d75d28e370321d9ad8da0cff7cbe672025718320ba81aeadee1acd2e7b0787278921260c1054890d649a542fb4 SHA512 2e99c8eddd87a906edc4b1ea6e6b4a11fbf74abc5da00f3d1d3f7af4d05bb8f775c742c900767f70cf8aef4222a28695a5d595ec28b6e86db5719ebd74c5091a -DIST firefox-91.7.1esr-is.xpi 470230 BLAKE2B f7e2a6953e22c41b0b633c36c6e473b30257691c0138fc0da2a32b921b1074ff29fc610bb7c4fb2ce189f14ed935df76a243e29abbb2794330aa9008a78f6b37 SHA512 6e8164e42a02f3419c7c5da04397ebde559033fae1c4328bff8d92c9d3430b1d2032d8aa7e7f49429e104e4d10a5d274206a15fcc1cf69c836f394189cb7f3a5 -DIST firefox-91.7.1esr-it.xpi 459091 BLAKE2B 3514fe10c627988bb7ae41de65e8b8cc6344f6c7d4624eee6e1ee3cc3a9df69b73a61c9c125b42fb80d24c51c5baf905b20acb64263062bc4fd58a7d22d30651 SHA512 fba3c9265e7a3bf1bcb3bb656f33dab96e2c5cbdd761e8553298014b26a5058c9757820ab0fc0366bf692f42efed43ab33ba6424ebb585cab9414dd2de02021b -DIST firefox-91.7.1esr-ja.xpi 588067 BLAKE2B a367b5c71cd237caca1b744dfd230921fe988d64e27942fbcbc2d9de0c166bc680a59820407223257a5aeb928cc9dfa2180e14989c167138c6534b287a09276f SHA512 1687be62808bb5d74a2ad55b46dfcc80fbad2f5ce1f4aed128b17e91a6a35e7c90e07f15be3c35802f43b3eede668d0301ce6e070a0d8eb40edef10f0855f7e1 -DIST firefox-91.7.1esr-ka.xpi 592254 BLAKE2B 719e4b82f1bef0967a072c47a2879d74d4ac9aa34cf2123ac0514891f93223472aa1e6f6d9d5d9e55507657d200d4ad8e5b6ef1ec07e41d775839df5e0c97cc3 SHA512 f883619957462ae9bdd54782eb79365a7f4dc7bce4414e71c24cc601e01f854da5a61047fdebdb25b3c7fc6eb168e0414e518de49dbcc69fb0a9557e13acfb6b -DIST firefox-91.7.1esr-kab.xpi 545019 BLAKE2B 13f4b4ed319fb74d33b0604177dd6d048bc58f403cc8e4cc0c0eb0bf5ad49196ae78197d201cfe719ae8ec923a65c83e8b77c8c5e55f6d7c30876e94950cfc45 SHA512 4356b84668639447004e4cc2520be7cdb745dc167aa09d1b6874923635d00b754dc4375f448bb3c303fddc74aa484cdddd962556956ff30d39279c32246afefb -DIST firefox-91.7.1esr-kk.xpi 605551 BLAKE2B f2229f547df6ff797fde86c8b76613e0e392654770b88bf10ce0472fd3e5e1c51df881bd11cc6a6b9029eff23516ed875117cf683e35d10d5b505f50ce185b49 SHA512 246d832b4c8f114583cb21b92dd4486dd4f875add2bc66a91e27339a2634ee65833d5c5e9e3c4fe6961629c8a4194f129c86b63a8a6b0745f18013d54e58227a -DIST firefox-91.7.1esr-km.xpi 533114 BLAKE2B 5fdcc8c7c7e1387784e4b077f342c62b4043d47b534af86cba0aa8fb77f4d760192773ac9600f0e89ff981452a7752d83d38c0dc2115517b027d419a28ad269c SHA512 247e8cb11d695fc4dd1423d865bbbd9e46dd00f8c336683b28365cd82980555964d986dadfe54fe74a312ae7f05a57ebc9a3e982afd63c94f2bf15a33ceb67eb -DIST firefox-91.7.1esr-kn.xpi 498972 BLAKE2B 560326b1c7d22bae49e2b189e217f856ce3bfc98f1466a6e8ccfbfcaa3627beb4573d9e7dbc7156dd206187db7dee368a2e6ab42d64a34ecb079e40a461388f9 SHA512 10a2025530093dad34ed2c8ddb7cc1d185a7b6d5aac7d02214c869dc91d59fd9f311ac3137bcaf9aabc1076e28659fa75a4c92df26736e901341e8521960d1ab -DIST firefox-91.7.1esr-ko.xpi 579068 BLAKE2B d23c3a4f14eb2a9cdccb8be9348b5f92c2e4e19ae46934e0a4efe711a4f96bb217a9dc4ba15dab1fd014d0d02d837a4bbf04a3590f1c138372b886709b1478c2 SHA512 deba1e081db1c236d39bad68850203584a6a279343c20113a0637f88a2cecc48991b1e956cf6c69dc36a42b9b8e185fb2b87719dc2900ef850cdf66339eca2bd -DIST firefox-91.7.1esr-lij.xpi 470169 BLAKE2B 8b6e9aa8c889737f03fd79d97e1e9b629c46699c4e53a8dc35512228ca4f8b58cd7955dad4ca749119682d32b242972bb5738cb23df5b14cafaa6f711b2531f3 SHA512 b0865f3ec1b06b6ca1f304550841fc3443f198b083be1bccaf7fd955db8cf2dd5f3fe0fffc53e19c97824e0c1287294b5eec5ba5c0112bd91e4a942bca1ac62f -DIST firefox-91.7.1esr-lt.xpi 560107 BLAKE2B 4dbc87c58d8f1238e93e4a963838eb9ab04d9c2e2245833eb001f5e02cd442f25c19c949ce7dd71dffba49a504c5a611ee1ef78b6471f2974eba622d1ad85bf1 SHA512 24f0a380251b2a4fa58b9d2be0bfa56609f276c9e5af58dad448ec9c5269771dc3b7e84c419d766733f842c38fe26b08c1908b4c5c916f5ff33e9ee8e46217d2 -DIST firefox-91.7.1esr-lv.xpi 462463 BLAKE2B 7fab7e18b0741648bd3128390588afe5f48012e43ca8416033c72ba470d728ee0be483d45b554d36cb84ee993fc715f3f36e9d5b05e1c27b671616ef8dba384c SHA512 71155a97626757ef41745c8ef512880a65795fd2d7e9303bd5a044e22e4300933586eb05f62de4cb7831d9b5079676d964756447369de88f703bae92d5a461f5 -DIST firefox-91.7.1esr-mk.xpi 465344 BLAKE2B df85f087abed1fbf76faf072e8cd547de8ae9315a7c57e892b1b048f9c2d10b8a5c325b7be3b63371b205c0ffda59962027c76a459ea2049b56c1cf3155b9302 SHA512 ff568e3e5e7716078d1835abb5c43a26e4285373f364901642496a2a2c3549daee08b1f5d702ad3efc86a5e5f3825d36b19c1f5853d31260f46f6d7ea35fc972 -DIST firefox-91.7.1esr-mr.xpi 532119 BLAKE2B 3bfcd3684f3fa4c8fe172b8e2dd477551e0c934195a66ba0908e8add290fb613d27d626849985f801e901669d68166dbf4a699db7871ec567836750b7dc48d0c SHA512 d3adc0303e4f4dc39e8e28d6dde1c2c5a1ba42344c721d18fdb3b50be3e6b8edee15ffea2c061ec074728e5a9049dd6869051735aa89c32f2369278d3ec90cc4 -DIST firefox-91.7.1esr-ms.xpi 447333 BLAKE2B a6d2be3f36b2ca7c71da85ff00e2fbc5059d3beab61165ec45e0a0aa9e3a477264d1315d6c635c3cd74c87b306a66a1b6f2d6afa28b42da92d8577699d03402a SHA512 142f9d73c9157d5bd5004f0f1380e521bce228be7dd55a09c0222b1a2d78d07e218dede6df8d6613071d7589d90d10bc88a05be293d6039379e5e91d721da9cd -DIST firefox-91.7.1esr-my.xpi 516291 BLAKE2B 5a087e044f7f2c3daf631f341d35d38e0455578aab4a2306b567a08d29894de4e50aa8997d9b072fb26911bb94f81d03604c640125e5b8c9f826f493b67995d7 SHA512 d19f202db93fd8e63a97f06286e2943bf6e88bdb416ae5df0d6e5908ffb997b1e5859f575ae4ca9c78d27faa428d622c31bd4ad95a48e41611575b54b855762a -DIST firefox-91.7.1esr-nb-NO.xpi 529426 BLAKE2B 84e38ce042159f4f01a77969c9b50ea0bdd510f40be8dc6b2d1c22648614ad2a5530688e0e2d8978c57ad85d671d9a07679357023851f3fa3e242ee54ca24278 SHA512 62aa6c9b2c1a5c17aa51021408eef32fb31fe9cf49ded86a18321bdc992b035521e0611a540c32ead1c91c04b8359f2d6c1cb0769dce72e6921f992167f65a20 -DIST firefox-91.7.1esr-ne-NP.xpi 485207 BLAKE2B 077ac6f2151d11ec38f4106afa0097553fd19b9b7bc92e628a1d9cdff29d9ab05b96cee2855ea3e84d09f31ec4df5ebfc1350457fee5b2cbaa61b9a4f5b92a36 SHA512 f78ca94d879f79def92e545608cee8dc0a52769b1ed427d16db3039a9255f9ffec273c79b83c6ed517ec1d3a9126175421e9f8e75301848491c9ef2cb4c5e385 -DIST firefox-91.7.1esr-nl.xpi 537389 BLAKE2B d82c66a9ce2f3e66f31d4fe38cb0e04d53c8e8d850c000dad17fedb2cf5a24c4c7db33385b7032a34048c687d17750b3e4feecd69850fa07af0c4b59add7121e SHA512 2c9d9ef38479c82292f5bba87c90850e68059c05bbfe4e1d9c052cbfb57f534800d9e077629f18747fcf059acc46aafd459ee0ed664eda25fc86e5342af9a675 -DIST firefox-91.7.1esr-nn-NO.xpi 531677 BLAKE2B 82e172b915fb67c162b518e0865765295caf4f07a21f7679f57a4cc8c4361a8133bad1db0923c2f68e997807ac4fd35d57212c0e60efc59a225fdcd3950b0b78 SHA512 13b4878e06aed1deaa4465314f7150768cb7b48765d03c57367242552156729fff0f31dfc939a25672693a3ca905ad4146e85067923e04ed08283a7e483e3a03 -DIST firefox-91.7.1esr-oc.xpi 552943 BLAKE2B 09c640357c18d2f3f455d6b30e570afa0bf5ddb5b673b75c4da46f331bd906ff91e40c7c70311f191c18aa13e26c24172fd89cf3cae7b981dcdfbd6a5dfc18bf SHA512 57407ace391b410a22b8231c374e48ebcd69d54319254b004663eaac2314436684696d3b59b0d2fe4f832cda7d5eefd98c06a7fb2a34d84a9bacef22d43c769a -DIST firefox-91.7.1esr-pa-IN.xpi 595977 BLAKE2B 8148d51d7196168b495ad313269f34a369580bde0f48eedb44370d8eca8eb381d8a737ca48009d9a1ee069be9c8247cac11ab448aec4eedfe32864faa5ec5ce6 SHA512 69dd89347694a7a2009d85ed3bade2a2feca2c73094f9661e5bda28f7363a35819b5be82eeece0499a564468b8855d541c7b1a459b54a3a5e6dc9ef3c8b375d6 -DIST firefox-91.7.1esr-pl.xpi 555618 BLAKE2B d2a4e57498db8fd635198a503d84faefe4ab2f846d0abf4f5c817e729f290f8ce4c2fbe73d20d92ead9b9860a0d7c589e7eca2475203dc11de0651f44ab349b5 SHA512 af06aceee19bbee11537bc261db42c40d9df5e50839628a124d0f5f391b0256b990f12182548755f002302ff80b777b6034c7183239ac8b1cbc878de578da232 -DIST firefox-91.7.1esr-pt-BR.xpi 542611 BLAKE2B d67f266d332326f961bf76ae779701d05d35d04c89b7bb4620e94e74dd150250f85f359e4c05c146900c19275690032da86e9b2207b6e7aca3722afcb04449f2 SHA512 d81738774eeebe2a9efdf8556a956e85443905c07a0130e48f9f5e1b45f98c0ee85dae4943e5939018d8130d41f1614ef31a857090b43e97b8f8545ccf29ece5 -DIST firefox-91.7.1esr-pt-PT.xpi 546347 BLAKE2B a70593fa3ea1c11bb724024be6d2ae58aeb263b567e7e818bae66a7d247d127b1b4ce0f969345cbb915f4ff98195626308ddae7527555f67018cfe18f38c1503 SHA512 f5f565bfc96965a54f17b4e6ff4f5651db67323667601b9fff01c5879056b88d43f91b503f9b7e6249014b7fd35c8abef07f7a11a4f892795319cb7de383e31a -DIST firefox-91.7.1esr-rm.xpi 537362 BLAKE2B 9ce66f2c86f9c28e6c3bcee2c850fcb0086e408a79fc45e7bcd600a3d95c08e83cb0d3b66e0f03334d3d1c3e96fc54895f49c133bd7345855a9ed99d79e9fb31 SHA512 9cd0284e4e5c3eabb4cb35355ab844c6df6bd6c829435e45c09f249f5e8dd8d5c9ed81b306a7d941cdb579cddbf75233197e4bf51e7cba5ba178bd22ef98fa19 -DIST firefox-91.7.1esr-ro.xpi 529329 BLAKE2B cb0838e67c92ccb59d7e6000bac0a091deff4eb4cd9f9c90a1d60a2fae38ce53614d825bf6789eadd9417643c80f75a0ddd9f87993e10241585da791ca0b378d SHA512 6ee16ee0d5b16a6b0c10a974db6e83a5be250a5dbf95d08c31f38c4454b634562bb1068fd94b4becdc673e09baa1bf4d5c3b84c0f4ed70d49626cc73525283da -DIST firefox-91.7.1esr-ru.xpi 627121 BLAKE2B 765539f7949888da5417074b7a531f1a3797a4311a398411224a9c2b1b4574165f38eae1a198b1175fa05e5619d5db68ac28d0d226dd1337e219d0618796fdfe SHA512 c753c26fe3118b70a19d5f0ca97e806764c56aec38e305a5f560b93ed8627bbe2abd11d24ea81b326e10cad79e984926dc1258651400b1d967b60b74ad1a5b15 -DIST firefox-91.7.1esr-sco.xpi 504856 BLAKE2B 6d4263109389477c66d186e8c5f07c88f689f18231a8c4a4212c00d9352499d56e3f678932c837d6ce76d2bd990b74b3a5c45dcdc01dac1e52459f151c85ca42 SHA512 56d8c8ee9583f71f4572e2e04119bf1820f64d7db6fdb30bd7ddc3b1e6794edc71f4dc859c82f47520dfe663665285c626f2f3f31595cff75e9956a707e90b75 -DIST firefox-91.7.1esr-si.xpi 487954 BLAKE2B 1c6925f207648c04f6c5b73473fa46f2f51d98eb5019a86a9e110f7a18c1ef28c42dfe17b2b34a598d1a1516382f3fd722225bcf1f1e93081fca90167e430edf SHA512 756c03c321d5a2e2777438e30788cbdfb5f210439f026c9ac1cb984ea3a871e9e5bcc080fe9a96d5f55ed062f008fffc98879e86ca504e6bd07fb8aa35c007c1 -DIST firefox-91.7.1esr-sk.xpi 566488 BLAKE2B 7f3f9420ae29a021f8d65c87a1e290943954341ebb99136b02e1b5ea9ea50d3020f4e0adda15dd16a7ea328d79ae1c7eb2e499a866dbae27e7316442b38e3083 SHA512 d5512edb22774c5119c375f89f075740a382fdad019439957015adf28cb615ce6d7353bf45e59f70340b37dfe063670632a9a2ffdadebea1e2a14084a076f874 -DIST firefox-91.7.1esr-sl.xpi 538013 BLAKE2B a1fd02157efd65b8a7c141b75aa273bad2fcd2f510dd78e0838b0c6de652c6f20b239abfe6fbd2fc606644e094913c4077b61d1f15af1bb9cefdedf084cd13d6 SHA512 c12d06f9e270a4c479462c763d5880c67ab9aded34723064b54a39c3bac621c26b346969380ab138c47e502bff4ebae7f6c21599b755cd8042f5c621c1ee1fe7 -DIST firefox-91.7.1esr-son.xpi 425998 BLAKE2B f9b652c2a99e1b422a6781766549179c70d5a9a2c3373856afbb370cd84507ccc2b9051207f94aa1488cca199cb2d431150c1706328307d06727e501ef97e9fc SHA512 c4a758fefc8e6ca8881417e684f7e29e206dd5232b6dce7e8572e83ee9f94abb1616adc075dc7028748a759590ad70135c641e5cce27ea72ac8dc9b0da6d9aae -DIST firefox-91.7.1esr-sq.xpi 555989 BLAKE2B ba0f6c5eafe85ca60dc6ebad58eafa95126a22cc4e41514efc3b58a0455e6d9dd3aa2c9587f70dc8c13d600c926676bc128762fa603fc83cd661a5d0a416f6af SHA512 be1fe74c4ff0c01fe1cfb6bf33393b9887e1d7c651aaf20179c295d63251a0a54051d2c22365efb20efbb4d22a58b9b7f5821336c6e1e60b97f0f528a179c9bb -DIST firefox-91.7.1esr-sr.xpi 586072 BLAKE2B 2d1a7d8612e53f8358652e5030cb20258a1e959a965131be45f78a9debd505fd00f2c8911b25e2fd3f4c9718cd20d01bbc0e35d9fc2b17d194495320bce34800 SHA512 9e30eed05b4f72e0bab113c854e737da23f916c8773a97e9ffd249fb8dd66ef766e1416031f3867a7636b60e0a393706043c8b11ca33eee164e7dfa8fe0f54f4 -DIST firefox-91.7.1esr-sv-SE.xpi 539968 BLAKE2B 32a599e5bf48d500a0553387b63f208a46e9669f8e1d148afeb4ba2c223c180c8c20f608571d45f58c1107ea6e9ffe201ed967333755b1dfac898c7b550db49f SHA512 3d5169d4bd6f7066e702fc037294fca563d365303d1aaf812dcd6e386c5fcffd9677797abb7633cab56e79262d3df06440d7c621e95be7f6e90e98b4474cf5fa -DIST firefox-91.7.1esr-szl.xpi 509814 BLAKE2B 2ceb268d298275fba152051eedec1e6a516a47c8559b900655ca4ba94fa40dd9bdc7a8ee6cb4cd9467ab0d67c551553cf38cf8595257778a818ec82d72ad9ee0 SHA512 73932fa1961c2fc0b20f956da0175a6eb6ab1db52952b9a9feb8e82e23f6f3bc0376963c2232248a6bcaa3d9a5adec6a2d22888c196f50752fa1d441decd6145 -DIST firefox-91.7.1esr-ta.xpi 513815 BLAKE2B d260b2b2dd0307332b48d7035cce2bd6795777c70bfc4d94d3db93cfdd8d04d3c412dd60b562726af1c23578dc4162dd65e36aab069c391372faa911ed6cc2c0 SHA512 b625debfb7e85b207c8fba7721a0bec32255d121ba23b6f6cd7f9d82f49bd84c82c05264201dbfb2781b21cada456e6ac7a8d6a87c4c986a118db9d4331c1547 -DIST firefox-91.7.1esr-te.xpi 549965 BLAKE2B 34777def3e8033823f62dd59b697b9fddc65ff1fa147a8384ab48dc5a4d73d078fa8209343a3e1bb1afa9f8d3add14a71bdbbccc7caed390ea0a916a42c68427 SHA512 525cd3f0f78bd53508c797f29c52383636f2d08f806312072e4fc04149936db46e5f308dbbd34dd6ef2ef84adddfcaab71b3853e096ab0f808e4c26780f719c1 -DIST firefox-91.7.1esr-th.xpi 607068 BLAKE2B 823a461e11200db8c10bc4face1832939079f29ee0e1ed195c9ea6cb3964696a717a15881c477e137789d2ea0f3deab452c986b891ef305333f0987cdb02421e SHA512 e54e96ad884ea3c63bfb6e7dbe32ef2e5ffb43c29acd9dd1a9900b593e3ec99629587280b9c60d625510a739c824e1cf89deeb4eaba0e6f5ae4ac6ac3957c504 -DIST firefox-91.7.1esr-tl.xpi 516121 BLAKE2B 9a2811a6e988bca3d2c9e28db7f69f93aaa7ac263ae300c828406a13041f3c98a3a722b6ca8e425142e883c47a078c0f0a78bbe39f9bf38320c5d9bd65de859c SHA512 724fd519e0f72f35521e2da912d81de03c20713a5167225f4e16dfe603f6cea586e082673cd4a85954dd1fb52cf9c606115fab1601339d1ac00f32ce583eae14 -DIST firefox-91.7.1esr-tr.xpi 553673 BLAKE2B ec8d2d993cd608c89607cceb8b3986d41b442115301322f500c71b095cf9dcac68fd3e6533da107ef6a890786d157c8ecedf552710b22de26b236a92e1bf4725 SHA512 68fff4622ee1a637da55aff2b6f00ba9e080fe247b90d1adab53e38e0eb85dee3c532e7c3bf1c850f675dc1b6a19cb395210465be34f34f2b91c9e50cf50b517 -DIST firefox-91.7.1esr-trs.xpi 491081 BLAKE2B 7e38dbae85b8266baf213b630a6fb4ac038fa757c361d773d1eb94d8ffa4e16a5c6b03811ba09ee82586c2746d28785f58135dfab946a9709119878be450c815 SHA512 20fe3da296d52139fc1d6a296cfa57514246c66d8633f46b5f72e5a81bca8852c25a025c44ab323d19ff7d00112a505aeb8c631fed634abe6176f57256bddb44 -DIST firefox-91.7.1esr-uk.xpi 620498 BLAKE2B bea7e68752e37a26a19422d5ce26de88fd6af0969903156f013b38a76e8d977bf97b9c8951b5798aaeffa80f13df238be8c81e132506ff70606e7f161a60e357 SHA512 c9291f387529881e847b8062a5dadae72dc94fe11c3a9bde10d2a25139a832ce54bc3b78a68ada22063b5358da3a53c006c95f89f4139d26900325744d27bbe3 -DIST firefox-91.7.1esr-ur.xpi 557310 BLAKE2B 94b6bc69c9691e6579726cc145f0d29e8057b55189fb3d590b7090f1345162ce69ec24151d0aa2b4a169419f2d38241f5fae41b09a4f872d097b01c93adc111a SHA512 5da30d25f345ff7f33b0997b48daae148800520d782e80ac07e0a5bbb5a0f796be6089dab40b51df9fd7ecfb842c7c6d3af133c8d90b02af56dd727a2d5ec658 -DIST firefox-91.7.1esr-uz.xpi 466877 BLAKE2B b8848c4246829a3b349d92a3c6f026eeb66ea3158fd306b994695b2ad03015a90928ce11ad1c1afebd92f421bedb64e24c53000f00085d2c0e3ec382d8c4654a SHA512 7ec7c74754d7c5882b6bd4bf147b951a6a5fe98ef306e9fd90d3eab1064a74e41f34bd742250fbcfd272eeffa5702a85bb3fd43b56d733412f6abd9b4c6ca568 -DIST firefox-91.7.1esr-vi.xpi 573482 BLAKE2B 632d56778309b7e74d2d8c307e13e55a4b66d49741392d52b677747b6b495a5812262157c3e6f94acfeb41dd425a6111c8a2098e12cc2e1f76a7b6b091f1dace SHA512 524cef88d4b6fb20282ff0991c6914317aa046315aabf699c77d8ec09f653a14c5dab53260cff628f3d559febb04e297fa31b2ad994d5c54a904b016c1b4c5ef -DIST firefox-91.7.1esr-xh.xpi 428176 BLAKE2B 1770bfc825bc71fc40a2413af25a9d27294522d75d38635952a5b7f36547babdfa43330e5b31486f6b35c120cb0c1066bac383da393f099cc93cc6fcc2eebe16 SHA512 616f3c9f2e3ea9dfc82ea20d04fccb359611a1d8b1e1a67d22c002fbffd2ac968117cb65bb85206eab7bff4642e43fc21226e393e68f02911ceb5ab1f5d10322 -DIST firefox-91.7.1esr-zh-CN.xpi 575379 BLAKE2B 44cf2c4c0f180c9c5652214d45070a0a1cc2f3b0ec107d18be4746af1bfcbd8c56b5093d44f104406530e201ba2c40f5f0bcb624d3524ef955963e0b59f5f46b SHA512 0671755771eb94414da55ec0539ee950d24093c8acf2b17add5c895bb24b4e83946f8769b1913553e3d7bcb286b5b129e33aa64af391137c225c138246edaea5 -DIST firefox-91.7.1esr-zh-TW.xpi 576227 BLAKE2B 08196cddca48b3a68154ead26522a84be085a6b777f43bd11cc918efcb3b12a711869911736972cfb5b26e77f14f3b7a8da6e15a73eb32d7663102a26c1b6635 SHA512 3030828799207a4c37a06591f17636412b55042ee61bd9f42a01204ddbf148ac6176f64639eb83e3313958db3c36860fcbafb136e5e7ede70a588104690bc531 -DIST firefox-91.7.1esr.source.tar.xz 380937836 BLAKE2B 15995930be6b377c46e3932b56eb18b45c350c948f11afac4458c0ee3f2aa45e70244718872b101a560a155514dd479f38ed5ee58ff258c4e9f9f7070595f1e4 SHA512 c56aa38e9d706ff1f1838d2639dac82109dcffb54a7ea17326ae306604d78967ac32da13676756999bc1aa0bf50dc4e7072936ceb16e2e834bea48382ae4b48c DIST firefox-91.8.0esr-ach.xpi 453230 BLAKE2B 1fdc80d15961c175e220f08da45e7d020815deb74a9bb1ee4d64e91f57ca8aace009af1f908f0e9a9d33abd790801404436bbaf859cbc7a5711972a09c2583b6 SHA512 d7b2a3f5e2901e1cfd6970a1a57f2c5730c262e0e87b8e969122864e2c053ece36bb0c3b1ce550f227caf9196ee628fb079af71155dcb09d7946ab41f78318d3 DIST firefox-91.8.0esr-af.xpi 426924 BLAKE2B 8b456a253fbca60931ef7357307721656423869726df147df8a0ba687fae9eea70576f9cf92a6b2ba700ff5b7d2a0cbc3472781248813e58a17a7acd5f20735c SHA512 23454f657059a95318c0cdfbea3da7bff5e87c97a2e6bb7bd7cf58517e8e7d2d1657cddc48ebf8351827e68e79fb797c1428ffab2c4afe73b4b249bbd2115131 DIST firefox-91.8.0esr-an.xpi 499890 BLAKE2B 66b739ef571b483739573b37eb7d5f10efa158a26633dad70e61719ce4447a7817758f175e57f8fc4d5a7461b18acce5f41230d33da5e6c45d280adaa467c752 SHA512 c63ee6f7b31387f6b8dee901ca07896ccd4664a3193c357f9f1e9b46e5673e93c23b5dbc3c264211845be929e9e6b80e702c3f38967b94011157dee947760237 @@ -292,7 +96,6 @@ DIST firefox-91.8.0esr-xh.xpi 428174 BLAKE2B 5b8783a6d95f54b6661f1498a5829de69dc DIST firefox-91.8.0esr-zh-CN.xpi 575374 BLAKE2B cc5798a6e5c143bc5a58dff2ceab883c2635461b31a7785b031e4254da2b13fd2d6c095a1da54025443dcabb2ec6ecf661800fc1ab410195dd3be57430a821b1 SHA512 2056f9543a0692246b47a32d5d030734dceb9d8d109c94a7960a1f367ff3ee85ccf73d839492a57abf286f09a7e5bb43cb1d50a8be990b1a7e8b1fc1802a626a DIST firefox-91.8.0esr-zh-TW.xpi 576235 BLAKE2B 83c9bdb83050a7957891571f49b8baba78eddca780f9362fc86f761b61f6840b14395941214391438f4db4e9a07689c486baf2c32ff3d249bad9e35f8bc22cf4 SHA512 efac8090ffd8d5661df24a0d5f6726b5c15969dd349a28ab716e7ae059daf62605dde41df13b4c253c2b2bec5201554b4e06b490d9066188ad9d65b42548ab15 DIST firefox-91.8.0esr.source.tar.xz 380325092 BLAKE2B 9bc470d0e8c65517d67f4075be2aece6e82af7dc89c40018359d3dd53d45d67424db8ed4614dd3dde430e08ec6ffff29f4ecc81e1990e05abd05804c6a2b5891 SHA512 edea2c7d4d3d0322091b20b623019ef041090d9f89f33c8e3140f66a54624261f278257393db70d2038154de8ee02da0bee6ecf85c281f3558338da71fc173c3 -DIST firefox-91esr-patches-05j.tar.xz 17116 BLAKE2B 5db6d2d3d5432369d2cfcda1a2b542d70ac18c1af7013d91984054c9658d7e3f989527c3a248de53f2e8dc51a852a46477f9ad75e98db28f50f8609fcafe547c SHA512 42080a8e28014d5f8de7ff45e0128ab71747faad7a92f0f7094686125835c168751794bd0229f77290f075502c271af0171ffae2863325d10cc6e8a853a90d3e DIST firefox-91esr-patches-06j.tar.xz 17668 BLAKE2B ebe51e06197b70b0f0661724e1ccf2f2aaf0e0eb4576e795963c6a0f9c32f293825b8d2a487dcadd8e5e1cb5db7c756016c50f34e6bc6df451b44e54ef76686e SHA512 3af533a49c5e4a6fdb5be2225256655d402055332ba98f3aa159fcc78c4a9901a541b63d68cb02440f55ede04858388881118f655efebc75b18c316e0ab522a7 DIST firefox-98-patches-04j.tar.xz 17532 BLAKE2B da525840a0850a504d69dd8d758bd32c0146653450e5ca1023f43909fa3149424f48abfa98e8152875e44d72852a0310afbb42dc2684e3eecf666cdf6d84223d SHA512 db1b352c61ac784d44e197280b33e9088286571a66df6415ba28e5c910c67853053f56cd9c27faff2de77e13939e5d3e221ec4384e34881127e43a5cc315d357 DIST firefox-98.0.2-ach.xpi 449114 BLAKE2B 79c1f755fe5ba6e0aabe7f79af24165ab8a589a13edecfb1addb21db318de946b11a87677ee68e3373930e3490bb77e5768d2a7dc59f362967555eea437f782d SHA512 dae2b44134d7424ec55dfe3b18c68add16e67e139543055527cfacb3f9aa21ab00fe096c32131119acae0f5873408daa5b832bac2516fc4ea597a0e36745ae35 diff --git a/www-client/firefox/firefox-91.7.0.ebuild b/www-client/firefox/firefox-91.7.0.ebuild deleted file mode 100644 index 73ee1d6ace7d..000000000000 --- a/www-client/firefox/firefox-91.7.0.ebuild +++ /dev/null @@ -1,1230 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -FIREFOX_PATCHSET="firefox-91esr-patches-05j.tar.xz" - -LLVM_MAX_SLOT=13 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="ncurses,sqlite,ssl" - -WANT_AUTOCONF="2.1" - -VIRTUALX_REQUIRED="pgo" - -MOZ_ESR=yes - -MOZ_PV=${PV} -MOZ_PV_SUFFIX= -if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then - MOZ_PV_SUFFIX=${BASH_REMATCH[1]} - - # Convert the ebuild version to the upstream Mozilla version - MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI - MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI - MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI -fi - -if [[ -n ${MOZ_ESR} ]] ; then - # ESR releases have slightly different version numbers - MOZ_PV="${MOZ_PV}esr" -fi - -MOZ_PN="${PN%-bin}" -MOZ_P="${MOZ_PN}-${MOZ_PV}" -MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}" -MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}" - -inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \ - llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \ - virtualx xdg - -MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}" - -if [[ ${PV} == *_rc* ]] ; then - MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}" -fi - -PATCH_URIS=( - https://dev.gentoo.org/~{juippis,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET} -) - -SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz - ${PATCH_URIS[@]}" - -DESCRIPTION="Firefox Web Browser" -HOMEPAGE="https://www.mozilla.com/firefox" - -KEYWORDS="amd64 arm64 ~ppc64 x86" - -SLOT="esr" -LICENSE="MPL-2.0 GPL-2 LGPL-2.1" - -IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel" -IUSE+=" jack lto +openh264 pgo pulseaudio sndio selinux" -IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png +system-webp" -IUSE+=" wayland wifi" - -# Firefox-only IUSE -IUSE+=" geckodriver" -IUSE+=" +gmp-autoupdate" -IUSE+=" screencast" - -REQUIRED_USE="debug? ( !system-av1 ) - pgo? ( lto ) - wifi? ( dbus )" - -# Firefox-only REQUIRED_USE flags -REQUIRED_USE+=" screencast? ( wayland )" - -BDEPEND="${PYTHON_DEPS} - app-arch/unzip - app-arch/zip - >=dev-util/cbindgen-0.19.0 - >=net-libs/nodejs-10.23.1 - virtual/pkgconfig - >=virtual/rust-1.51.0 - || ( - ( - sys-devel/clang:13 - sys-devel/llvm:13 - clang? ( - =sys-devel/lld-13* - pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) - ) - ) - ( - sys-devel/clang:12 - sys-devel/llvm:12 - clang? ( - =sys-devel/lld-12* - pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) - ) - ) - ( - sys-devel/clang:11 - sys-devel/llvm:11 - clang? ( - =sys-devel/lld-11* - pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) - ) - ) - ) - amd64? ( >=dev-lang/nasm-2.13 ) - x86? ( >=dev-lang/nasm-2.13 )" - -COMMON_DEPEND=" - >=dev-libs/nss-3.68 - >=dev-libs/nspr-4.32 - dev-libs/atk - dev-libs/expat - >=x11-libs/cairo-1.10[X] - >=x11-libs/gtk+-3.4.0:3[X] - x11-libs/gdk-pixbuf - >=x11-libs/pango-1.22.0 - >=media-libs/mesa-10.2:* - media-libs/fontconfig - >=media-libs/freetype-2.4.10 - kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) - virtual/freedesktop-icon-theme - >=x11-libs/pixman-0.19.2 - >=dev-libs/glib-2.26:2 - >=sys-libs/zlib-1.2.3 - >=dev-libs/libffi-3.0.10:= - media-video/ffmpeg - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXt - dbus? ( - sys-apps/dbus - dev-libs/dbus-glib - ) - screencast? ( media-video/pipewire:= ) - system-av1? ( - >=media-libs/dav1d-0.8.1:= - >=media-libs/libaom-1.0.0:= - ) - system-harfbuzz? ( - >=media-libs/harfbuzz-2.8.1:0= - >=media-gfx/graphite2-1.3.13 - ) - system-icu? ( >=dev-libs/icu-69.1:= ) - system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) - system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) - system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) - system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) - system-webp? ( >=media-libs/libwebp-1.1.0:0= ) - wifi? ( - kernel_linux? ( - sys-apps/dbus - dev-libs/dbus-glib - net-misc/networkmanager - ) - ) - jack? ( virtual/jack ) - selinux? ( sec-policy/selinux-mozilla ) - sndio? ( media-sound/sndio )" - -RDEPEND="${COMMON_DEPEND} - !www-client/firefox:0 - !www-client/firefox:rapid - jack? ( virtual/jack ) - openh264? ( media-libs/openh264:*[plugin] ) - pulseaudio? ( - || ( - media-sound/pulseaudio - >=media-sound/apulse-0.1.12-r4 - ) - ) - selinux? ( sec-policy/selinux-mozilla )" - -DEPEND="${COMMON_DEPEND} - x11-libs/libICE - x11-libs/libSM - pulseaudio? ( - || ( - media-sound/pulseaudio - >=media-sound/apulse-0.1.12-r4[sdk] - ) - ) - wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) - amd64? ( virtual/opengl ) - x86? ( virtual/opengl )" - -S="${WORKDIR}/${PN}-${PV%_*}" - -# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or -# overridden in the enviromnent (advanced hackers only) -if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then - MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm ) -fi - -llvm_check_deps() { - if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then - einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 - return 1 - fi - - if use clang ; then - if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then - einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 - return 1 - fi - - if use pgo ; then - if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then - einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 - return 1 - fi - fi - fi - - einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2 -} - -MOZ_LANGS=( - af ar ast be bg br ca cak cs cy da de dsb - el en-CA en-GB en-US es-AR es-ES et eu - fi fr fy-NL ga-IE gd gl he hr hsb hu - id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO - pa-IN pl pt-BR pt-PT rm ro ru - sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW -) - -# Firefox-only LANGS -MOZ_LANGS+=( ach ) -MOZ_LANGS+=( an ) -MOZ_LANGS+=( az ) -MOZ_LANGS+=( bn ) -MOZ_LANGS+=( bs ) -MOZ_LANGS+=( ca-valencia ) -MOZ_LANGS+=( eo ) -MOZ_LANGS+=( es-CL ) -MOZ_LANGS+=( es-MX ) -MOZ_LANGS+=( fa ) -MOZ_LANGS+=( ff ) -MOZ_LANGS+=( gn ) -MOZ_LANGS+=( gu-IN ) -MOZ_LANGS+=( hi-IN ) -MOZ_LANGS+=( hy-AM ) -MOZ_LANGS+=( ia ) -MOZ_LANGS+=( km ) -MOZ_LANGS+=( kn ) -MOZ_LANGS+=( lij ) -MOZ_LANGS+=( mk ) -MOZ_LANGS+=( mr ) -MOZ_LANGS+=( my ) -MOZ_LANGS+=( ne-NP ) -MOZ_LANGS+=( oc ) -MOZ_LANGS+=( sco ) -MOZ_LANGS+=( si ) -MOZ_LANGS+=( son ) -MOZ_LANGS+=( szl ) -MOZ_LANGS+=( ta ) -MOZ_LANGS+=( te ) -MOZ_LANGS+=( tl ) -MOZ_LANGS+=( trs ) -MOZ_LANGS+=( ur ) -MOZ_LANGS+=( xh ) - -mozilla_set_globals() { - # https://bugs.gentoo.org/587334 - local MOZ_TOO_REGIONALIZED_FOR_L10N=( - fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE - ) - - local lang xflag - for lang in "${MOZ_LANGS[@]}" ; do - # en and en_US are handled internally - if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then - continue - fi - - # strip region subtag if $lang is in the list - if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then - xflag=${lang%%-*} - else - xflag=${lang} - fi - - SRC_URI+=" l10n_${xflag/[_@]/-}? (" - SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi" - SRC_URI+=" )" - IUSE+=" l10n_${xflag/[_@]/-}" - done -} -mozilla_set_globals - -moz_clear_vendor_checksums() { - debug-print-function ${FUNCNAME} "$@" - - if [[ ${#} -ne 1 ]] ; then - die "${FUNCNAME} requires exact one argument" - fi - - einfo "Clearing cargo checksums for ${1} ..." - - sed -i \ - -e 's/\("files":{\)[^}]*/\1/' \ - "${S}"/third_party/rust/${1}/.cargo-checksum.json \ - || die -} - -moz_install_xpi() { - debug-print-function ${FUNCNAME} "$@" - - if [[ ${#} -lt 2 ]] ; then - die "${FUNCNAME} requires at least two arguments" - fi - - local DESTDIR=${1} - shift - - insinto "${DESTDIR}" - - local emid xpi_file xpi_tmp_dir - for xpi_file in "${@}" ; do - emid= - xpi_tmp_dir=$(mktemp -d --tmpdir="${T}") - - # Unpack XPI - unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die - - # Determine extension ID - if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then - emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf") - [[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf" - elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then - emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json") - [[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json" - else - die "failed to determine extension id" - fi - - einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..." - newins "${xpi_file}" "${emid}.xpi" - done -} - -mozconfig_add_options_ac() { - debug-print-function ${FUNCNAME} "$@" - - if [[ ${#} -lt 2 ]] ; then - die "${FUNCNAME} requires at least two arguments" - fi - - local reason=${1} - shift - - local option - for option in ${@} ; do - echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG} - done -} - -mozconfig_add_options_mk() { - debug-print-function ${FUNCNAME} "$@" - - if [[ ${#} -lt 2 ]] ; then - die "${FUNCNAME} requires at least two arguments" - fi - - local reason=${1} - shift - - local option - for option in ${@} ; do - echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG} - done -} - -mozconfig_use_enable() { - debug-print-function ${FUNCNAME} "$@" - - if [[ ${#} -lt 1 ]] ; then - die "${FUNCNAME} requires at least one arguments" - fi - - local flag=$(use_enable "${@}") - mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}" -} - -mozconfig_use_with() { - debug-print-function ${FUNCNAME} "$@" - - if [[ ${#} -lt 1 ]] ; then - die "${FUNCNAME} requires at least one arguments" - fi - - local flag=$(use_with "${@}") - mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}" -} - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]] ; then - if use pgo ; then - if ! has usersandbox $FEATURES ; then - die "You must enable usersandbox as X server can not run as root!" - fi - fi - - # Ensure we have enough disk space to compile - if use pgo || use lto || use debug ; then - CHECKREQS_DISK_BUILD="13500M" - else - CHECKREQS_DISK_BUILD="6400M" - fi - - check-reqs_pkg_pretend - fi -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]] ; then - if use pgo ; then - if ! has userpriv ${FEATURES} ; then - eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!" - fi - fi - - # Ensure we have enough disk space to compile - if use pgo || use lto || use debug ; then - CHECKREQS_DISK_BUILD="13500M" - else - CHECKREQS_DISK_BUILD="6400M" - fi - - check-reqs_pkg_setup - - llvm_pkg_setup - - if use clang && use lto ; then - local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }') - [[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}") - [[ -z ${version_lld} ]] && die "Failed to read ld.lld version!" - - local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }') - [[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}") - [[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!" - - if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then - eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}." - eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:" - eerror " - Manually switch rust version using 'eselect rust' to match used LLVM version" - eerror " - Switch to dev-lang/rust[system-llvm] which will guarantee matching version" - eerror " - Build ${CATEGORY}/${PN} without USE=lto" - die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!" - fi - fi - - if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \ - && ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then - # bug 792705 - eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)." - die "Set USE=clang or select "${S}"/api-google.key || die - echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die - echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die - - xdg_src_prepare -} - -src_configure() { - # Show flags set at the beginning - einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}" - einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}" - einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}" - einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}" - einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}" - - local have_switched_compiler= - if use clang && ! tc-is-clang ; then - # Force clang - einfo "Enforcing the use of clang due to USE=clang ..." - have_switched_compiler=yes - AR=llvm-ar - CC=${CHOST}-clang - CXX=${CHOST}-clang++ - NM=llvm-nm - RANLIB=llvm-ranlib - elif ! use clang && ! tc-is-gcc ; then - # Force gcc - have_switched_compiler=yes - einfo "Enforcing the use of gcc due to USE=-clang ..." - AR=gcc-ar - CC=${CHOST}-gcc - CXX=${CHOST}-g++ - NM=gcc-nm - RANLIB=gcc-ranlib - fi - - if [[ -n "${have_switched_compiler}" ]] ; then - # Because we switched active compiler we have to ensure - # that no unsupported flags are set - strip-unsupported-flags - fi - - # Ensure we use correct toolchain - export HOST_CC="$(tc-getBUILD_CC)" - export HOST_CXX="$(tc-getBUILD_CXX)" - tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG - - # Pass the correct toolchain paths through cbindgen - if tc-is-cross-compiler ; then - export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}" - fi - - # Set MOZILLA_FIVE_HOME - export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - - # python/mach/mach/mixin/process.py fails to detect SHELL - export SHELL="${EPREFIX}/bin/bash" - - # Set state path - export MOZBUILD_STATE_PATH="${BUILD_DIR}" - - # Set MOZCONFIG - export MOZCONFIG="${S}/.mozconfig" - - # Initialize MOZCONFIG - mozconfig_add_options_ac '' --enable-application=browser - - # Set Gentoo defaults - export MOZILLA_OFFICIAL=1 - - mozconfig_add_options_ac 'Gentoo default' \ - --allow-addon-sideload \ - --disable-cargo-incremental \ - --disable-crashreporter \ - --disable-install-strip \ - --disable-strip \ - --disable-updater \ - --enable-official-branding \ - --enable-release \ - --enable-system-ffi \ - --enable-system-pixman \ - --host="${CBUILD:-${CHOST}}" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --prefix="${EPREFIX}/usr" \ - --target="${CHOST}" \ - --without-ccache \ - --with-intl-api \ - --with-libclang-path="$(llvm-config --libdir)" \ - --with-system-nspr \ - --with-system-nss \ - --with-system-zlib \ - --with-toolchain-prefix="${CHOST}-" \ - --with-unsigned-addon-scopes=app,system \ - --x-includes="${SYSROOT}${EPREFIX}/usr/include" \ - --x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)" - - # Set update channel - local update_channel=release - [[ -n ${MOZ_ESR} ]] && update_channel=esr - mozconfig_add_options_ac '' --update-channel=${update_channel} - - if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then - mozconfig_add_options_ac '' --enable-rust-simd - fi - - if [[ -s "${S}/api-google.key" ]] ; then - local key_origin="Gentoo default" - if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then - key_origin="User value" - fi - - mozconfig_add_options_ac "${key_origin}" \ - --with-google-safebrowsing-api-keyfile="${S}/api-google.key" - else - einfo "Building without Google API key ..." - fi - - if [[ -s "${S}/api-location.key" ]] ; then - local key_origin="Gentoo default" - if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then - key_origin="User value" - fi - - mozconfig_add_options_ac "${key_origin}" \ - --with-google-location-service-api-keyfile="${S}/api-location.key" - else - einfo "Building without Location API key ..." - fi - - if [[ -s "${S}/api-mozilla.key" ]] ; then - local key_origin="Gentoo default" - if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then - key_origin="User value" - fi - - mozconfig_add_options_ac "${key_origin}" \ - --with-mozilla-api-keyfile="${S}/api-mozilla.key" - else - einfo "Building without Mozilla API key ..." - fi - - mozconfig_use_with system-av1 - mozconfig_use_with system-harfbuzz - mozconfig_use_with system-harfbuzz system-graphite2 - mozconfig_use_with system-icu - mozconfig_use_with system-jpeg - mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr" - mozconfig_use_with system-libvpx - mozconfig_use_with system-png - mozconfig_use_with system-webp - - mozconfig_use_enable dbus - - use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme - - mozconfig_use_enable geckodriver - - if use hardened ; then - mozconfig_add_options_ac "+hardened" --enable-hardening - append-ldflags "-Wl,-z,relro -Wl,-z,now" - fi - - mozconfig_use_enable jack - - mozconfig_use_enable pulseaudio - # force the deprecated alsa sound code if pulseaudio is disabled - if use kernel_linux && ! use pulseaudio ; then - mozconfig_add_options_ac '-pulseaudio' --enable-alsa - fi - - mozconfig_use_enable sndio - - mozconfig_use_enable wifi necko-wifi - - if use wayland ; then - mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland - else - mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3 - fi - - if use lto ; then - if use clang ; then - # Upstream only supports lld when using clang - mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld - - mozconfig_add_options_ac '+lto' --enable-lto=cross - else - # ld.gold is known to fail: - # /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.1/../../../../x86_64-pc-linux-gnu/bin/ld.gold: internal error in set_xindex, at /var/tmp/portage/sys-devel/binutils-2.37_p1-r1/work/binutils-2.37/gold/object.h:1050 - - # ThinLTO is currently broken, see bmo#1644409 - mozconfig_add_options_ac '+lto' --enable-lto=full - mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd - fi - - if use pgo ; then - mozconfig_add_options_ac '+pgo' MOZ_PGO=1 - - if use clang ; then - # Used in build/pgo/profileserver.py - export LLVM_PROFDATA="llvm-profdata" - fi - fi - else - # Avoid auto-magic on linker - if use clang ; then - # This is upstream's default - mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld - else - mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd - fi - fi - - # LTO flag was handled via configure - filter-flags '-flto*' - - mozconfig_use_enable debug - if use debug ; then - mozconfig_add_options_ac '+debug' --disable-optimize - else - if is-flag '-g*' ; then - if use clang ; then - mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*') - else - mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols - fi - else - mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols - fi - - if is-flag '-O0' ; then - mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0 - elif is-flag '-O4' ; then - mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4 - elif is-flag '-O3' ; then - mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3 - elif is-flag '-O1' ; then - mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1 - elif is-flag '-Os' ; then - mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os - else - mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2 - fi - fi - - # Debug flag was handled via configure - filter-flags '-g*' - - # Optimization flag was handled via configure - filter-flags '-O*' - - # Modifications to better support ARM, bug #553364 - if use cpu_flags_arm_neon ; then - mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon - - if ! tc-is-clang ; then - # thumb options aren't supported when using clang, bug 666966 - mozconfig_add_options_ac '+cpu_flags_arm_neon' \ - --with-thumb=yes \ - --with-thumb-interwork=no - fi - fi - - if [[ ${CHOST} == armv*h* ]] ; then - mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard - - if ! use system-libvpx ; then - sed -i \ - -e "s|softfp|hard|" \ - "${S}"/media/libvpx/moz.build \ - || die - fi - fi - - if use clang ; then - # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1483822 - # toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64') - local disable_elf_hack= - if use amd64 ; then - disable_elf_hack=yes - elif use x86 ; then - disable_elf_hack=yes - elif use arm ; then - disable_elf_hack=yes - fi - - if [[ -n ${disable_elf_hack} ]] ; then - mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack - fi - elif tc-is-gcc ; then - if ver_test $(gcc-fullversion) -ge 10 ; then - einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..." - append-cxxflags -fno-tree-loop-vectorize - fi - fi - - # Additional ARCH support - case "${ARCH}" in - arm) - # Reduce the memory requirements for linking - if use clang ; then - # Nothing to do - :; - elif tc-ld-is-gold || use lto ; then - append-ldflags -Wl,--no-keep-memory - else - append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads - fi - ;; - esac - - if ! use elibc_glibc ; then - mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc - fi - - # Allow elfhack to work in combination with unstripped binaries - # when they would normally be larger than 2GiB. - append-ldflags "-Wl,--compress-debug-sections=zlib" - - # Make revdep-rebuild.sh happy; Also required for musl - append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags - - # Pass $MAKEOPTS to build system - export MOZ_MAKE_FLAGS="${MAKEOPTS}" - - # Use system's Python environment - export MACH_USE_SYSTEM_PYTHON=1 - export PIP_NO_CACHE_DIR=off - - # Disable notification when build system has finished - export MOZ_NOSPAM=1 - - # Portage sets XARGS environment variable to "xargs -r" by default which - # breaks build system's check_prog() function which doesn't support arguments - mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs" - - # Set build dir - mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}" - - # Show flags we will use - einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}" - einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}" - einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}" - einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}" - einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}" - - # Handle EXTRA_CONF and show summary - local ac opt hash reason - - # Apply EXTRA_ECONF entries to $MOZCONFIG - if [[ -n ${EXTRA_ECONF} ]] ; then - IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!} - for opt in "${ac[@]}"; do - mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--} - done - fi - - echo - echo "==========================================================" - echo "Building ${PF} with the following configuration" - grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do - [[ -z ${hash} || ${hash} == \# ]] \ - || die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}" - printf " %-30s %s\n" "${opt}" "${reason:-mozilla.org default}" - done - echo "==========================================================" - echo - - ./mach configure || die -} - -src_compile() { - local virtx_cmd= - - if use pgo ; then - virtx_cmd=virtx - - # Reset and cleanup environment variables used by GNOME/XDG - gnome2_environment_reset - - addpredict /root - fi - - local -x GDK_BACKEND=x11 - - ${virtx_cmd} ./mach build --verbose \ - || die -} - -src_install() { - # xpcshell is getting called during install - pax-mark m \ - "${BUILD_DIR}"/dist/bin/xpcshell \ - "${BUILD_DIR}"/dist/bin/${PN} \ - "${BUILD_DIR}"/dist/bin/plugin-container - - DESTDIR="${D}" ./mach install || die - - # Upstream cannot ship symlink but we can (bmo#658850) - rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die - dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin - - # Don't install llvm-symbolizer from sys-devel/llvm package - if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then - rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die - fi - - # Install policy (currently only used to disable application updates) - insinto "${MOZILLA_FIVE_HOME}/distribution" - newins "${FILESDIR}"/distribution.ini distribution.ini - newins "${FILESDIR}"/disable-auto-update.policy.json policies.json - - # Install system-wide preferences - local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences" - insinto "${PREFS_DIR}" - newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js - - local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js" - - # Set dictionary path to use system hunspell - cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref" - pref("spellchecker.dictionary_path", "${EPREFIX}/usr/share/myspell"); - EOF - - # Force hwaccel prefs if USE=hwaccel is enabled - if use hwaccel ; then - cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \ - >>"${GENTOO_PREFS}" \ - || die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js" - fi - - if ! use gmp-autoupdate ; then - local plugin - for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do - einfo "Disabling auto-update for ${plugin} plugin ..." - cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin" - pref("media.${plugin}.autoupdate", false); - EOF - done - fi - - # Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it - if use system-harfbuzz ; then - cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref" - sticky_pref("gfx.font_rendering.graphite.enabled", true); - EOF - fi - - # Install language packs - local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') ) - if [[ -n "${langpacks}" ]] ; then - moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}" - fi - - # Install geckodriver - if use geckodriver ; then - einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..." - pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver - exeinto "${MOZILLA_FIVE_HOME}" - doexe "${BUILD_DIR}"/dist/bin/geckodriver - - dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver - fi - - # Install icons - local icon_srcdir="${S}/browser/branding/official" - local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg" - - insinto /usr/share/icons/hicolor/symbolic/apps - newins "${icon_symbolic_file}" ${PN}-symbolic.svg - - local icon size - for icon in "${icon_srcdir}"/default*.png ; do - size=${icon%.png} - size=${size##*/default} - - if [[ ${size} -eq 48 ]] ; then - newicon "${icon}" ${PN}.png - fi - - newicon -s ${size} "${icon}" ${PN}.png - done - - # Install menu - local app_name="Mozilla ${MOZ_PN^}" - local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop" - local desktop_filename="${PN}.desktop" - local exec_command="${PN}" - local icon="${PN}" - local use_wayland="false" - - if use wayland ; then - use_wayland="true" - fi - - cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die - - sed -i \ - -e "s:@NAME@:${app_name}:" \ - -e "s:@EXEC@:${exec_command}:" \ - -e "s:@ICON@:${icon}:" \ - "${WORKDIR}/${PN}.desktop-template" \ - || die - - newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}" - - rm "${WORKDIR}/${PN}.desktop-template" || die - - # Install wrapper script - [[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}" - newbin "${FILESDIR}/${PN}-r1.sh" ${PN} - - # Update wrapper - sed -i \ - -e "s:@PREFIX@:${EPREFIX}/usr:" \ - -e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \ - -e "s:@APULSELIB_DIR@:${apulselib}:" \ - -e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \ - "${ED}/usr/bin/${PN}" \ - || die -} - -pkg_preinst() { - xdg_pkg_preinst - - # If the apulse libs are available in MOZILLA_FIVE_HOME then apulse - # does not need to be forced into the LD_LIBRARY_PATH - if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then - einfo "APULSE found; Generating library symlinks for sound support ..." - local lib - pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die - for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do - # A quickpkg rolled by hand will grab symlinks as part of the package, - # so we need to avoid creating them if they already exist. - if [[ ! -L ${lib##*/} ]] ; then - ln -s "${lib}" ${lib##*/} || die - fi - done - popd &>/dev/null || die - fi -} - -pkg_postinst() { - xdg_pkg_postinst - - if ! use gmp-autoupdate ; then - elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or" - elog "installing into new profiles:" - local plugin - for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do - elog "\t ${plugin}" - done - elog - fi - - if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then - elog "Apulse was detected at merge time on this system and so it will always be" - elog "used for sound. If you wish to use pulseaudio instead please unmerge" - elog "media-sound/apulse." - elog - fi - - local show_doh_information - local show_normandy_information - local show_shortcut_information - - if [[ -z "${REPLACING_VERSIONS}" ]] ; then - # New install; Tell user that DoH is disabled by default - show_doh_information=yes - show_normandy_information=yes - show_shortcut_information=no - else - local replacing_version - for replacing_version in ${REPLACING_VERSIONS} ; do - if ver_test "${replacing_version}" -lt 91.0 ; then - # Tell user that we no longer install a shortcut - # per supported display protocol - show_shortcut_information=yes - fi - done - fi - - if [[ -n "${show_doh_information}" ]] ; then - elog - elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):" - elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all" - elog "DNS traffic to Cloudflare by default is not a good idea and applications" - elog "should respect OS configured settings), \"network.trr.mode\" was set to 5" - elog "(\"Off by choice\") by default." - elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences." - fi - - # bug 713782 - if [[ -n "${show_normandy_information}" ]] ; then - elog - elog "Upstream operates a service named Normandy which allows Mozilla to" - elog "push changes for default settings or even install new add-ons remotely." - elog "While this can be useful to address problems like 'Armagadd-on 2.0' or" - elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security" - elog "concerns prevail, which is why we have switched off the use of this" - elog "service by default." - elog - elog "To re-enable this service set" - elog - elog " app.normandy.enabled=true" - elog - elog "in about:config." - fi - - if [[ -n "${show_shortcut_information}" ]] ; then - elog - elog "Since ${PN}-91.0 we no longer install multiple shortcuts for" - elog "each supported display protocol. Instead we will only install" - elog "one generic Mozilla ${PN^} shortcut." - elog "If you still want to be able to select between running Mozilla ${PN^}" - elog "on X11 or Wayland, you have to re-create these shortcuts on your own." - fi -} diff --git a/www-client/firefox/firefox-91.7.1.ebuild b/www-client/firefox/firefox-91.7.1.ebuild deleted file mode 100644 index d5b0e8d7db25..000000000000 --- a/www-client/firefox/firefox-91.7.1.ebuild +++ /dev/null @@ -1,1238 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -FIREFOX_PATCHSET="firefox-91esr-patches-06j.tar.xz" - -LLVM_MAX_SLOT=13 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="ncurses,sqlite,ssl" - -WANT_AUTOCONF="2.1" - -VIRTUALX_REQUIRED="pgo" - -MOZ_ESR=yes - -MOZ_PV=${PV} -MOZ_PV_SUFFIX= -if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then - MOZ_PV_SUFFIX=${BASH_REMATCH[1]} - - # Convert the ebuild version to the upstream Mozilla version - MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI - MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI - MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI -fi - -if [[ -n ${MOZ_ESR} ]] ; then - # ESR releases have slightly different version numbers - MOZ_PV="${MOZ_PV}esr" -fi - -MOZ_PN="${PN%-bin}" -MOZ_P="${MOZ_PN}-${MOZ_PV}" -MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}" -MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}" - -inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \ - llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \ - virtualx xdg - -MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}" - -if [[ ${PV} == *_rc* ]] ; then - MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}" -fi - -PATCH_URIS=( - https://dev.gentoo.org/~{juippis,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET} -) - -SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz - ${PATCH_URIS[@]}" - -DESCRIPTION="Firefox Web Browser" -HOMEPAGE="https://www.mozilla.com/firefox" - -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" - -SLOT="esr" -LICENSE="MPL-2.0 GPL-2 LGPL-2.1" - -IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel" -IUSE+=" jack lto +openh264 pgo pulseaudio sndio selinux" -IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png +system-webp" -IUSE+=" wayland wifi" - -# Firefox-only IUSE -IUSE+=" geckodriver" -IUSE+=" +gmp-autoupdate" -IUSE+=" screencast" - -REQUIRED_USE="debug? ( !system-av1 ) - pgo? ( lto ) - wifi? ( dbus )" - -# Firefox-only REQUIRED_USE flags -REQUIRED_USE+=" screencast? ( wayland )" - -BDEPEND="${PYTHON_DEPS} - app-arch/unzip - app-arch/zip - >=dev-util/cbindgen-0.19.0 - >=net-libs/nodejs-10.23.1 - virtual/pkgconfig - >=virtual/rust-1.51.0 - || ( - ( - sys-devel/clang:13 - sys-devel/llvm:13 - clang? ( - =sys-devel/lld-13* - pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) - ) - ) - ( - sys-devel/clang:12 - sys-devel/llvm:12 - clang? ( - =sys-devel/lld-12* - pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) - ) - ) - ( - sys-devel/clang:11 - sys-devel/llvm:11 - clang? ( - =sys-devel/lld-11* - pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) - ) - ) - ) - amd64? ( >=dev-lang/nasm-2.13 ) - x86? ( >=dev-lang/nasm-2.13 )" - -COMMON_DEPEND=" - >=dev-libs/nss-3.68 - >=dev-libs/nspr-4.32 - dev-libs/atk - dev-libs/expat - >=x11-libs/cairo-1.10[X] - >=x11-libs/gtk+-3.4.0:3[X] - x11-libs/gdk-pixbuf - >=x11-libs/pango-1.22.0 - >=media-libs/mesa-10.2:* - media-libs/fontconfig - >=media-libs/freetype-2.4.10 - kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) - virtual/freedesktop-icon-theme - >=x11-libs/pixman-0.19.2 - >=dev-libs/glib-2.26:2 - >=sys-libs/zlib-1.2.3 - >=dev-libs/libffi-3.0.10:= - media-video/ffmpeg - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXt - dbus? ( - sys-apps/dbus - dev-libs/dbus-glib - ) - screencast? ( media-video/pipewire:= ) - system-av1? ( - >=media-libs/dav1d-0.8.1:= - >=media-libs/libaom-1.0.0:= - ) - system-harfbuzz? ( - >=media-libs/harfbuzz-2.8.1:0= - >=media-gfx/graphite2-1.3.13 - ) - system-icu? ( >=dev-libs/icu-69.1:= ) - system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) - system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) - system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) - system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) - system-webp? ( >=media-libs/libwebp-1.1.0:0= ) - wifi? ( - kernel_linux? ( - sys-apps/dbus - dev-libs/dbus-glib - net-misc/networkmanager - ) - ) - jack? ( virtual/jack ) - selinux? ( sec-policy/selinux-mozilla ) - sndio? ( media-sound/sndio )" - -RDEPEND="${COMMON_DEPEND} - !www-client/firefox:0 - !www-client/firefox:rapid - jack? ( virtual/jack ) - openh264? ( media-libs/openh264:*[plugin] ) - pulseaudio? ( - || ( - media-sound/pulseaudio - >=media-sound/apulse-0.1.12-r4 - ) - ) - selinux? ( sec-policy/selinux-mozilla )" - -DEPEND="${COMMON_DEPEND} - x11-libs/libICE - x11-libs/libSM - pulseaudio? ( - || ( - media-sound/pulseaudio - >=media-sound/apulse-0.1.12-r4[sdk] - ) - ) - wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) - amd64? ( virtual/opengl ) - x86? ( virtual/opengl )" - -S="${WORKDIR}/${PN}-${PV%_*}" - -# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or -# overridden in the enviromnent (advanced hackers only) -if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then - MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm ) -fi - -llvm_check_deps() { - if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then - einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 - return 1 - fi - - if use clang ; then - if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then - einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 - return 1 - fi - - if use pgo ; then - if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then - einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 - return 1 - fi - fi - fi - - einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2 -} - -MOZ_LANGS=( - af ar ast be bg br ca cak cs cy da de dsb - el en-CA en-GB en-US es-AR es-ES et eu - fi fr fy-NL ga-IE gd gl he hr hsb hu - id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO - pa-IN pl pt-BR pt-PT rm ro ru - sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW -) - -# Firefox-only LANGS -MOZ_LANGS+=( ach ) -MOZ_LANGS+=( an ) -MOZ_LANGS+=( az ) -MOZ_LANGS+=( bn ) -MOZ_LANGS+=( bs ) -MOZ_LANGS+=( ca-valencia ) -MOZ_LANGS+=( eo ) -MOZ_LANGS+=( es-CL ) -MOZ_LANGS+=( es-MX ) -MOZ_LANGS+=( fa ) -MOZ_LANGS+=( ff ) -MOZ_LANGS+=( gn ) -MOZ_LANGS+=( gu-IN ) -MOZ_LANGS+=( hi-IN ) -MOZ_LANGS+=( hy-AM ) -MOZ_LANGS+=( ia ) -MOZ_LANGS+=( km ) -MOZ_LANGS+=( kn ) -MOZ_LANGS+=( lij ) -MOZ_LANGS+=( mk ) -MOZ_LANGS+=( mr ) -MOZ_LANGS+=( my ) -MOZ_LANGS+=( ne-NP ) -MOZ_LANGS+=( oc ) -MOZ_LANGS+=( sco ) -MOZ_LANGS+=( si ) -MOZ_LANGS+=( son ) -MOZ_LANGS+=( szl ) -MOZ_LANGS+=( ta ) -MOZ_LANGS+=( te ) -MOZ_LANGS+=( tl ) -MOZ_LANGS+=( trs ) -MOZ_LANGS+=( ur ) -MOZ_LANGS+=( xh ) - -mozilla_set_globals() { - # https://bugs.gentoo.org/587334 - local MOZ_TOO_REGIONALIZED_FOR_L10N=( - fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE - ) - - local lang xflag - for lang in "${MOZ_LANGS[@]}" ; do - # en and en_US are handled internally - if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then - continue - fi - - # strip region subtag if $lang is in the list - if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then - xflag=${lang%%-*} - else - xflag=${lang} - fi - - SRC_URI+=" l10n_${xflag/[_@]/-}? (" - SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi" - SRC_URI+=" )" - IUSE+=" l10n_${xflag/[_@]/-}" - done -} -mozilla_set_globals - -moz_clear_vendor_checksums() { - debug-print-function ${FUNCNAME} "$@" - - if [[ ${#} -ne 1 ]] ; then - die "${FUNCNAME} requires exact one argument" - fi - - einfo "Clearing cargo checksums for ${1} ..." - - sed -i \ - -e 's/\("files":{\)[^}]*/\1/' \ - "${S}"/third_party/rust/${1}/.cargo-checksum.json \ - || die -} - -moz_install_xpi() { - debug-print-function ${FUNCNAME} "$@" - - if [[ ${#} -lt 2 ]] ; then - die "${FUNCNAME} requires at least two arguments" - fi - - local DESTDIR=${1} - shift - - insinto "${DESTDIR}" - - local emid xpi_file xpi_tmp_dir - for xpi_file in "${@}" ; do - emid= - xpi_tmp_dir=$(mktemp -d --tmpdir="${T}") - - # Unpack XPI - unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die - - # Determine extension ID - if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then - emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf") - [[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf" - elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then - emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json") - [[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json" - else - die "failed to determine extension id" - fi - - einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..." - newins "${xpi_file}" "${emid}.xpi" - done -} - -mozconfig_add_options_ac() { - debug-print-function ${FUNCNAME} "$@" - - if [[ ${#} -lt 2 ]] ; then - die "${FUNCNAME} requires at least two arguments" - fi - - local reason=${1} - shift - - local option - for option in ${@} ; do - echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG} - done -} - -mozconfig_add_options_mk() { - debug-print-function ${FUNCNAME} "$@" - - if [[ ${#} -lt 2 ]] ; then - die "${FUNCNAME} requires at least two arguments" - fi - - local reason=${1} - shift - - local option - for option in ${@} ; do - echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG} - done -} - -mozconfig_use_enable() { - debug-print-function ${FUNCNAME} "$@" - - if [[ ${#} -lt 1 ]] ; then - die "${FUNCNAME} requires at least one arguments" - fi - - local flag=$(use_enable "${@}") - mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}" -} - -mozconfig_use_with() { - debug-print-function ${FUNCNAME} "$@" - - if [[ ${#} -lt 1 ]] ; then - die "${FUNCNAME} requires at least one arguments" - fi - - local flag=$(use_with "${@}") - mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}" -} - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]] ; then - if use pgo ; then - if ! has usersandbox $FEATURES ; then - die "You must enable usersandbox as X server can not run as root!" - fi - fi - - # Ensure we have enough disk space to compile - if use pgo || use lto || use debug ; then - CHECKREQS_DISK_BUILD="13500M" - else - CHECKREQS_DISK_BUILD="6400M" - fi - - check-reqs_pkg_pretend - fi -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]] ; then - if use pgo ; then - if ! has userpriv ${FEATURES} ; then - eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!" - fi - fi - - # Ensure we have enough disk space to compile - if use pgo || use lto || use debug ; then - CHECKREQS_DISK_BUILD="13500M" - else - CHECKREQS_DISK_BUILD="6400M" - fi - - check-reqs_pkg_setup - - llvm_pkg_setup - - if use clang && use lto ; then - local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }') - [[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}") - [[ -z ${version_lld} ]] && die "Failed to read ld.lld version!" - - local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }') - [[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}") - [[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!" - - if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then - eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}." - eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:" - eerror " - Manually switch rust version using 'eselect rust' to match used LLVM version" - eerror " - Switch to dev-lang/rust[system-llvm] which will guarantee matching version" - eerror " - Build ${CATEGORY}/${PN} without USE=lto" - die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!" - fi - fi - - if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \ - && ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then - # bug 792705 - eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)." - die "Set USE=clang or select "${S}"/api-google.key || die - echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die - echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die - - xdg_src_prepare -} - -src_configure() { - # Show flags set at the beginning - einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}" - einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}" - einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}" - einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}" - einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}" - - local have_switched_compiler= - if use clang && ! tc-is-clang ; then - # Force clang - einfo "Enforcing the use of clang due to USE=clang ..." - have_switched_compiler=yes - AR=llvm-ar - CC=${CHOST}-clang - CXX=${CHOST}-clang++ - NM=llvm-nm - RANLIB=llvm-ranlib - elif ! use clang && ! tc-is-gcc ; then - # Force gcc - have_switched_compiler=yes - einfo "Enforcing the use of gcc due to USE=-clang ..." - AR=gcc-ar - CC=${CHOST}-gcc - CXX=${CHOST}-g++ - NM=gcc-nm - RANLIB=gcc-ranlib - fi - - if [[ -n "${have_switched_compiler}" ]] ; then - # Because we switched active compiler we have to ensure - # that no unsupported flags are set - strip-unsupported-flags - fi - - # Ensure we use correct toolchain - export HOST_CC="$(tc-getBUILD_CC)" - export HOST_CXX="$(tc-getBUILD_CXX)" - tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG - - # Pass the correct toolchain paths through cbindgen - if tc-is-cross-compiler ; then - export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}" - fi - - # Set MOZILLA_FIVE_HOME - export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - - # python/mach/mach/mixin/process.py fails to detect SHELL - export SHELL="${EPREFIX}/bin/bash" - - # Set state path - export MOZBUILD_STATE_PATH="${BUILD_DIR}" - - # Set MOZCONFIG - export MOZCONFIG="${S}/.mozconfig" - - # Initialize MOZCONFIG - mozconfig_add_options_ac '' --enable-application=browser - - # Set Gentoo defaults - export MOZILLA_OFFICIAL=1 - - mozconfig_add_options_ac 'Gentoo default' \ - --allow-addon-sideload \ - --disable-cargo-incremental \ - --disable-crashreporter \ - --disable-install-strip \ - --disable-strip \ - --disable-updater \ - --enable-official-branding \ - --enable-release \ - --enable-system-ffi \ - --enable-system-pixman \ - --host="${CBUILD:-${CHOST}}" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --prefix="${EPREFIX}/usr" \ - --target="${CHOST}" \ - --without-ccache \ - --with-intl-api \ - --with-libclang-path="$(llvm-config --libdir)" \ - --with-system-nspr \ - --with-system-nss \ - --with-system-zlib \ - --with-toolchain-prefix="${CHOST}-" \ - --with-unsigned-addon-scopes=app,system \ - --x-includes="${SYSROOT}${EPREFIX}/usr/include" \ - --x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)" - - # Set update channel - local update_channel=release - [[ -n ${MOZ_ESR} ]] && update_channel=esr - mozconfig_add_options_ac '' --update-channel=${update_channel} - - if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then - mozconfig_add_options_ac '' --enable-rust-simd - fi - - if [[ -s "${S}/api-google.key" ]] ; then - local key_origin="Gentoo default" - if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then - key_origin="User value" - fi - - mozconfig_add_options_ac "${key_origin}" \ - --with-google-safebrowsing-api-keyfile="${S}/api-google.key" - else - einfo "Building without Google API key ..." - fi - - if [[ -s "${S}/api-location.key" ]] ; then - local key_origin="Gentoo default" - if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then - key_origin="User value" - fi - - mozconfig_add_options_ac "${key_origin}" \ - --with-google-location-service-api-keyfile="${S}/api-location.key" - else - einfo "Building without Location API key ..." - fi - - if [[ -s "${S}/api-mozilla.key" ]] ; then - local key_origin="Gentoo default" - if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then - key_origin="User value" - fi - - mozconfig_add_options_ac "${key_origin}" \ - --with-mozilla-api-keyfile="${S}/api-mozilla.key" - else - einfo "Building without Mozilla API key ..." - fi - - mozconfig_use_with system-av1 - mozconfig_use_with system-harfbuzz - mozconfig_use_with system-harfbuzz system-graphite2 - mozconfig_use_with system-icu - mozconfig_use_with system-jpeg - mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr" - mozconfig_use_with system-libvpx - mozconfig_use_with system-png - mozconfig_use_with system-webp - - mozconfig_use_enable dbus - - use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme - - mozconfig_use_enable geckodriver - - if use hardened ; then - mozconfig_add_options_ac "+hardened" --enable-hardening - append-ldflags "-Wl,-z,relro -Wl,-z,now" - fi - - mozconfig_use_enable jack - - mozconfig_use_enable pulseaudio - # force the deprecated alsa sound code if pulseaudio is disabled - if use kernel_linux && ! use pulseaudio ; then - mozconfig_add_options_ac '-pulseaudio' --enable-alsa - fi - - mozconfig_use_enable sndio - - mozconfig_use_enable wifi necko-wifi - - if use wayland ; then - mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland - else - mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3 - fi - - if use lto ; then - if use clang ; then - # Upstream only supports lld when using clang - mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld - - mozconfig_add_options_ac '+lto' --enable-lto=cross - else - # ld.gold is known to fail: - # /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.1/../../../../x86_64-pc-linux-gnu/bin/ld.gold: internal error in set_xindex, at /var/tmp/portage/sys-devel/binutils-2.37_p1-r1/work/binutils-2.37/gold/object.h:1050 - - # ThinLTO is currently broken, see bmo#1644409 - mozconfig_add_options_ac '+lto' --enable-lto=full - mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd - fi - - if use pgo ; then - mozconfig_add_options_ac '+pgo' MOZ_PGO=1 - - if use clang ; then - # Used in build/pgo/profileserver.py - export LLVM_PROFDATA="llvm-profdata" - fi - fi - else - # Avoid auto-magic on linker - if use clang ; then - # This is upstream's default - mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld - else - mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd - fi - fi - - # LTO flag was handled via configure - filter-flags '-flto*' - - mozconfig_use_enable debug - if use debug ; then - mozconfig_add_options_ac '+debug' --disable-optimize - else - if is-flag '-g*' ; then - if use clang ; then - mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*') - else - mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols - fi - else - mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols - fi - - if is-flag '-O0' ; then - mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0 - elif is-flag '-O4' ; then - mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4 - elif is-flag '-O3' ; then - mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3 - elif is-flag '-O1' ; then - mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1 - elif is-flag '-Os' ; then - mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os - else - mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2 - fi - fi - - # Debug flag was handled via configure - filter-flags '-g*' - - # Optimization flag was handled via configure - filter-flags '-O*' - - # Modifications to better support ARM, bug #553364 - if use cpu_flags_arm_neon ; then - mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon - - if ! tc-is-clang ; then - # thumb options aren't supported when using clang, bug 666966 - mozconfig_add_options_ac '+cpu_flags_arm_neon' \ - --with-thumb=yes \ - --with-thumb-interwork=no - fi - fi - - if [[ ${CHOST} == armv*h* ]] ; then - mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard - - if ! use system-libvpx ; then - sed -i \ - -e "s|softfp|hard|" \ - "${S}"/media/libvpx/moz.build \ - || die - fi - fi - - if use clang ; then - # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1483822 - # toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64') - local disable_elf_hack= - if use amd64 ; then - disable_elf_hack=yes - elif use x86 ; then - disable_elf_hack=yes - elif use arm ; then - disable_elf_hack=yes - fi - - if [[ -n ${disable_elf_hack} ]] ; then - mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack - fi - elif tc-is-gcc ; then - if ver_test $(gcc-fullversion) -ge 10 ; then - einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..." - append-cxxflags -fno-tree-loop-vectorize - fi - fi - - # Additional ARCH support - case "${ARCH}" in - arm) - # Reduce the memory requirements for linking - if use clang ; then - # Nothing to do - :; - elif tc-ld-is-gold || use lto ; then - append-ldflags -Wl,--no-keep-memory - else - append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads - fi - ;; - esac - - if ! use elibc_glibc ; then - mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc - fi - - # Allow elfhack to work in combination with unstripped binaries - # when they would normally be larger than 2GiB. - append-ldflags "-Wl,--compress-debug-sections=zlib" - - # Make revdep-rebuild.sh happy; Also required for musl - append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags - - # Pass $MAKEOPTS to build system - export MOZ_MAKE_FLAGS="${MAKEOPTS}" - - # Use system's Python environment - export MACH_USE_SYSTEM_PYTHON=1 - export PIP_NO_CACHE_DIR=off - - # Disable notification when build system has finished - export MOZ_NOSPAM=1 - - # Portage sets XARGS environment variable to "xargs -r" by default which - # breaks build system's check_prog() function which doesn't support arguments - mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs" - - # Set build dir - mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}" - - # Show flags we will use - einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}" - einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}" - einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}" - einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}" - einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}" - - # Handle EXTRA_CONF and show summary - local ac opt hash reason - - # Apply EXTRA_ECONF entries to $MOZCONFIG - if [[ -n ${EXTRA_ECONF} ]] ; then - IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!} - for opt in "${ac[@]}"; do - mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--} - done - fi - - echo - echo "==========================================================" - echo "Building ${PF} with the following configuration" - grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do - [[ -z ${hash} || ${hash} == \# ]] \ - || die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}" - printf " %-30s %s\n" "${opt}" "${reason:-mozilla.org default}" - done - echo "==========================================================" - echo - - ./mach configure || die -} - -src_compile() { - local virtx_cmd= - - if use pgo ; then - virtx_cmd=virtx - - # Reset and cleanup environment variables used by GNOME/XDG - gnome2_environment_reset - - addpredict /root - fi - - local -x GDK_BACKEND=x11 - - ${virtx_cmd} ./mach build --verbose \ - || die -} - -src_install() { - # xpcshell is getting called during install - pax-mark m \ - "${BUILD_DIR}"/dist/bin/xpcshell \ - "${BUILD_DIR}"/dist/bin/${PN} \ - "${BUILD_DIR}"/dist/bin/plugin-container - - DESTDIR="${D}" ./mach install || die - - # Upstream cannot ship symlink but we can (bmo#658850) - rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die - dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin - - # Don't install llvm-symbolizer from sys-devel/llvm package - if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then - rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die - fi - - # Install policy (currently only used to disable application updates) - insinto "${MOZILLA_FIVE_HOME}/distribution" - newins "${FILESDIR}"/distribution.ini distribution.ini - newins "${FILESDIR}"/disable-auto-update.policy.json policies.json - - # Install system-wide preferences - local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences" - insinto "${PREFS_DIR}" - newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js - - local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js" - - # Set dictionary path to use system hunspell - cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref" - pref("spellchecker.dictionary_path", "${EPREFIX}/usr/share/myspell"); - EOF - - # Force hwaccel prefs if USE=hwaccel is enabled - if use hwaccel ; then - cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \ - >>"${GENTOO_PREFS}" \ - || die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js" - fi - - if ! use gmp-autoupdate ; then - local plugin - for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do - einfo "Disabling auto-update for ${plugin} plugin ..." - cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin" - pref("media.${plugin}.autoupdate", false); - EOF - done - fi - - # Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it - if use system-harfbuzz ; then - cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref" - sticky_pref("gfx.font_rendering.graphite.enabled", true); - EOF - fi - - # Install language packs - local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') ) - if [[ -n "${langpacks}" ]] ; then - moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}" - fi - - # Install geckodriver - if use geckodriver ; then - einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..." - pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver - exeinto "${MOZILLA_FIVE_HOME}" - doexe "${BUILD_DIR}"/dist/bin/geckodriver - - dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver - fi - - # Install icons - local icon_srcdir="${S}/browser/branding/official" - local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg" - - insinto /usr/share/icons/hicolor/symbolic/apps - newins "${icon_symbolic_file}" ${PN}-symbolic.svg - - local icon size - for icon in "${icon_srcdir}"/default*.png ; do - size=${icon%.png} - size=${size##*/default} - - if [[ ${size} -eq 48 ]] ; then - newicon "${icon}" ${PN}.png - fi - - newicon -s ${size} "${icon}" ${PN}.png - done - - # Install menu - local app_name="Mozilla ${MOZ_PN^}" - local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop" - local desktop_filename="${PN}.desktop" - local exec_command="${PN}" - local icon="${PN}" - local use_wayland="false" - - if use wayland ; then - use_wayland="true" - fi - - cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die - - sed -i \ - -e "s:@NAME@:${app_name}:" \ - -e "s:@EXEC@:${exec_command}:" \ - -e "s:@ICON@:${icon}:" \ - "${WORKDIR}/${PN}.desktop-template" \ - || die - - newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}" - - rm "${WORKDIR}/${PN}.desktop-template" || die - - # Install wrapper script - [[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}" - newbin "${FILESDIR}/${PN}-r1.sh" ${PN} - - # Update wrapper - sed -i \ - -e "s:@PREFIX@:${EPREFIX}/usr:" \ - -e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \ - -e "s:@APULSELIB_DIR@:${apulselib}:" \ - -e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \ - "${ED}/usr/bin/${PN}" \ - || die -} - -pkg_preinst() { - xdg_pkg_preinst - - # If the apulse libs are available in MOZILLA_FIVE_HOME then apulse - # does not need to be forced into the LD_LIBRARY_PATH - if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then - einfo "APULSE found; Generating library symlinks for sound support ..." - local lib - pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die - for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do - # A quickpkg rolled by hand will grab symlinks as part of the package, - # so we need to avoid creating them if they already exist. - if [[ ! -L ${lib##*/} ]] ; then - ln -s "${lib}" ${lib##*/} || die - fi - done - popd &>/dev/null || die - fi -} - -pkg_postinst() { - xdg_pkg_postinst - - if ! use gmp-autoupdate ; then - elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or" - elog "installing into new profiles:" - local plugin - for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do - elog "\t ${plugin}" - done - elog - fi - - if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then - elog "Apulse was detected at merge time on this system and so it will always be" - elog "used for sound. If you wish to use pulseaudio instead please unmerge" - elog "media-sound/apulse." - elog - fi - - local show_doh_information - local show_normandy_information - local show_shortcut_information - - if [[ -z "${REPLACING_VERSIONS}" ]] ; then - # New install; Tell user that DoH is disabled by default - show_doh_information=yes - show_normandy_information=yes - show_shortcut_information=no - else - local replacing_version - for replacing_version in ${REPLACING_VERSIONS} ; do - if ver_test "${replacing_version}" -lt 91.0 ; then - # Tell user that we no longer install a shortcut - # per supported display protocol - show_shortcut_information=yes - fi - done - fi - - if [[ -n "${show_doh_information}" ]] ; then - elog - elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):" - elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all" - elog "DNS traffic to Cloudflare by default is not a good idea and applications" - elog "should respect OS configured settings), \"network.trr.mode\" was set to 5" - elog "(\"Off by choice\") by default." - elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences." - fi - - # bug 713782 - if [[ -n "${show_normandy_information}" ]] ; then - elog - elog "Upstream operates a service named Normandy which allows Mozilla to" - elog "push changes for default settings or even install new add-ons remotely." - elog "While this can be useful to address problems like 'Armagadd-on 2.0' or" - elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security" - elog "concerns prevail, which is why we have switched off the use of this" - elog "service by default." - elog - elog "To re-enable this service set" - elog - elog " app.normandy.enabled=true" - elog - elog "in about:config." - fi - - if [[ -n "${show_shortcut_information}" ]] ; then - elog - elog "Since ${PN}-91.0 we no longer install multiple shortcuts for" - elog "each supported display protocol. Instead we will only install" - elog "one generic Mozilla ${PN^} shortcut." - elog "If you still want to be able to select between running Mozilla ${PN^}" - elog "on X11 or Wayland, you have to re-create these shortcuts on your own." - fi -} diff --git a/www-client/links/Manifest b/www-client/links/Manifest index 436121318b67..6a6f0d018681 100644 --- a/www-client/links/Manifest +++ b/www-client/links/Manifest @@ -1 +1,2 @@ DIST links-2.25.tar.bz2 6505187 BLAKE2B 3efe9d43b9a8dad498101800ccdefd094a6371a2c74b264aaaaac2abf951db38729abcf00f74a45fdb7f0d24196413996aa02cd9d2ea3ee2cf008faf4062e365 SHA512 b094e3b2096b07da8385d6021e5a5794f5b602c90ec824c48b897e6b69def6d69cb879af3008a4af43effaa7d9359bf09e4feb8ed5371bb7ff22ffcb0794f690 +DIST links-2.26.tar.bz2 6508447 BLAKE2B e0bf5ac4e05a8e14ae7342aed7bb7ac0f5f6c2d9e23adda221cc3ba73f39020c95cef90d10d5c9d0697797683ff1edf1ed55a4d8aca0930b2eb01b547a21bf00 SHA512 b732f88ae0e9f63f577fc3041058c56b43ffec3b797328453d0770e326010b05fcc04128287ef35b0d189bd0768446057d8773e10f8e0a76bab72fb252cdd530 diff --git a/www-client/links/links-2.26.ebuild b/www-client/links/links-2.26.ebuild new file mode 100644 index 000000000000..cd2e60dc5f94 --- /dev/null +++ b/www-client/links/links-2.26.ebuild @@ -0,0 +1,177 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools desktop toolchain-funcs xdg-utils + +DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode" +HOMEPAGE="http://links.twibright.com/" +SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode webp X zlib zstd" + +GRAPHICS_DEPEND="media-libs/libpng:0=" + +RDEPEND=" + dev-libs/libbsd + brotli? ( + app-arch/brotli + ) + bzip2? ( + app-arch/bzip2 + ) + fbcon? ( + ${GRAPHICS_DEPEND} + ) + freetype? ( + media-libs/fontconfig + media-libs/freetype + ) + gpm? ( + sys-libs/gpm + ) + jpeg? ( + virtual/jpeg:0 + ) + libevent? ( + dev-libs/libevent:0= + ) + livecd? ( + ${GRAPHICS_DEPEND} + sys-libs/gpm + virtual/jpeg:0 + ) + lzip? ( + app-arch/lzip + ) + lzma? ( + app-arch/xz-utils + ) + ssl? ( + dev-libs/openssl:0= + ) + svga? ( + ${GRAPHICS_DEPEND} + media-libs/svgalib + ) + tiff? ( + media-libs/tiff:0 + ) + webp? ( + media-libs/libwebp:= + ) + X? ( + ${GRAPHICS_DEPEND} + x11-libs/libXext + ) + zlib? ( + sys-libs/zlib + ) + zstd? ( + app-arch/zstd + )" + +DEPEND="${RDEPEND} + fbcon? ( virtual/os-headers ) + livecd? ( virtual/os-headers )" + +BDEPEND="virtual/pkgconfig" + +IDEPEND="X? ( dev-util/desktop-file-utils )" + +REQUIRED_USE="!livecd? ( fbcon? ( gpm ) ) + svga? ( suid )" + +DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES ) + +src_prepare() { + use X && xdg_environment_reset + + if use unicode; then + pushd intl > /dev/null || die + ./gen-intl || die + ./synclang || die + popd > /dev/null || die + fi + + # error: conditional "am__fastdepCXX" was never defined (for eautoreconf) + sed -i \ + -e '/AC_PROG_CXX/s:dnl ::' \ + -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \ + configure.in || die #467020 + + # Upstream configure produced by broken autoconf-2.13. This also fixes + # toolchain detection. + mv configure.in configure.ac || die + + default + eautoreconf #131440 and #103483#c23 +} + +src_configure() { + local myconf + + if use livecd; then + export ac_cv_lib_gpm_Gpm_Open=yes + myconf+=' --with-fb --with-libjpeg' + else + export ac_cv_lib_gpm_Gpm_Open=$(usex gpm) + fi + + if use X || use fbcon || use svga || use livecd; then + myconf+=' --enable-graphics' + fi + + tc-export PKG_CONFIG + + econf \ + --without-directfb \ + --without-librsvg \ + $(use_with brotli) \ + $(use_with bzip2) \ + $(use_with fbcon fb) \ + $(use_with freetype) \ + $(use_with ipv6) \ + $(use_with jpeg libjpeg) \ + $(use_with libevent) \ + $(use_with lzip) \ + $(use_with lzma) \ + $(use_with ssl) \ + $(use_with svga svgalib) \ + $(use_with tiff libtiff) \ + $(use_with webp libwebp) \ + $(use_with X x) \ + $(use_with zlib) \ + $(use_with zstd) \ + ${myconf} +} + +src_install() { + HTML_DOCS="doc/links_cal/*" + default + + if use X; then + newicon Links_logo.png links.png + make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser' + local d="${ED}"/usr/share/applications + echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop || die + if use ssl; then + sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \ + "${d}"/*.desktop || die + fi + fi + + use suid && fperms 4755 /usr/bin/links +} + +pkg_postinst() { + use X && xdg_desktop_database_update +} + +pkg_postrm() { + use X && xdg_desktop_database_update +} diff --git a/www-client/microsoft-edge/Manifest b/www-client/microsoft-edge/Manifest index 9e23ba033040..0993cd95b667 100644 --- a/www-client/microsoft-edge/Manifest +++ b/www-client/microsoft-edge/Manifest @@ -1 +1 @@ -DIST microsoft-edge-stable_100.0.1185.36-1_amd64.deb 119086896 BLAKE2B f61083b3ab8722ee236f430d30ede0cbdf25cb3ce1117a81d7fa2754d4ea668885063357c3409505012dc9003d589623785087b97e8863b39869064e5efa0a13 SHA512 a7fdb30cf3551650f59c6f54e5ca153e07aa19eff3ce5cb0c665848f36e9c19fea01d8f36fce70261c85a528712d2efac4c7935d54608e777820d626469a5167 +DIST microsoft-edge-stable_100.0.1185.39-1_amd64.deb 119213224 BLAKE2B 1dd6a953a6d4ac081e6542c2d8c320ab87dcb1d104a459ccc258c901991601ea71f33887c322a8692e98d8e7a8aa01b0bbf41db760bad4f173d221bb6720c56a SHA512 1c96fa51c8674e77af2d2ddc8eb6ccd3034418c22afd432c4744d7fbb5f21e8dd7b1a0cc5c0d02b7c10e802a2b519c0d9291610a8643457192acd2b3ee24091d diff --git a/www-client/microsoft-edge/microsoft-edge-100.0.1185.36.ebuild b/www-client/microsoft-edge/microsoft-edge-100.0.1185.39.ebuild similarity index 100% rename from www-client/microsoft-edge/microsoft-edge-100.0.1185.36.ebuild rename to www-client/microsoft-edge/microsoft-edge-100.0.1185.39.ebuild diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz index 77ad47e245eb..37473ce9a60b 100644 Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ diff --git a/www-servers/puma/puma-5.6.4.ebuild b/www-servers/puma/puma-5.6.4.ebuild index 97be04bd98eb..ae201a4f9cc0 100644 --- a/www-servers/puma/puma-5.6.4.ebuild +++ b/www-servers/puma/puma-5.6.4.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="3" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="" DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"