diff --git a/Manifest.files.gz b/Manifest.files.gz
index 431aa976fb8d..d4b81e0f0110 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 55159aed023a..12f940114ea2 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/nginx-unit/nginx-unit-0.ebuild b/acct-group/nginx-unit/nginx-unit-0.ebuild
index dc8f1f58f989..004f55765547 100644
--- a/acct-group/nginx-unit/nginx-unit-0.ebuild
+++ b/acct-group/nginx-unit/nginx-unit-0.ebuild
@@ -7,4 +7,4 @@ inherit acct-group
DESCRIPTION="A group for www-servers/nginx-unit"
-ACCT_GROUP_ID="526"
+ACCT_GROUP_ID="527"
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 4890071e6d2d..752834a78e1a 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/nginx-unit/nginx-unit-0.ebuild b/acct-user/nginx-unit/nginx-unit-0.ebuild
index 9af0cc52ab82..25bc84af7397 100644
--- a/acct-user/nginx-unit/nginx-unit-0.ebuild
+++ b/acct-user/nginx-unit/nginx-unit-0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
inherit acct-user
-ACCT_USER_ID="526"
+ACCT_USER_ID="527"
ACCT_USER_GROUPS=( "nginx-unit" )
ACCT_USER_HOME="/var/lib/nginx-unit"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index cdab1f644fd5..665d91b8f069 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 092cf20fd665..f1e887221497 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,7 +1,3 @@
DIST aws-cli-1.27.74.gh.tar.gz 2368706 BLAKE2B 3eb9d8c21b9ddfd3a3e4bb53172a46ad69ca71033785bd29fd8b0b0f694c2ed62a4cad998ccd13b07949b86a89f2ca238a63a4553e591ba9066832f51ed87759 SHA512 cf61a3f1dd643bb7d0f81f047c1eeae78a7793532bffa612045273c46ae970b2763156a7679b6e16e65c2f886dec68e54db0169580bb3c37cc08420f874e704c
DIST aws-cli-1.27.79.gh.tar.gz 2376690 BLAKE2B 8e55d3607b805ebc5673c682731483f0fd6eb77a6cc972d58ce3219c33f9f2054529df6ab46fc85b39849871580cea03c4d7f490c4386cd5ce9d222ecb3c8eda SHA512 fd8b880b6358c50ed189fac538d91ef88d762b8c382da1b57bb086a316f7ee96fa33206a53f3eae2df98df175929c819b855c7ff5b7e5f84c73ecff88f297c79
-DIST aws-cli-1.27.80.gh.tar.gz 2377306 BLAKE2B 3a0e6c66bb9c373456bb05537f20ad339c0987290557c30dbd2e2a8ea127b0f8bfc7028930db712fcbe7461c7bc87dac123c1847da93b675403822f6c02b1d3f SHA512 b94aab2588e8bc0ad007e0392c6eed0642683246b1803007332563495a69deb5da924eda48944e37b674c714cf2e5a45aeddbbedb5d12d51ad8c9c8e76c18ebc
-DIST aws-cli-1.27.81.gh.tar.gz 2377937 BLAKE2B 7323c06cab727066c6541772478a961bc4f7b409b0910e57c79207fad928b7ec82d1b0048983e64d8a8fa3e7ef69d1898cadf2fbd1ea560e05d7a2582e726f88 SHA512 19cff28cd4721df32079795cfab852a11b36f1a2d0335567f0f1dae48eaaf268ae04163dac960a2d543be869f39e8c55e6a0bcee746ccbab29bcf8f37881c305
-DIST aws-cli-1.27.82.gh.tar.gz 2378047 BLAKE2B ca55c81431afeed336e01b7cb6840a05856d3e25f8c06a1169907fb3536aa45393f35995d1683bea3685e91d196b67bdeed487ba46e896f774caac0e63cbc9be SHA512 b760dd417a87e1804ef5bb7b4e8ca22ef750c75a63455fac7f17f564f8e591c459bfef225acb56a9a3b3ad1ac94458d4731fb4a56147a2a6fd59ec8113b2df41
-DIST aws-cli-1.27.83.gh.tar.gz 2378425 BLAKE2B 7784274aa3879b59b9ac51a0d687526261c27d4285ca279004e301b156e08bfc07f89b4584521093db0a3a9f42f47c7bca607c686763044f73495623a9e6f366 SHA512 e9748ada13533ab67249806fe09261634cdc2858bcc99b818a7ff5cb1dd2ce8f9c52f344fa7a5f19464d1500e91ff35b3e0a7ce4d2ac2adaecb939c4c9a2a70d
DIST aws-cli-1.27.84.gh.tar.gz 2378573 BLAKE2B b85d7eeb22b0a2a9264b49a27f2e3d3da9d35dbc44de205521c39522fcec31948ef8b67dfc3ce919b772ba85fa59cfc5a4d69e3c67aadd9cbb029da883ad699e SHA512 1d31d1b800b0795a8473af0dc334feb69f62d2fd8fcb88e0e4e7e4068435f6f37792d2c9382ec1b0c6b074d5eca09142e52f6e36c472145df9d57db2cc4ee078
diff --git a/app-admin/awscli/awscli-1.27.80.ebuild b/app-admin/awscli/awscli-1.27.80.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.80.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
- https://github.com/aws/aws-cli/
- https://pypi.org/project/awscli/
-"
-SRC_URI="
- https://github.com/aws/aws-cli/archive/${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- !app-admin/awscli-bin
-"
-BDEPEND="
- test? (
- dev-python/pytest-forked[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # TODO
- tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
- tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
- tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
- tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
- )
-
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.27.81.ebuild b/app-admin/awscli/awscli-1.27.81.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.81.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
- https://github.com/aws/aws-cli/
- https://pypi.org/project/awscli/
-"
-SRC_URI="
- https://github.com/aws/aws-cli/archive/${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- !app-admin/awscli-bin
-"
-BDEPEND="
- test? (
- dev-python/pytest-forked[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # TODO
- tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
- tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
- tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
- tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
- )
-
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.27.82.ebuild b/app-admin/awscli/awscli-1.27.82.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.82.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
- https://github.com/aws/aws-cli/
- https://pypi.org/project/awscli/
-"
-SRC_URI="
- https://github.com/aws/aws-cli/archive/${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- !app-admin/awscli-bin
-"
-BDEPEND="
- test? (
- dev-python/pytest-forked[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # TODO
- tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
- tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
- tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
- tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
- )
-
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.27.83.ebuild b/app-admin/awscli/awscli-1.27.83.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.83.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
- https://github.com/aws/aws-cli/
- https://pypi.org/project/awscli/
-"
-SRC_URI="
- https://github.com/aws/aws-cli/archive/${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- !app-admin/awscli-bin
-"
-BDEPEND="
- test? (
- dev-python/pytest-forked[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # TODO
- tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
- tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
- tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
- tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
- )
-
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index a8c29112c8ee..47ca17eb61b1 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,4 +1,3 @@
DIST conky-1.13.1.tar.gz 2443276 BLAKE2B e51610172e830d0368e8c9a48ea056285efe48275364c4d0c973da6467ea044303d75f94cc0b963c3b423a7ec61d8eff26da30c102c557ccd5a4e8cf984db4f6 SHA512 3ee0e14f6ff2bac39404c272790055ac1106f47a00e8298da909a0febf6de0661486e8ce23f34e8c5050e364168b2efcefd0b28736cbd0bc135e1362f0dc5516
-DIST conky-1.15.0.tar.gz 1800684 BLAKE2B e3b8c682e99be42cd28ed9507c346f16afefb525269c31bf9731169fa2c52bcaac4f523ecd0ec8c722fb4e269226254f8579876e68a2b27c3a3f5685dd50b423 SHA512 d317b0a141355ce56c9dce5ba6e4b9dbe73b05b9b0b85d93d491f6d6da4194c1aceefbbc7e1b10e5fc233a9732933949e273630845194f6c16dce34a77ee5841
DIST conky-1.17.0.tar.gz 1699311 BLAKE2B 9aead9e1e9bf4bf61c1b3e09c6e319135ccce19c43740c1bb3c6142c936c2a045820078f4684ea037fc26a8b02343e11b5372f74258fdf2c5386459410498cc9 SHA512 4da55ba3835e8ff42747f2bc01c34a94b2819e08eb74ddb913fd34bf4b682d75331119745ee006d842d3d2142fc53eeada16afdf698a60f37b566f55896aa2db
DIST conky-1.18.1.tar.gz 1703018 BLAKE2B ba3c0f9624bfcf229de4376a9446ad05285db4241d1caf4a7a8ac92971f57d022192504c9831a786e3c02db140d70f10cf34d7e146c8647cb2a2b923e6acc2cc SHA512 e390d2aa8a3f3b570b2e3dc43ef71ff0001e36f3b42ce5a9c01b8dca656a23b1af80ee2ee138f38b12b4581dd03711562445fb53e23ca0f26e8b8af878aa2ba1
diff --git a/app-admin/conky/conky-1.15.0.ebuild b/app-admin/conky/conky-1.15.0.ebuild
deleted file mode 100644
index 640060b9264d..000000000000
--- a/app-admin/conky/conky-1.15.0.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-3 )
-PYTHON_COMPAT=( python{3_9,3_10,3_11} )
-
-inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="https://github.com/brndnmtthws/conky"
-SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib
- intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd
- mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
- webserver wifi X xinerama xmms2"
-
-COMMON_DEPEND="
- curl? ( net-misc/curl )
- ical? ( dev-libs/libical:= )
- iconv? ( virtual/libiconv )
- imlib? ( media-libs/imlib2[X] )
- irc? ( net-libs/libircclient )
- lua-cairo? ( x11-libs/cairo[X] )
- lua-imlib? ( media-libs/imlib2[X] )
- lua-rsvg? ( gnome-base/librsvg )
- mysql? ( dev-db/mysql-connector-c )
- ncurses? ( sys-libs/ncurses:= )
- nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
- pulseaudio? ( media-libs/libpulse )
- rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
- systemd? ( sys-apps/systemd )
- truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
- wifi? ( net-wireless/wireless-tools )
- webserver? ( net-libs/libmicrohttpd )
- X? (
- x11-libs/libX11
- x11-libs/libXdamage
- x11-libs/libXfixes
- x11-libs/libXext
- )
- xinerama? ( x11-libs/libXinerama )
- xmms2? ( media-sound/xmms2 )
- ${LUA_DEPS}
-"
-RDEPEND="
- ${COMMON_DEPEND}
- apcupsd? ( sys-power/apcupsd )
- cmus? ( media-sound/cmus )
- hddtemp? ( app-admin/hddtemp )
- moc? ( media-sound/moc )
- extras? (
- app-editors/nano
- || ( app-editors/vim app-editors/gvim )
- )
-"
-DEPEND="
- ${COMMON_DEPEND}
-"
-BDEPEND="
- doc? (
- virtual/pandoc
- $(python_gen_any_dep '
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- ')
- )
- extras? (
- $(python_gen_any_dep '
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- ')
- )
-"
-
-python_check_deps() {
- use doc || use extras || return 0
- python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
- python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-REQUIRED_USE="
- imlib? ( X )
- lua-cairo? ( X bundled-toluapp )
- lua-imlib? ( X bundled-toluapp )
- lua-rsvg? ( X bundled-toluapp )
- nvidia? ( X )
- truetype? ( X )
- xinerama? ( X )
-"
-
-CONFIG_CHECK="~IPV6"
-
-DOCS=( README.md AUTHORS )
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
-To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf and edit it to your liking.
-
-There are pretty html docs available at https://conky.cc/.
-
-Also see https://github.com/brndnmtthws/conky/wiki or https://wiki.gentoo.org/wiki/Conky"
-
-pkg_setup() {
- linux-info_pkg_setup
- lua-single_pkg_setup
- if use doc || use extras; then
- python-any-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- cmake_src_prepare
- xdg_environment_reset
-}
-
-src_configure() {
- local mycmakeargs=()
-
- if use X; then
- mycmakeargs+=(
- -DBUILD_ARGB=yes
- -DBUILD_X11=yes
- -DBUILD_XDAMAGE=yes
- -DBUILD_XDBE=yes
- -DBUILD_XSHAPE=yes
- -DOWN_WINDOW=yes
- )
- else
- mycmakeargs+=(
- -DBUILD_X11=no
- )
- fi
-
- mycmakeargs+=(
- -DBUILD_APCUPSD=$(usex apcupsd)
- -DBUILD_AUDACIOUS=no
- -DBUILD_BUILTIN_CONFIG=yes
- -DBUILD_CMUS=$(usex cmus)
- -DBUILD_CURL=$(usex curl)
- -DBUILD_DOCS=$(usex doc)
- -DBUILD_EXTRAS=$(usex extras)
- -DBUILD_HDDTEMP=$(usex hddtemp)
- -DBUILD_HTTP=$(usex webserver)
- -DBUILD_I18N=yes
- -DBUILD_IBM=$(usex thinkpad)
- -DBUILD_ICAL=$(usex ical)
- -DBUILD_ICONV=$(usex iconv)
- -DBUILD_IMLIB2=$(usex imlib)
- -DBUILD_INTEL_BACKLIGHT=$(usex intel-backlight)
- -DBUILD_IOSTATS=$(usex iostats)
- -DBUILD_IPV6=yes
- -DBUILD_IRC=$(usex irc)
- -DBUILD_JOURNAL=$(usex systemd)
- -DBUILD_LUA_CAIRO=$(usex lua-cairo)
- -DBUILD_LUA_IMLIB2=$(usex lua-imlib)
- -DBUILD_LUA_RSVG=$(usex lua-rsvg)
- -DBUILD_MATH=$(usex math)
- -DBUILD_MOC=$(usex moc)
- -DBUILD_MPD=$(usex mpd)
- -DBUILD_MYSQL=$(usex mysql)
- -DBUILD_NCURSES=$(usex ncurses)
- -DBUILD_NVIDIA=$(usex nvidia)
- -DBUILD_OLD_CONFIG=yes
- -DBUILD_PORT_MONITORS=$(usex portmon)
- -DBUILD_PULSEAUDIO=$(usex pulseaudio)
- -DBUILD_RSS=$(usex rss)
- -DBUILD_WLAN=$(usex wifi)
- -DBUILD_XFT=$(usex truetype)
- -DBUILD_XINERAMA=$(usex xinerama)
- -DBUILD_XMMS2=$(usex xmms2)
- -DDOC_PATH=/usr/share/doc/${PF}
- -DMAINTAINER_MODE=no
- -DRELEASE=yes
- )
-
- if use doc || use extras; then
- mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use extras; then
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${S}"/extras/vim/ftdetect/conkyrc.vim
-
- insinto /usr/share/vim/vimfiles/syntax
- doins "${BUILD_DIR}"/extras/vim/syntax/conkyrc.vim
-
- insinto /usr/share/nano/
- doins "${BUILD_DIR}"/extras/nano/conky.nanorc
- fi
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- xdg_pkg_postinst
-}
diff --git a/app-admin/conky/conky-1.17.0.ebuild b/app-admin/conky/conky-1.17.0.ebuild
index 2b68b5ac28bd..3db5a0db1c8d 100644
--- a/app-admin/conky/conky-1.17.0.ebuild
+++ b/app-admin/conky/conky-1.17.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-3 BSD LGPL-2.1 MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc x86"
IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib
intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd
mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
diff --git a/app-admin/conky/conky-1.18.1.ebuild b/app-admin/conky/conky-1.18.1.ebuild
index 4622f87abaf3..44dd8a64799f 100644
--- a/app-admin/conky/conky-1.18.1.ebuild
+++ b/app-admin/conky/conky-1.18.1.ebuild
@@ -121,6 +121,10 @@ pkg_setup() {
}
src_prepare() {
+ # pin lua 5.4
+ sed -i -e 's|include(FindLua)|find_package(Lua "5.4" EXACT)|g' \
+ cmake/ConkyPlatformChecks.cmake || die "ConkyPlatformChecks.cmake"
+
cmake_src_prepare
xdg_environment_reset
}
diff --git a/app-admin/logrotate/logrotate-3.21.0.ebuild b/app-admin/logrotate/logrotate-3.21.0.ebuild
index fff845e354cd..274d7c986b0e 100644
--- a/app-admin/logrotate/logrotate-3.21.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.21.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://github.com/${PN}/${PN}/releases/download/${PV}/
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="acl +cron selinux"
DEPEND="
diff --git a/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild b/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild
index ff6aeb34ef98..c0ee30e744f2 100644
--- a/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild
+++ b/app-admin/rasdaemon/rasdaemon-0.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mchehab/rasdaemon/releases/download/v${PV}/${P}.tar.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
DEPEND="
dev-db/sqlite
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
index d61bbdc9995a..d3f9f9a6da8c 100644
--- a/app-admin/rex/Manifest
+++ b/app-admin/rex/Manifest
@@ -1,3 +1,3 @@
DIST Rex-1.13.3.tar.gz 349550 BLAKE2B c2ccc2144e56761d33ed2b5d790febd49863639d2e3bba8028b7937b43eb51e7e59e9e99cb1d67f247b2dff8ef91aa04776afd6277ad8a2370f35d71e0b528dd SHA512 beab22aef8ba620b6e74847698eab99977844d2e9632812a9ae0e1ee303cbe4e5a6489000bd5209d76e42e3bb4bb799a90408ed6fb14e034f68132a4d37766dc
DIST Rex-1.13.4.tar.gz 351011 BLAKE2B ec046b88f4443b03c05efbabb40900085293c61dab0ee9818a8c4d05be3cc0a1c1f53738b72cc245aaa2dfbcb00541f0e1e31b0c20f2464e9fc6586ed10707ef SHA512 27b76f4b527b42ea0b06dc1de05254dbd6e2fa3bc9a8a708af7557789ef22aec374a5d0585bf3ec4ee878a5387d51b881cf95855dbd05149b7b23929de12027d
-DIST Rex-1.14.0.tar.gz 353494 BLAKE2B 3943c56df99d3dd98cefbdc68644f1a34109e20e18aa6db61e617d1f5ece8cf9612b7b098dafff7df9435820791bd1476163e5b9e6d35ef20bd47506747ad849 SHA512 fa2ad4b71c9c7b9a352303626e7530fc7fd02b295908c6184680a2646b14553b037a264af932b9a9efd5f1019ded86f3c8857db9651d7a4d7d6cf153924ac3ad
+DIST Rex-1.14.1.tar.gz 354512 BLAKE2B e82248fa58b10e92f2256c57b589e8db6fc61a03532eac00a28431f2527b4a7e5fdaebbf4a0bdbdfa5b775be95826fb26fa831b58ecf354d6758f5a26649dc32 SHA512 c3cb3e64fb443858a47fbf0afabc9e57ca0a7646447ea259c109a5385a57b4347664dde23575e529afa17881f400bd1735994793362aa101519747805153cb75
diff --git a/app-admin/rex/rex-1.14.0-r1.ebuild b/app-admin/rex/rex-1.14.1.ebuild
similarity index 98%
rename from app-admin/rex/rex-1.14.0-r1.ebuild
rename to app-admin/rex/rex-1.14.1.ebuild
index 8cbbbb057ec2..c6c604f1e599 100644
--- a/app-admin/rex/rex-1.14.0-r1.ebuild
+++ b/app-admin/rex/rex-1.14.1.ebuild
@@ -81,6 +81,7 @@ RDEPEND="
dev-perl/libwww-perl
dev-perl/YAML
virtual/perl-version
+ virtual/perl-Term-ANSIColor
"
# NB: would add test? !minimal? Test-mysqld, but I can't get that to work
BDEPEND="
@@ -99,7 +100,9 @@ BDEPEND="
dev-perl/Test-Exception
dev-perl/Test-Output
dev-perl/Test-UseAllModules
+ dev-perl/Test-Warnings
virtual/perl-autodie
+ virtual/perl-Module-Load-Conditional
)
"
diff --git a/app-admin/rex/rex-9999.ebuild b/app-admin/rex/rex-9999.ebuild
index 8cbbbb057ec2..c6c604f1e599 100644
--- a/app-admin/rex/rex-9999.ebuild
+++ b/app-admin/rex/rex-9999.ebuild
@@ -81,6 +81,7 @@ RDEPEND="
dev-perl/libwww-perl
dev-perl/YAML
virtual/perl-version
+ virtual/perl-Term-ANSIColor
"
# NB: would add test? !minimal? Test-mysqld, but I can't get that to work
BDEPEND="
@@ -99,7 +100,9 @@ BDEPEND="
dev-perl/Test-Exception
dev-perl/Test-Output
dev-perl/Test-UseAllModules
+ dev-perl/Test-Warnings
virtual/perl-autodie
+ virtual/perl-Module-Load-Conditional
)
"
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 2d12b8cb2247..1e49c18bb66f 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,12 +1,4 @@
-DIST sudo-1.9.11p3.tar.gz 4826520 BLAKE2B f8508f65b514abd9979a11628d8bc0e085b2625993281e7d1f8794a576e88970bda6939d2f2f50d9485f00276970aba3489b19c102eca5625e389c9610f338dd SHA512 ad5c3d623547d1e3016e1a721676fee6d6b7348e77b2c234041e0af40c7220e8934c8c27beef0d12fa6df11708d37de711dacfefc135d26de46abca7f91c55d1
-DIST sudo-1.9.11p3.tar.gz.sig 566 BLAKE2B 8caf03b051222f0446eaf333b48563aa18d52acbd9f7e2d880f0a97043df1ec8d25d87cfd7b1b9543ab8f52f5dacff4cf031fe3e6b94593d576d1d351eb05aa4 SHA512 ea728cddbab50746a2cbb8ce6cb55df3def1c5e806a1d91ec6f2d65c8d246079bdb5799b961ab0da1cc2c347a36d93cc00d32c10856141a467b25e1224876e50
-DIST sudo-1.9.12p1.tar.gz 4908060 BLAKE2B 976d00fb16b0d26b2714a188e379ccba102e0fa67b8ec6278e5435728af0cc9ba23d63db64a87d4e14d59cd52d3f62401943eb7c0f9c33317179ff764a9f950c SHA512 6f564112aa1e0e9cd223adb280bd430d513109c031e52deca308501234dedc0d7418f13cbb9b4249ac58d997cfdae1908c280c26733acbc55dbf9db45dff239a
-DIST sudo-1.9.12p1.tar.gz.sig 566 BLAKE2B 09f51a9f8eddaafc83bc5faac84ef0c0c37148beec025c777c1a19fd6ca88ecf354390f3557c31c74d13944093eb0ad921a2b7bdff04415f901fee549617e5f8 SHA512 6ec0596ad69fd6afc95d15a6e0ff871449e4534a651311371a4a604c258a34af6b41202cd2c636213d3128a811c5824338454cad764e1c05413ef02b551b7ae2
DIST sudo-1.9.12p2.tar.gz 4909431 BLAKE2B 79eac710b757acae7aa98e6e6f495a475e5236be456e4687fb1441345ee296672ff80a5a60902cffcd257aa81a01fbc3857f3c52e51bb46f56c060fd299e0c05 SHA512 5e035246137d5820691f7ddfc13faec3886e3cf1563ed56633667d86ab4f1306f34cc0e27808f56790b6c6a4614826e54c5b7e47b31eb009b96dde3e52170c45
DIST sudo-1.9.12p2.tar.gz.sig 566 BLAKE2B fa679038c33d2bf1476b56944872d3a18b66bf5c5fb2e660d1f8777cdb209928912ddd8d89d878bd2218df3acd1e7fee5aa850e8d01a1cfac6ab310c788149fa SHA512 0b2f10488c44bfcd94eed97002865d89f4a03a92ef3b890fac3121ef0f9e6c55387771ddead1a94dc92d85c35e3d28b4730f35cdc2aafb51128594555ea29876
-DIST sudo-1.9.13.tar.gz 5093583 BLAKE2B a923879920ac5a3c71e6e898ecc9c1194f26ea5e0ac109a6163fbbdea02724bb0bc126cdd7ea0be2470febc4f978b00519adb2fbc2952706cd47bebcd48447aa SHA512 74c5f16a5be5823912ff239a85463b81e4463f27f7331ad2ea282765a3c21bf966310d73291014d8ca1edd4a745b012b77b1ea6099ba417ba577d76b32e40eb6
-DIST sudo-1.9.13.tar.gz.sig 566 BLAKE2B b6761e90025ccb78fe94e8152022fac74b8368b9975a4816ad1a60e9a3a5bb2a89915c55a570c1216e48ba4f1e00b08c86d84cf81e31000079d2e927c8ef5718 SHA512 045211021b12d3f7c3210be388c87a6a90391fe0b24aff567aa05b1d5431f03da852ce93e0eddc53fe3cabb5cafd46331be8f6d82efb367e5d51f46fb5017557
-DIST sudo-1.9.13p1.tar.gz 5096455 BLAKE2B e70545975c7570099100892121ae67686d6daa286d581a25cc0a574335c426e8cc3d5fe611525cb4d939a423cd9e7d836a27fb8d64aedcb79623ab9eb69488ec SHA512 4d19f06c4a592dac9a1a7feca6cc751093151af32313d9d579e2485fc6530a4340ec29cc2892b29dedf2a6aca3e91fb0bbf94bbfb6530f249c58430b83139044
-DIST sudo-1.9.13p1.tar.gz.sig 566 BLAKE2B 4176b56099394bbe78cfeb5846373614fa69d4bd84b446b714ef5d9a36307af71271df725379c3d013856fb077e7af55b377f6ea80e66b896f513a31ff633817 SHA512 df898199133082f4e9dd8e8f6c4c5b973e9d6920080ae72d6bf56247cdf2cb2c4d750b89535467e81d901ca1e09a806fa0618a7ae94ab137ba62f24257e0c4fb
-DIST sudo-1.9.13p2.tar.gz 5098083 BLAKE2B a96198e865c644c79b0879e1a39c9dcc5f9db2164d22fe25804805065a78424dd6ed6f9e0995cad2d0809a1a21957c6a059c6bdbd2ebdf26cfdf5488004d9cb4 SHA512 b3015a114fd518afd644c9934f2461046f1116506723217603af1a952bdb436689761b4d009dfe32b725bad2e0ebcaf19db72febfaa63895ba004256fea12bef
-DIST sudo-1.9.13p2.tar.gz.sig 566 BLAKE2B 60da89c9d76914965e0eb312b40b56a91b215feb880429916740ef89d0bcab38862a4332961e85aa0cf2ecc4af8f08b7f0f28ff736f2dab97a8d2b5d907aa876 SHA512 c42d9dcf7287df14e7aa6c12e5ea3a839058873859f6fdb3c5a743cd11c21d30f41958a807a0a503f8805b957dfcba57383f953b4c544334333dde5e1757a543
+DIST sudo-1.9.13p3.tar.gz 5100355 BLAKE2B 46218ecf4cf06d2280ccf4c257b12a6f697eda17b96a6b7aa56f6c7f22d847ec2a8036b9f615c3328d985656539c95f37a40c6c72dfa5f65786ab45a28cf353f SHA512 c0c5cd0c6308868afdad2ecf55b86fdcf1f49889b30831c9db3bc56a63dc3a07686c285c20b2500494b2a76653e2ec69196abdc583312609a5db1c81a6e4e737
+DIST sudo-1.9.13p3.tar.gz.sig 566 BLAKE2B 5b59c7178bf157b67500d972fe1b373bc86ab09345f59733cffa85700221ceec0d5be10bce4838f16e9238154c90a972570a7a933f48dbd56bc64b38dbc0043f SHA512 eebf36e86ebd03daca05838bc56d9b1fb7ea8584a83a9f0e03c5ff07e612d36472b23797c628eff1cf4301832d139de0de62ddc8b17e20f1498f769a4db1249a
diff --git a/app-admin/sudo/sudo-1.9.11_p3-r1.ebuild b/app-admin/sudo/sudo-1.9.11_p3-r1.ebuild
deleted file mode 100644
index e677d6731aaf..000000000000
--- a/app-admin/sudo/sudo-1.9.11_p3-r1.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pam libtool tmpfiles toolchain-funcs
-
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/b}"
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="https://www.sudo.ws/"
-if [[ ${PV} == 9999 ]] ; then
- inherit mercurial
- EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-else
- VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sudo.ws.asc
- inherit verify-sig
-
- uri_prefix=
- case ${P} in
- *_beta*|*_rc*) uri_prefix=beta/ ;;
- esac
-
- SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
- ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
- verify-sig? (
- https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
- ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
- )"
- if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris"
- fi
-
- BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
-fi
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
-
-DEPEND="
- sys-libs/zlib:=
- virtual/libcrypt:=
- gcrypt? ( dev-libs/libgcrypt:= )
- ldap? (
- >=net-nds/openldap-2.1.30-r1:=
- sasl? (
- dev-libs/cyrus-sasl
- net-nds/openldap:=[sasl]
- )
- )
- pam? ( sys-libs/pam )
- sasl? ( dev-libs/cyrus-sasl )
- selinux? ( sys-libs/libselinux )
- skey? ( >=sys-auth/skey-1.1.5-r1 )
- ssl? ( dev-libs/openssl:0= )
- sssd? ( sys-auth/sssd[sudo] )
-"
-RDEPEND="
- ${DEPEND}
- >=app-misc/editor-wrapper-3
- virtual/editor
- ldap? ( dev-lang/perl )
- pam? ( sys-auth/pambase )
- selinux? ( sec-policy/selinux-sudo )
- sendmail? ( virtual/mta )
-"
-BDEPEND+="
- sys-devel/bison
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
- ?? ( pam skey )
- ?? ( gcrypt ssl )
-"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
- default
-
- elibtoolize
-}
-
-set_secure_path() {
- # First extract the default ROOTPATH from build env
- SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
-
- case "${SECURE_PATH}" in
- */usr/sbin*)
- ;;
- *)
- SECURE_PATH=$(unset PATH; . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
- ;;
- esac
-
- if [[ -z ${SECURE_PATH} ]] ; then
- ewarn " Failed to detect SECURE_PATH, please report this"
- fi
-
- # Then remove duplicate path entries
- cleanpath() {
- local newpath thisp IFS=:
- for thisp in $1 ; do
- if [[ :${newpath}: != *:${thisp}:* ]] ; then
- newpath+=:${thisp}
- else
- einfo " Duplicate entry ${thisp} removed..."
- fi
- done
- SECURE_PATH=${newpath#:}
- }
- cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
-
- # Finally, strip gcc paths, bug #136027
- rmpath() {
- local e newpath thisp IFS=:
- for thisp in ${SECURE_PATH} ; do
- for e ; do
- [[ ${thisp} == ${e} ]] && continue 2 ;
- done
- newpath+=:${thisp}
- done
- SECURE_PATH=${newpath#:}
- }
- rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-}
-
-src_configure() {
- local SECURE_PATH
-
- set_secure_path
-
- # bug #767712
- tc-export PKG_CONFIG
-
- # - audit: somebody got to explain me how I can test this before I
- # enable it.. - Diego
- # - plugindir: autoconf code is crappy and does not delay evaluation
- # until `make` time, so we have to use a full path here rather than
- # basing off other values.
- local myeconfargs=(
- # We set all of the relevant options by ourselves (patched
- # into the toolchain) and setting these in the build system
- # actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3
- # (it'll downgrade to =2). So, this has no functional effect on
- # the hardening for users. It's safe.
- --disable-hardening
-
- # requires some python eclass
- --disable-python
- --enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
- --enable-zlib=system
- --with-editor="${EPREFIX}"/usr/libexec/editor
- --with-env-editor
- --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
- --with-rundir="${EPREFIX}"/run/sudo
- --with-vardir="${EPREFIX}"/var/db/sudo
- --without-linux-audit
- --without-opie
- $(use_enable gcrypt)
- $(use_enable nls)
- $(use_enable sasl)
- $(use_enable ssl openssl)
- $(use_with ldap)
- $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
- $(use_with offensive insults)
- $(use_with offensive all-insults)
- $(use_with pam)
- $(use_with pam pam-login)
- $(use_with secure-path secure-path "${SECURE_PATH}")
- $(use_with selinux)
- $(use_with sendmail)
- $(use_with skey)
- $(use_with sssd)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- if use ldap ; then
- dodoc README.LDAP.md
-
- cat <<-EOF > "${T}"/ldap.conf.sudo
- # See ldap.conf(5) and README.LDAP.md for details
- # This file should only be readable by root
-
- # supported directives: host, port, ssl, ldap_version
- # uri, binddn, bindpw, sudoers_base, sudoers_debug
- # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
- EOF
-
- if use sasl ; then
- cat <<-EOF >> "${T}"/ldap.conf.sudo
-
- # SASL directives: use_sasl, sasl_mech, sasl_auth_id
- # sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
- EOF
- fi
-
- insinto /etc
- doins "${T}"/ldap.conf.sudo
- fperms 0440 /etc/ldap.conf.sudo
-
- insinto /etc/openldap/schema
- newins docs/schema.OpenLDAP sudo.schema
- fi
-
- if use pam ; then
- pamd_mimic system-auth sudo auth account session
- pamd_mimic system-auth sudo-i auth account session
- fi
-
- keepdir /var/db/sudo/lectured
- fperms 0700 /var/db/sudo/lectured
- # bug #652958
- fperms 0711 /var/db/sudo
-
- # Don't install into /run as that is a tmpfs most of the time
- # (bug #504854)
- rm -rf "${ED}"/run || die
-
- # bug #697812
- find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
- tmpfiles_process sudo.conf
-
- # bug #652958
- local sudo_db="${EROOT}/var/db/sudo"
- if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
- chmod 711 "${sudo_db}" || die
- fi
-
- if use ldap ; then
- ewarn
- ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration."
- ewarn
- if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
- ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
- ewarn "configured in ${ROOT}/etc/nsswitch.conf."
- ewarn
- ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:"
- ewarn " sudoers: ldap files"
- ewarn
- fi
- fi
- if use prefix ; then
- ewarn
- ewarn "To use sudo on Prefix, you need to change file ownership and permissions"
- ewarn "with root privileges, as follows:"
- ewarn
- ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
- ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
- ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
- ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
- ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
- ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
- ewarn
- fi
-
- elog "To use the -A (askpass) option, you need to install a compatible"
- elog "password program from the following list. Starred packages will"
- elog "automatically register for the use with sudo (but will not force"
- elog "the -A option):"
- elog ""
- elog " [*] net-misc/ssh-askpass-fullscreen"
- elog " net-misc/x11-ssh-askpass"
- elog ""
- elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
- elog "variable to the program you want to use."
-}
diff --git a/app-admin/sudo/sudo-1.9.12_p1.ebuild b/app-admin/sudo/sudo-1.9.12_p1.ebuild
deleted file mode 100644
index 35748ea38ecd..000000000000
--- a/app-admin/sudo/sudo-1.9.12_p1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pam libtool tmpfiles toolchain-funcs
-
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/b}"
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="https://www.sudo.ws/"
-
-if [[ ${PV} == 9999 ]] ; then
- inherit mercurial
- EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-else
- VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sudo.ws.asc
- inherit verify-sig
-
- uri_prefix=
- case ${P} in
- *_beta*|*_rc*) uri_prefix=beta/ ;;
- esac
-
- SRC_URI="
- https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
- ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
- verify-sig? (
- https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
- ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
- )
- "
-
- if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris"
- fi
-
- BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
-
-DEPEND="
- sys-libs/zlib:=
- virtual/libcrypt:=
- gcrypt? ( dev-libs/libgcrypt:= )
- ldap? (
- >=net-nds/openldap-2.1.30-r1:=
- sasl? (
- dev-libs/cyrus-sasl
- net-nds/openldap:=[sasl]
- )
- )
- pam? ( sys-libs/pam )
- sasl? ( dev-libs/cyrus-sasl )
- selinux? ( sys-libs/libselinux )
- skey? ( >=sys-auth/skey-1.1.5-r1 )
- ssl? ( dev-libs/openssl:0= )
- sssd? ( sys-auth/sssd[sudo] )
-"
-RDEPEND="
- ${DEPEND}
- >=app-misc/editor-wrapper-3
- virtual/editor
- ldap? ( dev-lang/perl )
- pam? ( sys-auth/pambase )
- selinux? ( sec-policy/selinux-sudo )
- sendmail? ( virtual/mta )
-"
-BDEPEND+="
- sys-devel/bison
- virtual/pkgconfig
-"
-
-REQUIRED_USE="
- ?? ( pam skey )
- ?? ( gcrypt ssl )
-"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
- default
-
- elibtoolize
-}
-
-set_secure_path() {
- # First extract the default ROOTPATH from build env
- SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
-
- case "${SECURE_PATH}" in
- */usr/sbin*)
- ;;
- *)
- SECURE_PATH=$(unset PATH; . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
- ;;
- esac
-
- if [[ -z ${SECURE_PATH} ]] ; then
- ewarn " Failed to detect SECURE_PATH, please report this"
- fi
-
- # Then remove duplicate path entries
- cleanpath() {
- local newpath thisp IFS=:
- for thisp in $1 ; do
- if [[ :${newpath}: != *:${thisp}:* ]] ; then
- newpath+=:${thisp}
- else
- einfo " Duplicate entry ${thisp} removed..."
- fi
- done
- SECURE_PATH=${newpath#:}
- }
- cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
-
- # Finally, strip gcc paths, bug #136027
- rmpath() {
- local e newpath thisp IFS=:
- for thisp in ${SECURE_PATH} ; do
- for e ; do
- [[ ${thisp} == ${e} ]] && continue 2 ;
- done
- newpath+=:${thisp}
- done
- SECURE_PATH=${newpath#:}
- }
- rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-}
-
-src_configure() {
- local SECURE_PATH
-
- set_secure_path
-
- # bug #767712
- tc-export PKG_CONFIG
-
- # - audit: somebody got to explain me how I can test this before I
- # enable it.. - Diego
- # - plugindir: autoconf code is crappy and does not delay evaluation
- # until `make` time, so we have to use a full path here rather than
- # basing off other values.
- local myeconfargs=(
- # We set all of the relevant options by ourselves (patched
- # into the toolchain) and setting these in the build system
- # actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3
- # (it'll downgrade to =2). So, this has no functional effect on
- # the hardening for users. It's safe.
- --disable-hardening
-
- # requires some python eclass
- --disable-python
- --enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
- --enable-zlib=system
- --with-editor="${EPREFIX}"/usr/libexec/editor
- --with-env-editor
- --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
- --with-rundir="${EPREFIX}"/run/sudo
- --with-vardir="${EPREFIX}"/var/db/sudo
- --without-linux-audit
- --without-opie
- $(use_enable gcrypt)
- $(use_enable nls)
- $(use_enable sasl)
- $(use_enable ssl openssl)
- $(use_with ldap)
- $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
- $(use_with offensive insults)
- $(use_with offensive all-insults)
- $(use_with pam)
- $(use_with pam pam-login)
- $(use_with secure-path secure-path "${SECURE_PATH}")
- $(use_with selinux)
- $(use_with sendmail)
- $(use_with skey)
- $(use_with sssd)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- if use ldap ; then
- dodoc README.LDAP.md
-
- cat <<-EOF > "${T}"/ldap.conf.sudo
- # See ldap.conf(5) and README.LDAP.md for details
- # This file should only be readable by root
-
- # supported directives: host, port, ssl, ldap_version
- # uri, binddn, bindpw, sudoers_base, sudoers_debug
- # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
- EOF
-
- if use sasl ; then
- cat <<-EOF >> "${T}"/ldap.conf.sudo
-
- # SASL directives: use_sasl, sasl_mech, sasl_auth_id
- # sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
- EOF
- fi
-
- insinto /etc
- doins "${T}"/ldap.conf.sudo
- fperms 0440 /etc/ldap.conf.sudo
-
- insinto /etc/openldap/schema
- newins docs/schema.OpenLDAP sudo.schema
- fi
-
- if use pam ; then
- pamd_mimic system-auth sudo auth account session
- pamd_mimic system-auth sudo-i auth account session
- fi
-
- keepdir /var/db/sudo/lectured
- fperms 0700 /var/db/sudo/lectured
- # bug #652958
- fperms 0711 /var/db/sudo
-
- # Don't install into /run as that is a tmpfs most of the time
- # (bug #504854)
- rm -rf "${ED}"/run || die
-
- # bug #697812
- find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
- tmpfiles_process sudo.conf
-
- # bug #652958
- local sudo_db="${EROOT}/var/db/sudo"
- if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
- chmod 711 "${sudo_db}" || die
- fi
-
- if use ldap ; then
- ewarn
- ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration."
- ewarn
- if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
- ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
- ewarn "configured in ${ROOT}/etc/nsswitch.conf."
- ewarn
- ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:"
- ewarn " sudoers: ldap files"
- ewarn
- fi
- fi
- if use prefix ; then
- ewarn
- ewarn "To use sudo on Prefix, you need to change file ownership and permissions"
- ewarn "with root privileges, as follows:"
- ewarn
- ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
- ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
- ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
- ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
- ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
- ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
- ewarn
- fi
-
- elog "To use the -A (askpass) option, you need to install a compatible"
- elog "password program from the following list. Starred packages will"
- elog "automatically register for the use with sudo (but will not force"
- elog "the -A option):"
- elog ""
- elog " [*] net-misc/ssh-askpass-fullscreen"
- elog " net-misc/x11-ssh-askpass"
- elog ""
- elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
- elog "variable to the program you want to use."
-}
diff --git a/app-admin/sudo/sudo-1.9.13.ebuild b/app-admin/sudo/sudo-1.9.13.ebuild
deleted file mode 100644
index a4d75f41c04b..000000000000
--- a/app-admin/sudo/sudo-1.9.13.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pam libtool tmpfiles toolchain-funcs
-
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/b}"
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="https://www.sudo.ws/"
-
-if [[ ${PV} == 9999 ]] ; then
- inherit mercurial
- EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-else
- VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sudo.ws.asc
- inherit verify-sig
-
- uri_prefix=
- case ${P} in
- *_beta*|*_rc*) uri_prefix=beta/ ;;
- esac
-
- SRC_URI="
- https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
- ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
- verify-sig? (
- https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
- ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
- )
- "
-
- if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
- fi
-
- BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
-
-DEPEND="
- sys-libs/zlib:=
- virtual/libcrypt:=
- gcrypt? ( dev-libs/libgcrypt:= )
- ldap? (
- >=net-nds/openldap-2.1.30-r1:=
- sasl? (
- dev-libs/cyrus-sasl
- net-nds/openldap:=[sasl]
- )
- )
- pam? ( sys-libs/pam )
- sasl? ( dev-libs/cyrus-sasl )
- selinux? ( sys-libs/libselinux )
- skey? ( >=sys-auth/skey-1.1.5-r1 )
- ssl? ( dev-libs/openssl:0= )
- sssd? ( sys-auth/sssd[sudo] )
-"
-RDEPEND="
- ${DEPEND}
- >=app-misc/editor-wrapper-3
- virtual/editor
- ldap? ( dev-lang/perl )
- pam? ( sys-auth/pambase )
- selinux? ( sec-policy/selinux-sudo )
- sendmail? ( virtual/mta )
-"
-BDEPEND+="
- sys-devel/bison
- virtual/pkgconfig
-"
-
-REQUIRED_USE="
- ?? ( pam skey )
- ?? ( gcrypt ssl )
-"
-
-MAKEOPTS+=" SAMPLES="
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.9.13-missing-bracket-as-if.patch
- "${FILESDIR}"/${PN}-1.9.13-gcc-13.patch
-)
-
-src_prepare() {
- default
-
- elibtoolize
-}
-
-set_secure_path() {
- # First extract the default ROOTPATH from build env
- SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
-
- case "${SECURE_PATH}" in
- */usr/sbin*)
- ;;
- *)
- SECURE_PATH=$(unset PATH; . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
- ;;
- esac
-
- if [[ -z ${SECURE_PATH} ]] ; then
- ewarn " Failed to detect SECURE_PATH, please report this"
- fi
-
- # Then remove duplicate path entries
- cleanpath() {
- local newpath thisp IFS=:
- for thisp in $1 ; do
- if [[ :${newpath}: != *:${thisp}:* ]] ; then
- newpath+=:${thisp}
- else
- einfo " Duplicate entry ${thisp} removed..."
- fi
- done
- SECURE_PATH=${newpath#:}
- }
- cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
-
- # Finally, strip gcc paths, bug #136027
- rmpath() {
- local e newpath thisp IFS=:
- for thisp in ${SECURE_PATH} ; do
- for e ; do
- [[ ${thisp} == ${e} ]] && continue 2 ;
- done
- newpath+=:${thisp}
- done
- SECURE_PATH=${newpath#:}
- }
- rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-}
-
-src_configure() {
- local SECURE_PATH
-
- set_secure_path
-
- # bug #767712
- tc-export PKG_CONFIG
-
- # - audit: somebody got to explain me how I can test this before I
- # enable it.. - Diego
- # - plugindir: autoconf code is crappy and does not delay evaluation
- # until `make` time, so we have to use a full path here rather than
- # basing off other values.
- local myeconfargs=(
- # We set all of the relevant options by ourselves (patched
- # into the toolchain) and setting these in the build system
- # actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3
- # (it'll downgrade to =2). So, this has no functional effect on
- # the hardening for users. It's safe.
- --disable-hardening
-
- # requires some python eclass
- --disable-python
- --enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
- --enable-zlib=system
- --with-editor="${EPREFIX}"/usr/libexec/editor
- --with-env-editor
- --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
- --with-rundir="${EPREFIX}"/run/sudo
- --with-vardir="${EPREFIX}"/var/db/sudo
- --without-linux-audit
- --without-opie
- $(use_enable gcrypt)
- $(use_enable nls)
- $(use_enable sasl)
- $(use_enable ssl openssl)
- $(use_with ldap)
- $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
- $(use_with offensive insults)
- $(use_with offensive all-insults)
- $(use_with pam)
- $(use_with pam pam-login)
- $(use_with secure-path secure-path "${SECURE_PATH}")
- $(use_with selinux)
- $(use_with sendmail)
- $(use_with skey)
- $(use_with sssd)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- if use ldap ; then
- dodoc README.LDAP.md
-
- cat <<-EOF > "${T}"/ldap.conf.sudo
- # See ldap.conf(5) and README.LDAP.md for details
- # This file should only be readable by root
-
- # supported directives: host, port, ssl, ldap_version
- # uri, binddn, bindpw, sudoers_base, sudoers_debug
- # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
- EOF
-
- if use sasl ; then
- cat <<-EOF >> "${T}"/ldap.conf.sudo
-
- # SASL directives: use_sasl, sasl_mech, sasl_auth_id
- # sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
- EOF
- fi
-
- insinto /etc
- doins "${T}"/ldap.conf.sudo
- fperms 0440 /etc/ldap.conf.sudo
-
- insinto /etc/openldap/schema
- newins docs/schema.OpenLDAP sudo.schema
- fi
-
- if use pam ; then
- pamd_mimic system-auth sudo auth account session
- pamd_mimic system-auth sudo-i auth account session
- fi
-
- keepdir /var/db/sudo/lectured
- fperms 0700 /var/db/sudo/lectured
- # bug #652958
- fperms 0711 /var/db/sudo
-
- # Don't install into /run as that is a tmpfs most of the time
- # (bug #504854)
- rm -rf "${ED}"/run || die
-
- # bug #697812
- find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
- tmpfiles_process sudo.conf
-
- # bug #652958
- local sudo_db="${EROOT}/var/db/sudo"
- if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
- chmod 711 "${sudo_db}" || die
- fi
-
- if use ldap ; then
- ewarn
- ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration."
- ewarn
- if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
- ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
- ewarn "configured in ${ROOT}/etc/nsswitch.conf."
- ewarn
- ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:"
- ewarn " sudoers: ldap files"
- ewarn
- fi
- fi
- if use prefix ; then
- ewarn
- ewarn "To use sudo on Prefix, you need to change file ownership and permissions"
- ewarn "with root privileges, as follows:"
- ewarn
- ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
- ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
- ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
- ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
- ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
- ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
- ewarn
- fi
-
- elog "To use the -A (askpass) option, you need to install a compatible"
- elog "password program from the following list. Starred packages will"
- elog "automatically register for the use with sudo (but will not force"
- elog "the -A option):"
- elog ""
- elog " [*] net-misc/ssh-askpass-fullscreen"
- elog " net-misc/x11-ssh-askpass"
- elog ""
- elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
- elog "variable to the program you want to use."
-}
diff --git a/app-admin/sudo/sudo-1.9.13_p2.ebuild b/app-admin/sudo/sudo-1.9.13_p2.ebuild
deleted file mode 100644
index 2d77e6863bd9..000000000000
--- a/app-admin/sudo/sudo-1.9.13_p2.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pam libtool tmpfiles toolchain-funcs
-
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/b}"
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="https://www.sudo.ws/"
-
-if [[ ${PV} == 9999 ]] ; then
- inherit mercurial
- EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-else
- VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sudo.ws.asc
- inherit verify-sig
-
- uri_prefix=
- case ${P} in
- *_beta*|*_rc*) uri_prefix=beta/ ;;
- esac
-
- SRC_URI="
- https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
- ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
- verify-sig? (
- https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
- ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
- )
- "
-
- if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
- fi
-
- BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
-
-DEPEND="
- sys-libs/zlib:=
- virtual/libcrypt:=
- gcrypt? ( dev-libs/libgcrypt:= )
- ldap? (
- >=net-nds/openldap-2.1.30-r1:=
- sasl? (
- dev-libs/cyrus-sasl
- net-nds/openldap:=[sasl]
- )
- )
- pam? ( sys-libs/pam )
- sasl? ( dev-libs/cyrus-sasl )
- selinux? ( sys-libs/libselinux )
- skey? ( >=sys-auth/skey-1.1.5-r1 )
- ssl? ( dev-libs/openssl:0= )
- sssd? ( sys-auth/sssd[sudo] )
-"
-RDEPEND="
- ${DEPEND}
- >=app-misc/editor-wrapper-3
- virtual/editor
- ldap? ( dev-lang/perl )
- pam? ( sys-auth/pambase )
- selinux? ( sec-policy/selinux-sudo )
- sendmail? ( virtual/mta )
-"
-BDEPEND+="
- sys-devel/bison
- virtual/pkgconfig
-"
-
-REQUIRED_USE="
- ?? ( pam skey )
- ?? ( gcrypt ssl )
-"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
- default
-
- elibtoolize
-}
-
-set_secure_path() {
- # First extract the default ROOTPATH from build env
- SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
-
- case "${SECURE_PATH}" in
- */usr/sbin*)
- ;;
- *)
- SECURE_PATH=$(unset PATH; . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
- ;;
- esac
-
- if [[ -z ${SECURE_PATH} ]] ; then
- ewarn " Failed to detect SECURE_PATH, please report this"
- fi
-
- # Then remove duplicate path entries
- cleanpath() {
- local newpath thisp IFS=:
- for thisp in $1 ; do
- if [[ :${newpath}: != *:${thisp}:* ]] ; then
- newpath+=:${thisp}
- else
- einfo " Duplicate entry ${thisp} removed..."
- fi
- done
- SECURE_PATH=${newpath#:}
- }
- cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
-
- # Finally, strip gcc paths, bug #136027
- rmpath() {
- local e newpath thisp IFS=:
- for thisp in ${SECURE_PATH} ; do
- for e ; do
- [[ ${thisp} == ${e} ]] && continue 2 ;
- done
- newpath+=:${thisp}
- done
- SECURE_PATH=${newpath#:}
- }
- rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-}
-
-src_configure() {
- local SECURE_PATH
-
- set_secure_path
-
- # bug #767712
- tc-export PKG_CONFIG
-
- # - audit: somebody got to explain me how I can test this before I
- # enable it.. - Diego
- # - plugindir: autoconf code is crappy and does not delay evaluation
- # until `make` time, so we have to use a full path here rather than
- # basing off other values.
- local myeconfargs=(
- # We set all of the relevant options by ourselves (patched
- # into the toolchain) and setting these in the build system
- # actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3
- # (it'll downgrade to =2). So, this has no functional effect on
- # the hardening for users. It's safe.
- --disable-hardening
-
- # requires some python eclass
- --disable-python
- --enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
- --enable-zlib=system
- --with-editor="${EPREFIX}"/usr/libexec/editor
- --with-env-editor
- --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
- --with-rundir="${EPREFIX}"/run/sudo
- --with-vardir="${EPREFIX}"/var/db/sudo
- --without-linux-audit
- --without-opie
- $(use_enable gcrypt)
- $(use_enable nls)
- $(use_enable sasl)
- $(use_enable ssl openssl)
- $(use_with ldap)
- $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
- $(use_with offensive insults)
- $(use_with offensive all-insults)
- $(use_with pam)
- $(use_with pam pam-login)
- $(use_with secure-path secure-path "${SECURE_PATH}")
- $(use_with selinux)
- $(use_with sendmail)
- $(use_with skey)
- $(use_with sssd)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- if use ldap ; then
- dodoc README.LDAP.md
-
- cat <<-EOF > "${T}"/ldap.conf.sudo
- # See ldap.conf(5) and README.LDAP.md for details
- # This file should only be readable by root
-
- # supported directives: host, port, ssl, ldap_version
- # uri, binddn, bindpw, sudoers_base, sudoers_debug
- # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
- EOF
-
- if use sasl ; then
- cat <<-EOF >> "${T}"/ldap.conf.sudo
-
- # SASL directives: use_sasl, sasl_mech, sasl_auth_id
- # sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
- EOF
- fi
-
- insinto /etc
- doins "${T}"/ldap.conf.sudo
- fperms 0440 /etc/ldap.conf.sudo
-
- insinto /etc/openldap/schema
- newins docs/schema.OpenLDAP sudo.schema
- fi
-
- if use pam ; then
- pamd_mimic system-auth sudo auth account session
- pamd_mimic system-auth sudo-i auth account session
- fi
-
- keepdir /var/db/sudo/lectured
- fperms 0700 /var/db/sudo/lectured
- # bug #652958
- fperms 0711 /var/db/sudo
-
- # Don't install into /run as that is a tmpfs most of the time
- # (bug #504854)
- rm -rf "${ED}"/run || die
-
- # bug #697812
- find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
- tmpfiles_process sudo.conf
-
- # bug #652958
- local sudo_db="${EROOT}/var/db/sudo"
- if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
- chmod 711 "${sudo_db}" || die
- fi
-
- if use ldap ; then
- ewarn
- ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration."
- ewarn
- if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
- ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
- ewarn "configured in ${ROOT}/etc/nsswitch.conf."
- ewarn
- ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:"
- ewarn " sudoers: ldap files"
- ewarn
- fi
- fi
- if use prefix ; then
- ewarn
- ewarn "To use sudo on Prefix, you need to change file ownership and permissions"
- ewarn "with root privileges, as follows:"
- ewarn
- ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
- ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
- ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
- ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
- ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
- ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
- ewarn
- fi
-
- elog "To use the -A (askpass) option, you need to install a compatible"
- elog "password program from the following list. Starred packages will"
- elog "automatically register for the use with sudo (but will not force"
- elog "the -A option):"
- elog ""
- elog " [*] net-misc/ssh-askpass-fullscreen"
- elog " net-misc/x11-ssh-askpass"
- elog ""
- elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
- elog "variable to the program you want to use."
-}
diff --git a/app-admin/sudo/sudo-1.9.13_p1.ebuild b/app-admin/sudo/sudo-1.9.13_p3.ebuild
similarity index 100%
rename from app-admin/sudo/sudo-1.9.13_p1.ebuild
rename to app-admin/sudo/sudo-1.9.13_p3.ebuild
diff --git a/app-admin/testdisk/testdisk-7.1-r1.ebuild b/app-admin/testdisk/testdisk-7.1-r1.ebuild
deleted file mode 100644
index 502a73ebc76e..000000000000
--- a/app-admin/testdisk/testdisk-7.1-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils xdg-utils
-
-DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
-HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
-SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv x86"
-IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
-
-REQUIRED_USE="static? ( !qt5 )"
-
-# WARNING: reiserfs support does NOT work with reiserfsprogs
-# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
-DEPEND="
- static? (
- sys-apps/util-linux[static-libs]
- sys-fs/e2fsprogs[static-libs]
- sys-libs/ncurses:0[static-libs]
- jpeg? ( virtual/jpeg:0[static-libs] )
- ntfs? ( sys-fs/ntfs3g[static-libs] )
- reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
- zlib? ( sys-libs/zlib[static-libs] )
- !arm? ( ewf? ( app-forensics/libewf[static-libs] ) )
- )
- !static? (
- sys-apps/util-linux
- sys-fs/e2fsprogs
- sys-libs/ncurses:0=
- jpeg? ( virtual/jpeg:0 )
- ntfs? ( sys-fs/ntfs3g:= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
- zlib? ( sys-libs/zlib )
- !arm? ( ewf? ( app-forensics/libewf:= ) )
- )
-"
-RDEPEND="!static? ( ${DEPEND} )"
-BDEPEND="qt5? ( dev-qt/linguist-tools:5 )"
-
-DOCS=()
-
-src_configure() {
- export PATH="$(qt5_get_bindir):${PATH}"
-
- local myconf=(
- --enable-sudo
- --without-ntfs
- $(use_with ewf)
- $(use_with jpeg)
- $(use_with ntfs ntfs3g)
- $(use_enable qt5 qt)
- $(use_with reiserfs)
- $(use_with zlib)
- )
-
- # this static method is the same used by upstream for their 'static' make
- # target, but better, as it doesn't break.
- use static && append-ldflags -static
-
- econf "${myconf[@]}"
-
- # perform safety checks for NTFS, REISERFS and JPEG
- if use ntfs && ! grep -E -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
- die "Failed to find either NTFS or NTFS-3G library."
- fi
- if use reiserfs && grep -E -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
- die "Failed to find reiserfs library."
- fi
- if use jpeg && grep -E -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
- die "Failed to find jpeg library."
- fi
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/app-admin/testdisk/testdisk-7.1-r2.ebuild b/app-admin/testdisk/testdisk-7.1-r2.ebuild
index 746af9681ff3..b280e54ecc04 100644
--- a/app-admin/testdisk/testdisk-7.1-r2.ebuild
+++ b/app-admin/testdisk/testdisk-7.1-r2.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv x86"
IUSE="ewf jpeg ntfs gui reiserfs static zlib"
REQUIRED_USE="static? ( !gui )"
diff --git a/app-alternatives/Manifest.gz b/app-alternatives/Manifest.gz
index 344287157364..f31faf56faff 100644
Binary files a/app-alternatives/Manifest.gz and b/app-alternatives/Manifest.gz differ
diff --git a/app-alternatives/awk/metadata.xml b/app-alternatives/awk/metadata.xml
index 0cf5fbf0d2f2..7c4c46c75e10 100644
--- a/app-alternatives/awk/metadata.xml
+++ b/app-alternatives/awk/metadata.xml
@@ -1,10 +1,6 @@
-
- junghans@gentoo.org
- Christoph Junghans
-
base-system@gentoo.org
Gentoo Base System
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index af41fee8ffb4..422bf9449c5d 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/ncompress/ncompress-5.0-r1.ebuild b/app-arch/ncompress/ncompress-5.0-r1.ebuild
index d5ae2d383723..0e8390191260 100644
--- a/app-arch/ncompress/ncompress-5.0-r1.ebuild
+++ b/app-arch/ncompress/ncompress-5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE=""
src_prepare() {
diff --git a/app-arch/unrar/unrar-6.2.3.ebuild b/app-arch/unrar/unrar-6.2.3.ebuild
index 07e3cbfe21b0..e34669f3505f 100644
--- a/app-arch/unrar/unrar-6.2.3.ebuild
+++ b/app-arch/unrar/unrar-6.2.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/unrar"
LICENSE="unRAR"
SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
PATCHES=(
"${FILESDIR}"/${PN}-5.9.3-build.patch
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 9efa5875806a..ea382768e6a4 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/bareos/bareos-22.0.2.ebuild b/app-backup/bareos/bareos-22.0.2.ebuild
index 4e4745015088..1c461fcddead 100644
--- a/app-backup/bareos/bareos-22.0.2.ebuild
+++ b/app-backup/bareos/bareos-22.0.2.ebuild
@@ -403,6 +403,14 @@ pkg_postinst() {
einfo " emerge --config app-backup/bareos"
einfo
einfo "to do this"
+ einfo
+ einfo "For major upgrades you may need to run:"
+ einfo
+ einfo " su postgres -c '/usr/libexec/bareos/update_bareos_tables'"
+ einfo
+ einfo "Please see release notes for details."
+ einfo "( https://docs.bareos.org/Appendix/ReleaseNotes.html )"
+ einfo
fi
}
diff --git a/app-backup/borgbackup/borgbackup-1.2.3.ebuild b/app-backup/borgbackup/borgbackup-1.2.3.ebuild
index a685a3ad5142..4502f05ba0ae 100644
--- a/app-backup/borgbackup/borgbackup-1.2.3.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.2.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
fi
DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index e6fe205d055d..c0aa07708f27 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,3 +1,4 @@
DIST borgmatic-1.7.2.tar.gz 333772 BLAKE2B fd628e9c77547686d4edf5d1066d3c171575f4d923ebc5205c5eb64f3a960e94c121282e9f4fb02b1291a81011a18dc393c6d13a07f215585459e7a5b55f8107 SHA512 6ec12ec25ae4d0210bb9114795c1ea292d8236f9e68c9425e24ee7b580796504e4c317a3fcf778806a33bbd3db68669beb4ef7a88ec538c1bd432db9a2845b3e
DIST borgmatic-1.7.5.tar.gz 338412 BLAKE2B e27fd709070a27c2ddd01fdfe23ef9caeb942c52d756332b4abd6d6cf39724656677a0d142a5392e35e0a0f25958421fe23edf04a252d212d761f48a0c320d9b SHA512 c27a364617e0e8fc1c11adac5375deac4e1663236a545d3fb70280974614d50ffe3821010ed5e4345afa3c3dab5f45c0d3bbfc946f50321601acb56965fd555d
DIST borgmatic-1.7.7.tar.gz 348839 BLAKE2B 686a5552bdace0e44ced612448fd9a9609d9df2dfb41007f0432bbb6fe9d4c2ef154a215eef63f4aed4626471feda52142d3511498901545a3ab4bbf3171c14f SHA512 e1a7c20a17a4ad37ce348feb89e1a3b34912ae6730742e6b4c822b7a1026e3630167645154268f47922a106621cd02d5f06ada448ac844dfd7c9ff46660ca2ec
+DIST borgmatic-1.7.8.tar.gz 350233 BLAKE2B 3fcd392983f73ec5e97f0dc6b96e211d7f1e1d1a4ce95c635c675cf043e796925df53c30c1e4f8eb1a095d9ec5ff81e90edee5ff2576f4683053d3108004afd9 SHA512 bcc65fdb7ea1171fb61deda9b1f69a00596e1e10a99508d336977b694bd8f93d74837aad9211bf1065b785220aaf1460a3ea403bf23fa4873d1bf4c6b4016525
diff --git a/app-backup/borgmatic/borgmatic-1.7.8.ebuild b/app-backup/borgmatic/borgmatic-1.7.8.ebuild
new file mode 100644
index 000000000000..87cdd1fed96c
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.7.8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+
+# borg is called as an external tool, hence no pythonic stuff
+RDEPEND="app-backup/borgbackup
+ $(python_gen_cond_dep '
+
-
- junghans@gentoo.org
- Christoph Junghans
-
+
chneukirchen/rdumpfs
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index b8169e124f61..d1a82f7b02d0 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/stress/Manifest b/app-benchmarks/stress/Manifest
index a94d6306f29c..800001deaded 100644
--- a/app-benchmarks/stress/Manifest
+++ b/app-benchmarks/stress/Manifest
@@ -1,2 +1 @@
-DIST stress_1.0.5.orig.tar.gz 105766 BLAKE2B 7bc4a1d7739828ccd4b58c814e8ded42cddbd0b226bb29e916fe220835bcfa9dcdb86191bb321247aa98bd0e58791556713770bdeda5dad399aa61f2703a766c SHA512 8ae2b74213e2a6e7d17948b8277bdd6143c135a6cee64fb43d183b10134eaea761981e1d76af86ea4700b2d41598d5ca53b17755e61982ab50802297b139b805
DIST stress_1.0.7.orig.tar.gz 105784 BLAKE2B 9faacbd1bba441be219033d9a51cd970ecadeca4f8b6b637c932b74e8819fd81472164c8c63c606bbbe19b2e4b1b8af008456062a893caa275ecf4ad3207ed70 SHA512 93d5d8708a0abbc7d85585a37cd6085362d3dca7d49d2915c09e7bc151296c4023e2cedd5e190578f7540e666280ba16b4e9a7aa0133f35dde598446252fdccb
diff --git a/app-benchmarks/stress/stress-1.0.5.ebuild b/app-benchmarks/stress/stress-1.0.5.ebuild
deleted file mode 100644
index 2cf842fe3bf4..000000000000
--- a/app-benchmarks/stress/stress-1.0.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A deliberately simple workload generator for POSIX systems"
-HOMEPAGE="https://salsa.debian.org/debian/stress"
-SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="static"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable static)
- )
-
- econf "${myeconfargs[@]}"
-}
diff --git a/app-benchmarks/stress/stress-1.0.7.ebuild b/app-benchmarks/stress/stress-1.0.7.ebuild
index 807518ab15f0..59d1d63cc898 100644
--- a/app-benchmarks/stress/stress-1.0.7.ebuild
+++ b/app-benchmarks/stress/stress-1.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
IUSE="static"
src_prepare() {
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 4242ed660b41..623a0d11b7f7 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index 316424e26428..ee9143b59282 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,2 +1 @@
-DIST cdrdao-1.2.4.tar.bz2 1442181 BLAKE2B e1163b25c165a7acd7ec8c53069794724d93f09a486150255a58985e3fd0a222ba7ac5c124cb7a6991cf440ac701651be38754615fd3d0d295affa93595dc388 SHA512 41f20275ca44ec9003d0e3ed280cc98012353005cda6f544ebfa44f3f79f991845c0ef17af74db9456f1bacc342a7fd48c9e942d757927a4a9ff91808f7bbb09
DIST cdrdao-1.2.4.tar.gz 1603363 BLAKE2B 9c22d21a391b6b1b6ded19f88506acd22e681a43ed91b1c71d20de27ce93cc74381d4efe8574adc929a189143c81f5838ca8d8227ec0e2e05a593f0df9547964 SHA512 decdc9d83fe380a4a05443ac26366eb3288d24bd7ed6c16d006707abb616dab91858a59af6638f2d7a72bc7bb6425dbfddd119ca492d18f07afbb27341b23d0b
diff --git a/app-cdr/cdrdao/cdrdao-1.2.4-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.2.4-r1.ebuild
deleted file mode 100644
index 0695b645b539..000000000000
--- a/app-cdr/cdrdao/cdrdao-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
-HOMEPAGE="http://cdrdao.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="encode mad vorbis"
-
-DEPEND="app-cdr/cdrtools
- encode? ( >=media-sound/lame-3.99 )
- mad? (
- media-libs/libao
- media-libs/libmad
- )
- vorbis? (
- media-libs/libao
- media-libs/libvorbis
- )"
-RDEPEND="${DEPEND}
- !app-cdr/cue2toc"
-BDEPEND="gnome-base/gconf
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${P}-ax_pthread.patch"
- "${FILESDIR}/${P}-wformat-security.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- append-cxxflags -std=c++11
- local myeconfargs=(
- --without-gcdmaster
- $(use_with vorbis ogg-support)
- $(use_with mad mp3-support)
- $(use_with encode lame)
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/app-cdr/cdrdao/cdrdao-1.2.4-r2.ebuild b/app-cdr/cdrdao/cdrdao-1.2.4-r2.ebuild
index 4b9654f2269f..e53adf8b4c31 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.4-r2.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.4-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
IUSE="encode mad vorbis"
DEPEND="app-cdr/cdrtools
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.4-ax_pthread.patch b/app-cdr/cdrdao/files/cdrdao-1.2.4-ax_pthread.patch
deleted file mode 100644
index fe052db02af7..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.4-ax_pthread.patch
+++ /dev/null
@@ -1,418 +0,0 @@
-Use AX_PTHREAD for finding proper pthread flags. Forcibly add these flags
-to CFLAGS, CXXFLAGS and LIBS.
-Also use AM_PROG_AR to detect proper ar
-See also: https://bugs.gentoo.org/548004
-
---- cdrdao-1.2.4/configure.ac
-+++ cdrdao-1.2.4/configure.ac
-@@ -2,6 +2,7 @@
- AC_REVISION($Revision: 1.26 $)dnl
-
- AC_INIT(cdrdao, 1.2.4)
-+AC_CONFIG_MACRO_DIR([m4])
-
- AC_CONFIG_SRCDIR(dao/main.cc)
- AM_INIT_AUTOMAKE
-@@ -32,7 +33,7 @@
- AC_PROG_CPP
- AC_PROG_INSTALL
- AC_PROG_RANLIB
--AC_CHECK_PROG(AR,ar,ar)
-+AM_PROG_AR
- AC_PROG_MAKE_SET
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-
-@@ -113,7 +114,10 @@
- fi
-
- if test "$use_pthreads" = yes; then
-- AC_CHECK_FUNC(pthread_create,have_pthread_std=yes,have_pthread_std=no)
-+ AX_PTHREAD([have_pthread_std=yes],[have_pthread_std=no])
-+ LIBS="$PTHREAD_LIBS $PTHREAD_CFLAGS $LIBS"
-+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+ CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
-
- if test "$have_pthread_std" = yes; then
- AC_DEFINE(USE_POSIX_THREADS,1,"")
---- cdrdao-1.2.4/m4/ax_pthread.m4
-+++ cdrdao-1.2.4/m4/ax_pthread.m4
-@@ -0,0 +1,332 @@
-+# ===========================================================================
-+# http://www.gnu.org/software/autoconf-archive/ax_pthread.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-+#
-+# DESCRIPTION
-+#
-+# This macro figures out how to build C programs using POSIX threads. It
-+# sets the PTHREAD_LIBS output variable to the threads library and linker
-+# flags, and the PTHREAD_CFLAGS output variable to any special C compiler
-+# flags that are needed. (The user can also force certain compiler
-+# flags/libs to be tested by setting these environment variables.)
-+#
-+# Also sets PTHREAD_CC to any special C compiler that is needed for
-+# multi-threaded programs (defaults to the value of CC otherwise). (This
-+# is necessary on AIX to use the special cc_r compiler alias.)
-+#
-+# NOTE: You are assumed to not only compile your program with these flags,
-+# but also link it with them as well. e.g. you should link with
-+# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-+#
-+# If you are only building threads programs, you may wish to use these
-+# variables in your default LIBS, CFLAGS, and CC:
-+#
-+# LIBS="$PTHREAD_LIBS $LIBS"
-+# CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+# CC="$PTHREAD_CC"
-+#
-+# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-+# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
-+# (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-+#
-+# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
-+# PTHREAD_PRIO_INHERIT symbol is defined when compiling with
-+# PTHREAD_CFLAGS.
-+#
-+# ACTION-IF-FOUND is a list of shell commands to run if a threads library
-+# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
-+# is not found. If ACTION-IF-FOUND is not specified, the default action
-+# will define HAVE_PTHREAD.
-+#
-+# Please let the authors know if this macro fails on any platform, or if
-+# you have any other suggestions or comments. This macro was based on work
-+# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
-+# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
-+# Alejandro Forero Cuervo to the autoconf macro repository. We are also
-+# grateful for the helpful feedback of numerous users.
-+#
-+# Updated for Autoconf 2.68 by Daniel Richard G.
-+#
-+# LICENSE
-+#
-+# Copyright (c) 2008 Steven G. Johnson
-+# Copyright (c) 2011 Daniel Richard G.
-+#
-+# This program is free software: you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by the
-+# Free Software Foundation, either version 3 of the License, or (at your
-+# option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-+# Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License along
-+# with this program. If not, see .
-+#
-+# As a special exception, the respective Autoconf Macro's copyright owner
-+# gives unlimited permission to copy, distribute and modify the configure
-+# scripts that are the output of Autoconf when processing the Macro. You
-+# need not follow the terms of the GNU General Public License when using
-+# or distributing such scripts, even though portions of the text of the
-+# Macro appear in them. The GNU General Public License (GPL) does govern
-+# all other use of the material that constitutes the Autoconf Macro.
-+#
-+# This special exception to the GPL applies to versions of the Autoconf
-+# Macro released by the Autoconf Archive. When you make and distribute a
-+# modified version of the Autoconf Macro, you may extend this special
-+# exception to the GPL to apply to your modified version as well.
-+
-+#serial 21
-+
-+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
-+AC_DEFUN([AX_PTHREAD], [
-+AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_LANG_PUSH([C])
-+ax_pthread_ok=no
-+
-+# We used to check for pthread.h first, but this fails if pthread.h
-+# requires special compiler flags (e.g. on True64 or Sequent).
-+# It gets checked for in the link test anyway.
-+
-+# First of all, check if the user has set any of the PTHREAD_LIBS,
-+# etcetera environment variables, and if threads linking works using
-+# them:
-+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
-+ save_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+ save_LIBS="$LIBS"
-+ LIBS="$PTHREAD_LIBS $LIBS"
-+ AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
-+ AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes])
-+ AC_MSG_RESULT([$ax_pthread_ok])
-+ if test x"$ax_pthread_ok" = xno; then
-+ PTHREAD_LIBS=""
-+ PTHREAD_CFLAGS=""
-+ fi
-+ LIBS="$save_LIBS"
-+ CFLAGS="$save_CFLAGS"
-+fi
-+
-+# We must check for the threads library under a number of different
-+# names; the ordering is very important because some systems
-+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-+# libraries is broken (non-POSIX).
-+
-+# Create a list of thread flags to try. Items starting with a "-" are
-+# C compiler flags, and other items are library names, except for "none"
-+# which indicates that we try without any flags at all, and "pthread-config"
-+# which is a program returning the flags for the Pth emulation library.
-+
-+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-+
-+# The ordering *is* (sometimes) important. Some notes on the
-+# individual items follow:
-+
-+# pthreads: AIX (must check this before -lpthread)
-+# none: in case threads are in libc; should be tried before -Kthread and
-+# other compiler flags to prevent continual compiler warnings
-+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-+# -pthreads: Solaris/gcc
-+# -mthreads: Mingw32/gcc, Lynx/gcc
-+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-+# doesn't hurt to check since this sometimes defines pthreads too;
-+# also defines -D_REENTRANT)
-+# ... -mt is also the pthreads flag for HP/aCC
-+# pthread: Linux, etcetera
-+# --thread-safe: KAI C++
-+# pthread-config: use pthread-config program (for GNU Pth library)
-+
-+case ${host_os} in
-+ solaris*)
-+
-+ # On Solaris (at least, for some versions), libc contains stubbed
-+ # (non-functional) versions of the pthreads routines, so link-based
-+ # tests will erroneously succeed. (We need to link with -pthreads/-mt/
-+ # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
-+ # a function called by this macro, so we could check for that, but
-+ # who knows whether they'll stub that too in a future libc.) So,
-+ # we'll just look for -pthreads and -lpthread first:
-+
-+ ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
-+ ;;
-+
-+ darwin*)
-+ ax_pthread_flags="-pthread $ax_pthread_flags"
-+ ;;
-+esac
-+
-+# Clang doesn't consider unrecognized options an error unless we specify
-+# -Werror. We throw in some extra Clang-specific options to ensure that
-+# this doesn't happen for GCC, which also accepts -Werror.
-+
-+AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
-+save_CFLAGS="$CFLAGS"
-+ax_pthread_extra_flags="-Werror"
-+CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
-+ [AC_MSG_RESULT([yes])],
-+ [ax_pthread_extra_flags=
-+ AC_MSG_RESULT([no])])
-+CFLAGS="$save_CFLAGS"
-+
-+if test x"$ax_pthread_ok" = xno; then
-+for flag in $ax_pthread_flags; do
-+
-+ case $flag in
-+ none)
-+ AC_MSG_CHECKING([whether pthreads work without any flags])
-+ ;;
-+
-+ -*)
-+ AC_MSG_CHECKING([whether pthreads work with $flag])
-+ PTHREAD_CFLAGS="$flag"
-+ ;;
-+
-+ pthread-config)
-+ AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
-+ if test x"$ax_pthread_config" = xno; then continue; fi
-+ PTHREAD_CFLAGS="`pthread-config --cflags`"
-+ PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-+ ;;
-+
-+ *)
-+ AC_MSG_CHECKING([for the pthreads library -l$flag])
-+ PTHREAD_LIBS="-l$flag"
-+ ;;
-+ esac
-+
-+ save_LIBS="$LIBS"
-+ save_CFLAGS="$CFLAGS"
-+ LIBS="$PTHREAD_LIBS $LIBS"
-+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
-+
-+ # Check for various functions. We must include pthread.h,
-+ # since some functions may be macros. (On the Sequent, we
-+ # need a special flag -Kthread to make this header compile.)
-+ # We check for pthread_join because it is in -lpthread on IRIX
-+ # while pthread_create is in libc. We check for pthread_attr_init
-+ # due to DEC craziness with -lpthreads. We check for
-+ # pthread_cleanup_push because it is one of the few pthread
-+ # functions on Solaris that doesn't have a non-functional libc stub.
-+ # We try pthread_create on general principles.
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include
-+ static void routine(void *a) { a = 0; }
-+ static void *start_routine(void *a) { return a; }],
-+ [pthread_t th; pthread_attr_t attr;
-+ pthread_create(&th, 0, start_routine, 0);
-+ pthread_join(th, 0);
-+ pthread_attr_init(&attr);
-+ pthread_cleanup_push(routine, 0);
-+ pthread_cleanup_pop(0) /* ; */])],
-+ [ax_pthread_ok=yes],
-+ [])
-+
-+ LIBS="$save_LIBS"
-+ CFLAGS="$save_CFLAGS"
-+
-+ AC_MSG_RESULT([$ax_pthread_ok])
-+ if test "x$ax_pthread_ok" = xyes; then
-+ break;
-+ fi
-+
-+ PTHREAD_LIBS=""
-+ PTHREAD_CFLAGS=""
-+done
-+fi
-+
-+# Various other checks:
-+if test "x$ax_pthread_ok" = xyes; then
-+ save_LIBS="$LIBS"
-+ LIBS="$PTHREAD_LIBS $LIBS"
-+ save_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+
-+ # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-+ AC_MSG_CHECKING([for joinable pthread attribute])
-+ attr_name=unknown
-+ for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ],
-+ [int attr = $attr; return attr /* ; */])],
-+ [attr_name=$attr; break],
-+ [])
-+ done
-+ AC_MSG_RESULT([$attr_name])
-+ if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
-+ AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
-+ [Define to necessary symbol if this constant
-+ uses a non-standard name on your system.])
-+ fi
-+
-+ AC_MSG_CHECKING([if more special flags are required for pthreads])
-+ flag=no
-+ case ${host_os} in
-+ aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
-+ osf* | hpux*) flag="-D_REENTRANT";;
-+ solaris*)
-+ if test "$GCC" = "yes"; then
-+ flag="-D_REENTRANT"
-+ else
-+ # TODO: What about Clang on Solaris?
-+ flag="-mt -D_REENTRANT"
-+ fi
-+ ;;
-+ esac
-+ AC_MSG_RESULT([$flag])
-+ if test "x$flag" != xno; then
-+ PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
-+ fi
-+
-+ AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
-+ [ax_cv_PTHREAD_PRIO_INHERIT], [
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]],
-+ [[int i = PTHREAD_PRIO_INHERIT;]])],
-+ [ax_cv_PTHREAD_PRIO_INHERIT=yes],
-+ [ax_cv_PTHREAD_PRIO_INHERIT=no])
-+ ])
-+ AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
-+ [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])
-+
-+ LIBS="$save_LIBS"
-+ CFLAGS="$save_CFLAGS"
-+
-+ # More AIX lossage: compile with *_r variant
-+ if test "x$GCC" != xyes; then
-+ case $host_os in
-+ aix*)
-+ AS_CASE(["x/$CC"],
-+ [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
-+ [#handle absolute path differently from PATH based program lookup
-+ AS_CASE(["x$CC"],
-+ [x/*],
-+ [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
-+ [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
-+ ;;
-+ esac
-+ fi
-+fi
-+
-+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
-+
-+AC_SUBST([PTHREAD_LIBS])
-+AC_SUBST([PTHREAD_CFLAGS])
-+AC_SUBST([PTHREAD_CC])
-+
-+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-+if test x"$ax_pthread_ok" = xyes; then
-+ ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
-+ :
-+else
-+ ax_pthread_ok=no
-+ $2
-+fi
-+AC_LANG_POP
-+])dnl AX_PTHREAD
---- cdrdao-1.2.4/m4/gconf-2.m4
-+++ cdrdao-1.2.4/m4/gconf-2.m4
-@@ -0,0 +1,44 @@
-+dnl AM_GCONF_SOURCE_2
-+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-+dnl (i.e. pass to gconftool-2
-+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-+dnl you should install foo.schemas files
-+dnl
-+
-+AC_DEFUN([AM_GCONF_SOURCE_2],
-+[
-+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-+ else
-+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-+ fi
-+
-+ AC_ARG_WITH([gconf-source],
-+ AC_HELP_STRING([--with-gconf-source=sourceaddress],
-+ [Config database for installing schema files.]),
-+ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-+
-+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-+
-+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-+ fi
-+
-+ AC_ARG_WITH([gconf-schema-file-dir],
-+ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-+ [Directory for installing schema files.]),
-+ [GCONF_SCHEMA_FILE_DIR="$withval"],)
-+
-+ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-+
-+ AC_ARG_ENABLE(schemas-install,
-+ AC_HELP_STRING([--disable-schemas-install],
-+ [Disable the schemas installation]),
-+ [case ${enableval} in
-+ yes|no) ;;
-+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
-+ esac])
-+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-+])
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 678f3b09c5d5..19dffbd65be9 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/ccid/ccid-1.5.1.ebuild b/app-crypt/ccid/ccid-1.5.1.ebuild
index 46740fd43c9b..d2baa0389016 100644
--- a/app-crypt/ccid/ccid-1.5.1.ebuild
+++ b/app-crypt/ccid/ccid-1.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-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="twinserial +usb"
RDEPEND="
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 21d72c316855..f0ce2692a84b 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/emacs/emacs-18.59-r15.ebuild b/app-editors/emacs/emacs-18.59-r15.ebuild
index 6822620a67f8..7844e27bcb93 100644
--- a/app-editors/emacs/emacs-18.59-r15.ebuild
+++ b/app-editors/emacs/emacs-18.59-r15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -134,8 +134,7 @@ src_install() {
dosym -r /usr/share/info/emacs-${SLOT} ${basedir}/info
docompress -x /usr/share/info
- # move Info dir to avoid collisions with the dir file generated by portage
- mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die
+ # dissuade Portage from removing our dir file #257260
touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
dodir /var/lib/emacs
@@ -146,10 +145,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
- if [[ -d "${D}"/usr/share/info ]]; then
- mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die
- fi
+ # verify that the PM hasn't removed our Info directory index #257260
+ local infodir="${ED}/usr/share/info/emacs-${SLOT}"
+ [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
}
pkg_postinst() {
diff --git a/app-editors/emacs/emacs-25.3-r16.ebuild b/app-editors/emacs/emacs-25.3-r16.ebuild
index 1e7a6cd64d8b..c30c446b5c38 100644
--- a/app-editors/emacs/emacs-25.3-r16.ebuild
+++ b/app-editors/emacs/emacs-25.3-r16.ebuild
@@ -240,11 +240,9 @@ src_install() {
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
|| die "moving emacs man page failed"
- # move info dir to avoid collisions with the dir file generated by portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
- || die "moving info dir failed"
+ # dissuade Portage from removing our dir file #257260
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+ docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
# movemail must be setgid mail
fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
@@ -330,10 +328,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
- if [[ -d ${ED}/usr/share/info ]]; then
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
- fi
+ # verify that the PM hasn't removed our Info directory index #257260
+ local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+ [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
}
pkg_postinst() {
diff --git a/app-editors/emacs/emacs-26.3-r13.ebuild b/app-editors/emacs/emacs-26.3-r13.ebuild
index 10482650084c..908d736cf0d5 100644
--- a/app-editors/emacs/emacs-26.3-r13.ebuild
+++ b/app-editors/emacs/emacs-26.3-r13.ebuild
@@ -249,10 +249,9 @@ src_install() {
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
- # move info dir to avoid collisions with the dir file generated by portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+ # dissuade Portage from removing our dir file #257260
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+ docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
# movemail must be setgid mail
if ! use mailutils; then
@@ -350,10 +349,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
- if [[ -d ${ED}/usr/share/info ]]; then
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
- fi
+ # verify that the PM hasn't removed our Info directory index #257260
+ local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+ [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
}
pkg_postinst() {
diff --git a/app-editors/emacs/emacs-27.2-r11.ebuild b/app-editors/emacs/emacs-27.2-r11.ebuild
index bbe0dd17f23d..314d7da47ad8 100644
--- a/app-editors/emacs/emacs-27.2-r11.ebuild
+++ b/app-editors/emacs/emacs-27.2-r11.ebuild
@@ -307,10 +307,9 @@ src_install() {
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
- # move info dir to avoid collisions with the dir file generated by portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+ # dissuade Portage from removing our dir file #257260
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+ docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
# movemail must be setgid mail
if ! use mailutils; then
@@ -413,10 +412,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
- if [[ -d ${ED}/usr/share/info ]]; then
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
- fi
+ # verify that the PM hasn't removed our Info directory index #257260
+ local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+ [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
}
pkg_postinst() {
diff --git a/app-editors/emacs/emacs-28.2-r6.ebuild b/app-editors/emacs/emacs-28.2-r6.ebuild
index 31ef2328e4a8..a86b866e289c 100644
--- a/app-editors/emacs/emacs-28.2-r6.ebuild
+++ b/app-editors/emacs/emacs-28.2-r6.ebuild
@@ -386,10 +386,9 @@ src_install() {
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
- # move info dir to avoid collisions with the dir file generated by portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+ # dissuade Portage from removing our dir file #257260
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+ docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
# movemail must be setgid mail
if ! use mailutils; then
@@ -492,10 +491,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
- if [[ -d ${ED}/usr/share/info ]]; then
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
- fi
+ # verify that the PM hasn't removed our Info directory index #257260
+ local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+ [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
}
pkg_postinst() {
diff --git a/app-editors/emacs/emacs-28.3_rc1.ebuild b/app-editors/emacs/emacs-28.3_rc1.ebuild
index 0a3be1463dbd..f27c55f138e8 100644
--- a/app-editors/emacs/emacs-28.3_rc1.ebuild
+++ b/app-editors/emacs/emacs-28.3_rc1.ebuild
@@ -403,10 +403,9 @@ src_install() {
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
- # move info dir to avoid collisions with the dir file generated by portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+ # dissuade Portage from removing our dir file #257260
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+ docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
# movemail must be setgid mail
if ! use mailutils; then
@@ -509,10 +508,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
- if [[ -d ${ED}/usr/share/info ]]; then
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
- fi
+ # verify that the PM hasn't removed our Info directory index #257260
+ local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+ [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
}
pkg_postinst() {
diff --git a/app-editors/emacs/emacs-29.0.9999-r1.ebuild b/app-editors/emacs/emacs-29.0.9999-r1.ebuild
index b06274d3a565..16e932a02739 100644
--- a/app-editors/emacs/emacs-29.0.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-29.0.9999-r1.ebuild
@@ -433,10 +433,9 @@ src_install() {
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
- # move info dir to avoid collisions with the dir file generated by portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+ # dissuade Portage from removing our dir file #257260
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+ docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
# movemail must be setgid mail
if ! use mailutils; then
@@ -539,10 +538,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
- if [[ -d ${ED}/usr/share/info ]]; then
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
- fi
+ # verify that the PM hasn't removed our Info directory index #257260
+ local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+ [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
}
pkg_postinst() {
diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild
index 0a03ca0c6d54..257e0e3e5c92 100644
--- a/app-editors/emacs/emacs-30.0.9999.ebuild
+++ b/app-editors/emacs/emacs-30.0.9999.ebuild
@@ -433,10 +433,9 @@ src_install() {
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
- # move info dir to avoid collisions with the dir file generated by portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+ # dissuade Portage from removing our dir file #257260
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+ docompress -x /usr/share/info/${EMACS_SUFFIX}/dir
# movemail must be setgid mail
if ! use mailutils; then
@@ -539,10 +538,9 @@ src_install() {
}
pkg_preinst() {
- # move Info dir file to correct name
- if [[ -d ${ED}/usr/share/info ]]; then
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
- fi
+ # verify that the PM hasn't removed our Info directory index #257260
+ local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}"
+ [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die
}
pkg_postinst() {
diff --git a/app-editors/gnome-latex/gnome-latex-3.44.0.ebuild b/app-editors/gnome-latex/gnome-latex-3.44.0.ebuild
index e273f490a551..2a2cbcd1fde6 100644
--- a/app-editors/gnome-latex/gnome-latex-3.44.0.ebuild
+++ b/app-editors/gnome-latex/gnome-latex-3.44.0.ebuild
@@ -45,6 +45,5 @@ BDEPEND="
src_configure() {
gnome2_src_configure \
$(use_enable introspection) \
- --enable-dconf_migration \
- --enable-vala=no
+ --enable-dconf_migration
}
diff --git a/app-editors/gvim/gvim-9.0.1000.ebuild b/app-editors/gvim/gvim-9.0.1000.ebuild
index 708d13e40470..5685854ed305 100644
--- a/app-editors/gvim/gvim-9.0.1000.ebuild
+++ b/app-editors/gvim/gvim-9.0.1000.ebuild
@@ -90,6 +90,14 @@ fi
# various failures (bugs #630042 and #682320)
RESTRICT="test"
+# platform-specific checks (bug #898450):
+# - acl() -- Solaris
+# - statacl() -- AIX
+QA_CONFIG_IMPL_DECL_SKIP=(
+ 'acl'
+ 'statacl'
+)
+
pkg_setup() {
# people with broken alphabets run into trouble. bug 82186.
unset LANG LC_ALL
diff --git a/app-editors/gvim/gvim-9.0.1157.ebuild b/app-editors/gvim/gvim-9.0.1157.ebuild
index 708d13e40470..5685854ed305 100644
--- a/app-editors/gvim/gvim-9.0.1157.ebuild
+++ b/app-editors/gvim/gvim-9.0.1157.ebuild
@@ -90,6 +90,14 @@ fi
# various failures (bugs #630042 and #682320)
RESTRICT="test"
+# platform-specific checks (bug #898450):
+# - acl() -- Solaris
+# - statacl() -- AIX
+QA_CONFIG_IMPL_DECL_SKIP=(
+ 'acl'
+ 'statacl'
+)
+
pkg_setup() {
# people with broken alphabets run into trouble. bug 82186.
unset LANG LC_ALL
diff --git a/app-editors/gvim/gvim-9.0.1363.ebuild b/app-editors/gvim/gvim-9.0.1363.ebuild
index cba104363a07..c6e8ca77a51c 100644
--- a/app-editors/gvim/gvim-9.0.1363.ebuild
+++ b/app-editors/gvim/gvim-9.0.1363.ebuild
@@ -91,6 +91,14 @@ fi
# various failures (bugs #630042 and #682320)
RESTRICT="test"
+# platform-specific checks (bug #898450):
+# - acl() -- Solaris
+# - statacl() -- AIX
+QA_CONFIG_IMPL_DECL_SKIP=(
+ 'acl'
+ 'statacl'
+)
+
pkg_setup() {
# people with broken alphabets run into trouble. bug 82186.
unset LANG LC_ALL
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index 01f283c88448..63a3e37a2a0d 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -90,6 +90,14 @@ fi
# various failures (bugs #630042 and #682320)
RESTRICT="test"
+# platform-specific checks (bug #898450):
+# - acl() -- Solaris
+# - statacl() -- AIX
+QA_CONFIG_IMPL_DECL_SKIP=(
+ 'acl'
+ 'statacl'
+)
+
pkg_setup() {
# people with broken alphabets run into trouble. bug 82186.
unset LANG LC_ALL
diff --git a/app-editors/nano/nano-7.2.ebuild b/app-editors/nano/nano-7.2.ebuild
index 4be5f807be92..766043f09add 100644
--- a/app-editors/nano/nano-7.2.ebuild
+++ b/app-editors/nano/nano-7.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
else
MY_P="${PN}-${PV/_}"
SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/retext/retext-8.0.0.ebuild b/app-editors/retext/retext-8.0.0.ebuild
index 8ed93a38001b..ba2426848d96 100644
--- a/app-editors/retext/retext-8.0.0.ebuild
+++ b/app-editors/retext/retext-8.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
# Please don't add pypy support before testing if it's actually supported. The
# old compat matrix is no longer accessible as of 2021-02-13 but stated back
# in 2020-07-05 that PyQt5 was explicitly not supported.
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1 optfeature qmake-utils virtualx xdg
diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index cf7bf4d8be84..ba2426848d96 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
# Please don't add pypy support before testing if it's actually supported. The
# old compat matrix is no longer accessible as of 2021-02-13 but stated back
# in 2020-07-05 that PyQt5 was explicitly not supported.
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1 optfeature qmake-utils virtualx xdg
diff --git a/app-editors/vim-core/vim-core-9.0.1000.ebuild b/app-editors/vim-core/vim-core-9.0.1000.ebuild
index 98d156f8fe5e..b67954888b35 100644
--- a/app-editors/vim-core/vim-core-9.0.1000.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.1000.ebuild
@@ -38,6 +38,14 @@ if [[ ${PV} != 9999* ]]; then
)
fi
+# platform-specific checks (bug #898406):
+# - acl() -- Solaris
+# - statacl() -- AIX
+QA_CONFIG_IMPL_DECL_SKIP=(
+ 'acl'
+ 'statacl'
+)
+
pkg_setup() {
# people with broken alphabets run into trouble. bug #82186.
unset LANG LC_ALL
diff --git a/app-editors/vim-core/vim-core-9.0.1157.ebuild b/app-editors/vim-core/vim-core-9.0.1157.ebuild
index f0e509e7c901..0f32efa8165b 100644
--- a/app-editors/vim-core/vim-core-9.0.1157.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.1157.ebuild
@@ -38,6 +38,14 @@ if [[ ${PV} != 9999* ]]; then
)
fi
+# platform-specific checks (bug #898406):
+# - acl() -- Solaris
+# - statacl() -- AIX
+QA_CONFIG_IMPL_DECL_SKIP=(
+ 'acl'
+ 'statacl'
+)
+
pkg_setup() {
# people with broken alphabets run into trouble. bug #82186.
unset LANG LC_ALL
diff --git a/app-editors/vim-core/vim-core-9.0.1363.ebuild b/app-editors/vim-core/vim-core-9.0.1363.ebuild
index 64e63ae0b84e..c2cb2313c925 100644
--- a/app-editors/vim-core/vim-core-9.0.1363.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.1363.ebuild
@@ -38,6 +38,14 @@ if [[ ${PV} != 9999* ]]; then
)
fi
+# platform-specific checks (bug #898406):
+# - acl() -- Solaris
+# - statacl() -- AIX
+QA_CONFIG_IMPL_DECL_SKIP=(
+ 'acl'
+ 'statacl'
+)
+
pkg_setup() {
# people with broken alphabets run into trouble. bug #82186.
unset LANG LC_ALL
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index 64e63ae0b84e..c2cb2313c925 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -38,6 +38,14 @@ if [[ ${PV} != 9999* ]]; then
)
fi
+# platform-specific checks (bug #898406):
+# - acl() -- Solaris
+# - statacl() -- AIX
+QA_CONFIG_IMPL_DECL_SKIP=(
+ 'acl'
+ 'statacl'
+)
+
pkg_setup() {
# people with broken alphabets run into trouble. bug #82186.
unset LANG LC_ALL
diff --git a/app-editors/vim/vim-9.0.1000.ebuild b/app-editors/vim/vim-9.0.1000.ebuild
index c3de4d218ee4..556785a2b235 100644
--- a/app-editors/vim/vim-9.0.1000.ebuild
+++ b/app-editors/vim/vim-9.0.1000.ebuild
@@ -75,6 +75,14 @@ if [[ ${PV} != 9999* ]]; then
)
fi
+# platform-specific checks (bug #898452):
+# - acl() -- Solaris
+# - statacl() -- AIX
+QA_CONFIG_IMPL_DECL_SKIP=(
+ 'acl'
+ 'statacl'
+)
+
pkg_setup() {
# people with broken alphabets run into trouble. bug #82186.
unset LANG LC_ALL
diff --git a/app-editors/vim/vim-9.0.1157.ebuild b/app-editors/vim/vim-9.0.1157.ebuild
index ebd71300ee4c..c4bd8dd86b3b 100644
--- a/app-editors/vim/vim-9.0.1157.ebuild
+++ b/app-editors/vim/vim-9.0.1157.ebuild
@@ -75,6 +75,14 @@ if [[ ${PV} != 9999* ]]; then
)
fi
+# platform-specific checks (bug #898452):
+# - acl() -- Solaris
+# - statacl() -- AIX
+QA_CONFIG_IMPL_DECL_SKIP=(
+ 'acl'
+ 'statacl'
+)
+
pkg_setup() {
# people with broken alphabets run into trouble. bug #82186.
unset LANG LC_ALL
diff --git a/app-editors/vim/vim-9.0.1363.ebuild b/app-editors/vim/vim-9.0.1363.ebuild
index 40a78fc412a4..0e985e6afed2 100644
--- a/app-editors/vim/vim-9.0.1363.ebuild
+++ b/app-editors/vim/vim-9.0.1363.ebuild
@@ -75,6 +75,14 @@ if [[ ${PV} != 9999* ]]; then
)
fi
+# platform-specific checks (bug #898452):
+# - acl() -- Solaris
+# - statacl() -- AIX
+QA_CONFIG_IMPL_DECL_SKIP=(
+ 'acl'
+ 'statacl'
+)
+
pkg_setup() {
# people with broken alphabets run into trouble. bug #82186.
unset LANG LC_ALL
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 40a78fc412a4..0e985e6afed2 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -75,6 +75,14 @@ if [[ ${PV} != 9999* ]]; then
)
fi
+# platform-specific checks (bug #898452):
+# - acl() -- Solaris
+# - statacl() -- AIX
+QA_CONFIG_IMPL_DECL_SKIP=(
+ 'acl'
+ 'statacl'
+)
+
pkg_setup() {
# people with broken alphabets run into trouble. bug #82186.
unset LANG LC_ALL
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 4640868a76cb..b5d151dc96ed 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/cmake-font-lock/Manifest b/app-emacs/cmake-font-lock/Manifest
index 85cbf633d185..0150c5f7efd3 100644
--- a/app-emacs/cmake-font-lock/Manifest
+++ b/app-emacs/cmake-font-lock/Manifest
@@ -1 +1,2 @@
DIST cmake-font-lock-0.1.12.tar.gz 225598 BLAKE2B f3bf11a804d58a92cc09c7e657a66a4f8b56c072b6cfa23184124e931e7a1f238818ac238c6f5d7fd368879bef155c12623837a2b40eb87ae28e7ad5c7bf8d44 SHA512 8ad4d03bfabb0aa9077fc5e8b1444b862934c0df49e4edd673e9f3c1fff702245e796f02e26850ac26fc5ae9134a0522a2648d1d8b5c844316905a3bdcfa2fa7
+DIST cmake-font-lock-0.1.13.tar.gz 226073 BLAKE2B 3abb88fb770b7913e649ea84147f02c201e4fb5e8a7633184b31236789a6e525beb3142e3cef643daa6ec94bd247ad5dccb37d8af239cb1cd56b30065173ba94 SHA512 8d0eef222b38e5fb8e345431276c12de179f313a2a94acfb58aa4ca5ada356f332a8ce4d6436140b98422dc4375c271de626ffaf5fde1f41f30532c4e52350c9
diff --git a/app-emacs/cmake-font-lock/cmake-font-lock-0.1.13.ebuild b/app-emacs/cmake-font-lock/cmake-font-lock-0.1.13.ebuild
new file mode 100644
index 000000000000..10fedf0c7d69
--- /dev/null
+++ b/app-emacs/cmake-font-lock/cmake-font-lock-0.1.13.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26
+
+inherit elisp
+
+DESCRIPTION="Advanced, type aware, highlight support for CMake"
+HOMEPAGE="https://github.com/Lindydancer/cmake-font-lock"
+SRC_URI="https://github.com/Lindydancer/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-util/cmake[emacs]"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp_src_compile
+ elisp-make-autoload-file
+}
diff --git a/app-emacs/compat/Manifest b/app-emacs/compat/Manifest
index f206a8ad7988..92921480d298 100644
--- a/app-emacs/compat/Manifest
+++ b/app-emacs/compat/Manifest
@@ -1,6 +1,6 @@
-DIST compat-28.1.1.3.tar.gz 72597 BLAKE2B 82186713370fed7f97eb057cb330d77c1d758224ad37c0b7fbbd21221b0d2ffd68be805483f3e9577866f02079c83a5686918c87a1ed7c67c9acdd64aa3a560b SHA512 d65e5ce666607cd6d26cf771d6878caeb6641aff0fc924ec901955c1a03b6fe42e3527220448fa92a8d6c3f5bd65e6f915ed4ada1be01a29d7919f916826e48f
DIST compat-28.1.2.2.tar.gz 82479 BLAKE2B 154104a3d1cf953f712de357d21736d648289dbdaccb0f9ca5cbd44cb1e41b9b7b4b52394548658b47216f9205f28d2020b015d22b5d0c4df63c79794ddfc56e SHA512 65cafbf4d48815f447e412c4dbd87c5bd3357df5302660a5296582648926f8e3fe96b4b90b53674f18be8affe66af95c8db7e58d7a9dd63d2b57983962e5a53c
DIST compat-29.1.1.0.tar.gz 94072 BLAKE2B 675f0bbf4411fb0d2c2e8f77bcd62dbe56da1f052bd6e390dade0c8075eaa480bb387280a29ae09396a2f4bf27746ae1065d38dd1b7882b9c8c0ec3a4eb776e5 SHA512 5c7b093314cd8f8d8cbab4f470a64d3f104d0e79d2881f2f2309700c6fe5f58a72a8a65379868edba33c0b6af1d43f1474e2fefc65c033f39981d29fca35259a
DIST compat-29.1.3.2.tar.gz 117624 BLAKE2B 340f9e5c31770370e1a7320c31d81bcd5e723c80fd1e178f852dfc4213c48387364b7ef05babd3a46fd71943d4c1c88ab76911d509be69b0993cf6e81f36abc2 SHA512 f5b16ebad7b9701548d605d2e015c8ced65c374ae8ab87e9c34a64be9f018ef909c6b775e7df0ce3b92827c7556a1f754a300ed25db1f3c6299a63f17694d08d
DIST compat-29.1.3.3.tar.gz 124534 BLAKE2B 680a404a4819ebbd95f94e2112f8fe3e08cd7c47204319f231c844bdc064153e7df0f653ac9614e6b6185f30b4e82b52aeb8317d74f5aa1c89252c4e6b6afa52 SHA512 fb69e2cff11daea1e3ba6a4755dccb81850c0e64b335978c5a30cb8236108ae369149d8f2e04746884281c01535aba6e6c5ac3c319497d511ecdd090bed83510
DIST compat-29.1.3.4.tar.gz 125753 BLAKE2B d757ea33ebf5b75c37bf3de5d70da2e4c1cf17bfea34d55fe6a06ffe6505632f5984a91e40b0e951fc4e5460fd98d3ac028c930a9f5f4c8adf381213d7d2a486 SHA512 c33aafcc22cfd158ee546a08b42d1cbd02b0687a6c28ecded991f8baafd2e20216adc3703c3c257c6e32e04da97dcccbb5db528c10d51a53be13ddd778f175bb
+DIST compat-29.1.4.0.tar.gz 127066 BLAKE2B e070ee6f64ad8a0ead91e8ef5fb6bdad95e4f0a8d16f8e513fcd60a91714f0fe2d8d084a23be5d6421d7129c603186db5ec80af3f2725f288e15c846c571ea3f SHA512 027341e06ab9f3c6c109a1bfee513b7ac1b472ed9e7002f731be2fa944920ec6805a928f69c7369ab98c818cee87dd3dfe0c217a4595752701f9939171f9f4de
diff --git a/app-emacs/compat/compat-28.1.1.3.ebuild b/app-emacs/compat/compat-29.1.4.0.ebuild
similarity index 78%
rename from app-emacs/compat/compat-28.1.1.3.ebuild
rename to app-emacs/compat/compat-29.1.4.0.ebuild
index 32c0bd9c7966..459edf66eea1 100644
--- a/app-emacs/compat/compat-28.1.1.3.ebuild
+++ b/app-emacs/compat/compat-29.1.4.0.ebuild
@@ -3,20 +3,19 @@
EAPI=8
-COMMIT=2c3233c0e09ef34176787b6e3da4319751ad91e7
-NEED_EMACS=24
+NEED_EMACS=24.4
inherit elisp
DESCRIPTION="Compatibility libraries for Emacs"
-HOMEPAGE="https://git.sr.ht/~pkal/compat/"
-SRC_URI="https://git.sr.ht/~pkal/${PN}/archive/${COMMIT}.tar.gz
+HOMEPAGE="https://github.com/emacs-compat/compat/
+ https://git.sr.ht/~pkal/compat/"
+SRC_URI="https://github.com/emacs-compat/${PN}/archive/${PV}.tar.gz
-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${COMMIT}
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
BDEPEND="sys-apps/texinfo"
diff --git a/app-emacs/eglot/Manifest b/app-emacs/eglot/Manifest
index 5a085a9ce376..22fa75572fe9 100644
--- a/app-emacs/eglot/Manifest
+++ b/app-emacs/eglot/Manifest
@@ -1,3 +1,4 @@
+DIST eglot-1.11.tar.xz 36900 BLAKE2B 20496e37944127c0e209762d2455fad01e6578fd1fa8350cc1a6782ed3e5dc11b09f8b737cd97d5439ab7ef67caa5cdf725d53d2e9e91bbca10223106a9073ad SHA512 c258c89d8c81b1c1df8ea9798c120a7534c174ce435a4551f503c7477520619ac08bd627372033ed1740dfc67bf7e8004751259769844d6be9adc9411d8ae5ac
DIST eglot-1.6.tar.gz 288078 BLAKE2B a2214d216d0eeaca32d974c6686696dfcf141b3384741bc8cce0d02abb508eb5713933bc227d12a07f4b87fc34601431845b1b8e519538ae04ecc74b24db4004 SHA512 51227c8e2b0a1dd9a63ededbea592f01616ff728c34c330400c078212fef3f3e747e6dd30ba312523cbe60c7ea663a7af9d83300210cf331ea6162d2db5c7e41
DIST eglot-1.8.tar.gz 302450 BLAKE2B 7247b11adaf9a65a2e071ca17b55038fe85f5842fb4155b44dbfa82bae5774e4cd2f7a5557d40cb1a7ab7f554233f15abe297e10568a1630b464ab6a600d978f SHA512 0295eff6dfbbf9d7a82349b8e5ed9e7dad700f2f0bfcab879d906e30bfbb4d28b8779fd9076108ac9b1594a60ca5e30c5035e2f8ceae44add99c28a843027609
DIST eglot-1.9.tar.gz 316541 BLAKE2B 5b9f188ae3f2b26fd7bb95aeb3095fbf5a78f6a15eeccaceaf947f5f91e78253622d2c81d5e57f11762c0370baf9d6c856a4f770c2652840d750f98ee780b418 SHA512 961399e0877a09bd292424715c3fac86e7750e144ba302e61262925b6ded1d30c6ebf3e63067b27b56fa2062461a947425951ac5538e25312d179fa20bd68b79
diff --git a/app-emacs/eglot/eglot-1.11.ebuild b/app-emacs/eglot/eglot-1.11.ebuild
new file mode 100644
index 000000000000..4c3f5fa8f297
--- /dev/null
+++ b/app-emacs/eglot/eglot-1.11.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.3
+
+inherit elisp
+
+DESCRIPTION="A minimal Emacs LSP client"
+HOMEPAGE="https://github.com/joaotavora/eglot/
+ https://elpa.gnu.org/packages/eglot.html"
+SRC_URI="https://dev.gentoo.org/~xgqt/distfiles/repackaged/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-emacs/external-completion"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+ elisp-make-autoload-file "${S}"/${PN}-autoload.el "${S}"/
+ elisp_src_install
+}
diff --git a/app-emacs/external-completion/Manifest b/app-emacs/external-completion/Manifest
new file mode 100644
index 000000000000..2c429c250531
--- /dev/null
+++ b/app-emacs/external-completion/Manifest
@@ -0,0 +1 @@
+DIST external-completion-0.1.tar.xz 3292 BLAKE2B c89929bb474f8d6d8a9b82d25a52591b0b84a10c25b217607d7d5438f99979c8fb50ea6c1278a295292bca14bdce385bcf727d2d4715ea1f280b00b15c898232 SHA512 beda4c0a57807bd2fb6944a8abfafd5801c6b32a7270e76395ad720a76fc0b27f73fb5e5ff60659add43805a715372d60687d5be1cee7fe8425e2573f4b51e2f
diff --git a/app-emacs/external-completion/external-completion-0.1.ebuild b/app-emacs/external-completion/external-completion-0.1.ebuild
new file mode 100644
index 000000000000..9286df028ef4
--- /dev/null
+++ b/app-emacs/external-completion/external-completion-0.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Let external tools control completion style in GNU Emacs"
+HOMEPAGE="https://elpa.gnu.org/packages/external-completion.html"
+SRC_URI="https://dev.gentoo.org/~xgqt/distfiles/repackaged/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/external-completion/files/50external-completion-gentoo.el b/app-emacs/external-completion/files/50external-completion-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/external-completion/files/50external-completion-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/external-completion/metadata.xml b/app-emacs/external-completion/metadata.xml
new file mode 100644
index 000000000000..717a115d639c
--- /dev/null
+++ b/app-emacs/external-completion/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
diff --git a/app-emacs/undo-tree/Manifest b/app-emacs/undo-tree/Manifest
index 0fe9d5dd299f..678a76f1c38a 100644
--- a/app-emacs/undo-tree/Manifest
+++ b/app-emacs/undo-tree/Manifest
@@ -1,2 +1,3 @@
DIST undo-tree-0.6.6.el.xz 31520 BLAKE2B 01ddd3283ab257de91bd3f38969b7426f21df58e010302d21ea093c9428481a4595ea7806c107c7f87f46825bf379e22423004a72d73fedf8c2a6138afeba510 SHA512 0510ca0020515d0afaf13dcfd1878fa527472a4115534b8f72ed907507a700b34fe7151f0f9aca3e9977f9d48a6fae231483beb14b63f1ce734dd6b3b0322a7a
+DIST undo-tree-0.8.2.tar.xz 34060 BLAKE2B 4976488fd7ae42eb273c6369758014b96503a3a852ef2a4b4798ec6363e23d3e3219f73c6a2cd2f190de8902dc9705a7a4a5331f0e7b67900f43b192ae25e81b SHA512 403ecdb0a30a53528bbaa64025b96b228249f6d2de85070dec8e20d56e02bbca06bc1dcac411dc4e342652d32626dae4b03e4538b9110b69f50d37c12d3ca391
DIST undo-tree-release-0.8.1.tar.gz 39499 BLAKE2B 0a47ab86889d1d043ff94ced330f9d9e82a9c6914d44633af85ff7e02d80d8914a59345f50a600eb676a9c46619a7ef13b18e4abb02186e6fd39ab9197cf81a6 SHA512 7a5cb7e949d8dd62ce54b7b7ba136f5c6ffcc5ca998af6552e8c9daddf13e38ddfe4de8c2b5d4732d193990018e003bc0eb6b732d913178efba15bb01064a745
diff --git a/app-emacs/undo-tree/undo-tree-0.8.2.ebuild b/app-emacs/undo-tree/undo-tree-0.8.2.ebuild
new file mode 100644
index 000000000000..fc23a69f50bb
--- /dev/null
+++ b/app-emacs/undo-tree/undo-tree-0.8.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24
+
+inherit readme.gentoo-r1 elisp
+
+DESCRIPTION="Undo trees and visualization"
+HOMEPAGE="http://www.dr-qubit.org/undo-tree.html"
+SRC_URI="https://dev.gentoo.org/~xgqt/distfiles/repackaged/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-emacs/queue"
+RDEPEND="${DEPEND}"
+
+DOC_CONTENTS="To enable undo trees globally, place '(global-undo-tree-mode)'
+ in your .emacs file."
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/websocket/Manifest b/app-emacs/websocket/Manifest
index 4d8ace5f65bf..9e57b84228b7 100644
--- a/app-emacs/websocket/Manifest
+++ b/app-emacs/websocket/Manifest
@@ -1,2 +1,3 @@
DIST websocket-1.12.tar.gz 27378 BLAKE2B d0aa576333c96e403d4507f25be5661b94de71afea1a39e6abbf0fc57c68dff109336c4c735ae15be336f620b6a09240fdfd4e016a19fc2b92f5836e83181a44 SHA512 c0cdcf407227914a94e24ef90146c3c394e0bc16f131c5b626a6ce49ee235e2519dc7c2dc174e6b87426eba8ce21e84e816b8074866e25be681ca626c51044de
DIST websocket-1.13.tar.gz 27421 BLAKE2B 1098cd1ba294a2829e7c2b14685514ef2a9426742846159a157f9068714a8d21d0cd2b893a1312cae29ae92231a0685e51832e5bc8715c1c20e62854ec5c81eb SHA512 3f4c9131650992be2992ca646268f01eef2407256c517a26940aabb673c13a6741c1e15cf0832e42c9ee7ffbe3e7b5e6532fcd2d4d77e0d9fae0c6d4f2613354
+DIST websocket-1.14_p20230305.tar.gz 27340 BLAKE2B 32b55fdff4bed7893d02bcafc67e473442803a492c31e565ec1487dc0e7211e505a517e460ca05f5f1f2d28d0852bced91cfbe9da98bcd6ed1e4598fe6bc4eb6 SHA512 6c4574387f8cae7d17a3a8e618678e9dc8d96d0301f3d20e236dae1820cdb2c7bb49e2f5bfe816670e9bac6a7be24b85f8ec9f8ea2aa248c6b5af302f227ae43
diff --git a/app-emacs/websocket/websocket-1.14_p20230305.ebuild b/app-emacs/websocket/websocket-1.14_p20230305.ebuild
new file mode 100644
index 000000000000..16337329f284
--- /dev/null
+++ b/app-emacs/websocket/websocket-1.14_p20230305.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+[[ ${PV} == *_p20230305 ]] && COMMIT=1a08093b122d8cf20366a1cba5faddf7a53d08ed
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A websocket implementation in elisp"
+HOMEPAGE="https://github.com/ahyatt/emacs-websocket"
+SRC_URI="https://github.com/ahyatt/emacs-${PN}/archive/${COMMIT}.tar.gz
+ -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${PN}-${COMMIT}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.org websocket-functional-test.el testserver.py )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp-compile ${PN}.el
+}
+
+src_test() {
+ ${EMACS} ${EMACSFLAGS} -L . -l websocket-test \
+ -f ert-run-tests-batch-and-exit || die "tests failed"
+}
+
+src_install() {
+ elisp-install ${PN} websocket.{el,elc}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ einstalldocs
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 1fa210ef4d94..9d0ee7c2cb63 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
index 2bbb6c2c75b5..d2ba04536748 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
@@ -16,11 +16,13 @@ SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
LICENSE="GPL-2 BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
RDEPEND="dev-libs/glib"
DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
+BDEPEND="${PYTHON_DEPS}
+ dev-lang/perl
+ dev-util/ninja"
S="${WORKDIR}/${MY_P}"
diff --git a/app-emulation/spice-protocol/spice-protocol-0.14.4.ebuild b/app-emulation/spice-protocol/spice-protocol-0.14.4.ebuild
index 12d57516703d..3bd2990219d2 100644
--- a/app-emulation/spice-protocol/spice-protocol-0.14.4.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-0.14.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-protocol.git"
else
SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
fi
DESCRIPTION="Headers defining the SPICE protocol"
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.22.1.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.22.1.ebuild
index c7951fa824e9..36be63a656d9 100644
--- a/app-emulation/spice-vdagent/spice-vdagent-0.22.1.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.22.1.ebuild
@@ -11,10 +11,10 @@ SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="gtk selinux systemd"
-DEPEND="
+COMMON_DEPEND="
dev-libs/glib:2
>=app-emulation/spice-protocol-0.14.0
media-libs/alsa-lib
@@ -27,7 +27,9 @@ DEPEND="
x11-libs/libXinerama
gtk? ( x11-libs/gtk+:3 )
systemd? ( sys-apps/systemd )"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+ x11-base/xorg-proto"
+RDEPEND="${COMMON_DEPEND}
selinux? ( sec-policy/selinux-vdagent )"
BDEPEND="virtual/pkgconfig"
diff --git a/app-emulation/spice/spice-0.15.1-r1.ebuild b/app-emulation/spice/spice-0.15.1-r1.ebuild
index 4fcfa6758091..b4f33a133e0d 100644
--- a/app-emulation/spice/spice-0.15.1-r1.ebuild
+++ b/app-emulation/spice/spice-0.15.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.spice-space.org/download/releases/spice-server/${P}.tar.bz2
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
IUSE="gstreamer lz4 sasl smartcard static-libs test"
RESTRICT="!test? ( test )"
diff --git a/app-emulation/virt-manager/virt-manager-4.1.0.ebuild b/app-emulation/virt-manager/virt-manager-4.1.0.ebuild
index 801e910ecd96..7dcde0ab5956 100644
--- a/app-emulation/virt-manager/virt-manager-4.1.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-4.1.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 x86"
fi
LICENSE="GPL-2"
diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index eac48de26624..9308ad8eae21 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -1,7 +1,5 @@
DIST wine-mono-7.0.0-x86.msi 86433280 BLAKE2B 9d164bf10f9c790a1f518624321a77965800742c84677a6372cd57b1f51bdd16a2d61ee85f868e84be9b07d4c3f5a7afa770e98637f698c2337c42d42890cf58 SHA512 d7af2a68c3b48cab93ddd489f674ab9064d69d5ca0b6c91e58713dd0408af9fb1ff82ef8847d91645d96df40cd5526c6735d621064a3598166ab5f51d1e0d076
DIST wine-mono-7.0.0-x86.tar.xz 45085800 BLAKE2B 504c57acce486c19a54bf33cdb4b9444c07a58a7f56ced0c93178886a91fa5d94a61f6e26aa885f3e3a2cceb2ff792f01006a4b16fa5bb88c3d25ddff02fefd7 SHA512 a3977563c5eb6418eaeda25e5b39bd2ef1faf305d514979211e049280c4577718ca48c8566e527b97a58fc465b310dd600093a616102573e12e8985794d828a6
-DIST wine-mono-7.3.0-x86.msi 86919680 BLAKE2B 917aa260ba7a012ed1e1565f8ed23225c82060c82dbb74a1e0d105a7b38a1d840c20689e0a8e7cc1a5c5de938807c78f36c98cbef07270accaf789b6b031f22d SHA512 d92ab4a9d0ac1c48dfec583b1681317e9ec9556efcb18766a865bee06a3a53ea08159099ca3ec92149f677d67583648991d59adb9b8a612ef41de06da8c77fd2
-DIST wine-mono-7.3.0-x86.tar.xz 43557004 BLAKE2B 919912faf97cf38b2fcc9813de4e035d907b0a00db78d2a251c1c43dab65ba44847ecbf494a15dba761d9ba8203855c1a6e5f5bbd07f20484c9948c3cfe4d3bc SHA512 c26dc21d0d462b3c79e778497815e33d26b5ab545eba0552b436f30d9b7aa340ccdef69fe0dcbf32c04330e6d0f813314646ded7d2d24e6f4746e4893adbbf7f
DIST wine-mono-7.3.1-x86.msi 86930432 BLAKE2B f43b605ab7b07a7b4d8d4675297af6e827e81b2b232c6991fb1f559a247c6b546490017dd4e1aab04aad664570cb90152ff872be61bb8e12a154ae2366dbb21c SHA512 dd9f3860c4b52edce44f51b27de2a3b4acc97271d661e41310b889fa378f502458739caaa548fff5e16ddba418d40d647528c151c0413519df54c38f9e237946
DIST wine-mono-7.3.1-x86.tar.xz 43216532 BLAKE2B bc00f41d2e9e88c0a687fad6bdd48e9a836f3d7369747602665691ca3e430c895655e9c5e9ef955a5cf45a96818b6858bc3cc93d90c3d7a49f8d8f4ff824d45a SHA512 a2c8d10d9b34fd7775eeddb6494b84f2f04e6a2f21d93940dc902434b189d43bdfdcd198baf8133cda8b17c2bc25ee84538e12a32027cdd66da9ab029eed6777
DIST wine-mono-7.4.0-x86.msi 87334912 BLAKE2B c0b778f9db59d1a2917631f1d6ca1a1798972a6a42e27975da78f3a35b77018a99228d7d95e5640c57618533a6b01bf2252859e3e978e2aa8dbdc8cd62afcc28 SHA512 cf35513b368324487c387d4339e5b05a90c4825b25ea603140524b79e69786ccc20dfb898213a9548c0313c0b0e4b160acb88364e4b280dd6712d185d9e5ae57
diff --git a/app-emulation/wine-mono/wine-mono-7.3.0.ebuild b/app-emulation/wine-mono/wine-mono-7.3.0.ebuild
deleted file mode 100644
index 4dc409c643f3..000000000000
--- a/app-emulation/wine-mono/wine-mono-7.3.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://wiki.winehq.org/Mono"
-SRC_URI="
- shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.tar.xz )
- !shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi )"
-S="${WORKDIR}"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+shared"
-
-src_install() {
- insinto /usr/share/wine/mono
-
- if use shared; then
- doins -r ${P}
- else
- doins "${DISTDIR}"/${P}-x86.msi
- fi
-}
diff --git a/app-emulation/wine-proton/wine-proton-7.0.5.ebuild b/app-emulation/wine-proton/wine-proton-7.0.5.ebuild
index 1b2840143d98..e025c4683455 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.5.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.5.ebuild
@@ -104,6 +104,7 @@ BDEPEND="
!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
IDEPEND=">=app-eselect/eselect-wine-2"
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
PATCHES=(
diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
index ac7d38464311..453a7f39a5a8 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -104,6 +104,7 @@ BDEPEND="
!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
IDEPEND=">=app-eselect/eselect-wine-2"
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
PATCHES=(
diff --git a/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild b/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild
index ac7d38464311..453a7f39a5a8 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild
@@ -104,6 +104,7 @@ BDEPEND="
!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
IDEPEND=">=app-eselect/eselect-wine-2"
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
PATCHES=(
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index f7d99928c547..197982707bc1 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,10 +1,8 @@
-DIST wine-7.19.tar.xz 28502612 BLAKE2B b7b270656955c7a1e1d84e8bbc7e3e8abff5aedadb5e8a458f0b1109d746875a359f3d2f53b1c9c6caae65d17fd1d205466cd3a884034a8bad6afe9456f13b5d SHA512 f76dbda97cccad4c0f249b5dd4e8d48afa832134f1704ae228650bb73ee82823e628b23bd53a3f8729e06a8933597ff2fffa5551f156fc9c9181b67c066747d5
-DIST wine-7.22.tar.xz 28974052 BLAKE2B c86466964817b916ee8f7b687f193eda8bdd3fb17152ab1565971e36f43b12b540033ac1c5fa5d15576041febd32cf1ea2955732c5386debcbda46fb3acca0f1 SHA512 bf58a5b98bef5b291aff1eca3f94c28da95990e4c8da9af5e9e28b9480d57163d088b501b0c1bca5b568bf586dd9933cdc1ea1f371b78d95c94e2d25d0a65efc
DIST wine-8.0.tar.xz 29054044 BLAKE2B baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02 SHA512 53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
DIST wine-8.1.tar.xz 29083080 BLAKE2B 6eed2128627f15159ad80588ebe839de76cb9a536797d7da136b61f56033ece60c60208702b7928cdb297c1d8730baae0d6bb0ac7a0473c34ed44b5c5edaaec5 SHA512 3f0477c26f293cf928acbdae2ffb98740ac227a605ec90f3ab3d35c0dbca2037529ff4e4de0b69cc975579ad14dc2fb8b52e050cfd99cffcc627418cf8cb4346
DIST wine-8.2.tar.xz 29129032 BLAKE2B 831a5d1c8228050db9257ed60dc77ed0a391f16ee16d2e5563eabbf8f7d988655477327e1081baf947b173e8eb716b15fb72d1daa70d5ade52508c7f1cc2c231 SHA512 d0b8bb8c6d75034519bdf48d52b89f9d44ba4f7306a0b8f860cbb2c4c39d8fae3c2d9c12be37427b9a9cbdb7dd8701844d0a74c245dd7a9e8a423cb56962b254
-DIST wine-staging-7.19.tar.gz 9523048 BLAKE2B e53fd47af493cbdc4542f908a39557324d70ad67ff2e06c80296c006a63518e43988750cab2f4d3d9197fc9c8a1e61ed4d96bcc310b82b6cfc8ec12b941f1c5c SHA512 c51cb18c4ae00eccf414f5edda18ebf363674ba7cfa95da135b3a43b7c012c086d454d6ac32b22d98e611bb87e55c3e1ee95571a4a0c9713028b5ac38e8aed3f
-DIST wine-staging-7.22.tar.gz 9528424 BLAKE2B e41f24f924117259715505f4f9998ef23a657bca5b0e285feb7f9fd732e6b566a495f48ec59af09b1d4d51db522b051028f6cbba748256e939929fbf978f0e44 SHA512 5fdac19ec290c67767fac71abe07d9350ec431919c67a0f2d2df18ced20f1d3dddb921b3d5586d03add187c6281e1a691cc220e8d2d5ad4eeb94015721479d65
+DIST wine-8.3.tar.xz 28983532 BLAKE2B b811a13aaa87f186c744254059d40fdf0740da42cf788acb2375c04cf3ecc281c92afc7bb7830d5797624d96f803edcb2d2778c5da378d89938fe0b68e72a287 SHA512 9c0c86f1d523cc65fe6bcb2f98e73f8909282eda1c04516ff35a32833e469421e099fe1351c3078ac96aa7884fc194a77fcf2ba8863e2a227316fd84562f1f5a
DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203 SHA512 76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
DIST wine-staging-8.1.tar.gz 9527176 BLAKE2B 363243a4a04bc767099b74f3b7613463d99da82996c176e68b9233cbf51c87ecd143840f7729a3edc31ac004b771b89ec3d57a0276b26e30d475feb273d09257 SHA512 c5c3111b27de7d3bf1d7a3a53f33e8d78c5006f22ff0361f77392455fa69b0afd7c58406515ace04b2df7e1dfb20e3adf9d874e5e8be09c9032c1c1aa31fe696
DIST wine-staging-8.2.tar.gz 9528476 BLAKE2B e6fb4d15e9b94c9196c1f472ac50fbd3eabe34ef4a54493ca11b702448c4039c5a4f13fb1119a88477924e204c6e1972b1b25efe742118beec01f71a9d879aa2 SHA512 24bbfb6d03ca8282de058019cbbee57b36f8fdcf3e485f2ca94dbcf50614cf6c80e31103196d11fe48c77953d59a741ae2baf6987e56a88bea038ed16b692ad9
+DIST wine-staging-8.3.tar.gz 9523336 BLAKE2B 3fdb6343ab3735e9235ea3d99e3da4d392de9620d93e85e2bd3b13ae2e0eca2654b2b48230a3bfd7c66ead1fb751ddb092b361943f7a95eb3df5a240c2b9e32b SHA512 e2b1dc107088f716f1c7e80bc25b152ff5c2c4c4a6f29a60e42eabdea0e8b5df84eaeaf8b978f5aefc3f9ad5962eb74784d5a98b95fa3694485d00f3fa628ce6
diff --git a/app-emulation/wine-staging/files/wine-staging-7.17-unwind.patch b/app-emulation/wine-staging/files/wine-staging-7.17-unwind.patch
deleted file mode 100644
index 52512ca82968..000000000000
--- a/app-emulation/wine-staging/files/wine-staging-7.17-unwind.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Fix build with llvm-libunwind, and also fix for non-llvm libunwind
-when using clang+bfd given clang doesn't have _Unwind_Find_FDE in
-its rtlib and expects it from llvm-libunwind.
-
-The _CONFIG_H_ check is for Rip - 1), &bases );
-
- if (fde)
- return dwarf_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context, fde,
- &bases, &dispatch->LanguageHandler, &dispatch->HandlerData );
-+#endif
- #ifdef HAVE_LIBUNWIND
- return libunwind_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context,
- &dispatch->LanguageHandler, &dispatch->HandlerData );
diff --git a/app-emulation/wine-staging/wine-staging-7.19.ebuild b/app-emulation/wine-staging/wine-staging-7.19.ebuild
deleted file mode 100644
index 649285646ebc..000000000000
--- a/app-emulation/wine-staging/wine-staging-7.19.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
-
-WINE_GECKO=2.47.3
-WINE_MONO=7.3.0
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
- WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
-else
- (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
- SRC_URI="
- https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz
- https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/wine-${PV}"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
- +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
- llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
- +gstreamer kerberos ldap +mingw +mono netapi nls odbc openal
- opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl
- selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan
- +xcomposite xinerama"
-REQUIRED_USE="
- X? ( truetype )
- crossdev-mingw? ( mingw )" # bug #551124 for truetype
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
- X? (
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXrender[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- opengl? (
- media-libs/libglvnd[X,${MULTILIB_USEDEP}]
- osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
- )
- xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- )
- cups? ( net-print/cups[${MULTILIB_USEDEP}] )
- fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
- netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
- odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
- sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
- ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
- truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
- udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
- v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
- vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
-WINE_COMMON_DEPEND="
- ${WINE_DLOPEN_DEPEND}
- X? (
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- )
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
- capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
- gstreamer? (
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- )
- ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
- openal? ( media-libs/openal[${MULTILIB_USEDEP}] )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
- pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
- scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
- udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
- unwind? (
- llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
- !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
- )
- usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )"
-RDEPEND="
- ${WINE_COMMON_DEPEND}
- app-emulation/wine-desktop-common
- dos? ( games-emulation/dosbox )
- gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
- gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
- mono? ( app-emulation/wine-mono:${WINE_MONO} )
- perl? (
- dev-lang/perl
- dev-perl/XML-LibXML
- )
- samba? ( net-fs/samba[winbind] )
- selinux? ( sec-policy/selinux-wine )
- udisks? ( sys-fs/udisks:2 )"
-DEPEND="
- ${WINE_COMMON_DEPEND}
- sys-kernel/linux-headers
- X? ( x11-base/xorg-proto )"
-BDEPEND="
- dev-lang/perl
- sys-devel/binutils
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )
- nls? ( sys-devel/gettext )"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.17-noexecstack.patch
- "${FILESDIR}"/${PN}-7.17-unwind.patch
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} == binary ]] && return
-
- if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
- local mingw=-w64-mingw32
- for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
- if ! type -P ${mingw}-gcc >/dev/null; then
- eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
- eerror "yourself by installing sys-devel/crossdev then running:"
- eerror
- eerror " crossdev --target ${mingw}"
- eerror
- eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
- die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
- fi
- done
- fi
-}
-
-src_unpack() {
- if [[ ${PV} == *9999 ]]; then
- EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
- git-r3_src_unpack
-
- EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
- EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
- EGIT_CHECKOUT_DIR=${S}
- einfo "Fetching Wine commit matching the current patchset by default (${EGIT_COMMIT})"
- git-r3_src_unpack
- else
- default
- fi
-}
-
-src_prepare() {
- local staging=(
- ./patchinstall.sh DESTDIR="${S}"
- --all
- --backend=eapply
- --no-autoconf
- -W winemenubuilder-Desktop_Icon_Path #652176
- ${MY_WINE_STAGING_CONF}
- )
-
- # source patcher in a subshell so can use eapply as a backend
- ebegin "Running ${staging[*]}"
- ( cd ../${P}/patches && . "${staging[@]}" )
- eend ${?} || die "Failed to apply the patchset"
-
- # sanity check, bumping these has a history of oversights
- local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
- dlls/appwiz.cpl/addons.c || die)
- if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
- local gmfatal=
- [[ ${PV} == *9999 ]] && gmfatal=nonfatal
- ${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
- fi
-
- default
-
- # ensure .desktop calls this variant + slot
- sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
-
- # always update for patches (including user's wrt #432348)
- eautoreconf
- tools/make_requests || die # perl
-}
-
-src_configure() {
- WINE_PREFIX=/usr/lib/${P}
- WINE_DATADIR=/usr/share/${P}
-
- local conf=(
- --prefix="${EPREFIX}"${WINE_PREFIX}
- --datadir="${EPREFIX}"${WINE_DATADIR}
- --includedir="${EPREFIX}"/usr/include/${P}
- --libdir="${EPREFIX}"${WINE_PREFIX}
- --mandir="${EPREFIX}"${WINE_DATADIR}/man
- $(use_enable gecko mshtml)
- $(use_enable mono mscoree)
- --disable-tests
- $(use_with X x)
- $(use_with alsa)
- $(use_with capi)
- $(use_with cups)
- $(use_with fontconfig)
- $(use_with gphoto2 gphoto)
- $(use_with gstreamer)
- $(use_with kerberos gssapi)
- $(use_with kerberos krb5)
- $(use_with ldap)
- $(use_with mingw)
- $(use_with netapi)
- $(use_with nls gettext)
- $(use_with openal)
- $(use_with opencl)
- $(use_with opengl)
- $(use_with osmesa)
- --without-oss # media-sound/oss is not packaged (OSSv4)
- $(use_with pcap)
- $(use_with pulseaudio pulse)
- $(use_with scanner sane)
- $(use_with sdl)
- $(use_with ssl gnutls)
- $(use_with truetype freetype)
- $(use_with udev)
- $(use_with udisks dbus) # dbus is only used for udisks
- $(use_with unwind)
- $(use_with usb)
- $(use_with v4l v4l2)
- $(use_with vulkan)
- $(use_with xcomposite)
- $(use_with xinerama)
- $(usev !odbc ac_cv_lib_soname_odbc=)
- )
-
- tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
- filter-lto # build failure
- use mingw || filter-flags -fno-plt # build failure
- use custom-cflags || strip-flags # can break in obscure ways at runtime
- use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
- # temporary workaround for tc-ld-force-bfd not yet enforcing with mold
- # https://github.com/gentoo/gentoo/pull/28355
- [[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
- append-ldflags -fuse-ld=bfd
-
- # build using upstream's way (--with-wine64)
- # order matters: configure+compile 64->32, install 32->64
- local -i bits
- for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
- (
- einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
-
- mkdir ../build${bits} || die
- cd ../build${bits} || die
-
- # CROSSCC_amd64/x86 are unused by Wine, but recognized here for users
- if (( bits == 64 )); then
- : "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
- conf+=( --enable-win64 )
- elif use amd64; then
- conf+=(
- $(usev abi_x86_64 --with-wine64=../build64)
- TARGETFLAGS=-m32 # for widl
- )
- # _setup is optional, but use over Wine's auto-detect (+#472038)
- multilib_toolchain_setup x86
- fi
- : "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
-
- # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
- if use mingw; then
- : "${CROSSCFLAGS:=$(
- filter-flags '-fstack-clash-protection' #758914
- filter-flags '-fstack-protector*' #870136
- filter-flags '-mfunction-return=thunk*' #878849
- CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
- : "${CROSSLDFLAGS:=$(
- filter-flags '-fuse-ld=*'
- CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
- export CROSS{CC,{C,LD}FLAGS}
- fi
-
- ECONF_SOURCE=${S} econf "${conf[@]}"
- )
- done
-}
-
-src_compile() {
- use abi_x86_64 && emake -C ../build64 # do first
- use abi_x86_32 && emake -C ../build32
-}
-
-src_install() {
- use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
- use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
-
- # symlink for plain 'wine' and install its man pages if 64bit-only #404331
- if use abi_x86_64 && use !abi_x86_32; then
- dosym wine64 ${WINE_PREFIX}/bin/wine
- dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
- local man
- for man in ../build64/loader/wine.*man; do
- : "${man##*/wine}"
- : "${_%.*}"
- insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
- newins ${man} wine.1
- done
- fi
-
- use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
- "${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
-
- # create variant wrappers for eselect-wine
- local bin
- for bin in "${ED}"${WINE_PREFIX}/bin/*; do
- make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
- done
-
- # don't let portage try to strip PE files with the wrong
- # strip executable and instead handle it here (saves ~120MB)
- if use mingw; then
- dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
- use debug ||
- find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
- -exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
- fi
-
- dodoc ANNOUNCE AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
- eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
- eselect wine update --if-unset || die
-}
diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index b23645292240..6d0fce43bdc4 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -122,6 +122,7 @@ BDEPEND="
nls? ( sys-devel/gettext )"
IDEPEND=">=app-eselect/eselect-wine-2"
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
PATCHES=(
diff --git a/app-emulation/wine-staging/wine-staging-8.1.ebuild b/app-emulation/wine-staging/wine-staging-8.1.ebuild
index 887f0e540454..4c27aba38ee4 100644
--- a/app-emulation/wine-staging/wine-staging-8.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.1.ebuild
@@ -122,6 +122,7 @@ BDEPEND="
nls? ( sys-devel/gettext )"
IDEPEND=">=app-eselect/eselect-wine-2"
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
PATCHES=(
diff --git a/app-emulation/wine-staging/wine-staging-8.2.ebuild b/app-emulation/wine-staging/wine-staging-8.2.ebuild
index 3c2601e3bcf8..9457d9533997 100644
--- a/app-emulation/wine-staging/wine-staging-8.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.2.ebuild
@@ -132,6 +132,7 @@ BDEPEND="
nls? ( sys-devel/gettext )"
IDEPEND=">=app-eselect/eselect-wine-2"
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
diff --git a/app-emulation/wine-staging/wine-staging-7.22.ebuild b/app-emulation/wine-staging/wine-staging-8.3.ebuild
similarity index 93%
rename from app-emulation/wine-staging/wine-staging-7.22.ebuild
rename to app-emulation/wine-staging/wine-staging-8.3.ebuild
index 6e64e8c69828..bcdbcf4db2b8 100644
--- a/app-emulation/wine-staging/wine-staging-7.22.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.3.ebuild
@@ -1,10 +1,12 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit python-any-r1 toolchain-funcs wrapper
WINE_GECKO=2.47.3
WINE_MONO=7.4.0
@@ -30,8 +32,8 @@ SLOT="${PV}"
IUSE="
+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
- +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
- osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl
+ +gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa
+ pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
+truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama"
REQUIRED_USE="
X? ( truetype )
@@ -61,7 +63,6 @@ WINE_DLOPEN_DEPEND="
fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
- odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
@@ -86,6 +87,7 @@ WINE_COMMON_DEPEND="
pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+ smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
unwind? (
llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
@@ -110,7 +112,16 @@ DEPEND="
${WINE_COMMON_DEPEND}
sys-kernel/linux-headers
X? ( x11-base/xorg-proto )"
+# gitapply.sh prefers git but can fallback to patch+extras
BDEPEND="
+ ${PYTHON_DEPS}
+ || (
+ dev-vcs/git
+ (
+ sys-apps/gawk
+ sys-apps/util-linux
+ )
+ )
dev-lang/perl
sys-devel/binutils
sys-devel/bison
@@ -122,6 +133,8 @@ BDEPEND="
nls? ( sys-devel/gettext )"
IDEPEND=">=app-eselect/eselect-wine-2"
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
+QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
PATCHES=(
@@ -164,19 +177,14 @@ src_unpack() {
}
src_prepare() {
- local staging=(
- ./patchinstall.sh DESTDIR="${S}"
+ local patchinstallargs=(
--all
- --backend=eapply
--no-autoconf
-W winemenubuilder-Desktop_Icon_Path #652176
${MY_WINE_STAGING_CONF}
)
- # source patcher in a subshell so can use eapply as a backend
- ebegin "Running ${staging[*]}"
- ( cd ../${P}/patches && . "${staging[@]}" )
- eend ${?} || die "Failed to apply the patchset"
+ edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
# sanity check, bumping these has a history of oversights
local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
@@ -230,6 +238,7 @@ src_configure() {
$(use_with pulseaudio pulse)
$(use_with scanner sane)
$(use_with sdl)
+ $(use_with smartcard pcsclite)
$(use_with ssl gnutls)
$(use_with truetype freetype)
$(use_with udev)
@@ -240,7 +249,6 @@ src_configure() {
$(use_with vulkan)
$(use_with xcomposite)
$(use_with xinerama)
- $(usev !odbc ac_cv_lib_soname_odbc=)
)
tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index b7b0d4577f20..bcdbcf4db2b8 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -133,6 +133,7 @@ BDEPEND="
nls? ( sys-devel/gettext )"
IDEPEND=">=app-eselect/eselect-wine-2"
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 9e7de5b11980..17f5ba6e2aa5 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,6 +1,5 @@
DIST wine-7.0.1.tar.xz 27167768 BLAKE2B 9bf74e7077fe4b77611f8195feeb53fc6475bdaeac97dab5221942115d6108d8786f93d4a96745bad72afb074b15129fec9b0b2f10261d91c9a9b57bd2240ded SHA512 5a5258132fe30bfb5313454598b85e7d97a74d1e0c7ca7af16aa8c486e316ad34ab74a25fd9a403c98ad1f3280385232f7d159bb824f713e920a4a0dae62c944
-DIST wine-7.19.tar.xz 28502612 BLAKE2B b7b270656955c7a1e1d84e8bbc7e3e8abff5aedadb5e8a458f0b1109d746875a359f3d2f53b1c9c6caae65d17fd1d205466cd3a884034a8bad6afe9456f13b5d SHA512 f76dbda97cccad4c0f249b5dd4e8d48afa832134f1704ae228650bb73ee82823e628b23bd53a3f8729e06a8933597ff2fffa5551f156fc9c9181b67c066747d5
-DIST wine-7.22.tar.xz 28974052 BLAKE2B c86466964817b916ee8f7b687f193eda8bdd3fb17152ab1565971e36f43b12b540033ac1c5fa5d15576041febd32cf1ea2955732c5386debcbda46fb3acca0f1 SHA512 bf58a5b98bef5b291aff1eca3f94c28da95990e4c8da9af5e9e28b9480d57163d088b501b0c1bca5b568bf586dd9933cdc1ea1f371b78d95c94e2d25d0a65efc
DIST wine-8.0.tar.xz 29054044 BLAKE2B baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02 SHA512 53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
DIST wine-8.1.tar.xz 29083080 BLAKE2B 6eed2128627f15159ad80588ebe839de76cb9a536797d7da136b61f56033ece60c60208702b7928cdb297c1d8730baae0d6bb0ac7a0473c34ed44b5c5edaaec5 SHA512 3f0477c26f293cf928acbdae2ffb98740ac227a605ec90f3ab3d35c0dbca2037529ff4e4de0b69cc975579ad14dc2fb8b52e050cfd99cffcc627418cf8cb4346
DIST wine-8.2.tar.xz 29129032 BLAKE2B 831a5d1c8228050db9257ed60dc77ed0a391f16ee16d2e5563eabbf8f7d988655477327e1081baf947b173e8eb716b15fb72d1daa70d5ade52508c7f1cc2c231 SHA512 d0b8bb8c6d75034519bdf48d52b89f9d44ba4f7306a0b8f860cbb2c4c39d8fae3c2d9c12be37427b9a9cbdb7dd8701844d0a74c245dd7a9e8a423cb56962b254
+DIST wine-8.3.tar.xz 28983532 BLAKE2B b811a13aaa87f186c744254059d40fdf0740da42cf788acb2375c04cf3ecc281c92afc7bb7830d5797624d96f803edcb2d2778c5da378d89938fe0b68e72a287 SHA512 9c0c86f1d523cc65fe6bcb2f98e73f8909282eda1c04516ff35a32833e469421e099fe1351c3078ac96aa7884fc194a77fcf2ba8863e2a227316fd84562f1f5a
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
index e17d6a292d1b..5be8047387f9 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -123,6 +123,7 @@ BDEPEND="
nls? ( sys-devel/gettext )"
IDEPEND=">=app-eselect/eselect-wine-2"
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
PATCHES=(
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild
deleted file mode 100644
index 5619b8ebd018..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-7.19.ebuild
+++ /dev/null
@@ -1,321 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
-
-WINE_GECKO=2.47.3
-WINE_MONO=7.3.0
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
-else
- (( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
- SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz"
- S="${WORKDIR}/wine-${PV}"
- KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="
- https://www.winehq.org/
- https://gitlab.winehq.org/wine/wine/"
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
- +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
- llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
- +gstreamer kerberos ldap +mingw +mono netapi nls odbc openal
- opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl
- selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan
- +xcomposite xinerama"
-REQUIRED_USE="
- X? ( truetype )
- crossdev-mingw? ( mingw )" # bug #551124 for truetype
-
-# tests are non-trivial to run, can hang easily, don't play well with
-# sandbox, and several need real opengl/vulkan or network access
-RESTRICT="test"
-
-# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
-WINE_DLOPEN_DEPEND="
- X? (
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXrender[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- opengl? (
- media-libs/libglvnd[X,${MULTILIB_USEDEP}]
- osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
- )
- xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- )
- cups? ( net-print/cups[${MULTILIB_USEDEP}] )
- fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
- netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
- odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
- sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
- ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
- truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
- udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
- v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
- vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
-WINE_COMMON_DEPEND="
- ${WINE_DLOPEN_DEPEND}
- X? (
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- )
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
- capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
- gstreamer? (
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- )
- ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
- openal? ( media-libs/openal[${MULTILIB_USEDEP}] )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
- pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
- scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
- udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
- unwind? (
- llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
- !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
- )
- usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )"
-RDEPEND="
- ${WINE_COMMON_DEPEND}
- app-emulation/wine-desktop-common
- dos? ( games-emulation/dosbox )
- gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
- gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
- mono? ( app-emulation/wine-mono:${WINE_MONO} )
- perl? (
- dev-lang/perl
- dev-perl/XML-LibXML
- )
- samba? ( net-fs/samba[winbind] )
- selinux? ( sec-policy/selinux-wine )
- udisks? ( sys-fs/udisks:2 )"
-DEPEND="
- ${WINE_COMMON_DEPEND}
- sys-kernel/linux-headers
- X? ( x11-base/xorg-proto )"
-BDEPEND="
- dev-lang/perl
- sys-devel/binutils
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) )
- nls? ( sys-devel/gettext )"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.0-noexecstack.patch
- "${FILESDIR}"/${PN}-7.0-unwind.patch
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} == binary ]] && return
-
- if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
- local mingw=-w64-mingw32
- for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
- if ! type -P ${mingw}-gcc >/dev/null; then
- eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
- eerror "yourself by installing sys-devel/crossdev then running:"
- eerror
- eerror " crossdev --target ${mingw}"
- eerror
- eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
- die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
- fi
- done
- fi
-}
-
-src_prepare() {
- # sanity check, bumping these has a history of oversights
- local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
- dlls/appwiz.cpl/addons.c || die)
- if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
- local gmfatal=
- [[ ${PV} == *9999 ]] && gmfatal=nonfatal
- ${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
- fi
-
- default
-
- # ensure .desktop calls this variant + slot
- sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
-
- # always update for patches (including user's wrt #432348)
- eautoreconf
- tools/make_requests || die # perl
-}
-
-src_configure() {
- WINE_PREFIX=/usr/lib/${P}
- WINE_DATADIR=/usr/share/${P}
-
- local conf=(
- --prefix="${EPREFIX}"${WINE_PREFIX}
- --datadir="${EPREFIX}"${WINE_DATADIR}
- --includedir="${EPREFIX}"/usr/include/${P}
- --libdir="${EPREFIX}"${WINE_PREFIX}
- --mandir="${EPREFIX}"${WINE_DATADIR}/man
- $(use_enable gecko mshtml)
- $(use_enable mono mscoree)
- --disable-tests
- $(use_with X x)
- $(use_with alsa)
- $(use_with capi)
- $(use_with cups)
- $(use_with fontconfig)
- $(use_with gphoto2 gphoto)
- $(use_with gstreamer)
- $(use_with kerberos gssapi)
- $(use_with kerberos krb5)
- $(use_with ldap)
- $(use_with mingw)
- $(use_with netapi)
- $(use_with nls gettext)
- $(use_with openal)
- $(use_with opencl)
- $(use_with opengl)
- $(use_with osmesa)
- --without-oss # media-sound/oss is not packaged (OSSv4)
- $(use_with pcap)
- $(use_with pulseaudio pulse)
- $(use_with scanner sane)
- $(use_with sdl)
- $(use_with ssl gnutls)
- $(use_with truetype freetype)
- $(use_with udev)
- $(use_with udisks dbus) # dbus is only used for udisks
- $(use_with unwind)
- $(use_with usb)
- $(use_with v4l v4l2)
- $(use_with vulkan)
- $(use_with xcomposite)
- $(use_with xinerama)
- $(usev !odbc ac_cv_lib_soname_odbc=)
- )
-
- tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
- filter-lto # build failure
- use mingw || filter-flags -fno-plt # build failure
- use custom-cflags || strip-flags # can break in obscure ways at runtime
- use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
- # temporary workaround for tc-ld-force-bfd not yet enforcing with mold
- # https://github.com/gentoo/gentoo/pull/28355
- [[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
- append-ldflags -fuse-ld=bfd
-
- # build using upstream's way (--with-wine64)
- # order matters: configure+compile 64->32, install 32->64
- local -i bits
- for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
- (
- einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
-
- mkdir ../build${bits} || die
- cd ../build${bits} || die
-
- # CROSSCC_amd64/x86 are unused by Wine, but recognized here for users
- if (( bits == 64 )); then
- : "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
- conf+=( --enable-win64 )
- elif use amd64; then
- conf+=(
- $(usev abi_x86_64 --with-wine64=../build64)
- TARGETFLAGS=-m32 # for widl
- )
- # _setup is optional, but use over Wine's auto-detect (+#472038)
- multilib_toolchain_setup x86
- fi
- : "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
-
- # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu)
- if use mingw; then
- : "${CROSSCFLAGS:=$(
- filter-flags '-fstack-clash-protection' #758914
- filter-flags '-fstack-protector*' #870136
- filter-flags '-mfunction-return=thunk*' #878849
- CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
- : "${CROSSLDFLAGS:=$(
- filter-flags '-fuse-ld=*'
- CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
- export CROSS{CC,{C,LD}FLAGS}
- fi
-
- ECONF_SOURCE=${S} econf "${conf[@]}"
- )
- done
-}
-
-src_compile() {
- use abi_x86_64 && emake -C ../build64 # do first
- use abi_x86_32 && emake -C ../build32
-}
-
-src_install() {
- use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
- use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
-
- # symlink for plain 'wine' and install its man pages if 64bit-only #404331
- if use abi_x86_64 && use !abi_x86_32; then
- dosym wine64 ${WINE_PREFIX}/bin/wine
- dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
- local man
- for man in ../build64/loader/wine.*man; do
- : "${man##*/wine}"
- : "${_%.*}"
- insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
- newins ${man} wine.1
- done
- fi
-
- use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
- "${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
-
- # create variant wrappers for eselect-wine
- local bin
- for bin in "${ED}"${WINE_PREFIX}/bin/*; do
- make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
- done
-
- # don't let portage try to strip PE files with the wrong
- # strip executable and instead handle it here (saves ~120MB)
- if use mingw; then
- dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
- use debug ||
- find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
- -exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
- fi
-
- dodoc ANNOUNCE AUTHORS README* documentation/README*
-}
-
-pkg_postinst() {
- eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
- eselect wine update --if-unset || die
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild
index d9b6ce69a9ec..441555bec6ca 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.ebuild
@@ -121,6 +121,7 @@ BDEPEND="
nls? ( sys-devel/gettext )"
IDEPEND=">=app-eselect/eselect-wine-2"
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
PATCHES=(
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.1.ebuild
index 1aa7a660b98a..a394c2c5bfba 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.1.ebuild
@@ -121,6 +121,7 @@ BDEPEND="
nls? ( sys-devel/gettext )"
IDEPEND=">=app-eselect/eselect-wine-2"
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
PATCHES=(
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.2.ebuild
index 1aa7a660b98a..a394c2c5bfba 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.2.ebuild
@@ -121,6 +121,7 @@ BDEPEND="
nls? ( sys-devel/gettext )"
IDEPEND=">=app-eselect/eselect-wine-2"
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
PATCHES=(
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.22.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.3.ebuild
similarity index 97%
rename from app-emulation/wine-vanilla/wine-vanilla-7.22.ebuild
rename to app-emulation/wine-vanilla/wine-vanilla-8.3.ebuild
index 02df0a4439ca..8aa9498430bc 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.22.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -30,7 +30,7 @@ IUSE="
+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
- osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl
+ osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
+truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama"
REQUIRED_USE="
X? ( truetype )
@@ -85,6 +85,7 @@ WINE_COMMON_DEPEND="
pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+ smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
unwind? (
llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
@@ -121,6 +122,7 @@ BDEPEND="
nls? ( sys-devel/gettext )"
IDEPEND=">=app-eselect/eselect-wine-2"
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
PATCHES=(
@@ -200,6 +202,7 @@ src_configure() {
$(use_with pulseaudio pulse)
$(use_with scanner sane)
$(use_with sdl)
+ $(use_with smartcard pcsclite)
$(use_with ssl gnutls)
$(use_with truetype freetype)
$(use_with udev)
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 5e06e2fc960f..8aa9498430bc 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -122,6 +122,7 @@ BDEPEND="
nls? ( sys-devel/gettext )"
IDEPEND=">=app-eselect/eselect-wine-2"
+QA_CONFIG_IMPL_DECL_SKIP=( res_getservers )
QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
PATCHES=(
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 0d8ec49e2d7f..b02be2315083 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-timezone/metadata.xml b/app-eselect/eselect-timezone/metadata.xml
index a2e015de1f8f..c3bda71eefca 100644
--- a/app-eselect/eselect-timezone/metadata.xml
+++ b/app-eselect/eselect-timezone/metadata.xml
@@ -1,9 +1,6 @@
-
- junghans@gentoo.org
- Christoph Junghans
-
+
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index e76a2cf87204..80d6f8676102 100644
Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ
diff --git a/app-forensics/aflplusplus/aflplusplus-4.05c.ebuild b/app-forensics/aflplusplus/aflplusplus-4.05c.ebuild
index 0838cb1a9224..a4d5afa1cc42 100644
--- a/app-forensics/aflplusplus/aflplusplus-4.05c.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-4.05c.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/AFLplusplus-${PV}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 arm64"
+KEYWORDS="amd64 arm64"
IUSE="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 073a5011b147..1efce5c441fd 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index 31d4ac917bb4..d8cf91f8963c 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -1,3 +1 @@
-DIST ibus-libpinyin-1.12.1.tar.gz 1766803 BLAKE2B 1de8a51b52688dede32c572b39bd379296480ab2b0f909357465370e346bdf50f4cade5ab3f105f62a74e59cf2dc5e8d5235aedde7571b70d3c5dcee86d2e36b SHA512 ad6e7507bdb468d506071135449383e5bd4fc878bcffda4be6e4e7915b79dbaf919d2fa941b92b177dc7790bd895eaa9a6d04a2610f85e1e80e8eb50f188211d
-DIST ibus-libpinyin-1.13.0.tar.gz 1726869 BLAKE2B f18ae81edb4ebf18f569fc13f3088f32e57c6a4512f7cafb33a18fdb08d5fdcdb17ff1861c3419db3063808f655510f6f4de63c274d798c48731ac4632203ba6 SHA512 8eca89c3c71ada37ec93307556fc476ad8719e58ca828f684dff6e74e1cb91df3e8c8ce03c87dbb72d5b7213e7c7ca367da8cf6b1dddb47d63afdf23d53bc54c
DIST ibus-libpinyin-1.13.1.tar.gz 1726900 BLAKE2B 2540b5ca6657fe421f6f2986f32fba1b8840cafcc37b3ec5402705cb0edc0aac6b12d972b5da0326339a04c875dbd8f8cce902f613558f3f9d21b4a0cace31a3 SHA512 ee3a8c95e091992acb0558ff297743eb49bd8c73fbb9cd1f2b56db75137573dda2c677b1b25eb213fbd8779be004b06f95cded04273d7a469cf49f45cc27813a
diff --git a/app-i18n/ibus-libpinyin/files/ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch b/app-i18n/ibus-libpinyin/files/ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch
new file mode 100644
index 000000000000..e3f001d42002
--- /dev/null
+++ b/app-i18n/ibus-libpinyin/files/ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch
@@ -0,0 +1,43 @@
+Fix quotes for compatibilty with sqlite3.41+
+https://bugs.gentoo.org/898478
+
+From b7f58280a3f1e20e01471fa53509007c0e96ad02 Mon Sep 17 00:00:00 2001
+From: graham
+Date: Sat, 4 Mar 2023 15:55:03 +0000
+Subject: [PATCH] change double quotes to single quotes to meet SQL standard
+ for strings, compatible with sqlite 3.41
+
+---
+ data/english.awk | 2 +-
+ data/table.awk | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/english.awk b/data/english.awk
+index c5dc0aa..bed156d 100644
+--- a/data/english.awk
++++ b/data/english.awk
+@@ -16,7 +16,7 @@ BEGIN {
+ }
+
+ # Insert data into english table
+- { printf "INSERT INTO english (word, freq) VALUES (\"%s\", %f);\n", $1, $2}
++ { printf "INSERT INTO english (word, freq) VALUES ('%s', %f);\n", $1, $2}
+
+ #quit sqlite3
+ END {
+diff --git a/data/table.awk b/data/table.awk
+index 700529c..c097ec2 100644
+--- a/data/table.awk
++++ b/data/table.awk
+@@ -21,7 +21,7 @@ BEGIN {
+
+ # Insert data into phrases table
+ NF == 4 {
+- printf "INSERT INTO phrases (id, tabkeys, phrase) VALUES (%d, \"%s\", \"%s\");\n", id, $3, $1;
++ printf "INSERT INTO phrases (id, tabkeys, phrase) VALUES (%d, '%s', '%s');\n", id, $3, $1;
+ id++;
+ }
+
+--
+2.39.2
+
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.12.1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.12.1.ebuild
deleted file mode 100644
index b7af5906e50e..000000000000
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.12.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2015-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit autotools gnome2-utils lua-single python-single-r1
-
-DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
-HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
-SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="boost lua opencc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- lua? ( ${LUA_REQUIRED_USE} )"
-
-BDEPEND="dev-db/sqlite:3
- virtual/pkgconfig"
-
-DEPEND="${PYTHON_DEPS}
- >=app-i18n/libpinyin-2.2.1:=
- dev-db/sqlite:3
- dev-libs/glib:2
- virtual/libintl
- $(python_gen_cond_dep '
- app-i18n/ibus[python(+),${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
- boost? ( dev-libs/boost:= )
- lua? ( ${LUA_DEPS} )
- opencc? ( app-i18n/opencc:= )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-
- if use lua; then
- lua-single_pkg_setup
- fi
-}
-
-src_prepare() {
- sed -i \
- -e "/^appdatadir/s:/appdata:/metainfo:" \
- data/Makefile.am || die
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --enable-english-input-mode \
- $(use_enable boost) \
- $(use_enable lua lua-extension) \
- $(use_enable opencc)
-}
-
-pkg_postinst() {
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.0.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1-r1.ebuild
similarity index 93%
rename from app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.0.ebuild
rename to app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1-r1.ebuild
index f2661fb08430..c61330975867 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.0.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit autotools gnome2-utils lua-single python-single-r1
@@ -36,6 +36,10 @@ DEPEND="${PYTHON_DEPS}
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${P}_sqlite3.41_fix_quotes.patch
+)
+
pkg_setup() {
python-single-r1_pkg_setup
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild
index b7af5906e50e..25bcb2100bd1 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit autotools gnome2-utils lua-single python-single-r1
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 782eb2cfc2c6..695664833b0e 100644
Binary files a/app-laptop/Manifest.gz and b/app-laptop/Manifest.gz differ
diff --git a/app-laptop/hdapsd/metadata.xml b/app-laptop/hdapsd/metadata.xml
index af8c4b30f832..ba8dfb8f7fb2 100644
--- a/app-laptop/hdapsd/metadata.xml
+++ b/app-laptop/hdapsd/metadata.xml
@@ -1,10 +1,6 @@
-
- junghans@gentoo.org
- Christoph Junghans
-
mjo@gentoo.org
Michael Orlitzky
diff --git a/app-laptop/tpacpi-bat/metadata.xml b/app-laptop/tpacpi-bat/metadata.xml
index 82c4e06c2bd5..6778091ccf54 100644
--- a/app-laptop/tpacpi-bat/metadata.xml
+++ b/app-laptop/tpacpi-bat/metadata.xml
@@ -1,10 +1,7 @@
-
- junghans@gentoo.org
- Christoph Junghans
-
+
teleshoes/tpacpi-bat
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index b926cdaddeed..cd1a3b786245 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/colordiff/colordiff-1.0.21.ebuild b/app-misc/colordiff/colordiff-1.0.21.ebuild
index fb95c9cd00e5..9a0fb0ab3ed0 100644
--- a/app-misc/colordiff/colordiff-1.0.21.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colordiff.org/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
RDEPEND="
dev-lang/perl
diff --git a/app-misc/ddccontrol-db/Manifest b/app-misc/ddccontrol-db/Manifest
index fc1bfe60beb1..60768e0b9236 100644
--- a/app-misc/ddccontrol-db/Manifest
+++ b/app-misc/ddccontrol-db/Manifest
@@ -1 +1 @@
-DIST ddccontrol-db-20210812.tar.gz 100719 BLAKE2B aecc9e9bf432905652e69b17b274daa07222d8f766048f29493eb0e50e07331fb5434258faad277ce21dec6475b192b4575eb1ebbd117edd25d333091ba33c8c SHA512 5bf64d69e1dd4324ce498909313b5c32a4af18d101e1536c40845f9a440f353e0ecb36d26441733c68de05be7e52dcea983325d70f4d542df85b5462ad193cb7
+DIST ddccontrol-db-20230223.tar.gz 112436 BLAKE2B 2ea33abe318005b340481ea6973ecbf5e261dfdd5579ad016262d0e1ee5ef44e15d16600a88d0323810bed4bf062632406c305202296932dc2e71288a888b091 SHA512 303345137d9f5760d4ee10db75322a3be97fe4269eb469e4ff798fe69f60670b8408ca87d2b3ad10f47ccb1f33c99c3ce09a1294f60e66d429074df685ab1501
diff --git a/app-misc/ddccontrol-db/ddccontrol-db-20210812.ebuild b/app-misc/ddccontrol-db/ddccontrol-db-20230223.ebuild
similarity index 93%
rename from app-misc/ddccontrol-db/ddccontrol-db-20210812.ebuild
rename to app-misc/ddccontrol-db/ddccontrol-db-20230223.ebuild
index 2a5c6087bcc6..3b099755cffe 100644
--- a/app-misc/ddccontrol-db/ddccontrol-db-20210812.ebuild
+++ b/app-misc/ddccontrol-db/ddccontrol-db-20230223.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/app-misc/radeontop/radeontop-1.4.ebuild b/app-misc/radeontop/radeontop-1.4.ebuild
index 2c1606ec6fba..6aad6527b642 100644
--- a/app-misc/radeontop/radeontop-1.4.ebuild
+++ b/app-misc/radeontop/radeontop-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/clbr/radeontop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~loong ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
IUSE="nls video_cards_amdgpu video_cards_radeon"
REQUIRED_USE="
|| ( video_cards_amdgpu video_cards_radeon )
diff --git a/app-misc/rmlint/rmlint-2.10.1-r1.ebuild b/app-misc/rmlint/rmlint-2.10.1-r2.ebuild
similarity index 89%
rename from app-misc/rmlint/rmlint-2.10.1-r1.ebuild
rename to app-misc/rmlint/rmlint-2.10.1-r2.ebuild
index 0bb48648fcc8..4d755cc14da3 100644
--- a/app-misc/rmlint/rmlint-2.10.1-r1.ebuild
+++ b/app-misc/rmlint/rmlint-2.10.1-r2.ebuild
@@ -27,7 +27,12 @@ RDEPEND="
${DEPEND}
gui? (
${PYTHON_DEPS}
- x11-libs/gtksourceview:3.0
+ gnome-base/librsvg:2[introspection]
+ sys-auth/polkit[introspection]
+ x11-libs/gdk-pixbuf[introspection]
+ x11-libs/gtk+:3[introspection]
+ x11-libs/gtksourceview:3.0[introspection]
+ x11-libs/pango[introspection]
$(python_gen_cond_dep '
dev-python/colorlog[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
@@ -76,6 +81,9 @@ PATCHES=(
src_prepare() {
default
+ # Force the GUI to run with the correct PYTHON_SINGLE_TARGET
+ sed -i "/const char \*commands/s/python3/${EPYTHON}/" \
+ lib/cmdline.c || die
if use test && use x86; then
# Skip part of a test until this is fixed:
# https://github.com/sahib/rmlint/issues/522
diff --git a/app-misc/tmux/tmux-3.3a-r1.ebuild b/app-misc/tmux/tmux-3.3a-r1.ebuild
index be5d2c77bb8b..875e3486c3c6 100644
--- a/app-misc/tmux/tmux-3.3a-r1.ebuild
+++ b/app-misc/tmux/tmux-3.3a-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
else
SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
fi
S="${WORKDIR}/${P/_/-}"
fi
diff --git a/app-misc/trash-cli/trash-cli-0.22.8.27.ebuild b/app-misc/trash-cli/trash-cli-0.22.8.27.ebuild
index ad77462deeaa..5eb1d0cd3167 100644
--- a/app-misc/trash-cli/trash-cli-0.22.8.27.ebuild
+++ b/app-misc/trash-cli/trash-cli-0.22.8.27.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/andreafrancia/${PN}/archive/${PV}.tar.gz -> ${P}.tar
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
BDEPEND="
test? (
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index aae8f54d9ab9..70458d55d91d 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/elogviewer/elogviewer-3.2.ebuild b/app-portage/elogviewer/elogviewer-3.2.ebuild
index f247168bb18c..1c6330793153 100644
--- a/app-portage/elogviewer/elogviewer-3.2.ebuild
+++ b/app-portage/elogviewer/elogviewer-3.2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
DISABLE_AUTOFORMATTING=true
diff --git a/app-portage/grs/grs-0.7.ebuild b/app-portage/grs/grs-0.7.ebuild
index 55591463910e..f4ad029668a2 100644
--- a/app-portage/grs/grs-0.7.ebuild
+++ b/app-portage/grs/grs-0.7.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9,10,11} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1 linux-info
diff --git a/app-portage/grs/grs-0.8-r1.ebuild b/app-portage/grs/grs-0.8-r1.ebuild
index 8b4b3d70c10c..c9da5b2394a2 100644
--- a/app-portage/grs/grs-0.8-r1.ebuild
+++ b/app-portage/grs/grs-0.8-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9,10,11} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1 linux-info
diff --git a/app-portage/grs/grs-9999.ebuild b/app-portage/grs/grs-9999.ebuild
index 84ef9c68439c..540cf24b2eb6 100644
--- a/app-portage/grs/grs-9999.ebuild
+++ b/app-portage/grs/grs-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9,10,11} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1 linux-info
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 7abd8893af5e..3445039df35c 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
index b7202a361d31..98621a7c9a80 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@@ -42,7 +42,7 @@ case ${TERM} in
PS1='\[\033]0;\u@\h:\w\007\]'
;;
screen*)
- PS1='\[\033k\u@\h:\w\033\\\]'
+ PS1='\[\033_\u@\h:\w\033\\\]'
;;
*)
unset PS1
diff --git a/app-shells/hstr/hstr-2.6.ebuild b/app-shells/hstr/hstr-2.6.ebuild
index 8383416e9bc6..6f85ef075e13 100644
--- a/app-shells/hstr/hstr-2.6.ebuild
+++ b/app-shells/hstr/hstr-2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
RDEPEND="
sys-libs/ncurses:=[unicode(+)]"
diff --git a/app-shells/mpibash/metadata.xml b/app-shells/mpibash/metadata.xml
index 05c42cd54152..9c1468f61f6a 100644
--- a/app-shells/mpibash/metadata.xml
+++ b/app-shells/mpibash/metadata.xml
@@ -1,10 +1,6 @@
-
- junghans@gentoo.org
- Christoph Junghans
-
sci@gentoo.org
Gentoo Science Project
diff --git a/app-shells/zsh/zsh-5.9-r3.ebuild b/app-shells/zsh/zsh-5.9-r3.ebuild
index 05a149894d5e..35f108739d09 100644
--- a/app-shells/zsh/zsh-5.9-r3.ebuild
+++ b/app-shells/zsh/zsh-5.9-r3.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
else
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
https://www.zsh.org/pub/old/${P}.tar.xz
mirror://sourceforge/${PN}/${P}.tar.xz
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index dda72be4f68b..ba878b13c285 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/dblatex/dblatex-0.3.12.ebuild b/app-text/dblatex/dblatex-0.3.12.ebuild
index d6fdaf52dc2d..ba104ee9d005 100644
--- a/app-text/dblatex/dblatex-0.3.12.ebuild
+++ b/app-text/dblatex/dblatex-0.3.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${PN}3-$
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="inkscape test"
RESTRICT="!test? ( test )"
diff --git a/app-text/extract_url/extract_url-1.6.2.ebuild b/app-text/extract_url/extract_url-1.6.2.ebuild
index 5f105f6cc147..e64257e765c4 100644
--- a/app-text/extract_url/extract_url-1.6.2.ebuild
+++ b/app-text/extract_url/extract_url-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/m3m0ryh0l3/${PN/_/}/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
RDEPEND="
diff --git a/app-text/kjots/kjots-5.1.0-r2.ebuild b/app-text/kjots/kjots-5.1.0-r3.ebuild
similarity index 80%
rename from app-text/kjots/kjots-5.1.0-r2.ebuild
rename to app-text/kjots/kjots-5.1.0-r3.ebuild
index ade68829883b..19a1d1ab13f5 100644
--- a/app-text/kjots/kjots-5.1.0-r2.ebuild
+++ b/app-text/kjots/kjots-5.1.0-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
KDE_ORG_CATEGORY="pim"
-KFMIN=5.82.0
-QTMIN=5.15.2
+KFMIN=5.102.0
+QTMIN=5.15.5
inherit ecm kde.org
DESCRIPTION="Note taking utility by KDE"
@@ -13,7 +13,7 @@ HOMEPAGE="https://userbase.kde.org/KJots https://community.kde.org/PIM/KJots"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64"
fi
LICENSE="GPL-2"
@@ -26,11 +26,11 @@ DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-apps/akonadi-20.12.2:5
- >=kde-apps/akonadi-notes-20.12.2:5
- >=kde-apps/kmime-20.12.2:5
- >=kde-apps/kontactinterface-20.12.2:5
- >=kde-apps/kpimtextedit-20.12.2:5[speech(+)=]
+ >=kde-apps/akonadi-22.08.3:5
+ >=kde-apps/akonadi-notes-22.08.3:5
+ >=kde-apps/kmime-22.08.3:5
+ >=kde-apps/kontactinterface-22.08.3:5
+ >=kde-apps/kpimtextedit-22.08.3:5[speech(+)=]
>=kde-frameworks/kbookmarks-${KFMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -43,7 +43,9 @@ DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ >=kde-apps/kdepim-runtime-22.08.3:5
+"
PATCHES=(
"${FILESDIR}/${P}-unused-dep.patch"
diff --git a/app-text/mdbook/Manifest b/app-text/mdbook/Manifest
index 165715069c98..2106d3330b18 100644
--- a/app-text/mdbook/Manifest
+++ b/app-text/mdbook/Manifest
@@ -94,6 +94,7 @@ DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b62
DIST markup5ever-0.11.0.crate 34667 BLAKE2B 7a4e9c860949296912616fab105b688fc5ad86df012f064efb3e5125aae57869b4e63f4a551fc787e65987e5bb8c0dc26e2ff99651a2e56fa67237796f5967e8 SHA512 c9e9452f5bd43a7e578434467ce324a857ad600965fe37a24650f0f3e968fe1dc603ac8c7b9c4ebe2f624511cbdbc592ca0072b04ae094738670e199df9ad05e
DIST markup5ever_rcdom-0.2.0.crate 222948 BLAKE2B 2105ceee730f5fbb3c14ddb7bfe8ee5139febc870e37e9ea169f107ac8060ee4f5782b185310bada5f646600c2b8bb7fbed144c056e5b437133443f62a04ad99 SHA512 bf21aee14ec41ea9ac5a5645285173394a561c34311f4b4a7f3c2e8fb32a54a777e4913c985daa2f693bb7b1aaf799d45ab9a6f359b900d2bb916b1ff376fbe4
DIST mdbook-0.4.27.tar.gz 1518389 BLAKE2B 6eb386a48d631eb246871fe5269e0a49f008ff8395fd05a3948de7b10d663c64ca22e3ee96aa79afbeac37a0f732c988ef7620359da2c25f563859664c8313f3 SHA512 30d78b11dd1c4302c156c5a2df7b3e32de7a9d8074d9826b555c4c1cafe43692fc80273ead9bce26c85885e16f2d99c872f89919239820d420048b8a56a09193
+DIST mdbook-0.4.28.tar.gz 1518890 BLAKE2B edabc227d28e7e4e38299e5e9e1973dd8f6cf533e9f21bbda01a5357376032da2319bc86bc2077b85ddb65317c4cd5e6d03e0dd67cdf51dc10e15426febd0330 SHA512 91c82aabd9b422c3714257a2de415f74b5091ef114586281e1adfdfa9d385e416c483d4f2c2ef052e9bd86234ca78f63f26ad24abcaeae05abebac0483f824ea
DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
DIST mime_guess-2.0.4.crate 26399 BLAKE2B 667f9b8009bac2e1d8b835ae8825afaaa2ea6eddd4cebbf18de8f8fcde9318eacaeeb08066bdd611883bef5f8a53fa2506b57dffff543c3a57316e07b525f7f5 SHA512 acfbbfdc5bd725edde43e4915858b8d016e90a5b483664f0bcd5e8d2b0b3684bf0f6020aea147b5bf429f218a7af8080761cea4c5c04b68fa66fd6a676376908
diff --git a/app-text/mdbook/mdbook-0.4.28.ebuild b/app-text/mdbook/mdbook-0.4.28.ebuild
new file mode 100644
index 000000000000..8ccef7d9ff34
--- /dev/null
+++ b/app-text/mdbook/mdbook-0.4.28.ebuild
@@ -0,0 +1,262 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+ aho-corasick-0.7.20
+ ammonia-3.3.0
+ android_system_properties-0.1.5
+ anyhow-1.0.69
+ assert_cmd-2.0.8
+ autocfg-1.1.0
+ base64-0.13.1
+ bit-set-0.5.3
+ bit-vec-0.6.3
+ bitflags-1.3.2
+ block-buffer-0.10.3
+ bstr-1.0.1
+ bumpalo-3.11.1
+ byteorder-1.4.3
+ bytes-1.3.0
+ cc-1.0.77
+ cfg-if-1.0.0
+ chrono-0.4.23
+ clap-4.0.29
+ clap_complete-4.0.6
+ clap_lex-0.3.0
+ codespan-reporting-0.11.1
+ core-foundation-sys-0.8.3
+ cpufeatures-0.2.5
+ crossbeam-channel-0.5.6
+ crossbeam-utils-0.8.14
+ crypto-common-0.1.6
+ ctor-0.1.26
+ cxx-1.0.83
+ cxx-build-1.0.83
+ cxxbridge-flags-1.0.83
+ cxxbridge-macro-1.0.83
+ diff-0.1.13
+ difflib-0.4.0
+ digest-0.10.6
+ doc-comment-0.3.3
+ either-1.8.0
+ elasticlunr-rs-3.0.1
+ env_logger-0.10.0
+ errno-0.2.8
+ errno-dragonfly-0.1.2
+ fastrand-1.8.0
+ filetime-0.2.19
+ float-cmp-0.9.0
+ fnv-1.0.7
+ form_urlencoded-1.1.0
+ fsevent-sys-4.1.0
+ futf-0.1.5
+ futures-channel-0.3.25
+ futures-core-0.3.25
+ futures-macro-0.3.25
+ futures-sink-0.3.25
+ futures-task-0.3.25
+ futures-util-0.3.25
+ generic-array-0.14.6
+ getrandom-0.2.8
+ gitignore-1.0.7
+ glob-0.3.0
+ h2-0.3.15
+ handlebars-4.3.6
+ hashbrown-0.12.3
+ headers-0.3.8
+ headers-core-0.2.0
+ hermit-abi-0.1.19
+ hermit-abi-0.2.6
+ html5ever-0.26.0
+ http-0.2.8
+ http-body-0.4.5
+ httparse-1.8.0
+ httpdate-1.0.2
+ humantime-2.1.0
+ hyper-0.14.23
+ iana-time-zone-0.1.53
+ iana-time-zone-haiku-0.1.1
+ idna-0.3.0
+ indexmap-1.9.2
+ inotify-0.9.6
+ inotify-sys-0.1.5
+ instant-0.1.12
+ io-lifetimes-1.0.3
+ is-terminal-0.4.1
+ itertools-0.10.5
+ itoa-1.0.4
+ js-sys-0.3.60
+ kqueue-1.0.7
+ kqueue-sys-1.0.3
+ libc-0.2.138
+ link-cplusplus-1.0.7
+ linux-raw-sys-0.1.4
+ lock_api-0.4.9
+ log-0.4.17
+ mac-0.1.1
+ maplit-1.0.2
+ markup5ever-0.11.0
+ markup5ever_rcdom-0.2.0
+ memchr-2.5.0
+ mime-0.3.16
+ mime_guess-2.0.4
+ mio-0.8.5
+ new_debug_unreachable-1.0.4
+ normalize-line-endings-0.3.0
+ notify-5.1.0
+ notify-debouncer-mini-0.2.1
+ num-integer-0.1.45
+ num-traits-0.2.15
+ num_cpus-1.14.0
+ once_cell-1.17.0
+ opener-0.5.2
+ os_str_bytes-6.4.1
+ output_vt100-0.1.3
+ parking_lot-0.12.1
+ parking_lot_core-0.9.5
+ percent-encoding-2.2.0
+ pest-2.5.1
+ pest_derive-2.5.1
+ pest_generator-2.5.1
+ pest_meta-2.5.1
+ phf-0.10.1
+ phf_codegen-0.10.0
+ phf_generator-0.10.0
+ phf_shared-0.10.0
+ pin-project-1.0.12
+ pin-project-internal-1.0.12
+ pin-project-lite-0.2.9
+ pin-utils-0.1.0
+ ppv-lite86-0.2.17
+ precomputed-hash-0.1.1
+ predicates-2.1.5
+ predicates-core-1.0.5
+ predicates-tree-1.0.7
+ pretty_assertions-1.3.0
+ proc-macro2-1.0.47
+ pulldown-cmark-0.9.2
+ quote-1.0.21
+ rand-0.8.5
+ rand_chacha-0.3.1
+ rand_core-0.6.4
+ redox_syscall-0.2.16
+ regex-1.7.1
+ regex-automata-0.1.10
+ regex-syntax-0.6.28
+ remove_dir_all-0.5.3
+ rustix-0.36.5
+ rustls-pemfile-0.2.1
+ ryu-1.0.11
+ same-file-1.0.6
+ scoped-tls-1.0.1
+ scopeguard-1.1.0
+ scratch-1.0.2
+ select-0.6.0
+ semver-1.0.16
+ serde-1.0.152
+ serde_derive-1.0.152
+ serde_json-1.0.93
+ serde_urlencoded-0.7.1
+ sha-1-0.10.1
+ sha1-0.10.5
+ shlex-1.1.0
+ siphasher-0.3.10
+ slab-0.4.7
+ smallvec-1.10.0
+ socket2-0.4.7
+ string_cache-0.8.4
+ string_cache_codegen-0.5.2
+ strsim-0.10.0
+ syn-1.0.105
+ tempfile-3.3.0
+ tendril-0.4.3
+ termcolor-1.1.3
+ terminal_size-0.2.3
+ termtree-0.4.0
+ thiserror-1.0.37
+ thiserror-impl-1.0.37
+ tinyvec-1.6.0
+ tinyvec_macros-0.1.0
+ tokio-1.25.0
+ tokio-macros-1.8.2
+ tokio-stream-0.1.11
+ tokio-tungstenite-0.17.2
+ tokio-util-0.7.4
+ toml-0.5.10
+ topological-sort-0.2.2
+ tower-service-0.3.2
+ tracing-0.1.37
+ tracing-core-0.1.30
+ try-lock-0.2.3
+ tungstenite-0.17.3
+ typenum-1.16.0
+ ucd-trie-0.1.5
+ unicase-2.6.0
+ unicode-bidi-0.3.8
+ unicode-ident-1.0.5
+ unicode-normalization-0.1.22
+ unicode-width-0.1.10
+ url-2.3.1
+ utf-8-0.7.6
+ version_check-0.9.4
+ wait-timeout-0.2.0
+ walkdir-2.3.2
+ want-0.3.0
+ warp-0.3.3
+ wasi-0.11.0+wasi-snapshot-preview1
+ wasm-bindgen-0.2.83
+ wasm-bindgen-backend-0.2.83
+ wasm-bindgen-macro-0.2.83
+ wasm-bindgen-macro-support-0.2.83
+ wasm-bindgen-shared-0.2.83
+ winapi-0.3.9
+ winapi-i686-pc-windows-gnu-0.4.0
+ winapi-util-0.1.5
+ winapi-x86_64-pc-windows-gnu-0.4.0
+ windows-sys-0.42.0
+ windows_aarch64_gnullvm-0.42.0
+ windows_aarch64_msvc-0.42.0
+ windows_i686_gnu-0.42.0
+ windows_i686_msvc-0.42.0
+ windows_x86_64_gnu-0.42.0
+ windows_x86_64_gnullvm-0.42.0
+ windows_x86_64_msvc-0.42.0
+ xml5ever-0.17.0
+ yansi-0.5.1"
+inherit cargo toolchain-funcs
+
+DESCRIPTION="Create a book from markdown files"
+HOMEPAGE="https://rust-lang.github.io/mdBook/"
+SRC_URI="
+ https://github.com/rust-lang/mdBook/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris)"
+S="${WORKDIR}/${P/b/B}"
+
+# CC-BY-4.0/OFL-1.1: embeds fonts inside the executable
+LICENSE="Apache-2.0 Artistic-2 BSD CC-BY-4.0 CC0-1.0 ISC MIT MPL-2.0 OFL-1.1 Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_compile() {
+ cargo_src_compile
+
+ if use doc; then
+ if tc-is-cross-compiler; then
+ ewarn "html docs were skipped due to cross-compilation"
+ else
+ target/$(usex debug{,} release)/${PN} build -d html guide || die
+ fi
+ fi
+}
+
+src_install() {
+ cargo_src_install
+
+ dodoc CHANGELOG.md README.md
+ use doc && ! tc-is-cross-compiler && dodoc -r guide/html
+}
diff --git a/app-text/pandoc-bin/Manifest b/app-text/pandoc-bin/Manifest
index 19a718381717..aab74acf7b76 100644
--- a/app-text/pandoc-bin/Manifest
+++ b/app-text/pandoc-bin/Manifest
@@ -1,6 +1,6 @@
-DIST pandoc-2.19.2-linux-amd64.tar.gz 17174200 BLAKE2B effed9eab23fb5e957e3f6282fe0356935819e5a89ac02bd687b6b635fd0a1f5ba65b5b8b40d5bbd8f89d3b17d290184dd84555442eae15f1c1d5c916711d43a SHA512 c3c2ea179601cf9fea3826e6e6d148b951e5d5fe440db80759bdd49de2200660e6b66100453bd1714623bd98ac46fd51a4fb6e715668de04a122181949eee82a
-DIST pandoc-2.19.2-linux-arm64.tar.gz 19033935 BLAKE2B c6964e708d6f0fbb4be4c3ba226dbc31629c466caa75f97ec450296f2c546d587db6c7d9145c65147d5c7ac7949e1dbd3fa3f6944276b4af8ccca2d896010403 SHA512 adb4eb5e3fa79d188d2123d132493c131dbedb408380012876b8ee80950cde4315ac179e9126d30d55221c3637b911b153ee4e6f550ccbc4dcd1f4828229974a
DIST pandoc-3.0.1-linux-amd64.tar.gz 26480576 BLAKE2B f74983b0665b015541e53e1f56666110c6587d7b80761a31bdb9b0da7450d934df93571c3e03ecf9561de5d3f0c4800e5b8fb6ef82f7eb5043c39348b11963a4 SHA512 9424af2647211894370a5f268a42add0c1437568e56b2cfd7f2c9b722216201afd2cbce39ab480652d4bc0b54ec8b0efafc5b0726c8ce68ac3d8a2f73e801dde
DIST pandoc-3.0.1-linux-arm64.tar.gz 28536489 BLAKE2B 38cfd1c6fda336f445ee58ff1b7d63c6edc72d0c87b9e01d724c2db75bb0bb429eb0b076e999b31149bc76921fc58dca47441233dd5c2cf010283c910107a75f SHA512 beb59675be8b6176c577c4a34e0c3a2dc5789d47dfdac51d22470f2e7ab8238ce12b996f5d8b021bc13d8cb4e4aecff428a5c1ed3703a483d06cd97f09705004
DIST pandoc-3.1-linux-amd64.tar.gz 26480348 BLAKE2B faabb114fde41c51ada10d4bb85ca694f010c2fe30e9f3078d4dc7b2bfb3d35c078bac9b7694de656b1bc4d2558476ead3b2ce2a1085e14a6e5e1ffb18b0a248 SHA512 945f077a2ad8f40546ec83e0a60b0e30b54f066005ef53f92a83e20eb38afda2270a214f35c6c0b2c2c77f53bcfe89cfad56795e58cb834dc2cb1af43b2192ea
DIST pandoc-3.1-linux-arm64.tar.gz 28541921 BLAKE2B c00281dd2b4707b5046a79b83d28d95d6b8bb71076f65904f4c64e9628491ee4e35a9470ca962357dd18776caa9f895fdb8edad1211a3cdf63276c20aa5a9b5f SHA512 4ada611a0748b5607ac97da80925a86bf7f10f723cd3cec276d257d81cf991c6e8d5324bb99f67e5fbf3785558f03e86b2cda6524c3de79f1c68febd17abe635
+DIST pandoc-3.1.1-linux-amd64.tar.gz 26510765 BLAKE2B 5d95137a9d5dabbead7a0a56b67d7f876491e6bb71812958163dae600e6826544d89d5f036c3c6e19b022462014a5c317d73ed59a6955d02c4a5ae70088e2a31 SHA512 f6b99770a173e8ef0136b009a3d646fe60c80133827f6a09c40d1a5a2c59cf757d89fbc1314555c0883fcfc2b8f8b05502e0efdfe57f17b892d13ef49d4e5725
+DIST pandoc-3.1.1-linux-arm64.tar.gz 28579848 BLAKE2B 8933d6d062f51b172bb142a96dd5fcd5057b1c070b90272b8b4f192780e5107b1ef8f143e662a68ac4472b23982dd5def753db0880f15785a40b8a87e116182a SHA512 b420f33114dcf6fa1e9512fdde64d85e00c837eb98c3f3e35b21c49dc8a38dfda3c90ef21aa99108da3349ae1abe27b108c57e969a703e8919105c1918c70aa0
diff --git a/app-text/pandoc-bin/pandoc-bin-2.19.2.ebuild b/app-text/pandoc-bin/pandoc-bin-3.1.1.ebuild
similarity index 55%
rename from app-text/pandoc-bin/pandoc-bin-2.19.2.ebuild
rename to app-text/pandoc-bin/pandoc-bin-3.1.1.ebuild
index 231940a71b4c..f5289c741e6a 100644
--- a/app-text/pandoc-bin/pandoc-bin-2.19.2.ebuild
+++ b/app-text/pandoc-bin/pandoc-bin-3.1.1.ebuild
@@ -7,7 +7,8 @@ MY_PN=${PN//-bin/}
MY_P=${MY_PN}-${PV}
DESCRIPTION="Conversion between markup formats (binary package)"
-HOMEPAGE="https://pandoc.org/"
+HOMEPAGE="https://pandoc.org/
+ https://github.com/jgm/pandoc/"
BASE_URI="https://github.com/jgm/${MY_PN}/releases/download/${PV}/${MY_P}"
SRC_URI="
@@ -16,9 +17,9 @@ SRC_URI="
"
S="${WORKDIR}"/${MY_P}
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="-* amd64 ~arm64" # Upstream provides only AMD and ARM 64-bit binaries
+KEYWORDS="-* ~amd64 ~arm64"
IUSE="+pandoc-symlink"
RDEPEND="pandoc-symlink? ( !${CATEGORY}/${MY_PN} )"
@@ -29,16 +30,27 @@ QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
src_unpack() {
default
- # Manpages are gzipped
- unpack "${S}"/share/man/man1/${MY_PN}.1.gz
+ # Manpages are gzipped.
+ unpack "${S}"/share/man/man1/*.1.gz
}
src_install() {
- newbin bin/${MY_PN} ${PN}
+ exeinto /usr/bin
+ newexe bin/${MY_PN} ${PN}
+ dosym ${PN} /usr/bin/pandoc-lua-bin
+ dosym ${PN} /usr/bin/pandoc-server-bin
+
+ newman "${WORKDIR}"/${MY_PN}-lua.1 pandoc-lua-bin.1
+ newman "${WORKDIR}"/${MY_PN}-server.1 pandoc-server-bin.1
newman "${WORKDIR}"/${MY_PN}.1 ${PN}.1
if use pandoc-symlink ; then
dosym ${PN} /usr/bin/${MY_PN}
+ dosym pandoc-lua-bin /usr/bin/${MY_PN}-lua
+ dosym pandoc-server-bin /usr/bin/${MY_PN}-server
+
dosym ${PN}.1 /usr/share/man/man1/${MY_PN}.1
+ dosym pandoc-lua-bin.1 /usr/share/man/man1/${MY_PN}-lua.1
+ dosym pandoc-server-bin.1 /usr/share/man/man1/${MY_PN}-server.1
fi
}
diff --git a/app-text/pdfarranger/Manifest b/app-text/pdfarranger/Manifest
index 1647ec34ce7a..0b264609101a 100644
--- a/app-text/pdfarranger/Manifest
+++ b/app-text/pdfarranger/Manifest
@@ -1 +1,2 @@
DIST pdfarranger-1.9.1.tar.gz 279138 BLAKE2B 18ac9a63eff5455e395b3c126adea590b230b1884ee64e08eeaf4951c663787a827e42db9475632210b2ca3875a23e1718fdfc1b4309c5babc7ce31b6e188829 SHA512 ba60744f1b7c96ca9f86ed75cc5ea1b3df41af162048550a916a96972b0e987acfbdc3c46693adc239fdad5569369f24555e157a2f56936374ba132ffc8cbde6
+DIST pdfarranger-1.9.2.tar.gz 280531 BLAKE2B 6a7a8e73e701fe9bbb5bd1f94411003dfb16966ad28522820a27e7ab554b3c2679eec3f4a08332bd58dc1c1cafd620e1daef2f39cb0f6dc5589d7bd5eb293650 SHA512 c22cc753e2606d90913970ce57462b4aca7c41fa6a9b6ece76b618800cad12bce808aba4a6fba2ef9698fda209e11799f30d091a88c9beb2e80a09ac7df51cb8
diff --git a/app-text/pdfarranger/pdfarranger-1.9.2.ebuild b/app-text/pdfarranger/pdfarranger-1.9.2.ebuild
new file mode 100644
index 000000000000..44893f0ef11c
--- /dev/null
+++ b/app-text/pdfarranger/pdfarranger-1.9.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 optfeature xdg desktop
+
+DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages"
+HOMEPAGE="https://github.com/jeromerobert/pdfarranger"
+SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ app-text/poppler[introspection,cairo]
+ >=dev-python/pikepdf-6.0.0[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]
+ x11-libs/pango[introspection]
+"
+DEPEND="${RDEPEND}
+ dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+ dev-util/intltool
+"
+
+src_install() {
+ distutils-r1_src_install
+ for x in 16 32 48 256 scalable
+ do doicon -s ${x} data/icons/hicolor/${x}*/*
+ done
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ optfeature "image file import" media-gfx/img2pdf
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index de9aebfdb354..0f6b0ba5bf66 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -2,3 +2,5 @@ DIST poppler-23.01.0.tar.xz 1847492 BLAKE2B 8dd85767a0c101b3d7166719374658a233af
DIST poppler-23.01.0.tar.xz.sig 833 BLAKE2B 46c3910627fd69930fd428397e739e3fe41c9b835379dfe7abbdf421049a77b33ce1cf6a44bd386278d3610ae2547d119ac6da4c3bfa7f348c51fbce7319a878 SHA512 0cebaac1846e6b3944175bcb28b49592d562738c009a97e048abe9f6677718c97bea2b470ea503b8dd083fc5f154e71d539cf1e3bce08363c6979d268dcdfd3b
DIST poppler-23.02.0.tar.xz 1847612 BLAKE2B ca5187432c5088372f0b8f4fcd39a93998b28e505d214964de99cd03db555f8f80b05de19874264b1d732d2c45388562faead50b2b82116bb6031690419abd8c SHA512 0765319a1b106da740c7300172866e774ccbeec0bc0e938f009efd1a106b35ca2e5ab60a523e1d1dd5682b30499de4dffed0a1ca129c770263a096f781337a2c
DIST poppler-23.02.0.tar.xz.sig 833 BLAKE2B 48b46b92d8d95f25a0619aaa50c29c652e91ba99c5f8d5f30cbb879a2145e3a21df0258585ee9e44d036f4a8c1d54023e1bb22aa0d90bf69403b37c601b37ef2 SHA512 68fe9d46ec6f7f1b6d0d7becf96675477454af9218ad20ad159d8a06def73f08db59915adbb77b520e3e43091aaf895e045c7ccaafb57d2b2b9390e84e70a963
+DIST poppler-23.03.0.tar.xz 1849324 BLAKE2B 1247b7cf62466f65c46b739f0784e8ba97911940e04f91a7db28bf0663c8fe182f79066aa3925cb338580ccedbf17aecd2a2d2795e859680d1fb721390a1cbe0 SHA512 1c370d9262141ff5b720a4c3cf6f01573047398f8950295e3e99f32700946e3241e26e3d909cf78a278fc402306811fd87977d0f86a744f3eaedb4f39b8e8a2c
+DIST poppler-23.03.0.tar.xz.sig 833 BLAKE2B a8a07aac9068a3edc6cdce4d59c2b5d3d792dd6addcd420d5b92f013041cfd934c0da04a21eabefdd25167fb89b940945f8ca03e7a7280d03a47b6df8490bdf4 SHA512 3d950ff4b1a368b6edd8333677d1d125f60b4b1a052e20a2be6a0d38489e7af393be8359fc2c75010b2a28673e201507da4bf4c8458904fa712247d8ebda4786
diff --git a/app-text/poppler/poppler-23.03.0.ebuild b/app-text/poppler/poppler-23.03.0.ebuild
new file mode 100644
index 000000000000..750ab1f52a57
--- /dev/null
+++ b/app-text/poppler/poppler-23.03.0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2005-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+ SLOT="0/9999"
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/aacid.asc
+ inherit verify-sig
+
+ SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+ SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ SLOT="0/126" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+ >=media-libs/fontconfig-2.13
+ >=media-libs/freetype-2.10
+ sys-libs/zlib
+ cairo? (
+ >=dev-libs/glib-2.64:2
+ >=x11-libs/cairo-1.16
+ introspection? ( >=dev-libs/gobject-introspection-1.64:= )
+ )
+ curl? ( net-misc/curl )
+ jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
+ jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+ lcms? ( media-libs/lcms:2 )
+ nss? ( >=dev-libs/nss-3.49 )
+ png? ( media-libs/libpng:0= )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtxml:5
+ )
+ tiff? ( media-libs/tiff:= )
+"
+RDEPEND="${COMMON_DEPEND}
+ cjk? ( app-text/poppler-data )
+"
+DEPEND="${COMMON_DEPEND}
+ boost? ( >=dev-libs/boost-1.71 )
+"
+BDEPEND="
+ >=dev-util/glib-utils-2.64
+ virtual/pkgconfig
+"
+
+if [[ ${PV} != *9999* ]] ; then
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-aacid )"
+fi
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+ "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
+ "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Clang doesn't grok this flag, the configure nicely tests that, but
+ # cmake just uses it, so remove it if we use clang
+ if tc-is-clang ; then
+ sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+ fi
+
+ if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+ sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+ -i CMakeLists.txt || die
+ else
+ einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+ fi
+}
+
+src_configure() {
+ xdg_environment_reset
+ local mycmakeargs=(
+ -DBUILD_GTK_TESTS=OFF
+ -DBUILD_QT5_TESTS=OFF
+ -DBUILD_CPP_TESTS=OFF
+ -DBUILD_MANUAL_TESTS=OFF
+ -DRUN_GPERF_IF_PRESENT=OFF
+ -DENABLE_BOOST="$(usex boost)"
+ -DENABLE_ZLIB=ON
+ -DENABLE_ZLIB_UNCOMPRESS=OFF
+ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+ -DUSE_FLOAT=OFF
+ -DWITH_Cairo=$(usex cairo)
+ -DENABLE_LIBCURL=$(usex curl)
+ -DENABLE_CPP=$(usex cxx)
+ -DWITH_JPEG=$(usex jpeg)
+ -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+ -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+ -DENABLE_CMS=$(usex lcms lcms2 none)
+ -DWITH_NSS3=$(usex nss)
+ -DWITH_PNG=$(usex png)
+ $(cmake_use_find_package qt5 Qt5Core)
+ -DWITH_TIFF=$(usex tiff)
+ -DENABLE_UTILS=$(usex utils)
+ -DENABLE_QT6=OFF
+ )
+ use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # live version doesn't provide html documentation
+ if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+ # For now install gtk-doc there
+ insinto /usr/share/gtk-doc/html/poppler
+ doins -r "${S}"/glib/reference/html/*
+ fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 750ab1f52a57..96f13351c75a 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake toolchain-funcs xdg-utils
+inherit cmake flag-o-matic toolchain-funcs xdg-utils
if [[ ${PV} == *9999* ]] ; then
inherit git-r3
@@ -92,6 +92,8 @@ src_prepare() {
src_configure() {
xdg_environment_reset
+ append-lfs-flags # bug #898506
+
local mycmakeargs=(
-DBUILD_GTK_TESTS=OFF
-DBUILD_QT5_TESTS=OFF
diff --git a/app-text/recode/recode-3.7.13.ebuild b/app-text/recode/recode-3.7.13.ebuild
index 6d3afeadd352..a9904d251fe9 100644
--- a/app-text/recode/recode-3.7.13.ebuild
+++ b/app-text/recode/recode-3.7.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz
LICENSE="GPL-3+"
# librecode soname version
SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
IUSE="nls test"
RESTRICT="!test? ( test )"
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1.ebuild
index cda9cd6aa073..7cb5bba6de35 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
EGIT_BRANCH="develop"
else
- KEYWORDS="~amd64 ~arm ~riscv ~x86"
+ KEYWORDS="~amd64 arm ~riscv x86"
SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz"
fi
diff --git a/app-text/zathura/zathura-0.5.2-r4.ebuild b/app-text/zathura/zathura-0.5.2-r4.ebuild
index 6fe10b0117a9..cdd339ff5c32 100644
--- a/app-text/zathura/zathura-0.5.2-r4.ebuild
+++ b/app-text/zathura/zathura-0.5.2-r4.ebuild
@@ -17,7 +17,7 @@ else
https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}-manpages.tar.xz
"
- KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~amd64 arm ~riscv x86 ~amd64-linux ~x86-linux"
fi
LICENSE="ZLIB"
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index f284fb8de383..5e2de7227fb8 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/doctest/Manifest b/dev-cpp/doctest/Manifest
index cd05ef97c453..50e73388b4e9 100644
--- a/dev-cpp/doctest/Manifest
+++ b/dev-cpp/doctest/Manifest
@@ -1 +1,2 @@
+DIST doctest-2.4.10.tar.gz 2297167 BLAKE2B e6d2af9dc9207a1a5d86ebdad16f29a4c4d860334e75f79ded596bf181ff0c334895b5606710993eb9bb1d8c76359063b5ce5c7faa5c371a4315ac53275783e5 SHA512 f3d7c5c45b12a13b5df359727328a519f7a17c92ab868274c8c89e58a573c886ab8da9213ed31634b62a9c92e792e721a71fcb42a3d483b6dff5f6ef7bb03d41
DIST doctest-2.4.9.tar.gz 2292632 BLAKE2B 7d501eede5a2311117a04a11da5b518fcac4de53a73ba7b14f47395a759bc5d708438f25df61053a16a256ffcdfa37500a6892ef0890aa4df4d9f23533bfb18d SHA512 c7337e2de371c18973a0f4cb76458d6ae387e78874c9bc8aa367ffd2d592514b774e7c5ebf44f83b7046f6b33c6905fd079c36f4c33eadf52b3d651d978182cb
diff --git a/dev-cpp/doctest/doctest-2.4.10.ebuild b/dev-cpp/doctest/doctest-2.4.10.ebuild
new file mode 100644
index 000000000000..b2da0710bd8a
--- /dev/null
+++ b/dev-cpp/doctest/doctest-2.4.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The fastest feature-rich C++11/14/17/20 single-header testing framework"
+HOMEPAGE="https://github.com/doctest/doctest"
+SRC_URI="https://github.com/doctest/doctest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+ sed -i '/-Werror/d' scripts/cmake/common.cmake || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DDOCTEST_WITH_TESTS=$(usex test)
+ )
+ cmake_src_configure
+}
diff --git a/dev-cpp/highway/highway-1.0.3.ebuild b/dev-cpp/highway/highway-1.0.3.ebuild
index 9dcc7e3c3d20..af752cf34a06 100644
--- a/dev-cpp/highway/highway-1.0.3.ebuild
+++ b/dev-cpp/highway/highway-1.0.3.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then
EGIT_REPO_URI="https://github.com/google/highway.git"
else
SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
LICENSE="Apache-2.0"
diff --git a/dev-cpp/kokkos/metadata.xml b/dev-cpp/kokkos/metadata.xml
index 3f0d6861e854..41492a48020d 100644
--- a/dev-cpp/kokkos/metadata.xml
+++ b/dev-cpp/kokkos/metadata.xml
@@ -1,10 +1,6 @@
-
- junghans@gentoo.org
- Christoph Junghans
-
tamiko@gentoo.org
Matthias Maier
diff --git a/dev-cpp/random123/metadata.xml b/dev-cpp/random123/metadata.xml
index 125513d74f67..c0cd18916a93 100644
--- a/dev-cpp/random123/metadata.xml
+++ b/dev-cpp/random123/metadata.xml
@@ -1,10 +1,6 @@
-
- junghans@gentoo.org
- Christoph Junghans
-
sci@gentoo.org
Gentoo Science Project
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 3c60b3a99ee8..e9906f98fe8b 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/pgcli/pgcli-3.3.1-r1.ebuild b/dev-db/pgcli/pgcli-3.3.1-r2.ebuild
similarity index 93%
rename from dev-db/pgcli/pgcli-3.3.1-r1.ebuild
rename to dev-db/pgcli/pgcli-3.3.1-r2.ebuild
index 924b39e0aeeb..65af71f16b94 100644
--- a/dev-db/pgcli/pgcli-3.3.1-r1.ebuild
+++ b/dev-db/pgcli/pgcli-3.3.1-r2.ebuild
@@ -3,7 +3,8 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1
DESCRIPTION="CLI for Postgres with auto-completion and syntax highlighting"
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 8a85bc81838d..d782adc94864 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -1,6 +1,6 @@
DIST redis-6.2.10.tar.gz 2490833 BLAKE2B 289f424f4a119bc6fb05d227999dd027e22ea91e868a876a6501a271bf015dd66699a3b93074ba9c7e13bdb48c01fa60edb56c4d6e7300ada365f2f50c04225e SHA512 307d7e8f2d07ed82c64959dc56847be5a1d7cc17e04cc9a7266053d61221f782acadbb26662eab60751fcbc1be6b0f2e03b688972308dfcb47511bc9f35bb27a
+DIST redis-6.2.11.tar.gz 2492990 BLAKE2B edf046d86e295878abc5ba46ea6c8048c97f27b90d132ec1318350fa0634bb5e4cd1407757f07ef3c11abcb13b05ccc8a757bc17d7f1c9800644dfc0d2994d77 SHA512 9962446d7b1f14524a3007967768b33281dd33706567b8ac56e4cb7d3caa8533bcbc319ea899a163d56567be85cbc03cdcc440d9b1c9707372e10b53d1c1dcd7
DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 06f1b1e16cdf06c38b67c1f1dcccc025da50cc3719688b8c2bf23077d77dd97ea546909043fb65e60478ac3661cc033fa6e8d7a38e361e69eb93ba3db07b7c66 SHA512 d113094b8e31754915db7f0317d9b7969e034af3a7bac2ae0cbfad6cc61ba3aae35e9709c435abc1024a96f914df7a760b3cd18d06c375b541cfa837d1c5b953
-DIST redis-6.2.8.tar.gz 2489670 BLAKE2B 6a05754dcf7e6ed8934f665c0dab544f6e393cbd5e55d5043e2055c15dcbaf1da16a63b5503c8b69fc9ad85c81fd92078e3175bff33d7481e21581176e06e3bd SHA512 b07009628211b21c3cf64c215515d3ce51b19ad5f69740c5f4566db58402ec7a9a43ee4c32bc944e0f2fbcd747703eb43c2444bd75c43ffa82b044f8c74c8d83
DIST redis-7.0.5.tar.gz 2968205 BLAKE2B c319a2f656e4bd26637735ef73e58eecc306e202b57d6da3a38150a02d738a414c6696e261b8ab88033e117aee4f02308aab9ca4a5f382d66ec3a10f3e020580 SHA512 16ff920cb8df4d82e78ef34209285024aa98189be8acbca86b10fb3064dcc70eac60206aadece6af08406860ed01a004ce3aaa86be896ea36c7f486686646753
-DIST redis-7.0.7.tar.gz 2979019 BLAKE2B fddf0c1aa9f9052b0e8efdac6958b7fae5006f06833da2b9ae016c4ac195a950e97ad0b70dc7a721cc80c2cf653ae7d1a352694b79ba432e611f77fb42d1d15e SHA512 56e33cf80439efa54694f26037ed8520fe51b25dbdfe57875d916c8f921131c71324b1dd1e974d0f9d523752d05e0f028cc8dd783ec8fa6d5d7e60b3081f78c0
DIST redis-7.0.8.tar.gz 2981212 BLAKE2B 38610104697de649bfac43a845ccd27826a1cbf88dbfc331360864d6763b4cb86981b8d94ae01d54f914d6919cf2b9cae977ea09833e61a09c02e0fcd9f1440a SHA512 d760fce02203265551198082f75b1e6be78a2cdb3d464e518d65a31839a3b6e45401c6bca6a091f59e121212aee7363d5e83c25365ab347a66b807015b32eeb6
+DIST redis-7.0.9.tar.gz 2984823 BLAKE2B 9c2e79f40ad14f6412ec4bc79507a32f8780bf4b3a311b87dd309e74b6367536f1c91b8026efc6acb3d750ca7c49687a74660c66d104caa439ef385db3eab230 SHA512 e984a19583e4aae0a5dce85a434d3255f4f13725eba0f11a1fe1a1189b17035152a26b65f1a3a8834f0dd8218f4a65986c918f96386120ea9419bd02366c8293
diff --git a/dev-db/redis/redis-6.2.8.ebuild b/dev-db/redis/redis-6.2.11.ebuild
similarity index 97%
rename from dev-db/redis/redis-6.2.8.ebuild
rename to dev-db/redis/redis-6.2.11.ebuild
index a15818f6a3db..7eebc0512372 100644
--- a/dev-db/redis/redis-6.2.8.ebuild
+++ b/dev-db/redis/redis-6.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -22,7 +22,7 @@ SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="+jemalloc selinux ssl systemd tcmalloc test"
RESTRICT="!test? ( test )"
diff --git a/dev-db/redis/redis-7.0.7.ebuild b/dev-db/redis/redis-7.0.9.ebuild
similarity index 96%
rename from dev-db/redis/redis-7.0.7.ebuild
rename to dev-db/redis/redis-7.0.9.ebuild
index d16e991e2f8b..813970dd9e2a 100644
--- a/dev-db/redis/redis-7.0.7.ebuild
+++ b/dev-db/redis/redis-7.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="+jemalloc selinux ssl systemd tcmalloc test"
RESTRICT="!test? ( test )"
diff --git a/dev-db/timescaledb/Manifest b/dev-db/timescaledb/Manifest
index 016c22228cd6..3e28e4dcd4cb 100644
--- a/dev-db/timescaledb/Manifest
+++ b/dev-db/timescaledb/Manifest
@@ -1,2 +1,3 @@
+DIST timescaledb-2.10.0.tar.gz 7410903 BLAKE2B e93117f41b918e315f1d867ef65a608ec4021d365e3854750ee788233d64435d37b6ff5e7b1a014c8bf095857c745978daece3dc5ff149ba0b869afa6e7d8e7c SHA512 6028146a421de91a356539d8027cfee8dc38dd03cf02fe04887ddaf134fa057c953cf6b6179a9160d797271943a8fe35ffe2f4d8959fe3be8e7bf527a3fe7d41
DIST timescaledb-2.9.2.tar.gz 7265748 BLAKE2B 6d821f3e93e5a4c8cb871e436b00f81befbc82b171c95c50f93d278c2dd87c44255c4fc7b6e09e7463eeb8b3ba6719ad95d07d76d2234a52f7f0ca015a1ed727 SHA512 2f8153e37e3fd1488f89398dfb6b4501267c0d4bae4b796738d0b25e26f9720c7d6388b41fd952b4760f9e85adfbf6d3b37f4f5b7cc9ec3e68825dbd9868e870
DIST timescaledb-2.9.3.tar.gz 7269123 BLAKE2B 009f3b9787e4dce49abb50a446b88f5a37ab9b1a3abb040fe5d332ab10d5a40e13fae7985fca6f6d412f7e555ab1833f83ce0c43bbda7054f668fa12288eac18 SHA512 0664ccc6e6846500757466646e2c8a9bdbdca079bd931cc95ad8ea687f37b099d846cf8cc8311f928a33d9228592e460b6fe331a639046bc845a25b4a7d914c6
diff --git a/dev-db/timescaledb/timescaledb-2.10.0.ebuild b/dev-db/timescaledb/timescaledb-2.10.0.ebuild
new file mode 100644
index 000000000000..83f98f57647b
--- /dev/null
+++ b/dev-db/timescaledb/timescaledb-2.10.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 12 13 14 15 )
+POSTGRES_USEDEP="ssl"
+
+inherit postgres-multi cmake
+
+DESCRIPTION="Open-source time-series SQL database"
+HOMEPAGE="https://www.timescale.com/"
+SRC_URI="https://github.com/timescale/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="proprietary-extensions"
+LICENSE="POSTGRESQL Apache-2.0 proprietary-extensions? ( timescale )"
+
+KEYWORDS="~amd64"
+
+SLOT=0
+
+RESTRICT="test"
+
+DEPEND="${POSTGRES_DEP}"
+RDEPEND="${DEPEND}"
+
+CMAKE_IN_SOURCE_BUILD=yes
+CMAKE_BUILD_TYPE="RelWithDebInfo"
+BUILD_DIR=${WORKDIR}/${P}
+
+src_prepare() {
+ postgres-multi_src_prepare
+ postgres-multi_foreach cmake_src_prepare
+}
+
+timescale_configure() {
+ local CMAKE_USE_DIR=$BUILD_DIR
+ local mycmakeargs=( "-DPG_CONFIG=/usr/bin/pg_config${MULTIBUILD_VARIANT}" "-DREGRESS_CHECKS=OFF" )
+
+ # licensing is tied to features, this useflag disables the non-apache2 licensed bits
+ if ! use proprietary-extensions ; then
+ mycmakeargs+=("-DAPACHE_ONLY=ON")
+ fi
+ cmake_src_configure
+}
+
+src_configure() {
+ postgres-multi_foreach timescale_configure
+}
+
+timescale_src_compile() {
+ local CMAKE_USE_DIR=$BUILD_DIR
+ cmake_src_compile
+}
+
+src_compile() {
+ postgres-multi_foreach timescale_src_compile
+}
+
+timescale_src_install() {
+ local CMAKE_USE_DIR=$BUILD_DIR
+ cmake_src_install
+}
+
+src_install() {
+ postgres-multi_foreach timescale_src_install
+}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index a72be2951086..ddab8dba86a9 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/gputils/Manifest b/dev-embedded/gputils/Manifest
index 91bfb2d62d21..3b4ccf1b585b 100644
--- a/dev-embedded/gputils/Manifest
+++ b/dev-embedded/gputils/Manifest
@@ -1 +1,2 @@
DIST gputils-1.5.0.tar.gz 13155377 BLAKE2B 68f6ed2ba93f83eaae0573dde5fe8d3a67ec6cf4349832e5edcab70ec35db7d8210f28d46bf3272a7b7f9b52299b1289792b1ca2a75b952e7ea2fc263448c8b9 SHA512 fc74e92ddfe2c9c7ee272a712a411bf01790358c310afc9a802f503902675fa4717410354bf8791f64da45b63f0b1f562b55fdd7127d3989f4295ebe5f80b645
+DIST gputils-1.5.2.tar.bz2 7231711 BLAKE2B c52bd75ee408b2ff98f63679b18834e8e41b5aea4f2b4b659860acb8fa4dd3f922aa6307f99ae0fc024a4fc6f56d3be262cd873cf112ebac444d41eeca635d3b SHA512 43ed508d164152bf36e4f27b09656e6e3d58fc174806ad57d6415e6e2726a56381b1323be3acfc635f2a05babade695e9777b0db8b5f4b90da00b9d29e75eddc
diff --git a/dev-embedded/gputils/files/gputils-1.5.2-fix-invalid-operator.patch b/dev-embedded/gputils/files/gputils-1.5.2-fix-invalid-operator.patch
new file mode 100644
index 000000000000..ec2d8d425832
--- /dev/null
+++ b/dev-embedded/gputils/files/gputils-1.5.2-fix-invalid-operator.patch
@@ -0,0 +1,25 @@
+Fix invalid operator in dash
+
+Some shells, like dash, don't support [ x == x ], reporting invalid syntax,
+and silently failing.
+
+--- gputils-1.5.2.orig/doc/html-help/Makefile.am
++++ gputils-1.5.2/doc/html-help/Makefile.am
+@@ -7,7 +7,7 @@
+ pkgdatadir = @GPUTILS_HTMLDOC_PATH@
+
+ html-doc:
+- if [ "$(ENABLE_HTML_DOC)" == "yes" ]; then \
++ if [ "$(ENABLE_HTML_DOC)" = "yes" ]; then \
+ if [ ! -e $(DEFAULT_MPLABX_PATH)/mpasmx/8bit_device.info ]; then \
+ @echo "Can't find mplabx installation; HTML documentation will not be built."; \
+ else \
+@@ -18,7 +18,7 @@
+ install: install-html
+
+ install-html:
+- if [ "$(ENABLE_HTML_DOC)" == "yes" ]; then \
++ if [ "$(ENABLE_HTML_DOC)" = "yes" ]; then \
+ if [ -n "$$(ls *.html 2>/dev/null)" -a -n "$$(ls *.css 2>/dev/null)" ]; then \
+ $(install_sh) -d "$(DESTDIR)$(pkgdatadir)"; \
+ $(install_sh) -c -m 644 *.css *.html "$(DESTDIR)$(pkgdatadir)"; \
diff --git a/dev-embedded/gputils/gputils-1.5.2.ebuild b/dev-embedded/gputils/gputils-1.5.2.ebuild
new file mode 100644
index 000000000000..11fb1036b9e4
--- /dev/null
+++ b/dev-embedded/gputils/gputils-1.5.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs flag-o-matic
+
+DESCRIPTION="Tools including assembler, linker and librarian for PIC microcontrollers"
+HOMEPAGE="https://gputils.sourceforge.io"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+PATCHES=(
+ "${FILESDIR}"/gputils-1.5.2-fix-invalid-operator.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # bug #369291, bug #818802
+ tc-ld-disable-gold
+
+ # Their configure script tries to do funky things with default
+ # compiler selection. Force our own defaults instead.
+ tc-export CC
+
+ # LTO currently causes various segfaults in dev-embedded/sdcc
+ # sys-devel/gcc-11.3.0 '-O3 -flto'
+ filter-flags '-flto*'
+
+ local myeconfargs=(
+ $(use_enable doc html-doc)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ use doc && dodoc doc/gputils.pdf
+}
diff --git a/dev-embedded/rpi-eeprom/rpi-eeprom-15.0_p1.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-15.0_p1.ebuild
index aa705d4d9dbc..528bfc276e3a 100644
--- a/dev-embedded/rpi-eeprom/rpi-eeprom-15.0_p1.ebuild
+++ b/dev-embedded/rpi-eeprom/rpi-eeprom-15.0_p1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
LICENSE="BSD rpi-eeprom"
SLOT="0"
-KEYWORDS="~arm ~arm64"
+KEYWORDS="~arm arm64"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
BDEPEND="sys-apps/help2man"
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index f2c7ac6c98a1..772ac6c967a3 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -1,6 +1,8 @@
DIST sdcc-doc-3.8.0.tar.bz2 965465 BLAKE2B 541ed3ba4d3a23dd3fcea248de84d887fdcd8ddaf3ed0f9f810bf8cb9fcb5b10eb2cd96099d83c5a0fda240cdd3d11fd247e576a67a32047a4f7a705b8401637 SHA512 63319b7c344b320600e6a7c158d1a5e69abe595dfd6b8d32a95f15678c3bc2f6fe72c959516c4b1f812deb089854c6a51c31438ef6a6c7f9fcb4d419d8cce3cf
DIST sdcc-doc-4.0.0.tar.bz2 980999 BLAKE2B 6f9478c095e6b4fec27c6ab7a10a8564ae46d754709848b3a7a26a7a2dfecd3833ce3cfe7a41f9033b5a34a1b6e962090d91c9688294dd347e1c98658761c019 SHA512 83bed77b46ad2f028725a3ffe6090d71185f73d4e99c241e7ebd1c509ba1be1911f4b9130c344fa4eb928f48122179b6b71e9d5a27d9f18ff74017c61fae77ff
DIST sdcc-doc-4.1.0.tar.bz2 991207 BLAKE2B fd1ab82c8cc65031a8231bc4aba1e0562ed4b3178612a4d915568cb5600ba9159d89f905e261e860da9e0f4aa5a24fbd7ab1364f2f9f7b3078bcf3aa01d71ba5 SHA512 01686e590d0168108099d3c6c9bdb0885a25abccc9b6c87739eafec7103054424da1a5960a8d4566462dca9bf00cdd8b103ab6026523833d9aaa4d4bcdc5b620
+DIST sdcc-doc-4.2.0.tar.bz2 1244684 BLAKE2B d6ee4001ee0d2dde61dd1e8567499909fa6373eac93f3731fa1d6628f6e488742cc0798b1ebb908769d4cc52e091d4d685b3891d7c15a519294240643e528b02 SHA512 8494de35991e9a38ca138545b7c2396d353b21d67a4f321afa9187a5c117c6ce7d3c0850e95c981ccc7a3c8fa1e470f5e2351b84ccbe1634b1f8bf085cd45f76
DIST sdcc-src-3.8.0.tar.bz2 18987862 BLAKE2B 7e8ddea41ae02842bb1376c53364c386a0fb47a1acdcc97cc72f002e78a2854fc43adfd0177f94dd1173dbd81052c390c5b2fef302c73f0b830ec83eea70869c SHA512 38145ea3e9560eb8894c54bd7213da67a20163739c944c3247fa8fa456dfedaaa469746169d3e114affcab48b73db4cd8c9a0a367e7368f2471de64761a3e04a
DIST sdcc-src-4.0.0.tar.bz2 19204540 BLAKE2B 2192a7dc7418826440209dd8c7a73fd5ced491b799975b953368daeabb429327a6c518a1212a2fd49c34c6e5ab7d84f240cbf6ff8b3779e2d38f5ad81499ee71 SHA512 41a92711a9278261879caec1a01425104b7c75346b3c6ad9617cab025309c9b38f79eea2d04122f5ae6ce273fcd61fbde8a0d23756313a4593394230b51a1d4c
DIST sdcc-src-4.1.0.tar.bz2 19400609 BLAKE2B 9754d70026af595a5456f0d7c1b375df2716c6400ca59affcadbfd3588f4d51c45a3d52c235d6efc9b7512b5f94f023d8d2964cc0365cdff4586edf71fc51af1 SHA512 a9c3fee427cbc66b56a286c8d66b2922f79c9dfb42d2ed2843b2e192a6b314a04de4c82f1083d8625b49756b5f1d99f8fb706402b5f1284110760ec346303779
+DIST sdcc-src-4.2.0.tar.bz2 19662367 BLAKE2B a11d6b3af2552e0508bb1d0644d3e6db385634237fc93079716a5e3aa710bac25fd888e10dce76e6891ebe524f4d81d8318492001d8ce9ade0ef16d114adf14b SHA512 7ca4037d526b5fed7bbca4433835d0299ced7315dd69c1ec66cff873ec7caa41b69927363bf5850e2ad4f27ef6286e57f9ccd40bb6792308be6c3073c5238cba
diff --git a/dev-embedded/sdcc/files/sdcc-4.2.0-link-tinfo.patch b/dev-embedded/sdcc/files/sdcc-4.2.0-link-tinfo.patch
new file mode 100644
index 000000000000..a8f4ae7565bc
--- /dev/null
+++ b/dev-embedded/sdcc/files/sdcc-4.2.0-link-tinfo.patch
@@ -0,0 +1,24 @@
+Link -ltinfo for ucsim
+
+/usr/lib/gcc/x86_64-pc-linux-gnu/11.3.0/../../../../x86_64-pc-linux-gnu/bin/ld: /var/tmp/portage/dev-embedded/sdcc-4.2.0/temp/cc3R2ckl.ltrans0.ltrans.o: undefined reference to symbol 'nodelay'
+/usr/lib/gcc/x86_64-pc-linux-gnu/11.3.0/../../../../x86_64-pc-linux-gnu/bin/ld: /lib64/libtinfo.so.6: error adding symbols: DSO missing from command line
+
+--- sdcc-4.2.0.orig/sim/ucsim/configure.ac
++++ sdcc-4.2.0/sim/ucsim/configure.ac
+@@ -405,14 +405,14 @@
+ if test $curses_ok != yes; then
+ AC_CHECK_LIB(curses,nl,
+ curses_ok="yes"
+- CURSES_LIBS="${CURSES_LIBS} -lcurses",
++ CURSES_LIBS="${CURSES_LIBS} -lcurses -ltinfo",
+ curses_ok="no")
+ fi
+
+ if test $curses_ok != yes; then
+ AC_CHECK_LIB(ncurses,nl,
+ curses_ok="yes"
+- CURSES_LIBS="${CURSES_LIBS} -lncurses",
++ CURSES_LIBS="${CURSES_LIBS} -lncurses -ltinfo",
+ curses_ok="no")
+ fi
+ fi
diff --git a/dev-embedded/sdcc/metadata.xml b/dev-embedded/sdcc/metadata.xml
index 573753d73430..c4bc3f3380ae 100644
--- a/dev-embedded/sdcc/metadata.xml
+++ b/dev-embedded/sdcc/metadata.xml
@@ -6,12 +6,14 @@
Embedded Gentoo
-SDCC is a retargettable, optimizing ANSI - C compiler suite that targets the
-Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim
-(formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) HC08 based
-(hc08, s08), Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000, Rabbit
-3000A, TLCS-90) and STMicroelectronics STM8. It can be retargeted for other
-microprocessors.
+SDCC is a retargettable, optimizing Standard C (ANSI C89, ISO C99, ISO C11)
+compiler suite that targets the Intel MCS51 based microprocessors (8031, 8032,
+8051, 8052, etc.), Maxim (formerly Dallas) DS80C390 variants, Freescale
+(formerly Motorola) HC08 based (hc08, s08), Zilog Z80 based MCUs (Z80, Z180,
+SM83, Rabbit 2000, 2000A, 3000A, TLCS-90), Padauk (pdk14, pdk15) and
+STMicroelectronics STM8. Work is in progress on supporting the Padauk pdk13 and
+MOS 6502 targets; Microchip PIC16 and PIC18 targets are unmaintained. SDCC can
+be retargeted for other microprocessors.
sdcc
@@ -35,6 +37,7 @@ microprocessors.
Add support for Rabbit 2000A
Add support for Rabbit 3000A
Add support for Gameboy gbz80
+ Add support for Gameboy SM83
Add support for TLCS-90
Add support for EZ80-Z80
Add support for Zilog Z80N
@@ -49,5 +52,7 @@ microprocessors.
Add support for PDK14
Add support for PDK15
Add support for PDK16
+ Add support for MOS 6502
+ Add support for MOS 65C02
diff --git a/dev-embedded/sdcc/sdcc-4.2.0.ebuild b/dev-embedded/sdcc/sdcc-4.2.0.ebuild
new file mode 100644
index 000000000000..dc4655403f3d
--- /dev/null
+++ b/dev-embedded/sdcc/sdcc-4.2.0.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+if [[ ${PV} == "9999" ]] ; then
+ ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
+ inherit subversion
+else
+ SRC_URI="
+ https://downloads.sourceforge.net/project/${PN}/sdcc/${PV}/${PN}-src-${PV}.tar.bz2
+ doc? ( https://downloads.sourceforge.net/project/${PN}/sdcc-doc/${PV}/${PN}-doc-${PV}.tar.bz2 )
+ "
+
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Small device C compiler (for various microprocessors)"
+HOMEPAGE="https://sdcc.sourceforge.net/"
+
+LICENSE="
+ GPL-2 ZLIB
+ non-free? ( MicroChip-SDCC )
+ packihx? ( public-domain )
+"
+SLOT="0"
+# in order of configure.ac's AC_DO_PORT stanzas
+SDCC_PORTS="
+ mcs51
+ z80 z180
+ r2k r2ka r3ka
+ sm83
+ tlcs90
+ ez80-z80
+ z80n
+ ds390 ds400
+ pic14 pic16
+ hc08
+ s08
+ stm8
+ pdk13 pdk14 pdk15 pdk16
+ mos6502 mos65c02
+"
+IUSE="
+ ${SDCC_PORTS}
+ +boehm-gc device-lib doc non-free packihx sdcdb +sdcpp ucsim
+"
+
+RDEPEND="
+ dev-libs/boost:=
+ sys-libs/zlib:=
+ pic14? ( >=dev-embedded/gputils-0.13.7 )
+ pic16? ( >=dev-embedded/gputils-0.13.7 )
+ boehm-gc? ( dev-libs/boehm-gc:= )
+ sdcdb? ( sys-libs/readline:0= )
+ ucsim? ( sys-libs/ncurses:= )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-util/gperf
+"
+PATCHES=(
+ "${FILESDIR}"/sdcc-3.8.0-override-override.patch
+ "${FILESDIR}"/sdcc-4.2.0-link-tinfo.patch
+)
+
+src_prepare() {
+ # Fix conflicting variable names between Gentoo and sdcc
+ find device/lib/pic{14,16} device/non-free/lib/pic{14,16} \( \
+ -name 'configure.ac' -o -name 'Makefile.*' \) \
+ -exec sed -i 's/\/SDCC_&/g' {} + || die
+ find device -name 'Makefile.in' \
+ -exec sed -i 's/\/SDCC_&/g' {} + || die
+ # Possible alternative: Patch the following files to not pick up the
+ # variables from the environment:
+ # - lib/Makefile.in (PORTDIR ifndef/endif)
+ # - device/non-free/lib/pic14/Makefile.common.in (ARCH ?= 877)
+ # - device/non-free/lib/pic16/configure.ac (${ARCH:-18f452})
+ # - device/lib/pic14/configure.ac (${ARCH:-16f877})
+ # - device/lib/pic16/configure.ac (${ARCH:-18f452})
+
+ # Make sure timestamps don't get messed up.
+ [[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
+
+ default
+ eautoreconf
+
+ # Avoid 'bfd.info' rebuild with 'makeinfo': bug #705424
+ # Build dependencies are: eautoreconf->Makefile.in->bfdver.texi->bfd.info
+ touch support/sdbinutils/bfd/doc/bfdver.texi || die
+ touch support/sdbinutils/bfd/doc/bfd.info || die
+}
+
+src_configure() {
+ local myeconfargs=(
+ ac_cv_prog_STRIP=true
+ --without-ccache
+ --enable-sdbinutils
+
+ $(use_enable ucsim)
+ $(use_enable device-lib)
+ $(use_enable packihx)
+ $(use_enable sdcpp)
+ $(use_enable sdcdb)
+ $(use_enable non-free)
+ $(use_enable boehm-gc libgc)
+
+ $(use_enable mcs51 mcs51-port)
+ $(use_enable z80 z80-port)
+ $(use_enable z180 z180-port)
+ $(use_enable r2k r2k-port)
+ $(use_enable r2ka r2ka-port)
+ $(use_enable r3ka r3ka-port)
+ $(use_enable sm83 sm83-port)
+ $(use_enable tlcs90 tlcs90-port)
+ $(use_enable ez80-z80 ez80_z80-port)
+ $(use_enable z80n z80n-port)
+ $(use_enable ds390 ds390-port)
+ $(use_enable ds400 ds400-port)
+ $(use_enable pic14 pic14-port)
+ $(use_enable pic16 pic16-port)
+ $(use_enable hc08 hc08-port)
+ $(use_enable s08 s08-port)
+ $(use_enable stm8 stm8-port)
+ $(use_enable pdk13 pdk13-port)
+ $(use_enable pdk14 pdk14-port)
+ $(use_enable pdk15 pdk15-port)
+ $(use_enable pdk16 pdk16-port)
+ $(use_enable mos6502 mos6502-port)
+ $(use_enable mos65c02 mos65c02-port)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ # Sanity check, as gputils errors/segfaults don't cause make to stop
+ local libs=()
+ use pic14 && libs+=( device/lib/build/pic14/libsdcc.lib )
+ use pic16 && libs+=( device/lib/build/pic16/libsdcc.lib )
+ for lib in "${libs[@]}"; do
+ [[ -f "${lib}" ]] || die "Failed to build ${lib}"
+ done
+}
+
+src_install() {
+ default
+ dodoc doc/*.txt
+ find "${ED}" -type d -name .deps -exec rm -vr {} + || die
+
+ if use doc && [[ ${PV} != "9999" ]]; then
+ cd "${WORKDIR}"/doc
+ dodoc -r *
+ fi
+}
diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild
index 9b5bf53b05db..dc4655403f3d 100644
--- a/dev-embedded/sdcc/sdcc-9999.ebuild
+++ b/dev-embedded/sdcc/sdcc-9999.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit autotools toolchain-funcs
+inherit autotools
if [[ ${PV} == "9999" ]] ; then
ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
inherit subversion
else
SRC_URI="
- mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
- doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )
+ https://downloads.sourceforge.net/project/${PN}/sdcc/${PV}/${PN}-src-${PV}.tar.bz2
+ doc? ( https://downloads.sourceforge.net/project/${PN}/sdcc-doc/${PV}/${PN}-doc-${PV}.tar.bz2 )
"
- S="${WORKDIR}/sdcc"
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="http://sdcc.sourceforge.net/"
+HOMEPAGE="https://sdcc.sourceforge.net/"
LICENSE="
GPL-2 ZLIB
@@ -29,11 +28,10 @@ LICENSE="
SLOT="0"
# in order of configure.ac's AC_DO_PORT stanzas
SDCC_PORTS="
- avr
mcs51
z80 z180
r2k r2ka r3ka
- gbz80
+ sm83
tlcs90
ez80-z80
z80n
@@ -43,47 +41,45 @@ SDCC_PORTS="
s08
stm8
pdk13 pdk14 pdk15 pdk16
+ mos6502 mos65c02
"
IUSE="
${SDCC_PORTS}
- +boehm-gc device-lib doc non-free packihx +sdbinutils sdcdb +sdcpp ucsim
+ +boehm-gc device-lib doc non-free packihx sdcdb +sdcpp ucsim
"
-for port in ${SDCC_PORTS}; do
-REQUIRED_USE="${REQUIRED_USE}
- ${port}? ( sdbinutils )
-"
-done
-REQUIRED_USE="${REQUIRED_USE}
- || ( ${SDCC_PORTS} )
-"
-
-RESTRICT="strip"
-
RDEPEND="
dev-libs/boost:=
- sys-libs/ncurses:=
- sys-libs/readline:0=
+ sys-libs/zlib:=
pic14? ( >=dev-embedded/gputils-0.13.7 )
pic16? ( >=dev-embedded/gputils-0.13.7 )
boehm-gc? ( dev-libs/boehm-gc:= )
- !dev-embedded/sdcc-svn
+ sdcdb? ( sys-libs/readline:0= )
+ ucsim? ( sys-libs/ncurses:= )
"
DEPEND="
${RDEPEND}
dev-util/gperf
"
PATCHES=(
- "${FILESDIR}"/${PN}-3.8.0-override-override.patch
+ "${FILESDIR}"/sdcc-3.8.0-override-override.patch
+ "${FILESDIR}"/sdcc-4.2.0-link-tinfo.patch
)
src_prepare() {
# Fix conflicting variable names between Gentoo and sdcc
- find \
- '(' -name 'Makefile*.in' -o -name 'configure' ')' \
- -exec sed -r -i \
- -e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \
- {} + || die
+ find device/lib/pic{14,16} device/non-free/lib/pic{14,16} \( \
+ -name 'configure.ac' -o -name 'Makefile.*' \) \
+ -exec sed -i 's/\/SDCC_&/g' {} + || die
+ find device -name 'Makefile.in' \
+ -exec sed -i 's/\/SDCC_&/g' {} + || die
+ # Possible alternative: Patch the following files to not pick up the
+ # variables from the environment:
+ # - lib/Makefile.in (PORTDIR ifndef/endif)
+ # - device/non-free/lib/pic14/Makefile.common.in (ARCH ?= 877)
+ # - device/non-free/lib/pic16/configure.ac (${ARCH:-18f452})
+ # - device/lib/pic14/configure.ac (${ARCH:-16f877})
+ # - device/lib/pic16/configure.ac (${ARCH:-18f452})
# Make sure timestamps don't get messed up.
[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
@@ -98,60 +94,65 @@ src_prepare() {
}
src_configure() {
- # sdbinutils subdir doesn't pass down --docdir properly, so need to
- # expand $(datarootdir) ourselves.
- econf \
- ac_cv_prog_AR="$(tc-getAR)" \
- ac_cv_prog_AS="$(tc-getAS)" \
- ac_cv_prog_STRIP=true \
- $(use_enable boehm-gc libgc) \
- $(use_enable device-lib) \
- $(use_enable non-free) \
- $(use_enable packihx) \
- $(use_enable sdbinutils) \
- $(use_enable sdcdb) \
- $(use_enable sdcpp) \
- $(use_enable ucsim) \
- \
- $(use_enable avr avr-port) \
- $(use_enable mcs51 mcs51-port) \
- $(use_enable z80 z80-port) \
- $(use_enable z180 z180-port) \
- $(use_enable r2k r2k-port) \
- $(use_enable r2ka r2ka-port) \
- $(use_enable r3ka r3ka-port) \
- $(use_enable gbz80 gbz80-port) \
- $(use_enable tlcs90 tlcs90-port) \
- $(use_enable ez80-z80 ez80_z80-port) \
- $(use_enable z80n z80n-port) \
- $(use_enable ds390 ds390-port) \
- $(use_enable ds400 ds400-port) \
- $(use_enable pic14 pic14-port) \
- $(use_enable pic16 pic16-port) \
- $(use_enable hc08 hc08-port) \
- $(use_enable s08 s08-port) \
- $(use_enable stm8 stm8-port) \
- $(use_enable pdk13 pdk13-port) \
- $(use_enable pdk14 pdk14-port) \
- $(use_enable pdk15 pdk15-port) \
- $(use_enable pdk16 pdk16-port) \
- \
- --disable-doc \
+ local myeconfargs=(
+ ac_cv_prog_STRIP=true
--without-ccache
+ --enable-sdbinutils
+
+ $(use_enable ucsim)
+ $(use_enable device-lib)
+ $(use_enable packihx)
+ $(use_enable sdcpp)
+ $(use_enable sdcdb)
+ $(use_enable non-free)
+ $(use_enable boehm-gc libgc)
+
+ $(use_enable mcs51 mcs51-port)
+ $(use_enable z80 z80-port)
+ $(use_enable z180 z180-port)
+ $(use_enable r2k r2k-port)
+ $(use_enable r2ka r2ka-port)
+ $(use_enable r3ka r3ka-port)
+ $(use_enable sm83 sm83-port)
+ $(use_enable tlcs90 tlcs90-port)
+ $(use_enable ez80-z80 ez80_z80-port)
+ $(use_enable z80n z80n-port)
+ $(use_enable ds390 ds390-port)
+ $(use_enable ds400 ds400-port)
+ $(use_enable pic14 pic14-port)
+ $(use_enable pic16 pic16-port)
+ $(use_enable hc08 hc08-port)
+ $(use_enable s08 s08-port)
+ $(use_enable stm8 stm8-port)
+ $(use_enable pdk13 pdk13-port)
+ $(use_enable pdk14 pdk14-port)
+ $(use_enable pdk15 pdk15-port)
+ $(use_enable pdk16 pdk16-port)
+ $(use_enable mos6502 mos6502-port)
+ $(use_enable mos65c02 mos65c02-port)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ # Sanity check, as gputils errors/segfaults don't cause make to stop
+ local libs=()
+ use pic14 && libs+=( device/lib/build/pic14/libsdcc.lib )
+ use pic16 && libs+=( device/lib/build/pic16/libsdcc.lib )
+ for lib in "${libs[@]}"; do
+ [[ -f "${lib}" ]] || die "Failed to build ${lib}"
+ done
}
src_install() {
default
dodoc doc/*.txt
- find "${D}" -name .deps -exec rm -rf {} + || die
+ find "${ED}" -type d -name .deps -exec rm -vr {} + || die
if use doc && [[ ${PV} != "9999" ]]; then
cd "${WORKDIR}"/doc
dodoc -r *
fi
-
- # a bunch of archives (*.a) are built & installed by gputils
- # for PIC processors, but they do not work with standard `ar`
- # & `scanelf` utils and they're not for the host.
- dostrip -x /usr/bin
}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 744e0485e491..62bb1fc041f7 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index 89691d52766a..99d1b66d4a18 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1 +1,2 @@
DIST byte-buddy-1.12.21.tar.gz 1931819 BLAKE2B 6b37b21d5f31c1564a3cc4d30870a7eca3c4c0512815db881a20602dc7ac970145dd9cc2bd6af4f2fdca0ff542b43dc675376c91f7ea7fdf3ea306112eba842b SHA512 9513caa9a5fc0924aea46e8de21ad2ad90320a582ad17be93f6305eb27f98d3af2c3fa09565083b5d97c0d9f0a1b0a9c7105738c4b65616e78bf2e7657c4ee76
+DIST byte-buddy-1.14.0.tar.gz 1989303 BLAKE2B c284f54ebc6bf67e4706380f0876f403fcf5ae172a690888d13d6b3399cf41bf1fd8890bf15059f71a9457ec6343254ad1f421f8e4975aa70dd9a2103ab59610 SHA512 e6ccda287935b5ff7104d5c0e4904b0595918a21bcc90c6ac5b2358cc0371b22a4fcac2a95dde9e377c5d1e43077c8b57ea9520a9093b2380ab53c830f107ced
diff --git a/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild b/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild
new file mode 100644
index 000000000000..f1f274b658eb
--- /dev/null
+++ b/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/raphw/byte-buddy/archive/byte-buddy-1.12.23.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.23.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_PROVIDES="net.bytebuddy:byte-buddy-agent:1.12.23 net.bytebuddy:byte-buddy:1.12.23"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM"
+HOMEPAGE="https://bytebuddy.net"
+SRC_URI="https://github.com/raphw/byte-buddy/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+ >=virtual/jdk-11:*
+ dev-java/asm:9
+ dev-java/findbugs-annotations:0
+ dev-java/jna:4
+ dev-java/jsr305:0
+ test? (
+ dev-java/mockito:4
+ )
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/byte-buddy-${P}"
+
+JAVA_CLASSPATH_EXTRA="
+ asm-9
+ findbugs-annotations
+ jsr305
+ jna-4
+"
+
+src_prepare() {
+ default
+ # https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy-agent/pom.xml#L142-L176
+ cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF || die
+ module net.bytebuddy.agent {
+ requires java.instrument;
+ requires static jdk.attach;
+ requires static com.sun.jna;
+ requires static com.sun.jna.platform;
+ requires java.base;
+ exports net.bytebuddy.agent;
+ exports net.bytebuddy.agent.utility.nullability;
+ }
+ EOF
+
+ # instead of shading byte-buddy-dep we move it into byte-buddy.
+ mv byte-buddy{-dep,}/src/main/java || die "cannot move sources"
+
+ # https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy/pom.xml#L159-L195
+ local exports="$( \
+ sed -n '//,/<\/packages.list.external/p' \
+ byte-buddy/pom.xml \
+ | sed -e 's:^:exports :' -e 's:,:;:' \
+ | grep -v 'packages.list.external\|shade' | tr -s '[:space:]' \
+ )" || die
+ cat > byte-buddy/src/main/java/module-info.java <<-EOF || die
+ module net.bytebuddy {
+ requires static java.instrument;
+ requires static java.management;
+ requires static jdk.unsupported;
+ requires static net.bytebuddy.agent;
+ requires static com.sun.jna;
+ requires static com.sun.jna.platform;
+ requires java.base;
+ ${exports}
+ }
+ EOF
+}
+
+src_compile() {
+ einfo "Compiling byte-buddy-agent.jar"
+ JAVA_JAR_FILENAME="byte-buddy-agent.jar"
+ JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources"
+ JAVA_SRC_DIR="byte-buddy-agent/src/main/java"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar"
+ rm -r target || die
+
+ einfo "Compiling byte-buddy.jar"
+ JAVA_JAR_FILENAME="byte-buddy.jar"
+ JAVA_MAIN_CLASS="net.bytebuddy.build.Plugin\$Engine\$Default"
+ JAVA_RESOURCE_DIRS=()
+ JAVA_SRC_DIR="byte-buddy/src/main/java"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy.jar"
+ rm -r target || die
+
+ if use doc; then
+ einfo "Compiling javadocs"
+ rm byte-buddy-agent/src/main/java/module-info.java || die
+ JAVA_SRC_DIR=(
+ "byte-buddy-agent/src/main/java"
+ "byte-buddy/src/main/java"
+ )
+ JAVA_JAR_FILENAME="ignoreme.jar"
+ java-pkg-simple_src_compile
+ fi
+}
+
+src_test() {
+ # instead of shading byte-buddy-dep we move it into byte-buddy.
+ mv byte-buddy{-dep,}/src/test || die "cannot move tests"
+
+ # @Ignore one of 4 tests, https://bugs.gentoo.org/863386
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/testIgnoreExistingField()/i @Ignore' \
+ -i byte-buddy/src/test/java/net/bytebuddy/build/CachedReturnPluginOtherTest.java || die
+
+ # @Ignore one of 39 tests, https://bugs.gentoo.org/863386
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/testNoParameterNameAndModifiers()/i @Ignore' \
+ -i byte-buddy/src/test/java/net/bytebuddy/description/method/AbstractMethodDescriptionTest.java || die
+
+ JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4"
+
+ einfo "Testing byte-buddy-agent"
+ # https://github.com/raphw/byte-buddy/issues/1321#issuecomment-1252776459
+ JAVA_TEST_EXTRA_ARGS=( -Dnet.bytebuddy.test.jnapath="${EPREFIX}/usr/$(get_libdir)/jna-4/" )
+ JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java"
+ java-pkg-simple_src_test
+
+ einfo "Testing byte-buddy"
+ JAVA_TEST_RESOURCE_DIRS=( byte-buddy/src/test/{resources,precompiled*} )
+ JAVA_TEST_SRC_DIR="byte-buddy/src/test/java"
+
+ JAVA_TEST_EXCLUDES=(
+ # all tests in this class fail, https://bugs.gentoo.org/863386
+ net.bytebuddy.build.CachedReturnPluginTest
+ )
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ java-pkg_dojar "byte-buddy-agent.jar"
+ java-pkg_dojar "byte-buddy.jar"
+
+ if use doc; then
+ java-pkg_dojavadoc target/api
+ fi
+
+ if use source; then
+ java-pkg_dosrc "byte-buddy-agent/src/main/java/*"
+ java-pkg_dosrc "byte-buddy/src/main/java/*"
+ fi
+}
diff --git a/dev-java/jakarta-activation-api/Manifest b/dev-java/jakarta-activation-api/Manifest
index 5f44c8a13868..2eb906737348 100644
--- a/dev-java/jakarta-activation-api/Manifest
+++ b/dev-java/jakarta-activation-api/Manifest
@@ -1,2 +1,3 @@
-DIST jakarta-activation-2.1.0.tar.gz 118833 BLAKE2B ad4b23405b412eb31ffe6fa9ebb62e5f3d21f721908bec6607d1e236b1aa36a5fbc5d721db879210b99a236a3ead4e6b89854f311b4593f32bc537f0d37638a0 SHA512 6552789b3bc590b241250387e07fd9973f2ba210544baf5e5c272ce9824ddc568dd186d2db2b28d89698b68c6505d8263d8aa5ceedf1a12a2d8fc94d648cc8fa
-DIST jakarta-activation-api-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
+DIST jakarta-activation-1.2.2.tar.gz 123311 BLAKE2B 1d33b9980f1843066ce1311dfcc81a897c23fd2667de7bf6ca9590b78e165b3ffe38230d8ccb2598b2e702a126849008421a21f97deceaf0a66ce0e9488ce5ea SHA512 4ea88a32b89a752e1dc8e6cc2a47b978c42e1a6a7103bda87b717cc5845ec6b9cce147362597959d188e02f7328decea620e0b7e425dede546a1d163ede47c10
+DIST jakarta-activation-2.1.0.tar.gz 118866 BLAKE2B 169457c88cb99bbcb712c9c6d2c6979bb48df7a84d5a2f302ceb56d21f4242042eef2408cfdcaccdc3fe76b78d5c417e49010885b7bf0a8955b080647cece175 SHA512 753437cfeb03ad15a66ec6895a992aba453cb4eea84042f31ed50c0b59b1299578bf1a8341d29fdf6bc5619d3a40233bf29b66aa5203ed54f295dc321a3fd6aa
+DIST jakarta-activation-api-2.1.1.tar.gz 127696 BLAKE2B d0f89e64a02fa88e251ab6f5eafa1001c987147c2163862e270b36e86c7c811bb32bfbab1aba32c8c4b8e7eab4eeed7478618974191b2f5386a0194a6a556a19 SHA512 95dd5b6696cf3ec66ce843334375740057c37dc5b4503173f607c95bd6020e8d0b8f87ec13b6d9be4d397096300cc0acb323b5700ad7ff0428a178272c1da41f
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild
index 459fa0f06282..20b19ae30fba 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom jaf-1.2.2/activationapi/pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/1.2.2.tar.gz --slot 1 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-api-1.2.2.ebuild
-
EAPI=8
JAVA_PKG_IUSE="doc source"
@@ -12,8 +9,8 @@ MAVEN_ID="jakarta.activation:jakarta.activation-api:1.2.2"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Jakarta Activation API jar"
-HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
LICENSE="EPL-1.0"
SLOT="1"
@@ -25,7 +22,7 @@ BDEPEND="app-arch/zip"
DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
-S="${WORKDIR}/jaf-${PV}/activation"
+S="${WORKDIR}/jaf-api-${PV}/activation"
JAVA_ENCODING="iso-8859-1"
@@ -33,7 +30,7 @@ JAVA_SRC_DIR="src/main/java"
JAVA_RESOURCE_DIRS="src/main/resources"
src_prepare() {
- default
+ java-pkg-2_src_prepare
# these files are not present in the upstream jar
find ${JAVA_RESOURCE_DIRS} -name "*.default" -delete || die "Failed to delete *.default files"
}
@@ -45,7 +42,6 @@ src_compile() {
}
src_install() {
- default
# we remove the implementation sources so that they don't land in sources
rm -fr ${JAVA_SRC_DIR}/com || "Failed to delete implementation sources"
java-pkg-simple_src_install
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild
index 2b6b9f6729b6..91741f54c08c 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/2.0.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-2.0.1.ebuild
-
EAPI=8
JAVA_PKG_IUSE="doc source"
@@ -12,8 +9,9 @@ MAVEN_ID="jakarta.activation:jakarta.activation-api:2.1.0"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Jakarta Activation API jar"
-HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> jakarta-activation-${PV}.tar.gz"
+S="${WORKDIR}/jaf-api-${PV}/api"
LICENSE="EPL-1.0"
SLOT="2"
@@ -24,12 +22,5 @@ RDEPEND=">=virtual/jre-1.8:*"
DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
-S="${WORKDIR}/jaf-${PV}/api"
-
JAVA_SRC_DIR="src/main/java"
JAVA_RESOURCE_DIRS="src/main/resources"
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild
new file mode 100644
index 000000000000..bf58d5636275
--- /dev/null
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="jakarta.activation:jakarta.activation-api:2.1.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Activation API jar"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/jaf-api-${PV}/api"
+
+LICENSE="EPL-1.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/jakarta-activation-api/metadata.xml b/dev-java/jakarta-activation-api/metadata.xml
index 947a81e39af4..26d86f56dec0 100644
--- a/dev-java/jakarta-activation-api/metadata.xml
+++ b/dev-java/jakarta-activation-api/metadata.xml
@@ -5,7 +5,7 @@
java@gentoo.org
- eclipse-ee4j/jaf
- https://github.com/eclipse-ee4j/jaf/issues
+ jakartaee/jaf-api
+ https://github.com/jakartaee/jaf-api/issues
diff --git a/dev-java/jakarta-activation/Manifest b/dev-java/jakarta-activation/Manifest
index 1dd5a7e9b404..69ab6e98ddb0 100644
--- a/dev-java/jakarta-activation/Manifest
+++ b/dev-java/jakarta-activation/Manifest
@@ -1,2 +1,2 @@
-DIST jakarta-activation-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
-DIST jakarta-activation-2.0.1.tar.gz 133807 BLAKE2B 3b793fc767601cc1406482facb0456efd1f784371dff602e71f579a2c74f8e66affed384c8ce3b6aa7c2abfcb5cb0ff5f781ea109829c03f645099fb52016e21 SHA512 51e60d851b9f2027944ab24b248b3c7c19028a504ccf5f92a61495ffa65176df78c63c25e91de4a22d6aa9a1989db274f419f91693a21f052875635b8b21bad1
+DIST jakarta-activation-1.2.2.tar.gz 123311 BLAKE2B 1d33b9980f1843066ce1311dfcc81a897c23fd2667de7bf6ca9590b78e165b3ffe38230d8ccb2598b2e702a126849008421a21f97deceaf0a66ce0e9488ce5ea SHA512 4ea88a32b89a752e1dc8e6cc2a47b978c42e1a6a7103bda87b717cc5845ec6b9cce147362597959d188e02f7328decea620e0b7e425dede546a1d163ede47c10
+DIST jakarta-activation-2.0.1.tar.gz 133817 BLAKE2B bd74e3df8a2d75c137cd3e25c9689296c4827f626c86455da4e10dd8b743e8ffbd5c502162f4f1f7399c4f1e1f2eab6632e9a69e67f017a7f8f111ea4a2ac836 SHA512 f5672f20588e894e7fb5248da7c69c1c8cebb3053342013f713fd58011a2ef069e9abfff8948613b19fd3404151f950d083aeda77ab6a79baaf673658016bfd6
diff --git a/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild b/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild
index 0a83f80926ed..1483a29bde02 100644
--- a/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-1.2.2-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/1.2.2.tar.gz --slot 1 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-1.2.2.ebuild
-
EAPI=8
JAVA_PKG_IUSE="doc source"
@@ -12,8 +9,9 @@ MAVEN_ID="com.sun.activation:jakarta.activation:1.2.2"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Jakarta Activation"
-HOMEPAGE="https://eclipse-ee4j.github.io/jaf/"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/jaf-api-${PV}/activation"
LICENSE="EPL-1.0"
SLOT="1"
@@ -28,8 +26,6 @@ BDEPEND="app-arch/zip"
DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
-S="${WORKDIR}/jaf-${PV}/activation"
-
JAVA_ENCODING="iso-8859-1"
JAVA_GENTOO_CLASSPATH="jakarta-activation-api-1"
@@ -37,7 +33,7 @@ JAVA_SRC_DIR="src/main/java"
JAVA_RESOURCE_DIRS="src/main/resources"
src_prepare() {
- default
+ java-pkg-2_src_prepare
find ${JAVA_RESOURCE_DIRS} -name "*.default" -delete || die "Failed to delete *.default files"
}
diff --git a/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild b/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
index c409f44c8000..7b2fc15669ec 100644
--- a/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
+++ b/dev-java/jakarta-activation/jakarta-activation-2.0.1-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/eclipse-ee4j/jaf/archive/refs/tags/2.0.1.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jakarta-activation-2.0.1.ebuild
-
EAPI=8
JAVA_PKG_IUSE="doc source"
@@ -12,24 +9,16 @@ MAVEN_ID="com.sun.activation:jakarta.activation:2.0.1"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Jakarta Activation"
-HOMEPAGE="https://github.com/eclipse-ee4j/jaf"
-SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://jakartaee.github.io/jaf-api/"
+SRC_URI="https://github.com/jakartaee/jaf-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/jaf-api-${PV}/activation"
LICENSE="EPL-1.0"
SLOT="2"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-DEPEND="
- >=virtual/jdk-11:*
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/jaf-${PV}/activation"
+DEPEND=">=virtual/jdk-11:* "
+RDEPEND=">=virtual/jre-1.8:* "
JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS=(
- "src/main/resources"
-)
+JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/jakarta-activation/metadata.xml b/dev-java/jakarta-activation/metadata.xml
index 947a81e39af4..9641aeda8c6f 100644
--- a/dev-java/jakarta-activation/metadata.xml
+++ b/dev-java/jakarta-activation/metadata.xml
@@ -5,7 +5,7 @@
java@gentoo.org
- eclipse-ee4j/jaf
- https://github.com/eclipse-ee4j/jaf/issues
+ https://github.com/jakartaee/jaf-api/issues
+ jakartaee/jaf-api
diff --git a/dev-java/jakarta-mail-api/Manifest b/dev-java/jakarta-mail-api/Manifest
index 799d229338cd..2e485d822b5e 100644
--- a/dev-java/jakarta-mail-api/Manifest
+++ b/dev-java/jakarta-mail-api/Manifest
@@ -1 +1,2 @@
DIST jakarta-mail-api-2.1.0.tar.gz 1072862 BLAKE2B dcfe0cbbd777dfe2bb703ddc67803402a6a617f6956822e574b7f9b01f2541d0e06eacb3cd192b08205a6ff8151c7a93ad0db758a7df0eec0085e3964a3f88b8 SHA512 38d3e0476073b4faa732e6840d251f9ec90c42a7558b1ac628e83dfdad65f74c8cb3f87b6e1964f15354b5bcfee7fce2d0bdee20fa49073985db0e4401bc7627
+DIST jakarta-mail-api-2.1.1.tar.gz 1214949 BLAKE2B d92861ed3c957db8d7fda2ec25269ed7b3ec27d55c6b8865278cd6b1dcdef750ecb126136760f15bf86216c14bb00a856a60719f6121ccb87b41523662754ab1 SHA512 e367c27d85aa9513ab1a4ff0a1eb9ef947b6fad6b0c24263c5f0c0befc8f152e193eedb4a0c9687aa3decac07615094904639e11db395d25dd45c5d9fd8677cc
diff --git a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild
new file mode 100644
index 000000000000..11bc903425a9
--- /dev/null
+++ b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="jakarta.mail:jakarta.mail-api:2.1.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jakarta Mail API 2.1 Specification API"
+HOMEPAGE="https://jakartaee.github.io/mail-api/"
+SRC_URI="https://github.com/jakartaee/mail-api/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/mail-api-${PV}/api"
+
+LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+ dev-java/jakarta-activation-api:2
+ >=virtual/jdk-11:*
+ test? (
+ >=dev-java/angus-activation-1.0.0-r1:0
+ )
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( ../{CONTRIBUTING,NOTICE,README}.md )
+
+JAVA_CLASSPATH_EXTRA="jakarta-activation-api-2"
+JAVA_SRC_DIR="src/main/"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,angus-activation"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+ rm src/test/java/module-info.java || die
+
+ # There was 1 failure:
+ # 1) doesNotExist(jakarta.mail.util.FactoryFinderTest)
+ # java.lang.NullPointerException
+ # at jakarta.mail.util.FactoryFinderTest.doesNotExist(FactoryFinderTest.java:55)
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/doesNotExist/i @Ignore' \
+ -i src/test/java/jakarta/mail/util/FactoryFinderTest.java || die
+
+ # These tests need to run separately, otherwise would fail
+ JAVA_TEST_EXCLUDES=(
+ jakarta.mail.internet.ContentDispositionNoStrictTest
+ jakarta.mail.internet.WindowsFileNamesTest
+ jakarta.mail.internet.AppleFileNamesTest
+ )
+ java-pkg-simple_src_test
+
+ JAVA_TEST_RUN_ONLY="jakarta.mail.internet.ContentDispositionNoStrictTest"
+ java-pkg-simple_src_test
+
+ JAVA_TEST_RUN_ONLY="jakarta.mail.internet.WindowsFileNamesTest"
+ java-pkg-simple_src_test
+
+ JAVA_TEST_RUN_ONLY="jakarta.mail.internet.AppleFileNamesTest"
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/jakarta-mail-api/metadata.xml b/dev-java/jakarta-mail-api/metadata.xml
index bb9bcf723eb6..42164ceaf82a 100644
--- a/dev-java/jakarta-mail-api/metadata.xml
+++ b/dev-java/jakarta-mail-api/metadata.xml
@@ -8,6 +8,7 @@
Jakarta Mail defines a platform-independent and protocol-independent framework to build mail and messaging applications.
- eclipse-ee4j/mail
+ https://jakartaee.github.io/mail-api/docs/CHANGES.txt
+ jakartaee/mail-api
diff --git a/dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch b/dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch
index 0e42b385e7b7..3153ff08d307 100644
--- a/dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch
+++ b/dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch
@@ -1,8 +1,19 @@
-diff --git a/jni/GNUmakefile b/jni/GNUmakefile
-index cfe570a..c8bbb51 100755
+Bug: #898142
--- a/jni/GNUmakefile
+++ b/jni/GNUmakefile
-@@ -278,7 +278,7 @@ debug:
+@@ -67,9 +67,11 @@ OFLAGS = -O2 $(JFLAGS)
+ WERROR = -Werror
+ ifneq ($(OS),darwin)
+ ifneq ($(OS),aix)
++ifneq ($(OS),linux)
+ WFLAGS += -Wundef $(WERROR)
+ endif
+ endif
++endif
+ WFLAGS += -W -Wall -Wno-unused -Wno-parentheses -Wno-unused-parameter
+ PICFLAGS = -fPIC
+ SOFLAGS = # Filled in for each OS specifically
+@@ -278,7 +280,7 @@ debug:
@echo "OBJS=$(OBJS)"
$(LIBJFFI): $(OBJS) $(LIBFFI_LIBS)
@@ -11,7 +22,7 @@ index cfe570a..c8bbb51 100755
$(STRIP) $@
ifeq ($(OS), darwin)
codesign -s - $@
-@@ -287,10 +287,14 @@ endif
+@@ -287,10 +289,14 @@ endif
$(BUILD_DIR)/%.o : $(SRC_DIR)/%.c $(wildcard $(JFFI_SRC_DIR)/*.h)
@mkdir -p $(@D)
@$(CCACHE) $(CC) $(CFLAGS) -c $< -o $@
diff --git a/dev-java/shrinkwrap-api/Manifest b/dev-java/shrinkwrap-api/Manifest
new file mode 100644
index 000000000000..34653394c3c9
--- /dev/null
+++ b/dev-java/shrinkwrap-api/Manifest
@@ -0,0 +1 @@
+DIST shrinkwrap-1.2.6.tar.gz 987090 BLAKE2B 0c837b6fae6c3e9c7155b6ddf1923b14320d39ee3fd45af5436f967535e8c3ab290b62b6ca67aafc146558466e8c161fa6527055e48a55b5456fce728c5618f9 SHA512 8d91e265f60f1ead931166da836106412ecb861112a65e4976f63df0e351d7cb2d1f64bc2633c5df1052eb39541906ac17d6c886d7d25cb1600799d17637a58c
diff --git a/dev-java/shrinkwrap-api/metadata.xml b/dev-java/shrinkwrap-api/metadata.xml
new file mode 100644
index 000000000000..ea5416922116
--- /dev/null
+++ b/dev-java/shrinkwrap-api/metadata.xml
@@ -0,0 +1,10 @@
+
+
+
+
+ java@gentoo.org
+
+
+ shrinkwrap/shrinkwrap
+
+
diff --git a/dev-java/shrinkwrap-api/shrinkwrap-api-1.2.6.ebuild b/dev-java/shrinkwrap-api/shrinkwrap-api-1.2.6.ebuild
new file mode 100644
index 000000000000..97caa63b423f
--- /dev/null
+++ b/dev-java/shrinkwrap-api/shrinkwrap-api-1.2.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jboss.shrinkwrap:shrinkwrap-api:1.2.6"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Client View of the ShrinkWrap Project"
+HOMEPAGE="https://arquillian.org/modules/shrinkwrap-shrinkwrap/"
+SRC_URI="https://github.com/shrinkwrap/shrinkwrap/archive/${PV}.tar.gz -> shrinkwrap-${PV}.tar.gz"
+S="${WORKDIR}/shrinkwrap-${PV}/api"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Restrict to jdk:1.8 - otherwhise one test would fail:
+# 1) shouldCreateDefensiveCopyOfURLOnConstruction(org.jboss.shrinkwrap.api.asset.UrlAssetTestCase)
+# java.lang.NoSuchMethodException: java.net.URL.set(java.lang.String,java.lang.String,int,java.lang.String,java.lang.String)
+# at java.base/java.lang.Class.getDeclaredMethod(Class.java:2675)
+# at org.jboss.shrinkwrap.api.asset.UrlAssetTestCase.mutateURL(UrlAssetTestCase.java:90)
+# at org.jboss.shrinkwrap.api.asset.UrlAssetTestCase.shouldCreateDefensiveCopyOfURLOnConstruction(UrlAssetTestCase.java:68)
+DEPEND="virtual/jdk:1.8"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/shrinkwrap-impl-base/Manifest b/dev-java/shrinkwrap-impl-base/Manifest
new file mode 100644
index 000000000000..34653394c3c9
--- /dev/null
+++ b/dev-java/shrinkwrap-impl-base/Manifest
@@ -0,0 +1 @@
+DIST shrinkwrap-1.2.6.tar.gz 987090 BLAKE2B 0c837b6fae6c3e9c7155b6ddf1923b14320d39ee3fd45af5436f967535e8c3ab290b62b6ca67aafc146558466e8c161fa6527055e48a55b5456fce728c5618f9 SHA512 8d91e265f60f1ead931166da836106412ecb861112a65e4976f63df0e351d7cb2d1f64bc2633c5df1052eb39541906ac17d6c886d7d25cb1600799d17637a58c
diff --git a/dev-java/shrinkwrap-impl-base/metadata.xml b/dev-java/shrinkwrap-impl-base/metadata.xml
new file mode 100644
index 000000000000..ea5416922116
--- /dev/null
+++ b/dev-java/shrinkwrap-impl-base/metadata.xml
@@ -0,0 +1,10 @@
+
+
+
+
+ java@gentoo.org
+
+
+ shrinkwrap/shrinkwrap
+
+
diff --git a/dev-java/shrinkwrap-impl-base/shrinkwrap-impl-base-1.2.6.ebuild b/dev-java/shrinkwrap-impl-base/shrinkwrap-impl-base-1.2.6.ebuild
new file mode 100644
index 000000000000..c03ecf1ebc6e
--- /dev/null
+++ b/dev-java/shrinkwrap-impl-base/shrinkwrap-impl-base-1.2.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Common Base for Implementations of the ShrinkWrap Project"
+HOMEPAGE="https://arquillian.org/modules/shrinkwrap-shrinkwrap/"
+SRC_URI="https://github.com/shrinkwrap/shrinkwrap/archive/${PV}.tar.gz -> shrinkwrap-${PV}.tar.gz"
+S="${WORKDIR}/shrinkwrap-${PV}/impl-base"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="
+ dev-java/jakarta-activation:1
+ ~dev-java/shrinkwrap-api-${PV}:0
+ ~dev-java/shrinkwrap-spi-${PV}:0
+"
+
+# Restrict to jdk:1.8 - otherwise there are 8 test failures:
+# java.lang.IllegalArgumentException:
+# /java.base/java/lang/String.class was not found in any available ClassLoaders
+# testAddResourceStringTargetResourceFromJar(DynamicContainerTestBase.java:599)
+# testAddManifestStringTargetResourceFromJar(DynamicContainerTestBase.java:586)
+DEPEND="
+ ${CP_DEPEND}
+ virtual/jdk:1.8
+"
+
+RDEPEND="
+ ${CP_DEPEND}
+ >=virtual/jre-1.8:*
+"
+
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_EXCLUDES=(
+ org.jboss.shrinkwrap.impl.base.test.dummy.DummyInterfaceForTest
+ org.jboss.shrinkwrap.impl.base.test.dummy.DummyClassForTest
+ org.jboss.shrinkwrap.impl.base.TestSecurityActions
+ org.jboss.shrinkwrap.impl.base.TestIOUtil
+ org.jboss.shrinkwrap.impl.base.asset.DirectoryAssetTestCase
+)
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,shrinkwrap-api,shrinkwrap-spi"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+ # 1) importFromNonZipFileThrowsException(org.jboss.shrinkwrap.impl.base.ShrinkWrapTestCase)
+ # java.lang.Exception: Unexpected exception, expected
+ # but was
+ # Caused by: java.lang.NullPointerException
+ # at org.jboss.shrinkwrap.impl.base.ShrinkWrapTestCase.importFromNonZipFileThrowsException(ShrinkWrapTestCase.java:373)
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/importFromNonZipFileThrowsException()/i @Ignore' \
+ -i src/test/java/org/jboss/shrinkwrap/impl/base/ShrinkWrapTestCase.java || die
+
+ java-pkg-simple_src_test
+}
diff --git a/dev-java/shrinkwrap-spi/Manifest b/dev-java/shrinkwrap-spi/Manifest
new file mode 100644
index 000000000000..34653394c3c9
--- /dev/null
+++ b/dev-java/shrinkwrap-spi/Manifest
@@ -0,0 +1 @@
+DIST shrinkwrap-1.2.6.tar.gz 987090 BLAKE2B 0c837b6fae6c3e9c7155b6ddf1923b14320d39ee3fd45af5436f967535e8c3ab290b62b6ca67aafc146558466e8c161fa6527055e48a55b5456fce728c5618f9 SHA512 8d91e265f60f1ead931166da836106412ecb861112a65e4976f63df0e351d7cb2d1f64bc2633c5df1052eb39541906ac17d6c886d7d25cb1600799d17637a58c
diff --git a/dev-java/shrinkwrap-spi/metadata.xml b/dev-java/shrinkwrap-spi/metadata.xml
new file mode 100644
index 000000000000..ea5416922116
--- /dev/null
+++ b/dev-java/shrinkwrap-spi/metadata.xml
@@ -0,0 +1,10 @@
+
+
+
+
+ java@gentoo.org
+
+
+ shrinkwrap/shrinkwrap
+
+
diff --git a/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild b/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild
new file mode 100644
index 000000000000..23a1f3bc4d6a
--- /dev/null
+++ b/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.jboss.shrinkwrap:shrinkwrap-spi:1.2.6"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Generic Service Provider Contract of the ShrinkWrap Project"
+HOMEPAGE="https://arquillian.org/modules/shrinkwrap-shrinkwrap/"
+SRC_URI="https://github.com/shrinkwrap/shrinkwrap/archive/${PV}.tar.gz -> shrinkwrap-${PV}.tar.gz"
+S="${WORKDIR}/shrinkwrap-${PV}/spi"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CP_DEPEND="~dev-java/shrinkwrap-api-${PV}:0"
+
+DEPEND="
+ ${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+ ${CDP_EPEND}
+ >=virtual/jre-1.8:*
+"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index d13b0784547b..a7b71782863c 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/cfortran/cfortran-20210827.ebuild b/dev-lang/cfortran/cfortran-20210827.ebuild
index 9639036d2826..feadc03d0c45 100644
--- a/dev-lang/cfortran/cfortran-20210827.ebuild
+++ b/dev-lang/cfortran/cfortran-20210827.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,7 +17,7 @@ SRC_URI+=" mirror://debian/pool/main/c/${PN}/${PN}_${PV}-${DEB_PR}.debian.tar.xz
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/eisl/Manifest b/dev-lang/eisl/Manifest
index ac63075af5fa..1c235228f0af 100644
--- a/dev-lang/eisl/Manifest
+++ b/dev-lang/eisl/Manifest
@@ -1,5 +1,5 @@
-DIST eisl-2.63.tar.gz 2004974 BLAKE2B f563c28ebfa6f45b1d5ace1087646fa63e99b98a6f44f42ed74f2bc4d7e29083bc1ad6c4e5234b5cdaf391fd07900fb309c153107a12e553b7636f978084a776 SHA512 fb2cead1cddb98ce63d471ef04f31cda3a8426d627f7d333fa5dc74401a075d923060dfb98ee9d399116535632983e649f2a99440157825f0528da03dae5d051
DIST eisl-2.65.tar.gz 2025074 BLAKE2B d4703b696ea28dd5113dba199ccaf6a37955ca27297efaff4fc7c575fb94d0adfca1a3ae3b2f2baa8fc17ab04cc1b0a5ee0eb2059743a0828b81d6a324a574ce SHA512 7e2f64b37211b119e8a12975403ceec7b0861826a5de0c5e776f1140323f5ee73c75443f2e3438dda4d4cf7e1a8738c6883b1ab6d579558813fa5ddbc6be7898
DIST eisl-2.69.tar.gz 2124476 BLAKE2B 8aa1c63f669f7fc04ca9d3f751cb298d3499d52007ccee7f6bc7d1a0cf6d4539e6d6dd9e76d2fa2ff887a26235ffcaa545d59d2c6c045b8d5f44913798e683af SHA512 3131f917408f768df51f488aadcc168705c118970a984ba5d72a5beb1a39cdd1327d3bc282108ec865df75110ef97c7f25ecfccf3fd552b5cdb0539ca3ca33b5
DIST eisl-2.70.tar.gz 2126647 BLAKE2B f9bebd32a45cf73d3b58598e2f7683611426dc97c4e6411549e49f19c9e843dd24d90e9bdaf9ca97bc70fea970068bf2dfd532a861fd444b9f8b17f76666bf07 SHA512 9aaf75244515d74d40d5534e20d108f7723e0fb9cf01ecc618d32a4cd2fdd2f7132445ed9ce020e0c9ea3a05bee614e78853ac0554ee189946ee3d220ba082ec
DIST eisl-2.72.tar.gz 2124119 BLAKE2B e0a1216b4e9c301ec965d0dc7a6fcaa5acd91fd611193959fee698a27523c0c4832e7960652af14af3e7f5846131d81f0ae9db7030511e051d5384ba573241ae SHA512 80998239b9cc421f42323f24ffbc5f518a2675c314580284309d127523bab328db21d294d8d32dca413abd63d279a2c857ea34ec35548da15459235eb0f3da2b
+DIST eisl-2.85.tar.gz 2126779 BLAKE2B b95735cac70a1bae0277f910ba0b69746ca44979c08b4c19c5642d1d998e0a248827cf6cc0bac9f29c620c34ede2558e7723b7ab8b841fadbf366fa9047e6a7c SHA512 4b09e0faa126e30e44d0d23cfb79316289631da1ae8069989c58852f14c4b1f2e28539698fc8a1f433ff11e0be7a63efd836d0978965eefe42a7620c11b56c54
diff --git a/dev-lang/eisl/eisl-2.63.ebuild b/dev-lang/eisl/eisl-2.85.ebuild
similarity index 97%
rename from dev-lang/eisl/eisl-2.63.ebuild
rename to dev-lang/eisl/eisl-2.85.ebuild
index 8f1958272ec6..90b033daee8b 100644
--- a/dev-lang/eisl/eisl-2.63.ebuild
+++ b/dev-lang/eisl/eisl-2.85.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sasagawa888/eisl/archive/v${PV}.tar.gz
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
RESTRICT="test" # Tests run cppcheck (and fail)
DOCS=( README{,-ja}.md documents )
diff --git a/dev-lang/eisl/files/eisl-2.85-Makefile.patch b/dev-lang/eisl/files/eisl-2.85-Makefile.patch
new file mode 100644
index 000000000000..ee33c5bd66c2
--- /dev/null
+++ b/dev-lang/eisl/files/eisl-2.85-Makefile.patch
@@ -0,0 +1,23 @@
+--- a/makefile
++++ b/makefile
+@@ -65,7 +65,7 @@ ifeq ($(DEBUG),1)
+ LDFLAGS += -fsanitize=undefined
+ endif
+ else
+- CFLAGS += -O3 -flto -DNDEBUG=1 -DWITHOUT_NANA=1
++ CFLAGS += -DNDEBUG=1 -DWITHOUT_NANA=1
+ SRC_CII += cii/src/mem.c
+ endif
+ OBJ_CII := $(SRC_CII:.c=.o)
+@@ -83,11 +83,9 @@ ifeq ($(shell uname -n),raspberrypi)
+ CFLAGS += -D__rpi__
+ endif
+ ifneq ($(DEBUG),1)
+- LDFLAGS += -flto
+ ifeq ($(shell uname),Darwin)
+ LDFLAGS += -Wl,-S,-x
+ else
+- LDFLAGS += -s
+ endif
+ endif
+ PREFIX := /usr/local
diff --git a/dev-lang/go/go-1.20.1.ebuild b/dev-lang/go/go-1.20.1.ebuild
index 8b8dd50b5ebd..651b35d6f5f0 100644
--- a/dev-lang/go/go-1.20.1.ebuild
+++ b/dev-lang/go/go-1.20.1.ebuild
@@ -21,7 +21,7 @@ case ${PV} in
case ${PV} in
*_beta*|*_rc*) ;;
*)
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+ KEYWORDS="-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
;;
esac
esac
diff --git a/dev-lang/nprolog/nprolog-1.94.ebuild b/dev-lang/nprolog/nprolog-1.94.ebuild
index b140b252bea6..1f92e4123250 100644
--- a/dev-lang/nprolog/nprolog-1.94.ebuild
+++ b/dev-lang/nprolog/nprolog-1.94.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sasagawa888/nprolog/archive/v${PV}.tar.gz
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
DOCS=( README{,-ja}.md document )
diff --git a/dev-lang/orc/orc-0.4.33.ebuild b/dev-lang/orc/orc-0.4.33.ebuild
index 53383cef9d04..48e3fa0e78dd 100644
--- a/dev-lang/orc/orc-0.4.33.ebuild
+++ b/dev-lang/orc/orc-0.4.33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
LICENSE="BSD BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RESTRICT="!test? ( test )"
IUSE="gtk-doc static-libs test"
diff --git a/dev-lang/python/python-3.10.10_p2.ebuild b/dev-lang/python/python-3.10.10_p2.ebuild
index e1bc4f518468..3f45df96fdec 100644
--- a/dev-lang/python/python-3.10.10_p2.ebuild
+++ b/dev-lang/python/python-3.10.10_p2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="
bluetooth build +ensurepip examples gdbm hardened libedit lto
+ncurses pgo +readline +sqlite +ssl test tk valgrind +xml
diff --git a/dev-lang/python/python-3.8.16_p3.ebuild b/dev-lang/python/python-3.8.16_p3.ebuild
index bcc6607cca46..76995741c69f 100644
--- a/dev-lang/python/python-3.8.16_p3.ebuild
+++ b/dev-lang/python/python-3.8.16_p3.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="
bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
+readline +sqlite +ssl test tk valgrind wininst +xml
diff --git a/dev-lang/python/python-3.9.16_p2.ebuild b/dev-lang/python/python-3.9.16_p2.ebuild
index 9a0a35177786..1796c12df3a1 100644
--- a/dev-lang/python/python-3.9.16_p2.ebuild
+++ b/dev-lang/python/python-3.9.16_p2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="
bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
+readline +sqlite +ssl test tk valgrind +xml
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 3f1b1875e6da..d4c4605da6e2 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,3 +1,4 @@
DIST ruby-2.7.7.tar.xz 12101804 BLAKE2B 35f53835259217e344bde7fa3e2fe18e24c3e56eed2ca6dffb7385f38def401e6115944189138b280df5bbb0f5ff2e98f88260165f6e1802c60bd24cc6366397 SHA512 a19be3f0dfce040fe79f439e606f179d6750d2cc6e7b64fd65933edd487f5995573f7d0730beec9d3edadf942f8e9216f01ab3fff189d6cbe9d46a9add3e2683
DIST ruby-3.0.5.tar.xz 15880196 BLAKE2B 581aa202f6b1b5c72bb18d486c4f74ec87a6c2dd38166c4841b75dba891aabd72c3889b158134b04763cddb22c0f60015f4d21c5130077053e1fcb13e28a8024 SHA512 1c69d18210a2156f7696c678a8d54bf05c4dc49a1401c1ecc5760b1c23fb6ac14053873a225564664d6a327cda274ce72f47d112a6ad8d378f978de4e507e9a0
DIST ruby-3.1.3.tar.xz 15300224 BLAKE2B f3ef9031c2902bf5d624dce0a4584724e7a9099fb8b33b86a99026c37f4b91f23ff35c23a3cd7715bf739e6c539cc3612b5a750d00cbacf8e4ebcc70bbc85f41 SHA512 4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69
+DIST ruby-3.2.1.tar.xz 15094384 BLAKE2B 2dce2201c2c44910fdfe3e58013df9432e6b242baa9cb1f2c0ea3b010a18f9508d9c7802932cca0a05e6b35a2fcd17195a076f6c6741684959065878c31fc2bf SHA512 69caadab9be6b56905ea4fc92fa0e36704f9fa6a0e7e7f4c6bdb79e9cbe8dc57c524f96d9c18802d61aa1ca578fed2e9758692f9d701bf0dba938f0206b721b3
diff --git a/dev-lang/ruby/files/3.2/010-default-gem-location.patch b/dev-lang/ruby/files/3.2/010-default-gem-location.patch
new file mode 100644
index 000000000000..36009ad66f61
--- /dev/null
+++ b/dev-lang/ruby/files/3.2/010-default-gem-location.patch
@@ -0,0 +1,11 @@
+--- a/tool/rbinstall.rb 2022-11-13 08:12:27.373041649 +0100
++++ b/tool/rbinstall.rb 2022-11-13 08:16:09.110406705 +0100
+@@ -994,7 +994,7 @@
+ end
+
+ install?(:ext, :comm, :gem, :'bundled-gems') do
+- gem_dir = Gem.default_dir
++ gem_dir = ENV['GEM_DESTDIR']
+ install_dir = with_destdir(gem_dir)
+ prepare "bundled gems", gem_dir
+ RbInstall.no_write do
diff --git a/dev-lang/ruby/files/3.2/901-musl-stacksize.patch b/dev-lang/ruby/files/3.2/901-musl-stacksize.patch
new file mode 100644
index 000000000000..e5fcfce2195e
--- /dev/null
+++ b/dev-lang/ruby/files/3.2/901-musl-stacksize.patch
@@ -0,0 +1,26 @@
+musl has a conservative stacksize, as compared to glibc, so treat it
+like other systems with such stacksize
+
+diff --git a/thread_pthread.c b/thread_pthread.c
+index 951885ffa0..e2d662143b 100644
+--- a/thread_pthread.c
++++ b/thread_pthread.c
+@@ -721,7 +721,7 @@ ruby_init_stack(volatile VALUE *addr
+ {
+ native_main_thread.id = pthread_self();
+
+-#if MAINSTACKADDR_AVAILABLE
++#if MAINSTACKADDR_AVAILABLE && !(defined(__linux__) && !defined(__GLIBC__))
+ if (native_main_thread.stack_maxsize) return;
+ {
+ void* stackaddr;
+@@ -1680,7 +1680,7 @@ ruby_stack_overflowed_p(const rb_thread_t *th, const void *addr)
+
+ #ifdef STACKADDR_AVAILABLE
+ if (get_stack(&base, &size) == 0) {
+-# ifdef __APPLE__
++# if defined(__APPLE__) || (defined(__linux__) && !defined(__GLIBC__))
+ if (pthread_equal(th->thread_id, native_main_thread.id)) {
+ struct rlimit rlim;
+ if (getrlimit(RLIMIT_STACK, &rlim) == 0 && rlim.rlim_cur > size) {
+
diff --git a/dev-lang/ruby/ruby-3.2.1.ebuild b/dev-lang/ruby/ruby-3.2.1.ebuild
new file mode 100644
index 000000000000..9193389e5f80
--- /dev/null
+++ b/dev-lang/ruby/ruby-3.2.1.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc socks5 +ssl static-libs systemtap tk xemacs"
+
+RDEPEND="
+ berkdb? ( sys-libs/db:= )
+ gdbm? ( sys-libs/gdbm:= )
+ jemalloc? ( dev-libs/jemalloc:= )
+ jit? ( >=virtual/rust-1.58.1 )
+ ssl? (
+ dev-libs/openssl:0=
+ )
+ socks5? ( >=net-proxy/dante-1.1.13 )
+ systemtap? ( dev-util/systemtap )
+ tk? (
+ dev-lang/tcl:0=[threads]
+ dev-lang/tk:0=[threads]
+ )
+ dev-libs/libyaml
+ dev-libs/libffi:=
+ sys-libs/readline:0=
+ sys-libs/zlib
+ virtual/libcrypt:=
+ >=app-eselect/eselect-ruby-20221225
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+ >=dev-ruby/debug-1.7.1[ruby_targets_ruby32]
+ >=dev-ruby/matrix-0.4.2[ruby_targets_ruby32]
+ >=dev-ruby/minitest-5.16.3[ruby_targets_ruby32]
+ >=dev-ruby/net-ftp-0.2.0[ruby_targets_ruby32]
+ >=dev-ruby/net-imap-0.3.4[ruby_targets_ruby32]
+ >=dev-ruby/net-pop-0.1.2[ruby_targets_ruby32]
+ >=dev-ruby/net-smtp-0.3.3[ruby_targets_ruby32]
+ >=dev-ruby/power_assert-2.0.3[ruby_targets_ruby32]
+ >=dev-ruby/prime-0.1.2[ruby_targets_ruby32]
+ >=dev-ruby/rake-13.0.6[ruby_targets_ruby32]
+ >=dev-ruby/rbs-2.8.2[ruby_targets_ruby32]
+ >=dev-ruby/rexml-3.2.5[ruby_targets_ruby32]
+ >=dev-ruby/rss-0.2.9[ruby_targets_ruby32]
+ >=dev-ruby/test-unit-3.5.7[ruby_targets_ruby32]
+ >=dev-ruby/typeprof-0.21.3[ruby_targets_ruby32]
+"
+
+PDEPEND="
+ ${BUNDLED_GEMS}
+ virtual/rubygems[ruby_targets_ruby32]
+ >=dev-ruby/bundler-2.3.3[ruby_targets_ruby32]
+ >=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby32]
+ >=dev-ruby/json-2.6.1[ruby_targets_ruby32]
+ rdoc? ( >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby32] )
+ xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+ eapply "${FILESDIR}"/"${SLOT}"/010*.patch
+
+ if use elibc_musl ; then
+ eapply "${FILESDIR}"/3.1/901-musl-*.patch
+ fi
+
+ einfo "Unbundling gems..."
+ cd "$S"
+ # Remove bundled gems that we will install via PDEPEND, bug
+ # 539700.
+ rm -fr gems/* || die
+ touch gems/bundled_gems || die
+ # Don't install CLI tools since they will clash with the gem
+ rm -f bin/{racc,racc2y,y2racc} || die
+ sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
+
+ # Remove tests that are known to fail or require a network connection
+ rm -f test/ruby/test_process.rb test/rubygems/test_gem{,_path_support}.rb || die
+ rm -f test/rinda/test_rinda.rb test/socket/test_tcp.rb test/fiber/test_address_resolve.rb spec/ruby/library/socket/tcpsocket/{initialize,open}_spec.rb|| die
+
+ # Remove webrick tests because setting LD_LIBRARY_PATH does not work for them.
+ rm -rf tool/test/webrick || die
+
+ # Avoid test using the system ruby
+ sed -i -e '/test_dumb_terminal/aomit "Uses system ruby"' test/reline/test_reline.rb || die
+
+ # Avoid testing against hard-coded blockdev devices that most likely are not available
+ sed -i -e '/def blockdev/a@blockdev = nil' test/ruby/test_file_exhaustive.rb || die
+
+ # Avoid tests that require gem downloads
+ sed -i -e '/^test-syntax-suggest/ s/\$(TEST_RUNNABLE)/no/' common.mk || die
+ sed -i -e '/^check:/ s/\$(TEST_RUNNABLE)-\$(PREPARE_SYNTAX_SUGGEST) test-syntax-suggest//' common.mk || die
+
+ if use prefix ; then
+ # Fix hardcoded SHELL var in mkmf library
+ sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
+
+ if [[ ${CHOST} == *darwin* ]] ; then
+ # avoid symlink loop on Darwin (?!)
+ sed -i \
+ -e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
+ configure.ac || die
+
+ # make ar/libtool hack for Darwin work
+ sed -i \
+ -e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
+ configure.ac || die
+ fi
+ fi
+
+ eapply_user
+
+ eautoreconf
+}
+
+src_configure() {
+ local modules="win32,win32ole" myconf=
+
+ # -fomit-frame-pointer makes ruby segfault, see bug #150413.
+ filter-flags -fomit-frame-pointer
+ # In many places aliasing rules are broken; play it safe
+ # as it's risky with newer compilers to leave it as it is.
+ append-flags -fno-strict-aliasing
+
+ # Socks support via dante
+ if use socks5 ; then
+ # Socks support can't be disabled as long as SOCKS_SERVER is
+ # set and socks library is present, so need to unset
+ # SOCKS_SERVER in that case.
+ unset SOCKS_SERVER
+ fi
+
+ # Increase GC_MALLOC_LIMIT if set (default is 8000000)
+ if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+ append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+ fi
+
+ # ipv6 hack, bug 168939. Needs --enable-ipv6.
+ use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+ # Determine which modules *not* to build depending in the USE flags.
+ if ! use berkdb ; then
+ modules="${modules},dbm"
+ fi
+ if ! use gdbm ; then
+ modules="${modules},gdbm"
+ fi
+ if ! use ssl ; then
+ modules="${modules},openssl"
+ fi
+ if ! use tk ; then
+ modules="${modules},tk"
+ fi
+
+ # Provide an empty LIBPATHENV because we disable rpath but we do not
+ # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+ # #564272
+ INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+ --program-suffix=${MY_SUFFIX} \
+ --with-soname=ruby${MY_SUFFIX} \
+ --with-readline-dir="${EPREFIX}"/usr \
+ --enable-shared \
+ --enable-pthread \
+ --disable-rpath \
+ --with-out-ext="${modules}" \
+ $(use_with jemalloc jemalloc) \
+ $(use_enable jit jit-support) \
+ $(use_enable jit yjit) \
+ $(use_enable socks5 socks) \
+ $(use_enable systemtap dtrace) \
+ $(use_enable doc install-doc) \
+ --enable-ipv6 \
+ $(use_enable static-libs static) \
+ $(use_enable static-libs install-static-library) \
+ $(use_with static-libs static-linked-ext) \
+ $(use_enable debug) \
+ ${myconf} \
+ --enable-option-checking=no
+
+ # Makefile is broken because it lacks -ldl
+ rm -rf ext/-test-/popen_deadlock || die
+}
+
+src_compile() {
+ export LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+ emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
+}
+
+src_test() {
+ export LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+ emake V=1 check
+}
+
+src_install() {
+ # Remove the remaining bundled gems. We do this late in the process
+ # since they are used during the build to e.g. create the
+ # documentation.
+ einfo "Removing default gems before installation"
+ rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
+
+ # Ruby is involved in the install process, we don't want interference here.
+ unset RUBYOPT
+
+ local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+ LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+
+ if [[ ${CHOST} == *darwin* ]] ; then
+ DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
+ export DYLD_LIBRARY_PATH
+ fi
+
+ RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+ for d in $(find "${S}/ext" -type d) ; do
+ RUBYLIB="${RUBYLIB}:$d"
+ done
+ export LD_LIBRARY_PATH RUBYLIB
+
+ # Create directory for the default gems
+ local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
+ mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
+
+ emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
+
+ # Remove installed rubygems and rdoc copy
+ rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+ rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+ rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+ rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+ if use doc; then
+ emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
+ fi
+
+ if use examples; then
+ dodoc -r sample
+ fi
+
+ dodoc ChangeLog NEWS.md README*
+ dodoc -r doc
+}
+
+pkg_postinst() {
+ if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+ eselect ruby set ruby${MY_SUFFIX}
+ fi
+
+ elog
+ elog "To switch between available Ruby profiles, execute as root:"
+ elog "\teselect ruby set ruby(23|24|...)"
+ elog
+}
+
+pkg_postrm() {
+ eselect ruby cleanup
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0bc9eb054e70..b470b9e34521 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/castxml/Manifest b/dev-libs/castxml/Manifest
index de8dcc691a90..02a4af51321f 100644
--- a/dev-libs/castxml/Manifest
+++ b/dev-libs/castxml/Manifest
@@ -1,2 +1 @@
-DIST castxml-0.4.5.tar.gz 104158 BLAKE2B 7d1642442d6908a7d7e1dd8f80a37b55ec8652191c4c93faf7f45601d730653d9b0e5af601f74aca7bce8579c0006eab0e9a2a75752abe2acbec1cfbf1522645 SHA512 c35c5d60dc7487d5dddba34de92590122db8457659458ee4e735fe9936dc59473bd31ed602e05e73651780f25a55ef5554e2daec0923ffb5a7575904320f5352
DIST castxml-0.5.1.tar.gz 106918 BLAKE2B 9268f149ea5a511d24cbbd0c7faec5bff5eade5a511961d3bb120409691bf2b8aca7f2978e048a759419c097d9d97219a61a122bd37d4f835c1d86827bfb07e3 SHA512 1dff8f5cc6932a159e1132c0b283a28414ea6007c942cac4ae15a1c31789f5bd29efd65a6b5b63d7bc48b3d68c3550804f31bee2658e51082269fc5ecc15590e
diff --git a/dev-libs/castxml/castxml-0.4.5.ebuild b/dev-libs/castxml/castxml-0.4.5.ebuild
deleted file mode 100644
index 7eee74c7e25a..000000000000
--- a/dev-libs/castxml/castxml-0.4.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="C-family abstract syntax tree XML output tool"
-HOMEPAGE="https://github.com/CastXML/CastXML"
-SRC_URI="https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/CastXML-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
-IUSE="+man test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- sys-devel/llvm:=
- sys-devel/clang:=
- "
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${RDEPEND}
- man? ( dev-python/sphinx )
- "
-
-PATCHES=(
- "${FILESDIR}"/${PN}-fix-tests.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DCastXML_INSTALL_DOC_DIR="share/doc/${P}"
- -DCastXML_INSTALL_MAN_DIR="share/man"
- -DSPHINX_MAN="$(usex man)"
- -DSPHINX_HTML=OFF
- -DBUILD_TESTING="$(usex test)"
- )
- cmake_src_configure
-}
diff --git a/dev-libs/castxml/castxml-0.5.1.ebuild b/dev-libs/castxml/castxml-0.5.1.ebuild
deleted file mode 100644
index 7eee74c7e25a..000000000000
--- a/dev-libs/castxml/castxml-0.5.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="C-family abstract syntax tree XML output tool"
-HOMEPAGE="https://github.com/CastXML/CastXML"
-SRC_URI="https://github.com/CastXML/CastXML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/CastXML-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
-IUSE="+man test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- sys-devel/llvm:=
- sys-devel/clang:=
- "
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${RDEPEND}
- man? ( dev-python/sphinx )
- "
-
-PATCHES=(
- "${FILESDIR}"/${PN}-fix-tests.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DCastXML_INSTALL_DOC_DIR="share/doc/${P}"
- -DCastXML_INSTALL_MAN_DIR="share/man"
- -DSPHINX_MAN="$(usex man)"
- -DSPHINX_HTML=OFF
- -DBUILD_TESTING="$(usex test)"
- )
- cmake_src_configure
-}
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 250b7af5a3cf..194016256fc7 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,4 +1,2 @@
-DIST girara-0.3.5.tar.xz 60488 BLAKE2B 2d0f2f0635e8e8906810b1425191f5d70b7f9af0985c461bd90654e83d87ad698da225d70064438fed4473295aca8dbd26c4ce1efd96f8a7399e7145b1f8c111 SHA512 e7c5bf887b29767878502224ad45d62e43b3da91bd8e754603256550d4f0126f1493f0fb7473a4ebb8cc5909306564249c6a60e99eba2b0b417b98c728fcdc84
-DIST girara-0.3.6.tar.xz 60056 BLAKE2B 4a9f651e2127c7924cd3e55c7f955b3f80b90849b5ee06f2785388ae3adbb8910bb90e59f934f426fdb6d8e7d797ac82a52bc7b05becff56e1aff610e5e56081 SHA512 e9496b1bb629d59377ed1fee8a2fab2c7e5d60845e6777ed9bb796e1843fea20abda32d7de885f01e892654ea996490403c442021528b6b4f2aa50cf54d74c42
DIST girara-0.3.7.tar.xz 60352 BLAKE2B 59515baf53d3ef46d98d5720437c253c82637df8380abe04a1649d4a2636124d6d0dfb001c9363d8a33a1bc496511e90b8c5365db34a29d489802fc780575d2a SHA512 9b91ef7e5047b3250327eab9280372f38615e9948884c108c3d1c5d3e81794f786adc827692b112d2bfdc2660e22206a143fafd5a814408df8ffd4c858148717
DIST girara-0.3.9.tar.xz 60832 BLAKE2B e577c4273c2d8f4d51e0ee283184ecd2b5b48877996f95aa5cec83ad716efd4946508203d3108d451492ff5d118d965ca98d86f4e0d9b31fcc1cc0b2266b9511 SHA512 b5399b26389cff0c6aa6f70687b53a99243d38d66ec401f48de49391c88b31dc3287366819288c405051d14f4f778db952953d48be51ac47d90d9f3604c94708
diff --git a/dev-libs/girara/girara-0.3.5.ebuild b/dev-libs/girara/girara-0.3.5.ebuild
deleted file mode 100644
index 67aab558816f..000000000000
--- a/dev-libs/girara/girara-0.3.5.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
-
-inherit meson virtualx
-
-DESCRIPTION="UI library that focuses on simplicity and minimalism"
-HOMEPAGE="https://pwmt.org/projects/girara/"
-
-if [[ ${PV} == *999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
- EGIT_BRANCH="develop"
-else
- SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
- KEYWORDS="amd64 arm ~riscv x86"
-fi
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc libnotify test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/glib:2
- dev-libs/json-c:=
- >=x11-libs/gtk+-3.20:3
- libnotify? ( x11-libs/libnotify )"
-RDEPEND="${DEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )
- test? ( dev-libs/check )
- virtual/pkgconfig"
-
-src_configure() {
- local emesonargs=(
- -Djson=enabled
- -Ddocs=$(usex doc enabled disabled)
- -Dnotify=$(usex libnotify enabled disabled)
- )
- meson_src_configure
-}
-
-src_test() {
- virtx meson_src_test
-}
diff --git a/dev-libs/girara/girara-0.3.6.ebuild b/dev-libs/girara/girara-0.3.6.ebuild
deleted file mode 100644
index 67aab558816f..000000000000
--- a/dev-libs/girara/girara-0.3.6.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
-
-inherit meson virtualx
-
-DESCRIPTION="UI library that focuses on simplicity and minimalism"
-HOMEPAGE="https://pwmt.org/projects/girara/"
-
-if [[ ${PV} == *999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
- EGIT_BRANCH="develop"
-else
- SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
- KEYWORDS="amd64 arm ~riscv x86"
-fi
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc libnotify test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/glib:2
- dev-libs/json-c:=
- >=x11-libs/gtk+-3.20:3
- libnotify? ( x11-libs/libnotify )"
-RDEPEND="${DEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )
- test? ( dev-libs/check )
- virtual/pkgconfig"
-
-src_configure() {
- local emesonargs=(
- -Djson=enabled
- -Ddocs=$(usex doc enabled disabled)
- -Dnotify=$(usex libnotify enabled disabled)
- )
- meson_src_configure
-}
-
-src_test() {
- virtx meson_src_test
-}
diff --git a/dev-libs/girara/girara-0.3.9.ebuild b/dev-libs/girara/girara-0.3.9.ebuild
index 88dc773e88de..37a2c0c517e5 100644
--- a/dev-libs/girara/girara-0.3.9.ebuild
+++ b/dev-libs/girara/girara-0.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} == *999 ]]; then
EGIT_BRANCH="develop"
else
SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~riscv ~x86"
+ KEYWORDS="~amd64 arm ~riscv x86"
fi
LICENSE="ZLIB"
diff --git a/dev-libs/hiredis/hiredis-1.1.0.ebuild b/dev-libs/hiredis/hiredis-1.1.0.ebuild
index 04945ae5a369..4d173dd34c4d 100644
--- a/dev-libs/hiredis/hiredis-1.1.0.ebuild
+++ b/dev-libs/hiredis/hiredis-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ LICENSE="BSD"
# Always check "Upgrading from ..." in README
# e.g. https://github.com/redis/hiredis#upgrading-to-110
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-solaris"
IUSE="examples ssl static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libcbor/libcbor-0.10.1.ebuild b/dev-libs/libcbor/libcbor-0.10.1.ebuild
index f4e4f48453a2..2f7271072a52 100644
--- a/dev-libs/libcbor/libcbor-0.10.1.ebuild
+++ b/dev-libs/libcbor/libcbor-0.10.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
IUSE="+custom-alloc doc test"
BDEPEND="
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index f60583ac2e4c..1edea9832f73 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -4,4 +4,5 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/dev-libs/libclc/libclc-17.0.0_pre20230304.ebuild b/dev-libs/libclc/libclc-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..93cce600989e
--- /dev/null
+++ b/dev-libs/libclc/libclc-17.0.0_pre20230304.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS=""
+IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+
+LLVM_MAX_SLOT=17
+BDEPEND="
+ ${PYTHON_DEPS}
+ || (
+ (
+ sys-devel/clang:17
+ spirv? ( dev-util/spirv-llvm-translator:17 )
+ )
+ (
+ sys-devel/clang:16
+ spirv? ( dev-util/spirv-llvm-translator:16 )
+ )
+ (
+ sys-devel/clang:15
+ spirv? ( dev-util/spirv-llvm-translator:15 )
+ )
+ (
+ sys-devel/clang:14
+ spirv? ( dev-util/spirv-llvm-translator:14 )
+ )
+ (
+ sys-devel/clang:13
+ spirv? ( dev-util/spirv-llvm-translator:13 )
+ )
+ )
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+llvm_check_deps() {
+ if use spirv; then
+ has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
+ return 1
+ fi
+ has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+ llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ local libclc_targets=()
+
+ use spirv && libclc_targets+=(
+ "spirv-mesa3d-"
+ "spirv64-mesa3d-"
+ )
+ use video_cards_nvidia && libclc_targets+=(
+ "nvptx--"
+ "nvptx64--"
+ "nvptx--nvidiacl"
+ "nvptx64--nvidiacl"
+ )
+ use video_cards_r600 && libclc_targets+=(
+ "r600--"
+ )
+ use video_cards_radeonsi && libclc_targets+=(
+ "amdgcn--"
+ "amdgcn-mesa-mesa3d"
+ "amdgcn--amdhsa"
+ )
+ [[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+ libclc_targets=${libclc_targets[*]}
+ local mycmakeargs=(
+ -DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+ )
+ cmake_src_configure
+}
diff --git a/dev-libs/libdispatch/libdispatch-5.7.1.ebuild b/dev-libs/libdispatch/libdispatch-5.7.1.ebuild
index af88a1aec21c..5c179746dc5b 100644
--- a/dev-libs/libdispatch/libdispatch-5.7.1.ebuild
+++ b/dev-libs/libdispatch/libdispatch-5.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/apple/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.g
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~riscv x86"
DEPEND="
!gnustep-base/libobjc2
diff --git a/dev-libs/libfido2/libfido2-1.12.0.ebuild b/dev-libs/libfido2/libfido2-1.12.0.ebuild
index 7c84b6b0f921..312758608b1d 100644
--- a/dev-libs/libfido2/libfido2-1.12.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/1"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="nfc static-libs"
DEPEND="
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
index 38cdf50ad91f..2d2497903a5b 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
LICENSE="LGPL-2.1 MIT"
SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc +getentropy static-libs"
# Build system only has --disable-arm-crypto-support right now
diff --git a/dev-libs/libinput/libinput-1.22.1.ebuild b/dev-libs/libinput/libinput-1.22.1.ebuild
index da83df27d555..a8b231cd3216 100644
--- a/dev-libs/libinput/libinput-1.22.1.ebuild
+++ b/dev-libs/libinput/libinput-1.22.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2
LICENSE="MIT"
SLOT="0/10"
if [[ $(ver_cut 3) -lt 900 ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
fi
IUSE="doc input_devices_wacom test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libliftoff/Manifest b/dev-libs/libliftoff/Manifest
index 722166cab7d6..a8c10dec1933 100644
--- a/dev-libs/libliftoff/Manifest
+++ b/dev-libs/libliftoff/Manifest
@@ -1,2 +1,2 @@
DIST libliftoff-0.3.0.tar.gz 31691 BLAKE2B 7584518f709b9a6eb975ece00b4e194de2d1e8dde71d831600b13785b8cef86b5e36493068c2345f02b85c20454d88a7cabc6082170591e7769c44f9894fd2be SHA512 696f771aef60a9bcd71e1e2e04b5abea4f3c67a0aae231f360b43cdb5835a2181f482372ab1128fe152b0cb214786f924c33ee9ecf13dfe08c1b260d03d241a4
-DIST libliftoff-0.4.0.tar.gz 36472 BLAKE2B aa8b66c154fae162dce5f32cc9d20d6e8eb6cfc5667bc529559e08a90566c404edce1c16e79e9c5f65a4b787609b5250ae98d394b240a25ad3ce4d4e57d24b5c SHA512 86db6efbb0700a43cb95efaecb4450b791e6b6c084205786fed72617a8cceef6884fea8b53bdc0bc5dd9bfba83e2bc72cffb334794a0e9a1807d0307804336b4
+DIST libliftoff-0.4.1.tar.gz 36504 BLAKE2B 23e73a9bb10a3c80caa21719bc2b857d612606f68559792731c04bf5b32d072b798e6f1a44da172910fbd2fbe6b439ef27d3848bf5c993a9f2a4d062a1038581 SHA512 4144dda17775a2b6f9f32bb62de9119365e93625ffeb6fb16c49224fcbe76991c18e66382a458ac4a648e5d72879c52be089ef3673e825edc158d73c97c874dc
diff --git a/dev-libs/libliftoff/libliftoff-0.4.0.ebuild b/dev-libs/libliftoff/libliftoff-0.4.1.ebuild
similarity index 91%
rename from dev-libs/libliftoff/libliftoff-0.4.0.ebuild
rename to dev-libs/libliftoff/libliftoff-0.4.1.ebuild
index bb61df9cef3f..7fcbf7f6a604 100644
--- a/dev-libs/libliftoff/libliftoff-0.4.0.ebuild
+++ b/dev-libs/libliftoff/libliftoff-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild b/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild
index 3ad8888ba6dd..63f14819cb1a 100644
--- a/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild
+++ b/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}/libltdl
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~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 ~loong ~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"
IUSE="static-libs"
# libltdl doesn't have a testsuite.
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.7.1.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.7.1.ebuild
index 18bf20f96372..2149770f4d7f 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.7.1.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.7.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
else
SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
fi
LICENSE="Apache-2.0"
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.8.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.8.ebuild
index 5549cd3a031f..84eadc48b96a 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.8.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libusb/libusb-compat-0.1/releases/download/v${PV}/${
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="debug examples"
RDEPEND="
diff --git a/dev-libs/libwacom/libwacom-2.6.0.ebuild b/dev-libs/libwacom/libwacom-2.6.0.ebuild
index e7b6ffe8d40e..d59625aaee58 100644
--- a/dev-libs/libwacom/libwacom-2.6.0.ebuild
+++ b/dev-libs/libwacom/libwacom-2.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0/9" # libwacom SONAME
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/mimalloc/mimalloc-2.0.9.ebuild b/dev-libs/mimalloc/mimalloc-2.0.9.ebuild
index 7747f2101976..10b7bdb1fa6c 100644
--- a/dev-libs/mimalloc/mimalloc-2.0.9.ebuild
+++ b/dev-libs/mimalloc/mimalloc-2.0.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -
LICENSE="MIT"
SLOT="0/2"
-KEYWORDS="~amd64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~loong ~ppc64 ~riscv ~x86"
IUSE="hardened test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/nss-pem/nss-pem-1.1.0.ebuild b/dev-libs/nss-pem/nss-pem-1.1.0.ebuild
index 363033f7db86..06f5e614872a 100644
--- a/dev-libs/nss-pem/nss-pem-1.1.0.ebuild
+++ b/dev-libs/nss-pem/nss-pem-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kdudka/${PN}/releases/download/${P}/${P}.tar.xz"
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
DEPEND="dev-libs/nss
dev-libs/nspr"
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index 22e33c13ee7c..7312966b6f99 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -1,3 +1,4 @@
DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d6512c3460374f19b12d50403c19301645c5f6fc4d697cc687079c5b0d23c32b5775b30fbf05a154aeec2c19 SHA512 9f7644b86741dfe61716bbc43b2ea0a02cfc21eaf229c47cc71a49e2f08bf2c1ff37d2b2242a1bcf518b1893be6b82c27b0e9010a1b47ef8df87ffd90d280f71
DIST pegtl-3.2.1.tar.gz 244746 BLAKE2B f1d4ab0bfbc0be09affc83ffdf07796705be949e1addd06e241b8c06dd34bea3844a34b6dfe143269e110279615238afa606944c52af32f8cf6ea34398c40c7b SHA512 6297adea085bb3043a60c28eb3a868a7c2d203b351f907ea3fdc4ef34c63f87a5786ac7d297531f8b8c8c3414f5ddef658a025a7bae2515bdc750e974975f6ff
DIST pegtl-3.2.5.tar.gz 248904 BLAKE2B 008f7b058c5a62910911815bee671baead509e673ce8f67bebc4244edd1abed4c2467a03cb47e55e75c3be17b937834915f568a0a47066ba80949b868aa69494 SHA512 e531eaeef614d822e4bddbc6662fbe116cc1536fa308109f28ce5433607e6102f4e754a31094f9c349e4319914da6c83450dd2e8fa10dcfc3eee5a5dca547c14
+DIST pegtl-3.2.7.tar.gz 249394 BLAKE2B d095ef337e1ff9e01692f07d0b110a685cbe447c36d7d294d0f18a15e076d15112b300232c5b4872b4a0b51d375799fc73261bff31c5b970a3d05b90b0ae6062 SHA512 e996be569e1c25377b13870c4f3e59f1935bbf24bb7c6edca0edc85b304fbe3d05db52a303839b0bd50c78769b773fc2237814787a703c58de8a79398210ee34
diff --git a/dev-libs/pegtl/pegtl-3.2.7.ebuild b/dev-libs/pegtl/pegtl-3.2.7.ebuild
new file mode 100644
index 000000000000..88a9c2105f41
--- /dev/null
+++ b/dev-libs/pegtl/pegtl-3.2.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Header-only library for creating parsers according to Parsing Expression Grammar"
+HOMEPAGE="https://github.com/taocpp/PEGTL"
+SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P^^}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.2.1-werror.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DPEGTL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/${PN}"
+ -DPEGTL_INSTALL_DOC_DIR="share/doc/${PF}"
+ )
+ cmake_src_configure
+}
diff --git a/dev-libs/popt/popt-1.19.ebuild b/dev-libs/popt/popt-1.19.ebuild
index c1a6e6bf95cf..ff3d464cc3ac 100644
--- a/dev-libs/popt/popt-1.19.ebuild
+++ b/dev-libs/popt/popt-1.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~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 ~loong ~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"
IUSE="nls static-libs"
RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/teakra/teakra-20220224.ebuild b/dev-libs/teakra/teakra-20220224.ebuild
index 9553e9149c97..faf0cf67592a 100644
--- a/dev-libs/teakra/teakra-20220224.ebuild
+++ b/dev-libs/teakra/teakra-20220224.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-H=01db7cdd00aabcce559a8dddce8798dabb71949b
+[[ ${PV} == 20220224 ]] && COMMIT=01db7cdd00aabcce559a8dddce8798dabb71949b
inherit cmake
DESCRIPTION="Emulator, assembler, etc for XpertTeak, the DSP used by DSi/3DS"
HOMEPAGE="https://github.com/wwylele/teakra/"
-SRC_URI="https://github.com/wwylele/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${H}
+SRC_URI="https://github.com/wwylele/${PN}/archive/${COMMIT}.tar.gz
+ -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
LICENSE="MIT"
SLOT="0"
@@ -23,8 +24,8 @@ src_prepare() {
}
src_configure() {
- local mycmakeargs=(
- -DCMAKE_SKIP_RPATH=ON
+ local -a mycmakeargs=(
+ -DCMAKE_SKIP_RPATCOMMIT=ON
)
cmake_src_configure
}
diff --git a/dev-libs/tre/tre-0.8.0_p20210321-r3.ebuild b/dev-libs/tre/tre-0.8.0_p20210321-r3.ebuild
index e80c8978678f..d540591832a0 100644
--- a/dev-libs/tre/tre-0.8.0_p20210321-r3.ebuild
+++ b/dev-libs/tre/tre-0.8.0_p20210321-r3.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="+agrep +alloca +approx debug nls profile python"
RDEPEND="
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index c45db1f11a68..7e6f0195ed03 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index f60583ac2e4c..1edea9832f73 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -4,4 +4,5 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230304.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..aee649edd10c
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230304.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.00.0:0=
+ dev-ml/ocaml-ctypes:=
+ ~sys-devel/llvm-${PV}:=[debug?]
+ !sys-devel/llvm[ocaml(-)]
+"
+
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-lang/perl
+ dev-ml/findlib
+ >=dev-util/cmake-3.16
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+ -DBUILD_SHARED_LIBS=OFF
+ -DLLVM_BUILD_LLVM_DYLIB=ON
+ -DLLVM_LINK_LLVM_DYLIB=ON
+ -DLLVM_OCAML_OUT_OF_TREE=ON
+
+ # cheap hack: LLVM combines both anyway, and the only difference
+ # is that the former list is explicitly verified at cmake time
+ -DLLVM_TARGETS_TO_BUILD=""
+ -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+ -DLLVM_BUILD_TESTS=$(usex test)
+
+ # disable various irrelevant deps and settings
+ -DLLVM_ENABLE_FFI=OFF
+ -DLLVM_ENABLE_TERMINFO=OFF
+ -DHAVE_HISTEDIT_H=NO
+ -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+
+ -DLLVM_HOST_TRIPLE="${CHOST}"
+
+ -DPython3_EXECUTABLE="${PYTHON}"
+
+ # TODO: ocamldoc
+ )
+
+ use test && mycmakeargs+=(
+ -DLLVM_LIT_ARGS="$(get_lit_flags)"
+ )
+
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ # also: custom rules for OCaml do not work for CPPFLAGS
+ use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+ cmake_src_configure
+
+ local llvm_libdir=$(llvm-config --libdir)
+ # an ugly hack; TODO: figure out a way to pass -L to ocaml...
+ cd "${BUILD_DIR}/${libdir}" || die
+ ln -s "${llvm_libdir}"/*.so . || die
+
+ if use test; then
+ local llvm_bindir=$(llvm-config --bindir)
+ # Force using system-installed tools.
+ sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+ "${BUILD_DIR}"/test/lit.site.cfg.py || die
+ fi
+}
+
+src_compile() {
+ cmake_build ocaml_all
+}
+
+src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+ cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+ DESTDIR="${D}" \
+ cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+ dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/odoc/odoc-2.2.0-r1.ebuild b/dev-ml/odoc/odoc-2.2.0-r2.ebuild
similarity index 90%
rename from dev-ml/odoc/odoc-2.2.0-r1.ebuild
rename to dev-ml/odoc/odoc-2.2.0-r2.ebuild
index 5028b9801081..24702587b03d 100644
--- a/dev-ml/odoc/odoc-2.2.0-r1.ebuild
+++ b/dev-ml/odoc/odoc-2.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,6 +16,7 @@ IUSE="+ocamlopt test"
RESTRICT="test" # ocaml-crunch not in the tree
RDEPEND="
+ >=dev-ml/dune-3
dev-ml/astring:=
dev-ml/cmdliner:=
dev-ml/cppo:=
diff --git a/dev-ml/zed/zed-3.2.1-r1.ebuild b/dev-ml/zed/zed-3.2.1-r2.ebuild
similarity index 96%
rename from dev-ml/zed/zed-3.2.1-r1.ebuild
rename to dev-ml/zed/zed-3.2.1-r2.ebuild
index 3caadbbe9b7c..066ffd88b927 100644
--- a/dev-ml/zed/zed-3.2.1-r1.ebuild
+++ b/dev-ml/zed/zed-3.2.1-r2.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="+ocamlopt"
RDEPEND="
+ >=dev-ml/dune-3
dev-ml/react:=
dev-ml/result:=
dev-ml/uchar:=
diff --git a/dev-perl/Apache-Test/Apache-Test-1.430.0.ebuild b/dev-perl/Apache-Test/Apache-Test-1.430.0.ebuild
index c1483048b4ab..94dde3f81613 100644
--- a/dev-perl/Apache-Test/Apache-Test-1.430.0.ebuild
+++ b/dev-perl/Apache-Test/Apache-Test-1.430.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Test.pm wrapper with helpers for testing Apache"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild b/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
index f652c7b86d5d..29916b81e365 100644
--- a/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
+++ b/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="additional B helpers to check COW status"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Clone/Clone-0.460.0.ebuild b/dev-perl/Clone/Clone-0.460.0.ebuild
index 7263d754cb1c..3b313190114a 100644
--- a/dev-perl/Clone/Clone-0.460.0.ebuild
+++ b/dev-perl/Clone/Clone-0.460.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Recursively copy Perl datatypes"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
BDEPEND="
virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0-r1.ebuild b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0-r1.ebuild
index 929135217a7a..b97ee71a9923 100644
--- a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0-r1.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="OpenSSL pseudo-random number generator access"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
RDEPEND="
dev-libs/openssl:0=
diff --git a/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.420.0.ebuild b/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.420.0.ebuild
index 49c0da32772e..feabd6e83a46 100644
--- a/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.420.0.ebuild
+++ b/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.420.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Provides interoperable MD5-based crypt() functions"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
RDEPEND="
>=virtual/perl-Digest-MD5-2.530.0
diff --git a/dev-perl/CryptX/CryptX-0.77.0.ebuild b/dev-perl/CryptX/CryptX-0.77.0.ebuild
index 8d80b508df58..959ab39848bb 100644
--- a/dev-perl/CryptX/CryptX-0.77.0.ebuild
+++ b/dev-perl/CryptX/CryptX-0.77.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Self-contained crypto toolkit"
LICENSE="|| ( Artistic GPL-1+ ) public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv sparc x86"
IUSE="minimal"
RDEPEND="
diff --git a/dev-perl/Curses/Curses-1.410.0.ebuild b/dev-perl/Curses/Curses-1.410.0.ebuild
index 2dd008b6d4fd..1c6b67bcf6a2 100644
--- a/dev-perl/Curses/Curses-1.410.0.ebuild
+++ b/dev-perl/Curses/Curses-1.410.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module toolchain-funcs
DESCRIPTION="Curses interface modules for Perl"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~s390 sparc x86 ~sparc-solaris ~x86-solaris"
IUSE="+unicode"
RDEPEND="
diff --git a/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/Dist-Zilla-Plugin-AuthorsFromGit-0.7.0.ebuild b/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/Dist-Zilla-Plugin-AuthorsFromGit-0.7.0.ebuild
index b5aff0d2ef17..728d3f30d458 100644
--- a/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/Dist-Zilla-Plugin-AuthorsFromGit-0.7.0.ebuild
+++ b/dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/Dist-Zilla-Plugin-AuthorsFromGit-0.7.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Add per-file per-year copyright information"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RDEPEND="
dev-perl/DateTime
diff --git a/dev-perl/File-RsyncP/File-RsyncP-0.760.0-r1.ebuild b/dev-perl/File-RsyncP/File-RsyncP-0.760.0-r1.ebuild
index 2c19a775d327..fb4db20b16d1 100644
--- a/dev-perl/File-RsyncP/File-RsyncP-0.760.0-r1.ebuild
+++ b/dev-perl/File-RsyncP/File-RsyncP-0.760.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://perlrsync.sourceforge.net/ https://metacpan.org/release/File-Rs
# Bundled files make for some weirdness
LICENSE="GPL-3+ GPL-2+ RSA"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86"
RDEPEND="
>=virtual/perl-Getopt-Long-2.240.0
diff --git a/dev-perl/HTTP-Message/HTTP-Message-6.440.0.ebuild b/dev-perl/HTTP-Message/HTTP-Message-6.440.0.ebuild
index 0ae98e9e4aaa..9c0be6e7327d 100644
--- a/dev-perl/HTTP-Message/HTTP-Message-6.440.0.ebuild
+++ b/dev-perl/HTTP-Message/HTTP-Message-6.440.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Base class for Request/Response"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.81.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.81.0.ebuild
index b803d507eae9..c294dae34ed4 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.81.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.81.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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"
IUSE="idn"
RDEPEND="
diff --git a/dev-perl/MIME-Types/MIME-Types-2.240.0.ebuild b/dev-perl/MIME-Types/MIME-Types-2.240.0.ebuild
index aa6e51ca960c..099ba007369a 100644
--- a/dev-perl/MIME-Types/MIME-Types-2.240.0.ebuild
+++ b/dev-perl/MIME-Types/MIME-Types-2.240.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Definition of MIME types"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
RDEPEND="
virtual/perl-File-Spec
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index d0b79c28efff..bc8b5e2931aa 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Math-GMP/Math-GMP-2.250.0.ebuild b/dev-perl/Math-GMP/Math-GMP-2.250.0.ebuild
index c25f7166b15a..6231ae064ca5 100644
--- a/dev-perl/Math-GMP/Math-GMP-2.250.0.ebuild
+++ b/dev-perl/Math-GMP/Math-GMP-2.250.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ DESCRIPTION="High speed arbitrary size integer math"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc x86"
RDEPEND="
virtual/perl-AutoLoader
diff --git a/dev-perl/Net-Pcap/Net-Pcap-0.210.0.ebuild b/dev-perl/Net-Pcap/Net-Pcap-0.210.0.ebuild
index 097705fa0fce..3920401a5b09 100644
--- a/dev-perl/Net-Pcap/Net-Pcap-0.210.0.ebuild
+++ b/dev-perl/Net-Pcap/Net-Pcap-0.210.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Interface to the pcap(3) LBL packet capture library"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 ppc x86"
RDEPEND="
net-libs/libpcap
diff --git a/dev-perl/Sys-Virt/Sys-Virt-8.9.0.ebuild b/dev-perl/Sys-Virt/Sys-Virt-8.9.0.ebuild
index 2a37a5b631de..caddfe0079bc 100644
--- a/dev-perl/Sys-Virt/Sys-Virt-8.9.0.ebuild
+++ b/dev-perl/Sys-Virt/Sys-Virt-8.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,7 @@ inherit perl-module
DESCRIPTION="API for using the libvirt library from Perl"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
>=app-emulation/libvirt-${PV}
diff --git a/dev-perl/URI-Find/URI-Find-20160806.0.0-r1.ebuild b/dev-perl/URI-Find/URI-Find-20160806.0.0-r1.ebuild
index 3a59bddbd563..7dd12079c59e 100644
--- a/dev-perl/URI-Find/URI-Find-20160806.0.0-r1.ebuild
+++ b/dev-perl/URI-Find/URI-Find-20160806.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Find URIs in plain text"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~x86-solaris"
RDEPEND="
>=dev-perl/URI-1.600.0
diff --git a/dev-perl/X11-XCB/X11-XCB-0.190.0-r1.ebuild b/dev-perl/X11-XCB/X11-XCB-0.190.0-r1.ebuild
index 99b07980e170..0b664df3d797 100644
--- a/dev-perl/X11-XCB/X11-XCB-0.190.0-r1.ebuild
+++ b/dev-perl/X11-XCB/X11-XCB-0.190.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module virtualx
DESCRIPTION="Perl bindings for libxcb"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/XML-LibXSLT/XML-LibXSLT-2.2.0.ebuild b/dev-perl/XML-LibXSLT/XML-LibXSLT-2.2.0.ebuild
index 9cdbb2f02ce4..011b49d8e8a8 100644
--- a/dev-perl/XML-LibXSLT/XML-LibXSLT-2.2.0.ebuild
+++ b/dev-perl/XML-LibXSLT/XML-LibXSLT-2.2.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A Perl module to parse XSL Transformational sheets using GNOME's li
# https://github.com/shlomif/perl-XML-LibXSLT/issues/5
LICENSE="|| ( Artistic GPL-1+ ) MIT"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
RDEPEND="
virtual/perl-Encode
diff --git a/dev-perl/libintl-perl/libintl-perl-1.330.0.ebuild b/dev-perl/libintl-perl/libintl-perl-1.330.0.ebuild
index 21da0d96e51c..9b3492343889 100644
--- a/dev-perl/libintl-perl/libintl-perl-1.330.0.ebuild
+++ b/dev-perl/libintl-perl/libintl-perl-1.330.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://guido-flohr.net/projects/libintl-perl https://metacpan.org/rele
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="minimal"
RDEPEND="
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d2a875923552..b278930eeddf 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 4a4a4be50199..51964ef919f1 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,3 +1,4 @@
+DIST alembic-1.10.0.tar.gz 1146577 BLAKE2B 9063a62a10e3c8a2fc5c7b78d285d6526dd0a4b97775db7881e28667752ac9154a4867b7213ca9dde7df51c97317104cb66a8e42dde22d8678ac2da7b4e8994a SHA512 39deb7182660a4afbcfac4b32c1607ff7d97fe599fa99dc74c6dea41c26e298d3fa0618dbd7c3c8984264d54f6f2b00a0e9bde66dc1aa76a2a64eccc81e85a03
DIST alembic-1.9.2.tar.gz 1136929 BLAKE2B 26c4ad3185bc274aa4321a0860dc357566625abb51c951f2d0151bfd109f0e0bf7a37075d07ad2f0975127bdd327579f2d9a700f3cc130fbdd1c6458127b2e50 SHA512 d878d48d140be68facdaf0ec25f8582c9e10a369b23e9ee035ae63f8f2ad52d50464c5b8e9c666307edd1a797b6a2c495e56fa890f7dc8f46b3d75a726905ded
DIST alembic-1.9.3.tar.gz 1137492 BLAKE2B 17dbc5513b7e15daa51f623bfa90febf356caad8d13e215c6007fd0330e569ea4ffddd374c1ab9b7954e38a136c27d2e5d0ff5db026a6c2ad04d242b3cfdbe7f SHA512 dcbde51c26a81f88b102979aa000c17d0af065e96c51484c94c138fc08099e229deb06f5934d499058f25ef87eb5a5de765225fb890a76eb030d1ad6649e57a4
DIST alembic-1.9.4.tar.gz 1139210 BLAKE2B 5b740803b6bf5b715e9572a91d87d5403d64e665647776d28511704fa17ed81825fe6f5cdab2cec77a0806abb02ef2a7acf5f9702ff87639b90e74d9e22a4b1a SHA512 76e6f86e789cecff78f8e86c34d22a70615158833bc24a26f38fe2d0d5ccd098920e0fe4cbebaadd2c9a4a2e63152720945645000d46a2b6b8b6696ce873f899
diff --git a/dev-python/alembic/alembic-1.10.0.ebuild b/dev-python/alembic/alembic-1.10.0.ebuild
new file mode 100644
index 000000000000..65822a6ad910
--- /dev/null
+++ b/dev-python/alembic/alembic-1.10.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="
+ https://github.com/sqlalchemy/alembic/
+ https://pypi.org/project/alembic/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+ >=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+ dev-python/mako[${PYTHON_USEDEP}]
+ >=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ >=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 2a9e16e75e01..be405743faba 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1 +1,2 @@
DIST argcomplete-2.0.0.tar.gz 54164 BLAKE2B 77da149b07d4019f8d6f3dda8fd9bbe9953c25b8461ab0746e1c2eb4d1bb51a9007c1f046ad9dc41dc5f8f248fbdf18ad7d921cf644fbc7580661084fd1427a1 SHA512 ef2a551e1372ecf3739006fe2c020e9f7ec53c5809680dcd3d9d552290565d8d09ba22bcc989f40644120a129b101f8e2e8ed34723e947a7d8d7884e9b502c31
+DIST argcomplete-2.0.5.tar.gz 54665 BLAKE2B 33b3c1d6ba4b6fe6ac959db050d4944411a3ef6e737b9ae16f70d1e2cdd6cea0c2534ac4f4edce63df3606a18b9d8e16831a14db655cdd9cb4c2ad3afed60c72 SHA512 6354f2f67a5d0ff35539c2c4fa5ab5b78d3e57648ee2436da7b3916044d568d8558316a3e2b34581c97540c4a9f2191869fb215f0020ce09416d7b31377252e5
diff --git a/dev-python/argcomplete/argcomplete-2.0.5.ebuild b/dev-python/argcomplete/argcomplete-2.0.5.ebuild
new file mode 100644
index 000000000000..62fa0769c218
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-2.0.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="
+ https://github.com/kislyuk/argcomplete/
+ https://pypi.org/project/argcomplete/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# pip is called as an external tool
+BDEPEND="
+ test? (
+ app-shells/fish
+ app-shells/tcsh
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ >=dev-python/pip-19
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/argcomplete-2.0.5-test-install.patch
+)
+
+src_prepare() {
+ sed -i -e 's:timeout=5:timeout=30:' test/test.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ "${EPYTHON}" test/test.py -v || die
+}
diff --git a/dev-python/argcomplete/files/argcomplete-2.0.5-test-install.patch b/dev-python/argcomplete/files/argcomplete-2.0.5-test-install.patch
new file mode 100644
index 000000000000..a710498d5223
--- /dev/null
+++ b/dev-python/argcomplete/files/argcomplete-2.0.5-test-install.patch
@@ -0,0 +1,26 @@
+https://github.com/kislyuk/argcomplete/pull/406
+
+From e6682b3e3e0c7882a3b93df2f0e466ef001d37e4 Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Sun, 5 Mar 2023 08:14:10 +0000
+Subject: [PATCH] setup.py: exclude test.* subpackages from find_packages too
+
+Otherwise, test.test_package will be picked up when installing via
+PEP517.
+
+Bug: https://bugs.gentoo.org/899628
+Signed-off-by: Sam James
+--- a/setup.py
++++ b/setup.py
+@@ -33,7 +33,7 @@ setup(
+ ':python_version == "3.6"': importlib_backport_requires,
+ ':python_version == "3.7"': importlib_backport_requires,
+ },
+- packages=find_packages(exclude=["test"]),
++ packages=find_packages(exclude=["test", "test.*"]),
+ scripts=glob.glob("scripts/*"),
+ package_data={"argcomplete": ["bash_completion.d/python-argcomplete"]},
+ zip_safe=False,
+--
+2.39.2
+
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index ed745dd8817e..05dfbca39cc5 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -2,3 +2,4 @@ DIST astroid-2.13.2.gh.tar.gz 449022 BLAKE2B c8180057edef860fae6697b40d6b023b5be
DIST astroid-2.13.5.gh.tar.gz 451241 BLAKE2B 6994c9a62911ab347be4de17b9322ca9957b274c2a42085b5c521bc4a810ab0c0079fda89203910a1d7151ebad1b07cc446c1fc8e88580051029861cfb3465ae SHA512 87920dfe5a4e3e64b77cbeefcdd1e227dd712230aeb957f78b57a50d215ef0601689df26ac97cec65d7690e89b10e1b8ab8f2976d1a9b1a3e9a971eb2142d9d2
DIST astroid-2.14.1.gh.tar.gz 452889 BLAKE2B f6cee61825d2c86bbf02ba6cc9f48076692d3d71ac2c8a02880a778380b076692aef549ab01829d943323b5829b83ee88009b5136b308da6f81a824fa1f62047 SHA512 47dd132e66645c3da639c68011f4691409af38affa80c5b1863706a864fb8458cdfd100f86929fdaac027a514d285132d8865d2d40996c583077384696a84123
DIST astroid-2.14.2.gh.tar.gz 453109 BLAKE2B cb4b0795bde841e98712a719ba0870a3f0c616fc777cb3afc1ebbb0f5e49b763241825072d7915df87e778649a5632fec8f48e125cfa67de0b70618e34509157 SHA512 2dad27c0a3ddad5747a021c0700b831fe9f7a557238a2f52d87722c637120d49796a0a8e9e6f27d42ab4bee1c91541b7b5b5fa93dc3ec8a47197f35569a64a3a
+DIST astroid-2.15.0.gh.tar.gz 460733 BLAKE2B cc80ffd9b5804a1a0c94598f75363088dcb971ee322b556e150799a5e18aa16d20c58d9bf7725c2697d34152daa72a20d845e7c56a524d58354913eed338010f SHA512 7ec121b3c7d60e2d48f738fbc4eeae3e32c7135a77fb778db9479d730a757818f549d8bd35facdd67d411d777d57ec620a2448de1f4da23754863cae18717bce
diff --git a/dev-python/astroid/astroid-2.15.0.ebuild b/dev-python/astroid/astroid-2.15.0.ebuild
new file mode 100644
index 000000000000..e619ead6e779
--- /dev/null
+++ b/dev-python/astroid/astroid-2.15.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+ https://github.com/PyCQA/astroid/
+ https://pypi.org/project/astroid/
+"
+SRC_URI="
+ https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Version specified in pyproject.toml
+RDEPEND="
+ >=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
+ ' 3.{8..10})
+ Python
+ simonpercivall/astunparse
astunparse
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index f1bc792f8814..be50691cb5e7 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,2 +1 @@
-DIST black-22.12.0.gh.tar.gz 1182329 BLAKE2B fa7461b296e278a9d0945816fe88b933794e1302bc6e5fc2d2d48c94dcf50826471962351d1acc12da804ff7fa434efd8a8dca874dac91c8e36092ac50752669 SHA512 a89acd3c0f0d446e21695e9d7059a6417f8101bca32b22018d974cb08d6f3c9e4dbc3aab0a12091618ca860fbf9b0a53d4f2729311f65ca72f50a71629b60ac8
DIST black-23.1.0.gh.tar.gz 1196151 BLAKE2B 3c81bf5e52bb08928b568a20c9b3d769c5ebdd120bdfd4565c89fbffd978cd4a93dd70eacd041a4560723987278d16acfcae49245007bdc59178264757fba74d SHA512 f86d1bcf59c3fa0bb1bc3e71511c5df435ea437fd1cb30c466b8babc9522fb96bba6261da1431db75e6d578a85d061d31bd6ddbe50327fb4a3987eb03b03c330
diff --git a/dev-python/black/black-22.12.0.ebuild b/dev-python/black/black-22.12.0.ebuild
deleted file mode 100644
index ebfa5284ab79..000000000000
--- a/dev-python/black/black-22.12.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="
- https://black.readthedocs.io/en/stable/
- https://github.com/psf/black/
- https://pypi.org/project/black/
-"
-SRC_URI="
- https://github.com/psf/black/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
- >=dev-python/click-8.0.0[${PYTHON_USEDEP}]
- >=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
- >=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
- >=dev-python/platformdirs-2[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- >=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
- ' 3.8 3.9 3.10)
- $(python_gen_cond_dep '
- >=dev-python/typing-extensions-3.10.0.0[${PYTHON_USEDEP}]
- ' 3.8 3.9)
-"
-BDEPEND="
- dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
- dev-python/hatch-vcs[${PYTHON_USEDEP}]
- test? (
- >=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
- dev-python/aiohttp-cors[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/parameterized[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-pkg_postinst() {
- optfeature "blackd - HTTP API for black" "dev-python/aiohttp dev-python/aiohttp-cors"
-}
diff --git a/dev-python/black/black-23.1.0.ebuild b/dev-python/black/black-23.1.0.ebuild
index f9b31fcaa4c0..8ab986331f85 100644
--- a/dev-python/black/black-23.1.0.ebuild
+++ b/dev-python/black/black-23.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
RDEPEND="
>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index ce9e8baf7953..540ac98ef0ca 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,7 +1,3 @@
DIST boto3-1.26.74.gh.tar.gz 602525 BLAKE2B 6d9b397864649ecd9b3f46bcee832c57cdce809545522f3beaf0d2eb98ca1f99e5fcab132f3389a4b2edcd585d9f6759de961b1f83f5912420629b6b03092c36 SHA512 eba11711dbd77988deb1695b954b6eb931b8ad49f96971e221415355de9bd2f3015b5a58be34a7378180f59500f9c15135192ccb97454141dbcaa664f0183627
DIST boto3-1.26.79.gh.tar.gz 605312 BLAKE2B c36b86ab289be9c08a1ab43274a4f4db71cede08598b6f8092af8404bc9994e345b263b144ee3a1974ea276fce63c330d7ffa6335bb889bea32e380e9003a8c7 SHA512 cfc789296b904c0c3bd3999153067f4fb174b323f0fbd22e8f4a49aed98338e20fd238876e2f55f608f5d6b60b584e15d370400e8d0a8a00b0689e0867d00f05
-DIST boto3-1.26.80.gh.tar.gz 606204 BLAKE2B ae80c1ec7e99f48844c4eec39df1f6802df1fbbf2d94f1b7ddc04c7a21cb885823ebadb11cf9e81b51af9aa5f09775c02e52e926b94c49331307873b86702446 SHA512 e4ab89f2afe506d7d1ba9e1615e3a92ba4bf5dc9a85d3a14f034c1b14733d99cebf594bb6dc80914bf444da34d09c045c8933cf3c97e6ccfa9e31901e99d76ee
-DIST boto3-1.26.81.gh.tar.gz 611431 BLAKE2B e3f607e4bbd4ae7002168a697c6c3081b3713acbf7d7c8abdb1016b63f9ac5b16ae44255f707272db6a7b4c657210af0ed1c355889b01434683889b28de9d4e7 SHA512 30faa2d60f5f661e4d56a57c5b9d258ad3de260be2a21723b921f2383e290ca0b3d417a4a970ba3defd8f8196deaade2741117393c664b5fe267deab2e210e06
-DIST boto3-1.26.82.gh.tar.gz 611850 BLAKE2B fbf4581d616c6978482689e42a5cf8dc846ef91c77bd9f94298bed1ec50cdf41bc999ee81a1dd43b697da282f2774133daf6c6789d7d78b78aeb272c42f91f56 SHA512 8dc96da11d6da19610810c850c69070d25629e583f4eda822c218f4ad09295d25d3ae689a321c6a0c5f0c27e34717c44eb708950b4f37fe1d27f1f48205e5870
-DIST boto3-1.26.83.gh.tar.gz 612532 BLAKE2B 2cbb1bdb45fcb594c981df7850bc5d2a50d381a34d995b604edb55787dac8e85e83f9588960b555ddb92672e1564b4287c4fa6998754dcc204942673f3c686d1 SHA512 467c3eeb7f6ad5a863704498109a355cd789b69d43752fc694c78e67a7953c08f42cbe90a442978dfee08ab032f5b562dc84014c0cb02ec607d6f4b299e0246f
DIST boto3-1.26.84.gh.tar.gz 612921 BLAKE2B cf98272681299aa11454d65a6bf8bc6aa28244803e3d448f01425e62bb5dc01d93e0790ecaf6b2949ea1978130782f5ac282766c8fea94682e33b0cec65e2148 SHA512 d72117cb2f258fccf4a25e201a2dad8e13e8a80a03859edec2f27da01209185cbbb2f02a7924819214a612c6f6d3758ba0aba0047fab1cced3312d1662a7482b
diff --git a/dev-python/boto3/boto3-1.26.80.ebuild b/dev-python/boto3/boto3-1.26.80.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.80.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
- https://github.com/boto/boto3/
- https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/boto3"
- inherit git-r3
- BOTOCORE_PV=${PV}
-else
- SRC_URI="
- https://github.com/boto/boto3/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
- "
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
- # botocore is x.(y+3).z
- BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # don't lock versions to narrow ranges
- sed -e '/botocore/ d' \
- -e '/jmespath/ d' \
- -e '/s3transfer/ d' \
- -i setup.py || die
-
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.81.ebuild b/dev-python/boto3/boto3-1.26.81.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.81.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
- https://github.com/boto/boto3/
- https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/boto3"
- inherit git-r3
- BOTOCORE_PV=${PV}
-else
- SRC_URI="
- https://github.com/boto/boto3/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
- "
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
- # botocore is x.(y+3).z
- BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # don't lock versions to narrow ranges
- sed -e '/botocore/ d' \
- -e '/jmespath/ d' \
- -e '/s3transfer/ d' \
- -i setup.py || die
-
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.82.ebuild b/dev-python/boto3/boto3-1.26.82.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.82.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
- https://github.com/boto/boto3/
- https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/boto3"
- inherit git-r3
- BOTOCORE_PV=${PV}
-else
- SRC_URI="
- https://github.com/boto/boto3/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
- "
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
- # botocore is x.(y+3).z
- BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # don't lock versions to narrow ranges
- sed -e '/botocore/ d' \
- -e '/jmespath/ d' \
- -e '/s3transfer/ d' \
- -i setup.py || die
-
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.83.ebuild b/dev-python/boto3/boto3-1.26.83.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.83.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
- https://github.com/boto/boto3/
- https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/boto3"
- inherit git-r3
- BOTOCORE_PV=${PV}
-else
- SRC_URI="
- https://github.com/boto/boto3/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
- "
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
- # botocore is x.(y+3).z
- BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # don't lock versions to narrow ranges
- sed -e '/botocore/ d' \
- -e '/jmespath/ d' \
- -e '/s3transfer/ d' \
- -i setup.py || die
-
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index a5cb4a2f7fc4..2cc2eb57174d 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,7 +1,3 @@
DIST botocore-1.29.74.gh.tar.gz 11153254 BLAKE2B b3d3b75643cd5e3fac54a09e971daa23a043ba9f7ab773c2fd57dc15417c1b30c6f503515bad8734332bc40c4210e4ac09566c0742649c6ac3592e81ae9f8d79 SHA512 944ebbf1268fa9e8bb68ce5960da347613bcab585bf54c2fd6dbecb499088c1dc426357cde0a0f0d1780ecbc06acc33d8587f37c7f3d13577283b4549a353406
DIST botocore-1.29.79.gh.tar.gz 11184048 BLAKE2B 062326a477fb27844ec47af28b77424863d6ff407dbcfd95bc9aa26d4009f503364f3d438997fe437b4830b8ef8c7bfb7e026313364bb3e9429cd3b7c2eae261 SHA512 260cf6a533e32c6f514774e5c5ef6830feb77058e1074e730d7fa05fb7067dac093f1a612ed11e02db116671ca9f7301ed29e1625f6e47724301d25b03eb3c30
-DIST botocore-1.29.80.gh.tar.gz 11197756 BLAKE2B 62f70c71f6b5892ff4daaede65389c75a159ebc29da69b2b2f9b59fabcf1818d91b968cbb04f48acce8310f34b96dbb30189c1fdc609e124202a6743d5b3e65a SHA512 27f31ba27448c5ea3214dcd585d60901761f6cd26e384a861aa377842dd3561f293c261a6a3fd91e78cc3ea75f48b9369e77f4a8d1a4b4dd08fbdde9335ee5a8
-DIST botocore-1.29.81.gh.tar.gz 11211684 BLAKE2B c89f683ab6fd238f975af4a30eea6191d1a6c2a8cf5ec1ac640a34de801bc289545dc2a98e9a76824afdb650b9d173751b23af3a3f3e9438f8cd1cdeb0fb64e3 SHA512 91b0d34652f68a3f41e768ff35d342c50868fb9e6f9da2b97a64cf08cac03e959395ac499b9fea7cf5997273700b06499f0d870661b9104709fead4a87c0a1ee
-DIST botocore-1.29.82.gh.tar.gz 11213502 BLAKE2B 8038e8a97e7c8795b9f273e6d7a87f42d764c7996ebc9c6ba831720db9104ead2e11b8a30e660b1112ca2e5ce2582f7135b0db79c56bf6c615f9a7e242b9ef8e SHA512 4492b8bed66736f446e3dd76bf0bde56e2402093630f38246941d17e388f62ca2d0e069b08c7a39cd12e719d062c85c0981636b72362118a8d689581e492ad06
-DIST botocore-1.29.83.gh.tar.gz 11216449 BLAKE2B a1eaa0710317c257291045fb1514ffaaff07f5ce8e8c37652e60658020273cb5ff4ec1af15a678b0f0249def13e793ee6ed4e8902ce8af4c6b6a48c2767703a7 SHA512 acaabf7c225fa5ae9b3428bdad3a28ffb41ff5a2b637b52c7a1829de0c50ed2d99118d77abcef9e333ffb25de09c5e37a9b817739512dafa8e75ca370a956cc1
DIST botocore-1.29.84.gh.tar.gz 11220100 BLAKE2B 588efd08ec38eee7e319ea6e1d41af3f8d96c8e71fa090e5d3e8c836d60be957c47b556a9ce18684d53cb415446a360006714501dfbfc77204b2822247e7bf35 SHA512 cee6066735b324d550b736224ce4a4cff207cb7494d14e599ff9606b7a530d3887636054b3d0457269234d83ec0078950e03f916cd834cf910680e7ca650167b
diff --git a/dev-python/botocore/botocore-1.29.80.ebuild b/dev-python/botocore/botocore-1.29.80.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.80.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
- https://github.com/boto/botocore/
- https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/botocore"
- inherit git-r3
-else
- SRC_URI="
- https://github.com/boto/botocore/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
- "
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
- =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
- # unpin deps
- sed -i -e "s:>=.*':':" setup.py || die
-
- # unbundle deps
- rm -r botocore/vendored || die
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # rely on bundled six
- tests/functional/test_six_imports.py::test_no_bare_six_imports
- tests/functional/test_six_threading.py::test_six_thread_safety
- # fails on unrelated warnings
- tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
- tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
- # TODO
- tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
- )
-
- epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.81.ebuild b/dev-python/botocore/botocore-1.29.81.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.81.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
- https://github.com/boto/botocore/
- https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/botocore"
- inherit git-r3
-else
- SRC_URI="
- https://github.com/boto/botocore/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
- "
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
- =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
- # unpin deps
- sed -i -e "s:>=.*':':" setup.py || die
-
- # unbundle deps
- rm -r botocore/vendored || die
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # rely on bundled six
- tests/functional/test_six_imports.py::test_no_bare_six_imports
- tests/functional/test_six_threading.py::test_six_thread_safety
- # fails on unrelated warnings
- tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
- tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
- # TODO
- tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
- )
-
- epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.82.ebuild b/dev-python/botocore/botocore-1.29.82.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.82.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
- https://github.com/boto/botocore/
- https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/botocore"
- inherit git-r3
-else
- SRC_URI="
- https://github.com/boto/botocore/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
- "
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
- =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
- # unpin deps
- sed -i -e "s:>=.*':':" setup.py || die
-
- # unbundle deps
- rm -r botocore/vendored || die
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # rely on bundled six
- tests/functional/test_six_imports.py::test_no_bare_six_imports
- tests/functional/test_six_threading.py::test_six_thread_safety
- # fails on unrelated warnings
- tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
- tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
- # TODO
- tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
- )
-
- epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.83.ebuild b/dev-python/botocore/botocore-1.29.83.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.83.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
- https://github.com/boto/botocore/
- https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/boto/botocore"
- inherit git-r3
-else
- SRC_URI="
- https://github.com/boto/botocore/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
- "
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
- =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/jsonschema[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs/source \
- 'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
- # unpin deps
- sed -i -e "s:>=.*':':" setup.py || die
-
- # unbundle deps
- rm -r botocore/vendored || die
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
-
- distutils-r1_src_prepare
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # rely on bundled six
- tests/functional/test_six_imports.py::test_no_bare_six_imports
- tests/functional/test_six_threading.py::test_six_thread_safety
- # fails on unrelated warnings
- tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
- tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
- # TODO
- tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
- )
-
- epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index 92e794c0a802..feb410e302d1 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,2 +1,3 @@
DIST bottle-0.12.23.tar.gz 73965 BLAKE2B ccd3dc3aad5c4c8b6899f55f03550cf9178e51788c27ece9808e1cff92693cc09dab145be16f814d29dae02ce53374a0470b2c4b032bc66a0ec2b1a11ec5ca44 SHA512 0550aa95680dd79d9c63c5de854845377183c86015893d9ee4e67126eca201582ef79d40ff0d1cbe79fe8a250118a775c63102475e337e18cfc1a65afe18f62a
DIST bottle-0.12.24.tar.gz 74146 BLAKE2B a6bb638a0cba4d5fadbcb3a1a303b66a04f3c4df84e34b87d4a9bb22178de943123403d2851bd28504cf9d91380af95dd108e3b84825a93a6345cbe39fec0c33 SHA512 a3bc4bdc1376aef6c7b5784de18bfaac83e2c0c279fb2c3c3a8322871c68516e858b8c82cfff9291d41a66b906c13099c9d1037184bc48ff6f4ef0783b048f9b
+DIST bottle-0.12.25.tar.gz 74231 BLAKE2B 2856d94e1525f21e272d70ca3101188ea65417179342d7b3e971c5d1a3be77265e4197e5d29764a5739adbd984883ed121524f29e6a5933b8681e2c34b511a57 SHA512 14b8ed1ffd58f9667d451872ccf73a6f4bf8f7ffb9329f55314f90c770630cfe3f9956f786bcc7fd5f67fde22d14961952969af405912ebe71f019ca6599c975
diff --git a/dev-python/bottle/bottle-0.12.25.ebuild b/dev-python/bottle/bottle-0.12.25.ebuild
new file mode 100644
index 000000000000..e7fcb7168349
--- /dev/null
+++ b/dev-python/bottle/bottle-0.12.25.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="A fast and simple micro-framework for small web-applications"
+HOMEPAGE="
+ https://bottlepy.org/
+ https://github.com/bottlepy/bottle/
+ https://pypi.org/project/bottle/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+ test? (
+ dev-python/mako[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+ sed -e '/scripts/d' -i setup.py || die
+
+ # Remove test file requiring connection to network
+ rm test/test_server.py || die
+ distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+ optfeature "Templating support" dev-python/mako
+ elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
+ elog "we do as most other distros and do not install the script anymore."
+ elog "If you do want/have to call it directly rather than through your app,"
+ elog "please use the following instead:"
+ elog ' `python -m bottle`'
+}
diff --git a/dev-python/cachetools/cachetools-5.3.0.ebuild b/dev-python/cachetools/cachetools-5.3.0.ebuild
index ac26e87a31d2..3d4c97632e68 100644
--- a/dev-python/cachetools/cachetools-5.3.0.ebuild
+++ b/dev-python/cachetools/cachetools-5.3.0.ebuild
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
distutils_enable_tests pytest
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 709d786d40cc..31382d0b340c 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,5 +1,2 @@
-DIST cfn-lint-0.72.10.gh.tar.gz 3252485 BLAKE2B 34290170b4620f2f094d96ebb41cb9e5afb84fb2a0b26826cfa92cf8f73ad7e15d3ab0d38ce3ac81477f389480b36edcea26bfcb5246de8b1a5ea93b6b60ca3d SHA512 2ae9cb11956ba431c7282c3813c3f00cb4a3599a0d73f521f3880ed1f916cf0fb447a889db2ae44748be810b1e95a7709d18ac18f27b4dd3e762fa7bfd499d13
-DIST cfn-lint-0.72.9.gh.tar.gz 3239001 BLAKE2B 935d07e58d12a7b95bb589523a9ef49c9f508386d58384e7b391442ef02e304e583d687fce0f8faf892049525d6e621670061ab96a124229de7fc94df3e3533e SHA512 bf83e4146d4f2951e670c07a3a0bb3ab212881af9687c16244cade18bac101468c35532516731f66a80708312a9ee33bc531be9a6b7fab671bf54d596886a523
-DIST cfn-lint-0.73.1.gh.tar.gz 3337094 BLAKE2B 0fd3ac1116f8d38ebc4eef04bca5a6f6970c270682941a820240180d5eaa5908a8320e4e2adb0f29fe132dd56215fb42377435099a3ccb95697cc2caaa391794 SHA512 efdc54f983f9b7200ee725a844a9d83674309c080fb62c63e02430eb81c2992c4232a42bbe34d7b7f4ecc5097403bd9d8bf55806876f83e4ba3993e62597b675
DIST cfn-lint-0.73.2.gh.tar.gz 3343513 BLAKE2B 48ec085ec1d4c6fcee57d44915b65760481cd753805de3817c63aa093480aef15c81583cfa5f61f62407002c0d82cb9f36f146afffcc6f30dc0043f4f6fa991b SHA512 f85909cefb0882d4b36c26542c9ec65af520797e25b849bdbeb2e7e18b4f1675f0ede1b7cb19c529d8d393345ed48d98cc67e7e5d752790c3d9829bd6d69c052
DIST cfn-lint-0.74.0.gh.tar.gz 3633749 BLAKE2B 68ba32c66a6cc4ddf1260523679565e7074e159c1d63b8e408a40426e0c3e7ec60159075b8dc91bb40d2fbdb8fb5a5fd55c0f70d02c165900a64a0d032285492 SHA512 635621995b74068ec2be9fcda0b710ab975e8aea428317d254fd6e93b2602071b985a6d80c12321b8245c2569b84b6c7c46e4cacfd59f0d0e21926ad6782e2f0
diff --git a/dev-python/cfn-lint/cfn-lint-0.72.10.ebuild b/dev-python/cfn-lint/cfn-lint-0.72.10.ebuild
deleted file mode 100644
index eeb94f75e137..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.72.10.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
- https://github.com/aws-cloudformation/cfn-lint/
- https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
- https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
- >=dev-python/aws-sam-translator-1.56.0[${PYTHON_USEDEP}]
- dev-python/jsonpatch[${PYTHON_USEDEP}]
- >=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
- dev-python/junit-xml[${PYTHON_USEDEP}]
- dev-python/networkx[${PYTHON_USEDEP}]
- >dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
- >=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
- >=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
- # TODO
- test/unit/module/test_template.py::TestTemplate::test_build_graph
- # requires git repo
- test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
- # Internet
- test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
- test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
- test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
- # unpin the deps
- sed -e 's:~=[0-9.]*::' -i setup.py || die
- distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.72.9.ebuild b/dev-python/cfn-lint/cfn-lint-0.72.9.ebuild
deleted file mode 100644
index 80be21e51ad3..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.72.9.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
- https://github.com/aws-cloudformation/cfn-lint/
- https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
- https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
- >=dev-python/aws-sam-translator-1.56.0[${PYTHON_USEDEP}]
- dev-python/jsonpatch[${PYTHON_USEDEP}]
- >=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
- dev-python/junit-xml[${PYTHON_USEDEP}]
- dev-python/networkx[${PYTHON_USEDEP}]
- >dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
- >=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
- >=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
- # TODO
- test/unit/module/test_template.py::TestTemplate::test_build_graph
- # requires git repo
- test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
- # Internet
- test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
- test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
- test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
- # unpin the deps
- sed -e 's:~=[0-9.]*::' -i setup.py || die
- distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.73.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.73.1.ebuild
deleted file mode 100644
index fdd280348c81..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.73.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
- https://github.com/aws-cloudformation/cfn-lint/
- https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
- https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
- >=dev-python/aws-sam-translator-1.59.0[${PYTHON_USEDEP}]
- dev-python/jsonpatch[${PYTHON_USEDEP}]
- >=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
- dev-python/junit-xml[${PYTHON_USEDEP}]
- dev-python/networkx[${PYTHON_USEDEP}]
- >dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
- >=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
- >=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
- # TODO
- test/unit/module/test_template.py::TestTemplate::test_build_graph
- # requires git repo
- test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
- # Internet
- test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
- test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
- # unpin the deps
- sed -e 's:~=[0-9.]*::' -i setup.py || die
- distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.73.2.ebuild b/dev-python/cfn-lint/cfn-lint-0.73.2.ebuild
index 5d67809f6acd..a8d6bacd111b 100644
--- a/dev-python/cfn-lint/cfn-lint-0.73.2.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.73.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
RDEPEND="
>=dev-python/aws-sam-translator-1.59.0[${PYTHON_USEDEP}]
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index f9fb6b20746a..0a661d5f3cd7 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1 +1,2 @@
DIST charset_normalizer-3.0.1.gh.tar.gz 89120 BLAKE2B ce46758a0e188c2c3370e8cadcf35430e62fc7abb158d4c6c86b4a93a75b30fbff10b584ebaaf9489c47bdcfe9ad3b04d0fe3e474b03b89700364b676caf4e0f SHA512 9c78713b17e9e8d10b2ac8de26b8481dd039aab98eb990d0788f82c354afc8290040da1aa07faed6f90590fed098e793fdf2aa257825222e44571c1810f263ec
+DIST charset_normalizer-3.1.0.gh.tar.gz 90246 BLAKE2B 2e96f7c9910091e81d05a6632f14b6ec9481f1f927551ac8d70c1b320c21b7b4be196118391ec4db3291f74819e9488c71d90dc9a489e51849d251fb97ec8f9d SHA512 77657990605ef342934c140b7a9b38cf843d9739725deb3d755a00000dd1e3a9b25d73986cf26cdb291ea0f32aee0c3f5dfb771cb22b8b19246eb909b78240ce
diff --git a/dev-python/charset_normalizer/charset_normalizer-3.1.0.ebuild b/dev-python/charset_normalizer/charset_normalizer-3.1.0.ebuild
new file mode 100644
index 000000000000..bb2b41b0d193
--- /dev/null
+++ b/dev-python/charset_normalizer/charset_normalizer-3.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022-2023 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=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="The Real First Universal Charset Detector"
+HOMEPAGE="
+ https://pypi.org/project/charset-normalizer/
+ https://github.com/Ousret/charset_normalizer/
+"
+SRC_URI="
+ https://github.com/Ousret/charset_normalizer/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+python_test() {
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ epytest -o addopts=
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index f60583ac2e4c..1edea9832f73 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -4,4 +4,5 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/dev-python/clang-python/clang-python-17.0.0_pre20230304.ebuild b/dev-python/clang-python/clang-python-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..5ec556a2ca20
--- /dev/null
+++ b/dev-python/clang-python/clang-python-17.0.0_pre20230304.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+ >=sys-devel/clang-${PV}:*
+ !sys-devel/llvm:0[clang(-),python(-)]
+ !sys-devel/clang:0[python(-)]
+"
+RDEPEND="
+ ${DEPEND}
+ ${PYTHON_DEPS}
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ test? (
+ sys-devel/clang:${LLVM_MAJOR}
+ )
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+ # tests rely on results from a specific clang version, so override
+ # the search path
+ local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
+ local -x CLANG_NO_DEFAULT_CONFIG=1
+ "${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+ python_foreach_impl python_test
+}
+
+src_install() {
+ python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/click-plugins/click-plugins-1.1.1-r1.ebuild b/dev-python/click-plugins/click-plugins-1.1.1-r1.ebuild
index 7edb524346e6..974d050db8f7 100644
--- a/dev-python/click-plugins/click-plugins-1.1.1-r1.ebuild
+++ b/dev-python/click-plugins/click-plugins-1.1.1-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Module for click to enable registering CLI commands via setuptools
HOMEPAGE="https://github.com/click-contrib/click-plugins"
LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
SLOT="0"
RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
diff --git a/dev-python/colored-traceback/colored-traceback-0.3.0.ebuild b/dev-python/colored-traceback/colored-traceback-0.3.0.ebuild
index bfd28ce3802e..4da6115229bb 100644
--- a/dev-python/colored-traceback/colored-traceback-0.3.0.ebuild
+++ b/dev-python/colored-traceback/colored-traceback-0.3.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 51319692f837..10cb3d3074a6 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,4 +1,2 @@
-DIST coverage-7.0.5.tar.gz 796171 BLAKE2B 87ecffd87c2465607bf1fd330296e84e174953d7696ee0ef3046f6555f54634cfc643ada2a03971685021a5cf59191d75a0bddbc83f736e11a2516c684b0f0d9 SHA512 d199d710cdfac5c6cde79224b4a27d6b88a0e0c504eff7ad5700e9fb1f5cc8e1e9359dcc12f6c447a7ee6cd680feeb89f70ad68574a739c55a6d09b22017df06
DIST coverage-7.1.0.tar.gz 809785 BLAKE2B 3720aee79ecfdd6aa652b5198bad4d6b5827a85f1d58986eec51bab1e72800dac28eb0ebbeb15d547ef03694ca1397bec47c37a9233dc34b2d3d2a6a22a48274 SHA512 80920b337391e47f1e631ba8a892792b6d2c72e753ddf403222c6ad527637699889f29cfee40721949e5eeb6e7977f319635c44d79f58e7e19676d1165dfdde2
-DIST coverage-7.2.0.tar.gz 812120 BLAKE2B 17851996635a1621643e64025ba43f11d7e844fb8757c5bfd6794dbff85cf2c218dc61119c8604f19f951c83264eb13f9c8f0cf7f070f6b213603b25b756a59c SHA512 a913c257702a77b115b6519c0feaf9336973330c9264cb376453555c30f305db2b924d5dd8ff7b58bb89d9f1765b069512929d1ccc9c1c234bdd08d6fc82213b
DIST coverage-7.2.1.tar.gz 812219 BLAKE2B bb6b482990b0620d7e264244a9e31ee44b37fe83436c1d7d016d20e36d9ecbea85a614a4142683757bb1284bfbe2a157fc4748b01c76b5495c5eca5834e9a848 SHA512 40a7f1d25c7100b8f2f4ba1f877c241f65e1f560cdad861dab05254a4e177de37615888441d47a6c2ebc525ad2b52b476da7111efe5583708f094dd3a1b39984
diff --git a/dev-python/coverage/coverage-7.0.5.ebuild b/dev-python/coverage/coverage-7.0.5.ebuild
deleted file mode 100644
index f45105fbf16b..000000000000
--- a/dev-python/coverage/coverage-7.0.5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="
- https://coverage.readthedocs.io/en/latest/
- https://github.com/nedbat/coveragepy/
- https://pypi.org/project/coverage/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/tomli[${PYTHON_USEDEP}]
- ' 3.{8..10})
-"
-BDEPEND="
- test? (
- dev-python/flaky[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- >=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- sed -i -e '/^addopts/s:-q -n auto::' setup.cfg || die
- distutils-r1_src_prepare
-}
-
-test_tracer() {
- local -x COVERAGE_TEST_TRACER=${1}
- einfo " Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
- epytest tests
-}
-
-python_test() {
- local EPYTEST_IGNORE=(
- # pip these days insists on fetching build deps from Internet
- tests/test_venv.py
- )
-
- "${EPYTHON}" igor.py zip_mods || die
-
- local -x COVERAGE_TESTING=True
- # TODO: figure out why they can't be imported inside test env
- local -x COVERAGE_NO_CONTRACTS=1
- local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
-
- local prev_opt=$(shopt -p nullglob)
- shopt -s nullglob
- local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
- ${prev_opt}
-
- if [[ -n ${c_ext} ]]; then
- cp "${c_ext}" \
- coverage/ || die
- test_tracer c
- rm coverage/*.so || die
- else
- test_tracer py
- fi
-}
diff --git a/dev-python/coverage/coverage-7.1.0.ebuild b/dev-python/coverage/coverage-7.1.0.ebuild
index a0a35a6df9e0..f45105fbf16b 100644
--- a/dev-python/coverage/coverage-7.1.0.ebuild
+++ b/dev-python/coverage/coverage-7.1.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
RDEPEND="
$(python_gen_cond_dep '
diff --git a/dev-python/coverage/coverage-7.2.0.ebuild b/dev-python/coverage/coverage-7.2.0.ebuild
deleted file mode 100644
index b83e4bdd6609..000000000000
--- a/dev-python/coverage/coverage-7.2.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="
- https://coverage.readthedocs.io/en/latest/
- https://github.com/nedbat/coveragepy/
- https://pypi.org/project/coverage/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/tomli[${PYTHON_USEDEP}]
- ' 3.{8..10})
-"
-BDEPEND="
- test? (
- dev-python/flaky[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- >=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- sed -i -e '/^addopts/s:-q -n auto::' setup.cfg || die
- distutils-r1_src_prepare
-}
-
-test_tracer() {
- local -x COVERAGE_TEST_TRACER=${1}
- einfo " Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
- epytest tests
-}
-
-python_test() {
- local EPYTEST_IGNORE=(
- # pip these days insists on fetching build deps from Internet
- tests/test_venv.py
- )
-
- "${EPYTHON}" igor.py zip_mods || die
-
- local -x COVERAGE_TESTING=True
- # TODO: figure out why they can't be imported inside test env
- local -x COVERAGE_NO_CONTRACTS=1
- local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
-
- local prev_opt=$(shopt -p nullglob)
- shopt -s nullglob
- local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
- ${prev_opt}
-
- if [[ -n ${c_ext} ]]; then
- cp "${c_ext}" \
- coverage/ || die
- test_tracer c
- rm coverage/*.so || die
- else
- test_tracer py
- fi
-}
diff --git a/dev-python/cython/cython-0.29.33.ebuild b/dev-python/cython/cython-0.29.33.ebuild
index db102dddd08d..ed6b43043b3b 100644
--- a/dev-python/cython/cython-0.29.33.ebuild
+++ b/dev-python/cython/cython-0.29.33.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
IUSE="emacs test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/django-tables2/Manifest b/dev-python/django-tables2/Manifest
index 5b5c8d167dbf..1ba20f0a22ab 100644
--- a/dev-python/django-tables2/Manifest
+++ b/dev-python/django-tables2/Manifest
@@ -1,2 +1,3 @@
DIST django-tables2-2.5.1.gh.tar.gz 430778 BLAKE2B 7811880ec49a514b74252d32fbc59d800aaa34fb2bf4af5675d1c4555c7a52f9eb3ca67d8d940697146c07de1e42006c6d3880a53b31a386bd088aa6939b056f SHA512 baf955b255dcbcf09250cfdbb2dc1fb51f3f9142ad29bf4ca8888344d1bcbe9f23a59f1509cad7e847d82bb6d410a494ed9eae1d4d4ca633e7f0351e4a98839d
DIST django-tables2-2.5.2.gh.tar.gz 430733 BLAKE2B 70aa25ca949e4244a089894a26e384d5fbdd77cc5f7b939c9fd594c70114dafd0b8134d8327d247c1272159f278c54c980a5363ad86c75af95b4ffed489468cb SHA512 0a3522cd7500e09bfbe1dd4ee102542f9e6361163195928b2d8ea301133b39aa8d417bba29b93a6166b79b744fd58889af8ae8eb49bcc2251c21dd8b9b64827e
+DIST django-tables2-2.5.3.gh.tar.gz 431016 BLAKE2B 5564cd1ea19ffd7de83f949103bb5a56f987efd1e8a0cb356a0455c2244118b60c7ef78eb8fc7e57e023007046c51b4717470ee3542e1ed8a84b65e481455e75 SHA512 61b79e9fd8c2ea69afe88d7f2dd7f7015e53a6b68800c769106214bbc5818bc4f5b30eebe2d190cd6cc3a36686978befcc9b88fb4a0a7930f5bb37c608345e30
diff --git a/dev-python/django-tables2/django-tables2-2.5.3.ebuild b/dev-python/django-tables2/django-tables2-2.5.3.ebuild
new file mode 100644
index 000000000000..823847d534f7
--- /dev/null
+++ b/dev-python/django-tables2/django-tables2-2.5.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Table/data-grid framework for Django"
+HOMEPAGE="
+ https://pypi.org/project/django-tables2/
+ https://github.com/jieter/django-tables2/
+"
+SRC_URI="
+ https://github.com/jieter/django-tables2/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-python/django-3.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ ${RDEPEND}
+ dev-python/django-filter[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/psycopg:2[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ )
+"
+
+src_prepare() {
+ # these tests require tablib
+ rm tests/test_export.py tests/test_templatetags.py || die
+ # these tests require fudge
+ rm tests/test_config.py || die
+
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ "${EPYTHON}" manage.py test -v 2 tests || die
+}
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 4ae7eb62fda9..e78409642661 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,5 +1,2 @@
-DIST dulwich-0.20.50.tar.gz 430389 BLAKE2B 1ea86fe00fa560311bdcff8c51904982a506fa670efb503f9103c5fb25036a792a87583fdf6435a6a6ec7bd6aaa2277c621359e1d99f55450c247fdc4be74e51 SHA512 506cc76f7deb8247b910fa4971e28eeda6ddd34703ac3c7a2f3b6525e6a9229bbec527b1965bebf7aa3da17b5adbd146916f247acacf9caf86d2494e60cc8626
-DIST dulwich-0.21.0.tar.gz 436570 BLAKE2B d63185fe6e900823f5b295454a41be4f8508aa4c1757599186a0daab6f9b44e0036485d16d9f3dd34e3d1d191987cb0191254cee844caadadf9e43d0a2de0645 SHA512 ff437cb8381d91183d2843397afed5c1b04db000a093d61b6cdb1d76821104260e9d8572a05cf10c8959b88b99ec8fbcd3ff3a3ae2f860ab6201773de32635b5
-DIST dulwich-0.21.1.tar.gz 436958 BLAKE2B b821eb8a195496066017c0f9c9076ed25e1bfb894cead5175143a8944a16b8a82ca54d9a65d1aea23d7a039ce63343c608e2694f756b65b49e345d0ff49293f4 SHA512 bef3725b6101d0b8f115df432ca41a5f7b05fc5d84aa87f99f5815c670775ab74264a88768fbbe41bb89ff4cc6618b5a8a01ad2dae33f121ead424b5ed977f82
DIST dulwich-0.21.2.tar.gz 436949 BLAKE2B 8c3b42e103146c3641292eaaae29b2e53690a84fe0ba68adcaecc7ed75ce5ee3af64cffcc702b98a5bef18b6edfe888b2db0232430cf0289d1ca14dd49f3fb14 SHA512 edc7ea98f3417bd3f460d3c5fb54ceb1974df79e85fea4b4d324a79f487a5303edbdb256bae0b5c6e83615cf8788a2a921bfbd5031d4d3e4dbdd1c97ea1295e8
DIST dulwich-0.21.3.tar.gz 437815 BLAKE2B 889bb20800bbf45da6ddd688ed1e8ff2ca76fc3671409bb4bee4ed7604f008610adcd68feda9bf50bdd6432d3ad400e381506369d6411905a8388884093d5540 SHA512 ffe89535bd48709e68bff6b299034ab6ccd28960cc32b3717d9779c84c87548d8366dfadfb0699c99b99f8e599d91284e05dcc3c1f9ae4d7b208500856eb33ac
diff --git a/dev-python/dulwich/dulwich-0.20.50.ebuild b/dev-python/dulwich/dulwich-0.20.50.ebuild
deleted file mode 100644
index d774e8bcb728..000000000000
--- a/dev-python/dulwich/dulwich-0.20.50.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
- https://github.com/jelmer/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 ~riscv ~s390 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}
- 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.21.0.ebuild b/dev-python/dulwich/dulwich-0.21.0.ebuild
deleted file mode 100644
index 2949d3dcec07..000000000000
--- a/dev-python/dulwich/dulwich-0.21.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
- https://github.com/jelmer/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 ~riscv ~s390 ~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}
- 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.21.1.ebuild b/dev-python/dulwich/dulwich-0.21.1.ebuild
deleted file mode 100644
index 2949d3dcec07..000000000000
--- a/dev-python/dulwich/dulwich-0.21.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
- https://github.com/jelmer/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 ~riscv ~s390 ~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}
- 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.21.2.ebuild b/dev-python/dulwich/dulwich-0.21.2.ebuild
index 3860758cfd93..d774e8bcb728 100644
--- a/dev-python/dulwich/dulwich-0.21.2.ebuild
+++ b/dev-python/dulwich/dulwich-0.21.2.ebuild
@@ -17,7 +17,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 ~riscv ~s390 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 ~riscv ~s390 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/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index 840f4a1aa481..c0a3bac284e3 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,3 +1,4 @@
DIST setuptools-65.6.3-py3-none-any.whl 1233963 BLAKE2B 2bad02cc00293c9b6615cdcee9f2da4d66f83c494904c0467054ec15cb5650a7b72caaa52bb8925aea84eb6becd52107ba10763c2b241216d91072a1319f5d24 SHA512 6a9bf2230840ab90b228b433552e8813a176a9ad5f6dc74b20da412fe96c4a7f1df6095aac8dc2f25bd2393aae731927875eb9e7bc05203907539fb4a3b5c8fb
DIST setuptools-67.2.0-py3-none-any.whl 1082973 BLAKE2B 7769ebdbde59e47cfc9f364ab28fada207e0b0826e0a40ccdec4ab4c8536148f8a8e071d688f74464a74dca6fb62ca840f3f54a48ccae5c016dd476634b99d2d SHA512 3987cc21a40b55f3aaae1ec643843dc473f8a3b442461892cbc77cc78f056c7e3736aad8624b68d8061358fbbeb555faf62c498df259de63fe3feecdd0d786e4
DIST setuptools-67.4.0-py3-none-any.whl 1088291 BLAKE2B 9306200c32a903695edbc6330e6853368fc0dfc9c8b8b79ee6650b90a30f2ed321b9478ae2fb14755718ab7fb25db349d4028405f2aacfb70e6a6e8d0d2d35cd SHA512 b70632f1f7299c107cacfe8f0bbe1e448b660321977562dc0d18144eb997692c579f88e2f25b967f5c97ec8475e9e6314002685435ba6c8d9b5e39e27f8d4862
+DIST setuptools-67.5.1-py3-none-any.whl 1089040 BLAKE2B 3a63dd1cbcbd48110cb1a146f9ce27f4b5898058d5bace6ab504654894cefe2f7883b7d1166bd225b474de07f035e259dab870f708438b4c4d5a0c87b8f6f747 SHA512 64db0154188a67a7bec4862a45585a94ddc87d6bcce9f11caa933428dc590aa90116deb81d1e2850f5372eebec0cfd162f515aaf65bbd68e874c974aaabd0b71
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.5.1.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.5.1.ebuild
new file mode 100644
index 000000000000..c13c3370cbbe
--- /dev/null
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.5.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pypi
+
+DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
+HOMEPAGE="https://pypi.org/project/setuptools/"
+SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
+S=${DISTDIR}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+ !/dev/null || die
-
- # Tests require "node_failed.txt" file where the logs are kept
- if [[ -f ./node_failed.txt ]] ; then
- rm ./node_failed.txt || die
- fi
-
- touch ./node_failed.txt || die
- "${EPYTHON}" ./run.py || die "tests failed with ${EPYTHON}"
-
- popd >/dev/null || die
-}
diff --git a/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild b/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild
index a575814d1869..79a838cf0d1f 100644
--- a/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild
+++ b/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~hppa ~s390 ~sparc"
RDEPEND="
dev-python/terminado[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild b/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
index 49f147de433f..64d46b624e99 100644
--- a/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
RDEPEND="
>=dev-python/jupyter_core-5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_events/jupyter_events-0.6.3.ebuild b/dev-python/jupyter_events/jupyter_events-0.6.3.ebuild
index c4fed0cf6ef2..4aa86dab5d33 100644
--- a/dev-python/jupyter_events/jupyter_events-0.6.3.ebuild
+++ b/dev-python/jupyter_events/jupyter_events-0.6.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
# jsonschema[format-nongpl] deps are always on in our ebuild
RDEPEND="
diff --git a/dev-python/jupyter_server/jupyter_server-2.3.0.ebuild b/dev-python/jupyter_server/jupyter_server-2.3.0.ebuild
index 297025d2a593..82e47e9d444a 100644
--- a/dev-python/jupyter_server/jupyter_server-2.3.0.ebuild
+++ b/dev-python/jupyter_server/jupyter_server-2.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~hppa ~s390 ~sparc"
RDEPEND="
>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ldap3/ldap3-2.9.1.ebuild b/dev-python/ldap3/ldap3-2.9.1.ebuild
index e8f0b05796d8..f9c7db6383f0 100644
--- a/dev-python/ldap3/ldap3-2.9.1.ebuild
+++ b/dev-python/ldap3/ldap3-2.9.1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
inherit distutils-r1
DESCRIPTION="A strictly RFC 4511 conforming LDAP V3 pure Python client"
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index f60583ac2e4c..1edea9832f73 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -4,4 +4,5 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/dev-python/lit/lit-17.0.0_pre20230304.ebuild b/dev-python/lit/lit-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..f4b401a77373
--- /dev/null
+++ b/dev-python/lit/lit-17.0.0_pre20230304.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+ test? (
+ dev-python/psutil[${PYTHON_USEDEP}]
+ sys-devel/llvm
+ )
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+ cd "${WORKDIR}" || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local -x LIT_PRESERVES_TMP=1
+ local litflags=$(get_lit_flags)
+ ./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index ffa97a657791..d79e6201d131 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -4,3 +4,4 @@ DIST matplotlib-3.6.1.tar.gz 35826557 BLAKE2B b30710436a773298dcdf233e592656d981
DIST matplotlib-3.6.2.tar.gz 35843927 BLAKE2B 22b933b2ca2bfb156ee1592f522da6e7566f279fd6c7ef2d2f5aeb8697fc04085b57ba6bb5f7948572b3e671687b74d6ba9f7def2728b6224fbc98b121281a3c SHA512 51b84a4328a85f674cb44728955fca8bb5b8b702c788158b8bcfc13a44206a5a658ac12ed8f9a5f6ec53ef543395fab4f3871f91013ba1432f3e2b848c36976f
DIST matplotlib-3.6.3.tar.gz 35868590 BLAKE2B aa511e7d82c41ff2b5622b23847c2e94ed5d400be74eddcdab12ddba8d25bcc1b778c5fb2a29935bca71b76cbf4213088286c9a6a3d085e06036069909ccc1e7 SHA512 844ca90bcc9953d3d1289a6d471180a3dadb49c75eb59858bbbfb67d4b1292b83b86b366f22ab12d9e97c980376d48b86e745607ec4e812a3010c6fec01398dc
DIST matplotlib-3.7.0.tar.gz 36346055 BLAKE2B 558e14c5afaf7ec7f88604707b1adbd9bbcab7f8fcf2dfbc4d25b94b9fa55f4f04b4150d71f813a2be59b739dec1b70981afb0158d90fba03fbe19b291c3eafe SHA512 60207fb10394422b7a11faffb2775c23c377e6dd72ef9f3fde1099d50e1810c4be55cf814da74fd87faf49a628459472945bb901a4cbe73c9676df54b862ad5c
+DIST matplotlib-3.7.1.tar.gz 38003777 BLAKE2B a387d23b58e09011cd3ae1f8c0ebf5dd8c04c8c15c1f6453c92cd22b2439fcabcf384f39ae8d2d2c6b7d2645817cd57a60856a4c05728e8f8aff9dd163af5083 SHA512 d7db4213d5b38eba779ba06ffaa8e67a435192e4a8cf62f8e1cd4b8079cd257b2e83cb79926df012b7084c785c0ce8b03275035f68cfcf0a36b0dda7322f2e67
diff --git a/dev-python/matplotlib/files/matplotlib-3.7.1-test.patch b/dev-python/matplotlib/files/matplotlib-3.7.1-test.patch
new file mode 100644
index 000000000000..e2471a4282c2
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-3.7.1-test.patch
@@ -0,0 +1,244 @@
+From 2290694d52ef1af255b9f0fa0d9c3c9ebcee9264 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
+Date: Tue, 14 Feb 2023 20:46:30 +0100
+Subject: [PATCH] Adjust tolerances to make tests pass on real hardware
+
+---
+ lib/matplotlib/tests/test_arrow_patches.py | 6 +++---
+ lib/matplotlib/tests/test_axes.py | 6 +++---
+ lib/matplotlib/tests/test_colorbar.py | 2 +-
+ lib/matplotlib/tests/test_constrainedlayout.py | 8 ++++----
+ lib/matplotlib/tests/test_contour.py | 3 +--
+ lib/matplotlib/tests/test_figure.py | 2 +-
+ lib/matplotlib/tests/test_image.py | 2 +-
+ lib/matplotlib/tests/test_legend.py | 6 +++---
+ lib/matplotlib/tests/test_lines.py | 2 +-
+ lib/matplotlib/tests/test_units.py | 4 ++--
+ lib/matplotlib/tests/test_usetex.py | 3 ++-
+ 11 files changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
+index 8d573b4adb..dfc42efcb9 100644
+--- a/lib/matplotlib/tests/test_arrow_patches.py
++++ b/lib/matplotlib/tests/test_arrow_patches.py
+@@ -67,7 +67,7 @@ def __prepare_fancyarrow_dpi_cor_test():
+
+
+ @image_comparison(['fancyarrow_dpi_cor_100dpi.png'], remove_text=True,
+- tol=0 if platform.machine() == 'x86_64' else 0.02,
++ tol=0.015 if platform.machine() == 'x86_64' else 0.02,
+ savefig_kwarg=dict(dpi=100))
+ def test_fancyarrow_dpi_cor_100dpi():
+ """
+@@ -82,7 +82,7 @@ def test_fancyarrow_dpi_cor_100dpi():
+
+
+ @image_comparison(['fancyarrow_dpi_cor_200dpi.png'], remove_text=True,
+- tol=0 if platform.machine() == 'x86_64' else 0.02,
++ tol=0.018 if platform.machine() == 'x86_64' else 0.02,
+ savefig_kwarg=dict(dpi=200))
+ def test_fancyarrow_dpi_cor_200dpi():
+ """
+@@ -115,7 +115,7 @@ def test_fancyarrow_dash():
+
+
+ @image_comparison(['arrow_styles.png'], style='mpl20', remove_text=True,
+- tol=0 if platform.machine() == 'x86_64' else 0.005)
++ tol=0.005)
+ def test_arrow_styles():
+ styles = mpatches.ArrowStyle.get_styles()
+
+diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
+index 004f6320de..63d705cb91 100644
+--- a/lib/matplotlib/tests/test_axes.py
++++ b/lib/matplotlib/tests/test_axes.py
+@@ -1034,7 +1034,7 @@ def test_imshow():
+
+ @image_comparison(
+ ['imshow_clip'], style='mpl20',
+- tol=1.24 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
++ tol=1.24)
+ def test_imshow_clip():
+ # As originally reported by Gellule Xg
+ # use former defaults to match existing baseline image
+@@ -2364,7 +2364,7 @@ def test_contour_hatching():
+
+ @image_comparison(
+ ['contour_colorbar'], style='mpl20',
+- tol=0.02 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
++ tol=0.02)
+ def test_contour_colorbar():
+ x, y, z = contour_dat()
+
+@@ -4704,7 +4704,7 @@ def test_vertex_markers():
+
+
+ @image_comparison(['vline_hline_zorder', 'errorbar_zorder'],
+- tol=0 if platform.machine() == 'x86_64' else 0.02)
++ tol=0.015 if platform.machine() == 'x86_64' else 0.02)
+ def test_eb_line_zorder():
+ x = list(range(10))
+
+diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
+index e39d007378..fa0cb2e72f 100644
+--- a/lib/matplotlib/tests/test_colorbar.py
++++ b/lib/matplotlib/tests/test_colorbar.py
+@@ -237,7 +237,7 @@ def test_colorbar_single_ax_panchor_east(constrained):
+
+ @image_comparison(
+ ['contour_colorbar.png'], remove_text=True,
+- tol=0.01 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
++ tol=0.01)
+ def test_contour_colorbar():
+ fig, ax = plt.subplots(figsize=(4, 2))
+ data = np.arange(1200).reshape(30, 40) - 500
+diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
+index b0833052ad..c7633f6842 100644
+--- a/lib/matplotlib/tests/test_constrainedlayout.py
++++ b/lib/matplotlib/tests/test_constrainedlayout.py
+@@ -651,11 +651,11 @@ def test_compressed1():
+ fig.draw_without_rendering()
+
+ pos = axs[0, 0].get_position()
+- np.testing.assert_allclose(pos.x0, 0.06195, atol=1e-3)
+- np.testing.assert_allclose(pos.y1, 0.8537, atol=1e-3)
++ np.testing.assert_allclose(pos.x0, 0.06195, atol=2e-3)
++ np.testing.assert_allclose(pos.y1, 0.8537, atol=2e-3)
+ pos = axs[1, 2].get_position()
+- np.testing.assert_allclose(pos.x1, 0.8618, atol=1e-3)
+- np.testing.assert_allclose(pos.y0, 0.1934, atol=1e-3)
++ np.testing.assert_allclose(pos.x1, 0.8618, atol=2e-3)
++ np.testing.assert_allclose(pos.y0, 0.1934, atol=2e-3)
+
+
+ @pytest.mark.parametrize('arg, state', [
+diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
+index 41d4dc8501..e0f9f5c112 100644
+--- a/lib/matplotlib/tests/test_contour.py
++++ b/lib/matplotlib/tests/test_contour.py
+@@ -316,8 +316,7 @@ def test_contourf_log_extension():
+
+ @image_comparison(
+ ['contour_addlines.png'], remove_text=True, style='mpl20',
+- tol=0.15 if platform.machine() in ('aarch64', 'ppc64le', 's390x')
+- else 0.03)
++ tol=0.15)
+ # tolerance is because image changed minutely when tick finding on
+ # colorbars was cleaned up...
+ def test_contour_addlines():
+diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
+index f3ece07660..18c95e4a55 100644
+--- a/lib/matplotlib/tests/test_figure.py
++++ b/lib/matplotlib/tests/test_figure.py
+@@ -26,7 +26,7 @@ import matplotlib.dates as mdates
+
+
+ @image_comparison(['figure_align_labels'], extensions=['png', 'svg'],
+- tol=0 if platform.machine() == 'x86_64' else 0.01)
++ tol=0.02)
+ def test_align_labels():
+ fig = plt.figure(layout='tight')
+ gs = gridspec.GridSpec(3, 3)
+diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
+index 76a622181d..af81d2fc0d 100644
+--- a/lib/matplotlib/tests/test_image.py
++++ b/lib/matplotlib/tests/test_image.py
+@@ -1339,7 +1339,7 @@ def test_nonuniform_and_pcolor():
+
+ @image_comparison(
+ ['rgba_antialias.png'], style='mpl20', remove_text=True,
+- tol=0.007 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
++ tol=0.007)
+ def test_rgba_antialias():
+ fig, axs = plt.subplots(2, 2, figsize=(3.5, 3.5), sharex=False,
+ sharey=False, constrained_layout=True)
+diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
+index a8d7fd107d..2f658bc116 100644
+--- a/lib/matplotlib/tests/test_legend.py
++++ b/lib/matplotlib/tests/test_legend.py
+@@ -174,7 +174,7 @@ def test_multiple_keys():
+
+
+ @image_comparison(['rgba_alpha.png'], remove_text=True,
+- tol=0 if platform.machine() == 'x86_64' else 0.01)
++ tol=0.02)
+ def test_alpha_rgba():
+ fig, ax = plt.subplots()
+ ax.plot(range(10), lw=5)
+@@ -183,7 +183,7 @@ def test_alpha_rgba():
+
+
+ @image_comparison(['rcparam_alpha.png'], remove_text=True,
+- tol=0 if platform.machine() == 'x86_64' else 0.01)
++ tol=0.02)
+ def test_alpha_rcparam():
+ fig, ax = plt.subplots()
+ ax.plot(range(10), lw=5)
+@@ -209,7 +209,7 @@ def test_fancy():
+
+
+ @image_comparison(['framealpha'], remove_text=True,
+- tol=0 if platform.machine() == 'x86_64' else 0.02)
++ tol=0.02)
+ def test_framealpha():
+ x = np.linspace(1, 100, 100)
+ y = x
+diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py
+index b75d3c01b2..d08cc79172 100644
+--- a/lib/matplotlib/tests/test_lines.py
++++ b/lib/matplotlib/tests/test_lines.py
+@@ -185,7 +185,7 @@ def test_set_drawstyle():
+
+ @image_comparison(
+ ['line_collection_dashes'], remove_text=True, style='mpl20',
+- tol=0.65 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
++ tol=0.65)
+ def test_set_line_coll_dash_image():
+ fig, ax = plt.subplots()
+ np.random.seed(0)
+diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
+index d3b8c5a716..56a1d0a0a4 100644
+--- a/lib/matplotlib/tests/test_units.py
++++ b/lib/matplotlib/tests/test_units.py
+@@ -79,7 +79,7 @@ def quantity_converter():
+ # Tests that the conversion machinery works properly for classes that
+ # work as a facade over numpy arrays (like pint)
+ @image_comparison(['plot_pint.png'], style='mpl20',
+- tol=0 if platform.machine() == 'x86_64' else 0.01)
++ tol=0.002 if platform.machine() == 'x86_64' else 0.01)
+ def test_numpy_facade(quantity_converter):
+ # use former defaults to match existing baseline image
+ plt.rcParams['axes.formatter.limits'] = -7, 7
+@@ -106,7 +106,7 @@ def test_numpy_facade(quantity_converter):
+
+ # Tests gh-8908
+ @image_comparison(['plot_masked_units.png'], remove_text=True, style='mpl20',
+- tol=0 if platform.machine() == 'x86_64' else 0.01)
++ tol=0.02)
+ def test_plot_masked_units():
+ data = np.linspace(-5, 5)
+ data_masked = np.ma.array(data, mask=(data > -2) & (data < 2))
+diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py
+index 0f01ebaffb..5e44dc8d22 100644
+--- a/lib/matplotlib/tests/test_usetex.py
++++ b/lib/matplotlib/tests/test_usetex.py
+@@ -14,6 +14,7 @@ import matplotlib.pyplot as plt
+ pytestmark = needs_usetex
+
+
++@pytest.mark.skip(reason="TODO: broken")
+ @image_comparison(
+ baseline_images=['test_usetex'],
+ extensions=['pdf', 'png'],
+@@ -64,7 +65,7 @@ def test_mathdefault():
+ fig.canvas.draw()
+
+
+-@image_comparison(['eqnarray.png'])
++@image_comparison(['eqnarray.png'], tol=23)
+ def test_multiline_eqnarray():
+ text = (
+ r'\begin{eqnarray*}'
+--
+2.39.2
+
diff --git a/dev-python/matplotlib/matplotlib-3.7.1.ebuild b/dev-python/matplotlib/matplotlib-3.7.1.ebuild
new file mode 100644
index 000000000000..950b499d395d
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-3.7.1.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic multiprocessing prefix pypi
+inherit toolchain-funcs virtualx
+
+FT_PV=2.6.1
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="
+ https://matplotlib.org/
+ https://github.com/matplotlib/matplotlib/
+ https://pypi.org/project/matplotlib/
+"
+SRC_URI+="
+ test? (
+ https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
+ )
+"
+
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
+
+# internal copy of pycxx highly patched
+# dev-python/pycxx
+RDEPEND="
+ dev-python/certifi[${PYTHON_USEDEP}]
+ >=dev-python/contourpy-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
+ >=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}]
+ >=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/numpy-1.20[${PYTHON_USEDEP}]
+ >=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+ >=dev-python/pillow-7.1.1[jpeg,webp,${PYTHON_USEDEP}]
+ >=dev-python/pyparsing-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+ media-fonts/dejavu
+ media-fonts/stix-fonts
+ media-libs/freetype:2
+ media-libs/libpng:0
+ >=media-libs/qhull-2013:=
+ virtual/imagemagick-tools[jpeg,tiff]
+ $(python_gen_cond_dep '
+ dev-python/importlib_resources[${PYTHON_USEDEP}]
+ ' 3.9)
+ cairo? (
+ dev-python/cairocffi[${PYTHON_USEDEP}]
+ )
+ excel? (
+ dev-python/xlwt[${PYTHON_USEDEP}]
+ )
+ gtk3? (
+ >=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]
+ )
+ latex? (
+ virtual/latex-base
+ app-text/dvipng
+ app-text/ghostscript-gpl
+ app-text/poppler[utils]
+ dev-texlive/texlive-fontsrecommended
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-luatex
+ dev-texlive/texlive-xetex
+ )
+ qt5? (
+ dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+ )
+ webagg? (
+ >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
+ )
+ wxwidgets? (
+ $(python_gen_cond_dep '
+ dev-python/wxpython:*[${PYTHON_USEDEP}]
+ ' python3_{8..10})
+ )
+"
+
+BDEPEND="
+ ${RDEPEND}
+ >=dev-python/setuptools-scm-7[${PYTHON_USEDEP}]
+ virtual/pkgconfig
+ doc? (
+ >=app-text/dvipng-1.15-r1
+ >=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
+ >=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
+ >=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
+ >=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
+ >=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
+ virtual/latex-base
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-fontsrecommended
+ dev-texlive/texlive-latexrecommended
+ dev-texlive/texlive-luatex
+ dev-texlive/texlive-xetex
+ >=media-gfx/graphviz-2.42.3[cairo]
+ )
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ >=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
+ >=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]
+ )
+"
+
+distutils_enable_tests pytest
+
+use_setup() {
+ local uword="${2:-${1}}"
+ if use "${1}"; then
+ echo "${uword} = True"
+ echo "${uword}agg = True"
+ else
+ echo "${uword} = False"
+ echo "${uword}agg = False"
+ fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+# local PATCHES=(
+# "${FILESDIR}"/${P}-unbundle-pycxx.patch
+# "${FILESDIR}"/${P}-unbundle-agg.patch
+# )
+# rm -r agg24 CXX || die
+# rm -r agg24 || die
+
+ # Affects installed _version.py, bug #854600
+ export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+ local PATCHES=(
+ "${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
+ "${FILESDIR}"/matplotlib-3.7.1-test.patch
+ )
+
+ sed \
+ -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+ -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+ || die "sed pyparsing failed"
+ sed -i -e '/setuptools_scm/s:,<7::' setup.py || die
+
+ hprefixify setupext.py
+
+ rm -rf libqhull || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+ append-flags -fno-strict-aliasing
+ append-cppflags -DNDEBUG # or get old trying to do triangulation
+ tc-export PKG_CONFIG
+
+ unset DISPLAY # bug #278524
+ export XDG_RUNTIME_DIR="${T}/runtime-dir"
+ mkdir "${XDG_RUNTIME_DIR}" || die
+ chmod 0700 "${XDG_RUNTIME_DIR}" || die
+}
+
+python_configure() {
+ mkdir -p "${BUILD_DIR}" || die
+
+ # create setup.cfg (see setup.cfg.template for any changes).
+
+ # common switches.
+ cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+ [directories]
+ basedirlist = ${EPREFIX}/usr
+ [provide_packages]
+ pytz = False
+ dateutil = False
+ [libs]
+ system_freetype = True
+ system_qhull = True
+ [packages]
+ tests = True
+ [gui_support]
+ agg = True
+ gtk = False
+ gtkagg = False
+ macosx = False
+ pyside = False
+ pysideagg = False
+ qt4 = False
+ qt4agg = False
+ $(use_setup cairo)
+ $(use_setup gtk3)
+ $(use_setup qt5)
+ $(use_setup tk)
+ $(use_setup wxwidgets wx)
+ EOF
+
+ if use gtk3 && use cairo; then
+ echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+ else
+ echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+ fi
+}
+
+wrap_setup() {
+ local MAKEOPTS=-j1
+ local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
+ "$@"
+}
+
+python_compile() {
+ wrap_setup distutils-r1_python_compile
+ find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_compile_all() {
+ if use doc; then
+ cd doc || die
+
+ VARTEXFONTS="${T}"/fonts \
+ emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+ fi
+}
+
+src_test() {
+ mkdir build || die
+ ln -s "${WORKDIR}/freetype-${FT_PV}" build/ || die
+ virtx distutils-r1_src_test
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # broken by -Wdefault
+ "tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg6-MatplotlibDeprecationWarning]"
+ "tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]"
+ tests/test_testing.py::test_warn_to_fail
+ # TODO?
+ tests/test_backend_qt.py::test_fig_sigint_override
+ # unhappy about xdist
+ tests/test_widgets.py::test_span_selector_animated_artists_callback
+ )
+ [[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+ # https://github.com/matplotlib/matplotlib/issues/23384
+ "tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtagg', 'QT_API': 'PyQt5'}]"
+ "tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtcairo', 'QT_API': 'PyQt5'}]"
+ )
+
+ # we need to rebuild mpl against bundled freetype, otherwise
+ # over 1000 tests will fail because of mismatched font rendering
+ grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
+ > "${BUILD_DIR}"/test-setup.cfg || die
+ local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
+
+ esetup.py build -j1 --build-lib="${BUILD_DIR}"/test-lib
+ local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
+
+ # speed tests up
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ nonfatal epytest --pyargs matplotlib -m "not network" \
+ -p xdist.plugin -n "$(makeopts_jobs)" || die
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/build/html/. )
+
+ distutils-r1_python_install_all
+
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-python/meshio/meshio-5.3.4.ebuild b/dev-python/meshio/meshio-5.3.4.ebuild
index c18d5f584677..25665728f0bc 100644
--- a/dev-python/meshio/meshio-5.3.4.ebuild
+++ b/dev-python/meshio/meshio-5.3.4.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
dev-python/rich[${PYTHON_USEDEP}]
hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
- netcdf? ( dev-python/netcdf4-python[${PYTHON_USEDEP}] )
+ netcdf? ( dev-python/netcdf4[${PYTHON_USEDEP}] )
"
BDEPEND="
test? ( dev-python/h5py[${PYTHON_USEDEP}] )
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 8b3befdd71e3..ccad0e286316 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -4,3 +4,4 @@ DIST mkdocs-material-9.0.13.gh.tar.gz 10930459 BLAKE2B d3d4b25e2e2b524caa70a47c2
DIST mkdocs-material-9.0.14.gh.tar.gz 10932657 BLAKE2B a43fe024bd4c285801c10a3a45b0e601bc5c338fde51408db8c23cdf84455b606461fffda86d8bcb53374102a32a5efe315467305842a5e9fc5859db26b06b0e SHA512 9821fc1ce6e1b74b920b7c928c9ceb00d8f7489939c58d12c9a7c238ca75b619a23bffe0eccb7653d5303eaf6281e2fbd81392b19ff8f4c1431754544a432297
DIST mkdocs-material-9.0.15.gh.tar.gz 10923424 BLAKE2B d2980f058001f0246be4ad34496a066b962e9fed8239415dd54dff0287211d97a640a2aca808aea1daec2f445b548153f6efd229bba515c968d50bd609936b4d SHA512 39b4a6d5d50ea27c7cdd2d23cf2d41a79d6dc0e1949346bd8d7c0e9a0792f7a9a9ae15594ff83017211d858d94240a09b0314a6294f268cf43e7337868ba5e69
DIST mkdocs-material-9.1.0.gh.tar.gz 10868677 BLAKE2B b51fa6e78f087c74a6e2d38d56645492758af0ab2dee16427eb5628c4c3617b3b00b9a2f2ca04c687b98838551873c596b7dffa79cb888ca93f96f05a11f9990 SHA512 1ca7a8250732d737d6e0940243f0d835002736c2eadb5eb0eb1f58fe061d9a277ccd5e99ac3766642c464596d2ce31e445dfa02251b1db0dc1a4adcdbfc90db3
+DIST mkdocs-material-9.1.1.gh.tar.gz 10874113 BLAKE2B 24da8a9c93b46afaf7d2faf3becc3735c72e831b8ed5f3153f493178feffd9ee720b9a394814d8a151a337343065f664c0978fc8b02d357523d62c94c80a1f52 SHA512 e7c023027c9d970fde94a9bbd20e9b22a4f9666f3778660b759937ad855514720b710d8d32fa71802e3455bb1d3545b0451c055edd428098916acb980f465a7f
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.1.1.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.1.1.ebuild
new file mode 100644
index 000000000000..eedc60f73616
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+ dev-python/mkdocs-material-extensions
+ dev-python/mkdocs-minify-plugin
+ dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+ https://github.com/squidfunk/mkdocs-material/
+ https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+ https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+
+RDEPEND="
+ >=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+ >=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+ >=dev-python/mkdocs-1.4.2[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.14[${PYTHON_USEDEP}]
+ >=dev-python/pymdown-extensions-9.9.1[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND="
+ >=dev-python/mkdocs-material-extensions-1.1.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+ # simplify pyproject to remove extra deps for metadata
+ "${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
+)
+
+src_prepare() {
+ echo "__version__ = '${PV}'" > gentoo_version.py || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
index b377c2e19a91..86369cfad9f7 100644
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@@ -1,2 +1,3 @@
DIST nbclassic-0.5.1.tar.gz 20178622 BLAKE2B 1ff79c9af218011c697016ecef149f42e683607eebb8e199ef75957d9d3127858ce8f443aeedb60844e3277b4c8cd4959d123658a5103ab2112fec469ef01a96 SHA512 1dabc27ad115d1961e7881e7a51653449cae291c74aea222bbf92d49cb7bc9657ae1f1d9a81eafbd70bc0cafd57b75cd2c76bebf91aabc5fdd9eede534f1cec9
DIST nbclassic-0.5.2.tar.gz 20182217 BLAKE2B 02a91ea461acf56c8aeafab5d2af726c21add89bdfd651be9225fb3ec278de76bf8ab76c30d2e16f3a7b7a7d17f13a58907a14b2389c029dd0bb74af565115d0 SHA512 c26b86ee5958a6bb2b891f0bfff7fd90054727977a5cb29aacf1681e56490dcc7b8275709d74597e7d99940493a39499b8c8832a92fcf1a57955f20e100a10a4
+DIST nbclassic-0.5.3.tar.gz 20199979 BLAKE2B aa509bbd2bab51b94f475e81b7e1c5661370e850680df8f64c86d76ff2aed7a84a0e6c00f36a695ef7f84cdc731fb7613107abc96fb13a3127ded6689d6e81a1 SHA512 07e26d4cb30e3388420ced182a31a050419f4a872256efca6684e4af0e08ec8bf7f6f14f127fe1391457ad5fc792377a1a7bafc0fa1a92eec455454c6321a9ec
diff --git a/dev-python/nbclassic/nbclassic-0.5.3.ebuild b/dev-python/nbclassic/nbclassic-0.5.3.ebuild
new file mode 100644
index 000000000000..965e97187b26
--- /dev/null
+++ b/dev-python/nbclassic/nbclassic-0.5.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=jupyter
+
+inherit distutils-r1 pypi xdg-utils
+
+DESCRIPTION="Jupyter Notebook as a Jupyter Server Extension"
+HOMEPAGE="
+ https://jupyter.org/
+ https://github.com/jupyter/nbclassic/
+ https://pypi.org/project/nbclassic/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ dev-python/argon2-cffi[${PYTHON_USEDEP}]
+ dev-python/ipykernel[${PYTHON_USEDEP}]
+ dev-python/ipython_genutils[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ >=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
+ >=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+ >=dev-python/nbconvert-5[${PYTHON_USEDEP}]
+ dev-python/nbformat[${PYTHON_USEDEP}]
+ >=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
+ >=dev-python/notebook_shim-0.1.0[${PYTHON_USEDEP}]
+ dev-python/prometheus_client[${PYTHON_USEDEP}]
+ >=dev-python/send2trash-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+ >=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+ >=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+
+ =19.0
- python_requires = >=3.7
-
-+[options.packages.find]
-+exclude =
-+ tests
-+
- [options.extras_require]
- test =
- pytest>=6.2.4
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.5.0.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.5.0.ebuild
deleted file mode 100644
index 9b1b54b8bd84..000000000000
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="PEP 621 metadata parsing"
-HOMEPAGE="https://pypi.org/project/pyproject-metadata/ https://github.com/FFY00/python-pyproject-metadata/"
-SRC_URI="https://github.com/FFY00/python-pyproject-metadata/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}"/python-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.5.0-no-install-tests.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild
deleted file mode 100644
index 0d51ddb579b2..000000000000
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="PEP 621 metadata parsing"
-HOMEPAGE="
- https://github.com/FFY00/python-pyproject-metadata/
- https://pypi.org/project/pyproject-metadata/
-"
-SRC_URI="
- https://github.com/FFY00/python-pyproject-metadata/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/python-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
- dev-python/packaging[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.7.1.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.7.1.ebuild
index 86cac319e199..0e2d11f6ec96 100644
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.7.1.ebuild
+++ b/dev-python/pyproject-metadata/pyproject-metadata-0.7.1.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/python-${P}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
RDEPEND="
dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index 4864b94418d4..4d48249ab98d 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1 +1,2 @@
DIST pyqtgraph-0.13.1.gh.tar.gz 1368154 BLAKE2B cb19ae6564b0fc0a4ec4fb6232f7949bb5130345380a86f0cffdee14e767d306b27c26ae3f7c011d77f21353b511d99148e1acb38e8d33598dde16362475b5a8 SHA512 bcd3d0c9c1d91ad2ea3f85f8e34e68ab999fce636ed336362253f09a7863a62c4b635d71c137c9458532c7d1f76dfc8433d476cd84121cf89488fb0860039b8f
+DIST pyqtgraph-0.13.2.gh.tar.gz 1420684 BLAKE2B da702fc16e9dadc55382be75528147bb050ebeeba0aaf8f87a9592125058ffe9b0049cf7897d297e7408ebd78a20c31f9a47ec8058025bf5b1653ed1fb2fdd6d SHA512 64ae6708e1a44bb69fc159d1cd23df47075eeb1d7daa03c4b27a147ea83a25bb5ef03d28892b20b144bfa4ee600622ef0595494565d42fb861c6849ca3f5c7b9
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.13.2.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.13.2.ebuild
new file mode 100644
index 000000000000..aca231532ed0
--- /dev/null
+++ b/dev-python/pyqtgraph/pyqtgraph-0.13.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="A pure-python graphics and GUI library built on PyQt and numpy"
+HOMEPAGE="
+ https://www.pyqtgraph.org/
+ https://github.com/pyqtgraph/pyqtgraph/
+ https://pypi.org/project/pyqtgraph/
+"
+SRC_URI="
+ https://github.com/pyqtgraph/pyqtgraph/archive/${P}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE="opengl svg"
+REQUIRED_USE="test? ( opengl svg )"
+
+RDEPEND="
+ >=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+ dev-python/scipy[${PYTHON_USEDEP}]
+ dev-python/PyQt5[gui,widgets,opengl=,svg=,${PYTHON_USEDEP}]
+ opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+ test? (
+ dev-python/h5py[${PYTHON_USEDEP}]
+ dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ if ! use opengl; then
+ rm -r pyqtgraph/opengl || die
+ fi
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # apparently fragile
+ tests/test_reload.py::test_reload
+
+ # TODO
+ tests/graphicsItems/test_ROI.py::test_PolyLineROI
+
+ # pyside2 is normally skipped if not installed but these two
+ # fail if it is installed
+ # TODO: this could be due to USE flags, revisit when pyside2
+ # gains py3.9
+ 'pyqtgraph/examples/test_examples.py::testExamples[ DateAxisItem_QtDesigner.py - PySide2 ]'
+ 'pyqtgraph/examples/test_examples.py::testExamples[ designerExample.py - PySide2 ]'
+ )
+
+ epytest -p xvfb -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest
index 6d6de27407b4..5fb712c853db 100644
--- a/dev-python/pyside2-tools/Manifest
+++ b/dev-python/pyside2-tools/Manifest
@@ -1,2 +1 @@
-DIST pyside-setup-opensource-src-5.15.7.tar.xz 3581144 BLAKE2B 95b5720a5273c96b00bdf86b36734970991a29cf0db1e6fb2c00d7e671fbc4459b4434abc91a8a47ec5d8ba694bcdae5b57a52448908fdca25c348f9ee2b6c81 SHA512 9c551b47581e4f2671c4378f1a2c0d9e565b08edee74244a7704a2c94eef1e1041d23f0e388c07bdd61067e986340907cf80f4527257a9a706f7f07c497834c6
DIST pyside-setup-opensource-src-5.15.8.tar.xz 3582256 BLAKE2B eef6668c612c39eac4ea29db4eee0cc6eef72034babaa14525ca63cf6e02695df27bf8a6764110c4bcc77f55c7e9fb531074916a45d7ea324265e50d9a60d592 SHA512 78e19a8e8fa413bb784f16847d5774e4362409a2bd83567177b83f1391c37305d373155fb95ea569c6c483175e62a0d3f5d91a2fd5dae85d48c8047d242b9e22
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.7.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.7.ebuild
deleted file mode 100644
index bc841956419f..000000000000
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.7.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-# https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{9..11} )
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake python-r1
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="PySide development tools (pyside2-lupdate with support for Python)"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}/sources/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- ~dev-python/pyside2-${PV}[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-# the tools conflict with tools from QT
-PATCHES=(
- "${FILESDIR}/${PN}-5.15.1-dont-install-tools.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
-
- python_copy_sources
-}
-
-src_configure() {
- # The tests are only related to the tools that we don't install
- local mycmakeargs=(
- -DBUILD_TESTS=OFF
- )
-
- pyside-tools_configure() {
- local mycmakeargs=(
- "${mycmakeargs[@]}"
- -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
- )
- CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure
- }
-
- python_foreach_impl pyside-tools_configure
-}
-
-src_compile() {
- pyside-tools_compile() {
- CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile
- }
-
- python_foreach_impl pyside-tools_compile
-}
-
-src_install() {
- pyside-tools_install() {
- python_doexe "${BUILD_DIR}/pylupdate/pyside2-lupdate"
- }
-
- python_foreach_impl pyside-tools_install
-
- doman pylupdate/pyside2-lupdate.1
- einstalldocs
-}
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.8.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.8.ebuild
index 00bba590214d..bc841956419f 100644
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.8.ebuild
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.8.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}/sources/${PN}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index 6d6de27407b4..5fb712c853db 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -1,2 +1 @@
-DIST pyside-setup-opensource-src-5.15.7.tar.xz 3581144 BLAKE2B 95b5720a5273c96b00bdf86b36734970991a29cf0db1e6fb2c00d7e671fbc4459b4434abc91a8a47ec5d8ba694bcdae5b57a52448908fdca25c348f9ee2b6c81 SHA512 9c551b47581e4f2671c4378f1a2c0d9e565b08edee74244a7704a2c94eef1e1041d23f0e388c07bdd61067e986340907cf80f4527257a9a706f7f07c497834c6
DIST pyside-setup-opensource-src-5.15.8.tar.xz 3582256 BLAKE2B eef6668c612c39eac4ea29db4eee0cc6eef72034babaa14525ca63cf6e02695df27bf8a6764110c4bcc77f55c7e9fb531074916a45d7ea324265e50d9a60d592 SHA512 78e19a8e8fa413bb784f16847d5774e4362409a2bd83567177b83f1391c37305d373155fb95ea569c6c483175e62a0d3f5d91a2fd5dae85d48c8047d242b9e22
diff --git a/dev-python/pyside2/pyside2-5.15.7-r1.ebuild b/dev-python/pyside2/pyside2-5.15.7-r1.ebuild
deleted file mode 100644
index d82265de986e..000000000000
--- a/dev-python/pyside2/pyside2-5.15.7-r1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Add PyPy once officially supported. See also:
-# https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-r1 virtualx
-
-# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects"
-# USE flag after an external "dev-qt/qtremoteobjects" package has been created.
-# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
-# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
-# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
-# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
-# that the "PySide2/QtGui/CMakeLists.txt" and
-# "PySide2/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
-# testing whether the "Qt5::Gui" list property defined by
-# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
-# time contains the substring "opengles2". Since cmake does not permit
-# properties to be overridden from the command line, these files must instead
-# be conditionally patched to avoid these tests. An issue should be filed with
-# upstream requesting a CLI-settable variable to control this.
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}/sources/pyside2"
-
-# See "sources/pyside2/PySide2/licensecomment.txt" for licensing details.
-# Shall we allow essential modules to be disabled? They are:
-# (core), gui, widgets, printsupport, sql, network, testlib, concurrent,
-# x11extras (for X)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="
- 3d charts +concurrent datavis designer gles2-only +gui help location
- multimedia +network positioning +printsupport qml quick script scripttools
- scxml sensors speech +sql svg test +testlib webchannel webengine websockets
- +widgets +x11extras xml xmlpatterns
-"
-
-# Manually reextract these requirements on version bumps by running the
-# following one-liners from within "${S}":
-# $ grep 'set.*_deps' PySide2/Qt*/CMakeLists.txt
-# $ cat /lib64/cmake/Qt5*/Qt5*.cmake | grep -i DEPENDENCIES
-# Note that the "designer" USE flag corresponds to the "Qt5UiTools" module.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- 3d? ( gui network )
- charts? ( gui widgets )
- datavis? ( gui )
- designer? ( gui widgets xml )
- gles2-only? ( gui )
- help? ( gui sql widgets )
- location? ( gui network positioning quick )
- multimedia? ( gui network widgets )
- printsupport? ( gui widgets )
- qml? ( gui network )
- quick? ( gui network qml widgets network )
- scripttools? ( gui script widgets )
- speech? ( multimedia )
- sql? ( widgets )
- svg? ( widgets )
- testlib? ( widgets )
- webchannel? ( qml )
- webengine? (
- gui network positioning quick qml
- widgets? ( printsupport network webchannel )
- )
- websockets? ( network )
- widgets? ( gui )
- x11extras? ( gui )
-"
-
-# Tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-2)*:5"
-
-RDEPEND="${PYTHON_DEPS}
- ~dev-python/shiboken2-${PV}[${PYTHON_USEDEP}]
- =dev-qt/qtcore-${QT_PV}
- =dev-qt/qtopengl-${QT_PV}[gles2-only=]
- =dev-qt/qtserialport-${QT_PV}
- 3d? ( =dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] )
- charts? ( =dev-qt/qtcharts-${QT_PV}[qml?] )
- concurrent? ( =dev-qt/qtconcurrent-${QT_PV} )
- datavis? ( =dev-qt/qtdatavis3d-${QT_PV}[qml?,gles2-only=] )
- designer? ( =dev-qt/designer-${QT_PV} )
- gui? ( =dev-qt/qtgui-${QT_PV}[jpeg,gles2-only=] )
- help? ( =dev-qt/qthelp-${QT_PV} )
- location? ( =dev-qt/qtlocation-${QT_PV} )
- multimedia? ( =dev-qt/qtmultimedia-${QT_PV}[qml?,gles2-only=,widgets?] )
- network? ( =dev-qt/qtnetwork-${QT_PV} )
- positioning? ( =dev-qt/qtpositioning-${QT_PV}[qml?] )
- printsupport? ( =dev-qt/qtprintsupport-${QT_PV}[gles2-only=] )
- qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
- quick? (
- =dev-qt/qtdeclarative-${QT_PV}[widgets?]
- =dev-qt/qtquickcontrols2-${QT_PV}[widgets?]
- )
- script? ( =dev-qt/qtscript-${QT_PV}[scripttools?] )
- scxml? ( =dev-qt/qtscxml-${QT_PV} )
- sensors? ( =dev-qt/qtsensors-${QT_PV}[qml?] )
- speech? ( =dev-qt/qtspeech-${QT_PV} )
- sql? ( =dev-qt/qtsql-${QT_PV} )
- svg? ( =dev-qt/qtsvg-${QT_PV} )
- testlib? ( =dev-qt/qttest-${QT_PV} )
- webchannel? ( =dev-qt/qtwebchannel-${QT_PV}[qml] )
- webengine? ( =dev-qt/qtwebengine-${QT_PV}[alsa,widgets?] )
- websockets? ( =dev-qt/qtwebsockets-${QT_PV}[qml?] )
- widgets? ( =dev-qt/qtwidgets-${QT_PV}[gles2-only=] )
- x11extras? ( =dev-qt/qtx11extras-${QT_PV} )
- xml? ( =dev-qt/qtxml-${QT_PV} )
- xmlpatterns? ( =dev-qt/qtxmlpatterns-${QT_PV}[qml?] )
-"
-DEPEND="${RDEPEND}
- test? ( x11-misc/xvfb-run )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.15.2-python310.patch"
- "${FILESDIR}/${PN}-5.15.2-python311.patch"
- "${FILESDIR}/${PN}-5.15.2-python311-fixups.patch"
-)
-
-src_configure() {
- # See COLLECT_MODULE_IF_FOUND macros in CMakeLists.txt
- local mycmakeargs=(
- -DBUILD_TESTS=$(usex test)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DAnimation=$(usex !3d)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DCore=$(usex !3d)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DExtras=$(usex !3d)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DInput=$(usex !3d)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DLogic=$(usex !3d)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DRender=$(usex !3d)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Charts=$(usex !charts)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Concurrent=$(usex !concurrent)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DataVisualization=$(usex !datavis)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=$(usex !designer)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Gui=$(usex !gui)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Help=$(usex !help)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Location=$(usex !location)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=$(usex !multimedia)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Network=$(usex !network)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=$(usex !positioning)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5PrintSupport=$(usex !printsupport)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Qml=$(usex !qml)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Quick=$(usex !quick)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickControls2=$(usex !quick)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickWidgets=$(usex !quick yes $(usex !widgets))
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=$(usex !script)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=$(usex !scripttools)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Scxml=$(usex !scxml)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=$(usex !sensors)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=$(usex !speech)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sql=$(usex !sql)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Svg=$(usex !svg)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=$(usex !testlib)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5UiTools=$(usex !designer)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebChannel=$(usex !webchannel)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine=$(usex !webengine)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineCore=$(usex !webengine)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebSockets=$(usex !websockets)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=$(usex !widgets)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=$(usex !x11extras)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Xml=$(usex !xml)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5XmlPatterns=$(usex !xmlpatterns)
- )
-
- pyside2_configure() {
- local mycmakeargs=(
- "${mycmakeargs[@]}"
- -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
- -DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
- )
- cmake_src_configure
- }
- python_foreach_impl pyside2_configure
-}
-
-src_compile() {
- python_foreach_impl cmake_src_compile
-}
-
-src_test() {
- local -x PYTHONDONTWRITEBYTECODE
- python_foreach_impl virtx cmake_src_test
-}
-
-src_install() {
- pyside2_install() {
- cmake_src_install
- python_optimize
-
- # Uniquify the shiboken2 pkgconfig dependency in the PySide2 pkgconfig
- # file for the current Python target. See also:
- # https://github.com/leycec/raiagent/issues/73
- sed -i -e 's~^Requires: shiboken2$~&-'${EPYTHON}'~' \
- "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
-
- # Uniquify the PySide2 pkgconfig file for the current Python target,
- # preserving an unversioned "pyside2.pc" file arbitrarily associated
- # with the last Python target. (See the previously linked issue.)
- cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
- }
- python_foreach_impl pyside2_install
-
- # CMakeLists.txt installs a "PySide2Targets-gentoo.cmake" file forcing
- # downstream consumers (e.g., pyside2-tools) to target one
- # "libpyside2-*.so" library linked to one Python interpreter. See also:
- # https://bugreports.qt.io/browse/PYSIDE-1053
- # https://github.com/leycec/raiagent/issues/74
- sed -i -e 's~pyside2-python[[:digit:]]\+\.[[:digit:]]\+~pyside2${PYTHON_CONFIG_SUFFIX}~g' \
- "${ED}/usr/$(get_libdir)/cmake/PySide2-${PV}/PySide2Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die
-}
diff --git a/dev-python/pyside2/pyside2-5.15.8-r1.ebuild b/dev-python/pyside2/pyside2-5.15.8-r1.ebuild
index 22ff84be9b79..d82265de986e 100644
--- a/dev-python/pyside2/pyside2-5.15.8-r1.ebuild
+++ b/dev-python/pyside2/pyside2-5.15.8-r1.ebuild
@@ -37,7 +37,7 @@ S="${WORKDIR}/${MY_P}/sources/pyside2"
# x11extras (for X)
LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="
3d charts +concurrent datavis designer gles2-only +gui help location
multimedia +network positioning +printsupport qml quick script scripttools
diff --git a/dev-python/pytest_jupyter/pytest_jupyter-0.6.2.ebuild b/dev-python/pytest_jupyter/pytest_jupyter-0.6.2.ebuild
index e3faa0cc9a50..56c85c6e5338 100644
--- a/dev-python/pytest_jupyter/pytest_jupyter-0.6.2.ebuild
+++ b/dev-python/pytest_jupyter/pytest_jupyter-0.6.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
RDEPEND="
>=dev-python/jupyter_client-7.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-ironicclient/python-ironicclient-5.1.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-5.1.0.ebuild
index 76e546ea50a5..413d73abc8ef 100644
--- a/dev-python/python-ironicclient/python-ironicclient-5.1.0.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-5.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1 pypi
diff --git a/dev-python/python-json-logger/python-json-logger-2.0.7.ebuild b/dev-python/python-json-logger/python-json-logger-2.0.7.ebuild
index 4841c19190ed..ddda244391cc 100644
--- a/dev-python/python-json-logger/python-json-logger-2.0.7.ebuild
+++ b/dev-python/python-json-logger/python-json-logger-2.0.7.ebuild
@@ -17,6 +17,6 @@ HOMEPAGE="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
distutils_enable_tests unittest
diff --git a/dev-python/python-memcached/Manifest b/dev-python/python-memcached/Manifest
index ad992bd85f4b..0cf6825f7023 100644
--- a/dev-python/python-memcached/Manifest
+++ b/dev-python/python-memcached/Manifest
@@ -1 +1,2 @@
DIST python-memcached-1.59-gh.tar.gz 32334 BLAKE2B de8d18ba887b03e4737b554cc4b0074a4f16745e26a8b3631a747c45019e1da83612677dc3e98f97d76e851320c61baafbd0a29231a826c14b7d3bf3e477f29e SHA512 d7ff45a329f2a9bf97fdc7c0268c2c67046c3501270fcf03578b955c2da35904d7bdecd4239924d390797ddff8f4cc69fc5743f4d4f663cdb9f2f8c7e8159512
+DIST python-memcached-1.59.gh.tar.gz 32334 BLAKE2B de8d18ba887b03e4737b554cc4b0074a4f16745e26a8b3631a747c45019e1da83612677dc3e98f97d76e851320c61baafbd0a29231a826c14b7d3bf3e477f29e SHA512 d7ff45a329f2a9bf97fdc7c0268c2c67046c3501270fcf03578b955c2da35904d7bdecd4239924d390797ddff8f4cc69fc5743f4d4f663cdb9f2f8c7e8159512
diff --git a/dev-python/python-memcached/metadata.xml b/dev-python/python-memcached/metadata.xml
index febb3b815864..71b2011b44aa 100644
--- a/dev-python/python-memcached/metadata.xml
+++ b/dev-python/python-memcached/metadata.xml
@@ -1,18 +1,10 @@
-
- robbat2@gentoo.org
- Robin H. Johnson
-
python@gentoo.org
Python
-
- This is a Python based API (implemented in 100% python) for communicating with
- the memcached distributed memory object cache daemon.
-
python-memcached
diff --git a/dev-python/python-memcached/python-memcached-1.59-r1.ebuild b/dev-python/python-memcached/python-memcached-1.59-r1.ebuild
index b925997aac3d..8a90d01b36a7 100644
--- a/dev-python/python-memcached/python-memcached-1.59-r1.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.59-r1.ebuild
@@ -27,23 +27,23 @@ BDEPEND="
)
"
-distutils_enable_tests nose
+distutils_enable_tests unittest
python_test() {
local pidfile="${TMPDIR}/memcached.pid"
- memcached -d -P "$pidfile" || die "failed to start memcached"
+ memcached -d -P "${pidfile}" || die "failed to start memcached"
- nosetests -v || die "Tests fail with ${EPYTHON}"
+ eunittest || die "Tests fail with ${EPYTHON}"
- kill "$(<"$pidfile")" || die "failed to kill memcached"
+ kill "$(<"${pidfile}")" || die "failed to kill memcached"
local elapsed=0
- while [[ -f "$pidfile" ]]; do
- if [[ $elapsed -ge 30 ]]; then
- kill -KILL "$(<"$pidfile")" || die "failed to kill -KILL memcached"
+ while [[ -f ${pidfile} ]]; do
+ if [[ $(( elapsed++ )) -ge 30 ]]; then
+ kill -KILL "$(<"${pidfile}")" ||
+ die "failed to kill -KILL memcached"
die "memcached failed to stop after 30 seconds"
fi
sleep 1
- let elapsed++
done
}
diff --git a/dev-python/python-memcached/python-memcached-1.59-r2.ebuild b/dev-python/python-memcached/python-memcached-1.59-r2.ebuild
new file mode 100644
index 000000000000..ba8ceed185ef
--- /dev/null
+++ b/dev-python/python-memcached/python-memcached-1.59-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python memcached client"
+HOMEPAGE="
+ https://github.com/linsomniac/python-memcached/
+ https://pypi.org/project/python-memcached/
+"
+SRC_URI="
+ https://github.com/linsomniac/python-memcached/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="PSF-2.4"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ net-misc/memcached
+ )
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+ local pidfile="${TMPDIR}/memcached.pid"
+
+ memcached -d -P "${pidfile}" || die "failed to start memcached"
+
+ eunittest || die "Tests fail with ${EPYTHON}"
+
+ kill "$(<"${pidfile}")" || die "failed to kill memcached"
+ local elapsed=0
+ while [[ -f ${pidfile} ]]; do
+ if [[ $(( elapsed++ )) -ge 30 ]]; then
+ kill -KILL "$(<"${pidfile}")" ||
+ die "failed to kill -KILL memcached"
+ die "memcached failed to stop after 30 seconds"
+ fi
+ sleep 1
+ done
+}
diff --git a/dev-python/python-neutronclient/python-neutronclient-9.0.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-9.0.0.ebuild
index ba2b6a34a09a..d1c6961d1d83 100644
--- a/dev-python/python-neutronclient/python-neutronclient-9.0.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-9.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1 pypi
diff --git a/dev-python/python-novaclient/python-novaclient-18.3.0.ebuild b/dev-python/python-novaclient/python-novaclient-18.3.0.ebuild
index 22b9a33c497c..f28db15c8098 100644
--- a/dev-python/python-novaclient/python-novaclient-18.3.0.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-18.3.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1 pypi
diff --git a/dev-python/python-openstackclient/python-openstackclient-6.1.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-6.1.0.ebuild
index 8436120952db..9a9fed053c5a 100644
--- a/dev-python/python-openstackclient/python-openstackclient-6.1.0.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-6.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1 pypi
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
index c67bd6165c45..d3b9f3b805dd 100644
--- a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
+++ b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86"
DEPEND="
test? ( media-libs/exempi )
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 22a3158f855b..774efebaca17 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1 +1,2 @@
DIST rich-13.3.1.gh.tar.gz 15055408 BLAKE2B 79713ee232bc1c990c1432f7966cffd69b8ffef9ad8a562339d62b03fbab4620040c5ae1d735d3084d71f32581955f0ea5fad113ff992dcddb2dd0e20465484e SHA512 a3b5bef2183bbb888f0ef5a90b35fdb1ed7ef6103dfea01a5efa441ce8d1769b53d7888684e3b5cd76bcacf3768835d918d9fbb7801eab57c04d1412f129f6bb
+DIST rich-13.3.2.gh.tar.gz 15060707 BLAKE2B fbee6e01b60a18cb32a7f86fa41d621d2cb895e5602f23ed85e7338788f4fbab401fe0a8c2b2bb3a1975c40ebeaaf4d013e50a6d6e5cad6324a14acea21d48dc SHA512 9f33658d8dfa5c22fd92ca83690628ded12d428777d6cd7752afc35c36481d46df1766841eaf003917ec6da932d6f29981c779846d4c14a95e2738e74ec20b2c
diff --git a/dev-python/rich/rich-13.3.2.ebuild b/dev-python/rich/rich-13.3.2.ebuild
new file mode 100644
index 000000000000..8e2a3cb446e8
--- /dev/null
+++ b/dev-python/rich/rich-13.3.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
+HOMEPAGE="
+ https://github.com/Textualize/rich/
+ https://pypi.org/project/rich/
+"
+SRC_URI="
+ https://github.com/Textualize/rich/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+ dev-python/colorama[${PYTHON_USEDEP}]
+ =dev-python/markdown-it-py-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.13.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ ' 3.8)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+ local -x COLUMNS=80
+ local EPYTEST_DESELECT=(
+ # TODO
+ tests/test_console.py::test_size_can_fall_back_to_std_descriptors
+ tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
+ # pygments?
+ tests/test_syntax.py::test_python_render_simple_indent_guides
+ tests/test_syntax.py::test_python_render_line_range_indent_guides
+ )
+ epytest -p no:pytest-qt
+}
+
+pkg_postinst() {
+ optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index 8a75fcd5f95b..06977f881ece 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,2 +1,3 @@
DIST rpyc-5.2.3_p1.tar.gz 1269198 BLAKE2B 288568fcd34787850968d4e3fd9ca7c2d29e506f1331b746104760e678dfef43fd30b08f68b3bdda6df84d488f88dc76cfdd23d5a5ad0a4cefeab468ac6a1b0b SHA512 4b29899a51364779185d2b56f5d5ee4c650c40b8322e5594500222fdcec85414cdbabd41437467e2ff73124a79e8c9cde23dfe89138abb935732ccaba69de2bb
DIST rpyc-5.3.0.gh.tar.gz 1270508 BLAKE2B c7b0c06ea7151d80d84e057b7991cbc7bcb047f24544b7669d80218f9eeb9342ba58020f608bb615dea932a1380b0afb36ba9f8e216f139ba4aadd4a7efa344d SHA512 371c60dedf3fba3232c5c1d7616a04b8cf2a8295e31b945ab51d0dee5ba5d8769062aafa860db85b951f0283b8800b61972a7f2f7fa3cc69929c7563e74be1ee
+DIST rpyc-5.3.1.gh.tar.gz 1271046 BLAKE2B b7c86aa5cf774d306b2d6fdbac97441533bc5a847aaf03c11b0abf0a07587a2f7d081470d3402fde4251ea6654051d96983feefa2ba7e65a9a95d76f179edcad SHA512 a328903c336483f7110cbbff96173ba0b5ae6cf16f6306c624055bd631d914772c42dcfcf48a275b7dc53241f6b10a397ee49f17b8a3c3c8dbee8f42ac784465
diff --git a/dev-python/rpyc/rpyc-5.3.1.ebuild b/dev-python/rpyc/rpyc-5.3.1.ebuild
new file mode 100644
index 000000000000..bf999d1bb527
--- /dev/null
+++ b/dev-python/rpyc/rpyc-5.3.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
+HOMEPAGE="https://rpyc.readthedocs.io/en/latest/
+ https://pypi.org/project/rpyc/
+ https://github.com/tomerfiliba-org/rpyc"
+SRC_URI="https://github.com/tomerfiliba-org/rpyc/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+# USE flags gdb, numpy are used *only* to run tests depending on these packages
+IUSE="test numpy gdb"
+RESTRICT="!test? ( test )"
+
+CDEPEND="numpy? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] )
+ gdb? ( sys-devel/gdb )"
+
+DEPEND="${CDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="${CDEPEND}
+ dev-python/plumbum[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${PN}-5.3.0-no-gevent.patch )
+
+src_prepare() {
+ default
+
+ # Windows specific test
+ rm tests/test_win32pipes.py || die "rm tests/test_win32pipes.py failed"
+
+ # These tests require running sshd
+ rm tests/test_ssh.py tests/test_deploy.py || die "rm test_ssh.py test_deploy.py failed"
+
+ # This test requires internet access
+ rm tests/test_registry.py || die "rm test_registry.py failed"
+
+ # This test fails with NO_CIPHERS_AVAILABLE
+ rm tests/test_ssl.py || die "rm test_ssl.py failed"
+
+ # dev-python/gevent is being removed
+ rm tests/test_gevent_server.py || die "rm test_gevent_server.py failed"
+
+ if ! use numpy
+ then rm tests/test_service_pickle.py || die "rm test_service_pickle.py failed"
+ fi
+
+ if ! use gdb
+ then rm tests/test_gdb.py || die "rm test_gdb.py failed"
+ fi
+}
+
+python_test() {
+ # for some reason, when tests are run via pytest or nose, some of them hung
+ pushd tests > /dev/null || die "pushd tests failed"
+ for x in test_*.py
+ do PYTHONPATH="${WORKDIR}"/${P}-${EPYTHON/./_}/install/usr/lib/${EPYTHON}/site-packages ${EPYTHON} ${x} || die "${x} failed"
+ done
+ popd > /dev/null
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 712c8268b6c7..4d6fabfa15d7 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,3 +1,4 @@
DIST setuptools-65.7.0.tar.gz 2618315 BLAKE2B a0989c3fd0ab476d69885d022eccf1a89dc670a17d0b3e73bbe4ffb530e26a838fcd1cfffc4c2720ddd19cb8ba45d42bc31441f1e3bbc32fa71850d208f37cc8 SHA512 0eb2d9de9ef2565cf012db7d68ee18359a1432dd42ecd3fb7d490f73d57b0e7ba2a67e0401f66051127e913f29c2e221e88c0cbf523b0ac9abe7f00b6ab1ded8
DIST setuptools-67.2.0.tar.gz 2475665 BLAKE2B 1d82e21d5c5f7aea479d468ae5c29c62a86a552e811203794f2246bc715647c18c66ab6d37c9da3092fc2b402cc865c1ab85989092c9beccc440913ad7d51ccd SHA512 2d15719d7a0305535ee853e82b5196af2eaa29cbcf73c59515c2fa8e8c910c25fcf3854aac515789a51a845555b19c95e8d06fef4199cf19ba4a45dda5b7ab66
DIST setuptools-67.4.0.tar.gz 2484170 BLAKE2B 5c72b2bb813a84337e00c30a1375a24ca997a07100ca7f83afcb76d1fbde1432b049faa76d50ce8c74b3ea753096e63a09359bdcca2cb0d1d57eea21bbe5c2c9 SHA512 d5865283e13a8f42b6b49f9c507f6c41e75a92ad2c4e4c2b4184a410003fadfe7629ed5824340110400143e2ce82cde2e50e9b2898335462376b28f440648cd5
+DIST setuptools-67.5.1.tar.gz 2485370 BLAKE2B ed063a287787e56850cd4f20a8f07cc8670138bdbbb934a0684ead355f234312e6d3cebabffbbc41fb2dd2df27c493878c6660ea073ea00e65d31cef8a6568c0 SHA512 c064415c3169ba87be76f5842266f0f92b766a4eaabacf320c708f5cdbe8d60007e14773889c00c877350dcf0ffa39174fa2e30416f4c7047787aefc26e6fff4
diff --git a/dev-python/setuptools/setuptools-67.5.1.ebuild b/dev-python/setuptools/setuptools-67.5.1.ebuild
new file mode 100644
index 000000000000..8851d666e4cb
--- /dev/null
+++ b/dev-python/setuptools/setuptools-67.5.1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2023 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
+
+# please bump dev-python/ensurepip-setuptools along with this package!
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing pypi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+ https://github.com/pypa/setuptools/
+ https://pypi.org/project/setuptools/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+ >=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+ >=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
+ >=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+ >=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+ >=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
+ >=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+ ' 3.9)
+"
+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/pip[${PYTHON_USEDEP}]
+ dev-python/pip-run[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+ dev-python/pytest-timeout[${PYTHON_USEDEP}]
+ dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ >=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ ' "${PYTHON_TESTED[@]}")
+ )
+"
+PDEPEND="
+ >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+ dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+ local PATCHES=(
+ # TODO: remove this when we're 100% PEP517 mode
+ "${FILESDIR}"/setuptools-62.4.0-py-compile.patch
+ )
+
+ distutils-r1_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
+}
+
+python_test() {
+ local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+ if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+ return
+ fi
+
+ local EPYTEST_DESELECT=(
+ # network
+ # TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+ setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+ setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+ setuptools/tests/test_build_meta.py::test_legacy_editable_install
+ setuptools/tests/test_distutils_adoption.py
+ setuptools/tests/test_editable_install.py
+ setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+ setuptools/tests/test_virtualenv.py::test_clean_env_install
+ setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+ setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+ # TODO
+ setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+ setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+ setuptools/tests/test_extern.py::test_distribution_picklable
+ # expects bundled deps in virtualenv
+ 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
+ setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+ # fails if python-xlib is installed
+ setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+ )
+
+ if has_version "=[0-9]\+::' pyproject.toml || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # devpi_process is not packaged, and has lots of dependencies
- cat > "${T}"/devpi_process.py <<-EOF || die
- def IndexServer(*args, **kwargs): raise NotImplementedError()
- EOF
-
- local -x PYTHONPATH=${T}:${PYTHONPATH}
- local EPYTEST_DESELECT=(
- # Internet
- tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
- )
- local EPYTEST_IGNORE=(
- # requires devpi*
- tests/test_provision.py
- )
-
- [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
- 'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
- 'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
- 'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
- 'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
- 'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
- 'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
- )
-
- epytest
-}
diff --git a/dev-python/tox/tox-4.4.5.ebuild b/dev-python/tox/tox-4.4.5.ebuild
deleted file mode 100644
index ff36971ecf17..000000000000
--- a/dev-python/tox/tox-4.4.5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-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
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
- >=dev-python/cachetools-5.3[${PYTHON_USEDEP}]
- >=dev-python/chardet-5.1[${PYTHON_USEDEP}]
- >=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
- >=dev-python/filelock-3.9[${PYTHON_USEDEP}]
- >=dev-python/packaging-21.3[${PYTHON_USEDEP}]
- >=dev-python/platformdirs-2.6[${PYTHON_USEDEP}]
- >=dev-python/pluggy-1[${PYTHON_USEDEP}]
- >=dev-python/pyproject-api-1.5[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- >=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
- ' 3.8 3.9 3.10)
- >=dev-python/virtualenv-20.17.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
- >=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
- test? (
- >=dev-python/build-0.10[${PYTHON_USEDEP}]
- >=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
- >=dev-python/flaky-3.7[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- >=dev-python/pytest-xdist-3.1[${PYTHON_USEDEP}]
- >=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- >=dev-python/time-machine-2.9[${PYTHON_USEDEP}]
- ' 'python*')
- )
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-src_prepare() {
- # the minimal bounds in tox are entirely meaningless and new packaging
- # breaks setuptools
- sed -i -e '/packaging/s:>=[0-9]\+::' pyproject.toml || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # devpi_process is not packaged, and has lots of dependencies
- cat > "${T}"/devpi_process.py <<-EOF || die
- def IndexServer(*args, **kwargs): raise NotImplementedError()
- EOF
-
- local -x PYTHONPATH=${T}:${PYTHONPATH}
- local EPYTEST_DESELECT=(
- # Internet
- tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
- )
- local EPYTEST_IGNORE=(
- # requires devpi*
- tests/test_provision.py
- )
-
- [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
- 'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
- 'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
- 'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
- 'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
- 'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
- 'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
- )
-
- epytest
-}
diff --git a/dev-python/tox/tox-4.4.6.ebuild b/dev-python/tox/tox-4.4.6.ebuild
index c63e5a73d314..bb9be16f77c3 100644
--- a/dev-python/tox/tox-4.4.6.ebuild
+++ b/dev-python/tox/tox-4.4.6.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
>=dev-python/cachetools-5.3[${PYTHON_USEDEP}]
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 11135117197f..bce576f78d37 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1 +1,2 @@
DIST xmlschema-2.2.1.tar.gz 491212 BLAKE2B 75212d7e159b0719bd1c01e8e31da6aab2b6422bb497d7312160aee4d00a920e65a135852441c2c61e83a9d8d65c94d9f5ed0f05e967fb456ffd46f314a4bb13 SHA512 8e3eef6379cbcb67fc0dd90f9a962f0ba890c5c9a1334c2cfe695e701b8a3aa1fa97f8e50c1e87cbdb5f0b7790bb84e1a181c00b678134cfbeeb8578fa78f724
+DIST xmlschema-2.2.2.tar.gz 492479 BLAKE2B 1d06841587172d8e67959e0096ac48c0ea3e63c24fa64d2ce9098a7031800a67aa73da9c7b4dcd1cde6ff8999bbc6c675dd157f962461f12446855788d38638a SHA512 a1bbc30e6233192cd275079019cd902d363b23bc02404686713dc16c05bf3a817676db20b6e6e5e7d8d6b9c9e228be3b19e541d0d3a9946765643894fcedc00e
diff --git a/dev-python/xmlschema/xmlschema-2.2.2.ebuild b/dev-python/xmlschema/xmlschema-2.2.2.ebuild
new file mode 100644
index 000000000000..c53430e64d4d
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-2.2.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="An XML Schema validator and decoder"
+HOMEPAGE="
+ https://github.com/sissaschool/xmlschema/
+ https://pypi.org/project/xmlschema/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ =dev-python/elementpath-4.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ ${RDEPEND}
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ )
+"
+
+python_test() {
+ "${EPYTHON}" tests/test_all.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 6f91abd383b4..b3e108649701 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtlocation/files/qtlocation-5.15.8-mapboxgl-gcc13.patch b/dev-qt/qtlocation/files/qtlocation-5.15.8-mapboxgl-gcc13.patch
new file mode 100644
index 000000000000..ba4e94e859fb
--- /dev/null
+++ b/dev-qt/qtlocation/files/qtlocation-5.15.8-mapboxgl-gcc13.patch
@@ -0,0 +1,51 @@
+From d8054f1efa0b97b291a6f8c7fff9090b0fd4328e Mon Sep 17 00:00:00 2001
+From: Fabian Vogt
+Date: Fri, 3 Mar 2023 11:39:58 +0100
+Subject: [PATCH] Add some missing cstdint inclusions (#872)
+
+GCC 13 removed some indirect inclusions of cstdint which this relied on.
+Include it explicitly to fix build errors.
+---
+ include/mbgl/util/geometry.hpp | 2 ++
+ include/mbgl/util/string.hpp | 1 +
+ src/mbgl/gl/stencil_mode.hpp | 2 ++
+ 3 files changed, 5 insertions(+)
+
+diff --git a/include/mbgl/util/geometry.hpp b/include/mbgl/util/geometry.hpp
+index a28c59a47d..283ec7dbbe 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
+@@ -1,5 +1,7 @@
+ #pragma once
+
++#include
++
+ #include
+ #include
+ #include
+diff --git a/include/mbgl/util/string.hpp b/include/mbgl/util/string.hpp
+index 13498ccb92..2f6acb6410 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
+@@ -3,6 +3,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+
+diff --git a/src/mbgl/gl/stencil_mode.hpp b/src/mbgl/gl/stencil_mode.hpp
+index bc959c9a73..fd00370f88 100644
+--- a/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
++++ b/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
+@@ -1,5 +1,7 @@
+ #pragma once
+
++#include
++
+ #include
+
+ namespace mbgl {
+--
+GitLab
diff --git a/dev-qt/qtlocation/qtlocation-5.15.8.ebuild b/dev-qt/qtlocation/qtlocation-5.15.8.ebuild
index 219efff528b3..a1ab77f7306e 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.8.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.8.ebuild
@@ -39,6 +39,8 @@ QT5_TARGET_SUBDIRS=(
src/plugins/geoservices
)
+PATCHES=( "${FILESDIR}/${P}-mapboxgl-gcc13.patch" ) # bug 885431
+
src_configure() {
# src/plugins/geoservices requires files that are only generated when
# qmake is run in the root directory. Bug 633776.
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 53b9c8d346ac..2ca7d17bc2a6 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,3 +1,4 @@
DIST qtwayland-5.15.8-gentoo-kde-1.tar.xz 44488 BLAKE2B bfdd7c2959eb99e115eaf01d617464359a549513958c997dd8b1a86bda755dec44d24b6619650bf385b2894a2001a712a344b093fc94e8cde40ac9c20323903e SHA512 3cd52fc78f2451c38c6d2b0dd958895016a94b255e38ff3909f40e4bcb1ef760332fde4cffd32ab11e868ce0afe6629f325613c88b8fd85ca28f1583194ce229
+DIST qtwayland-5.15.8-gentoo-kde-2.tar.xz 46592 BLAKE2B 0f2c460038a5b6f6fb7ea38edf61b392e95caa6356e8c070bde9d7939e20aaee4a45a581e08d04ad34f2a2da6317c2a16c40e58272d0c256fd16f0a1ce6fa34a SHA512 8b6c94e032a35f6ec6400fa292b1c7b864504d5c94d095c20fd41da8576eab4325bf7312b08cca00825aa858e175510b8b37c5877207fb4d60edde99c77c9886
DIST qtwayland-everywhere-opensource-src-5.15.8.tar.xz 568268 BLAKE2B b4e982015e25104b3270b48a180b5726ba85e83fd9616422422d8729dc09bc94bbeecfe2096e388eadb0930e4abfdd3b0349eba2bd1d8f742f0c74b5e72aeac5 SHA512 6c6e9dc20f98d71abd7dba54ff278bf4535e70f86bfc4e6dd46c1af7c87777f045a6aba02bba3eb786f7cf383da5fb72b03e1e6ec636c8be0cde0e4e5b7b5b2d
DIST qtwayland-everywhere-src-6.4.2.tar.xz 836720 BLAKE2B d8a6b84712081097775f083f3887c18eb001fd2beba32b2abc930ec3b932f6f19b347fe2fde3b98f35c1e7e31661974b13468fb176e73bdf557a330c80d847fd SHA512 29d3f3e7fade666bcd3145106f1d782122ac3fcf94811d25917c9f45af0dc8cddb3c2149545344d91e86f86490029555758ed2e180f241703251c22c7ec15122
diff --git a/dev-qt/qtwayland/qtwayland-5.15.8-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.8-r1.ebuild
new file mode 100644
index 000000000000..9cceea0f85cb
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.15.8-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+ QT5_KDEPATCHSET_REV=2
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+inherit qt5-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+SLOT=5/${QT5_PV} # bug 815646
+IUSE="vulkan X"
+
+DEPEND="
+ dev-libs/wayland
+ =dev-qt/qtcore-${QT5_PV}*:5=
+ =dev-qt/qtdeclarative-${QT5_PV}*:5=
+ =dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
+ media-libs/libglvnd
+ vulkan? ( dev-util/vulkan-headers )
+ X? (
+ =dev-qt/qtgui-${QT5_PV}*[-gles2-only]
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-util/wayland-scanner"
+
+src_configure() {
+ local myqmakeargs=(
+ --
+ $(qt_use vulkan feature-wayland-vulkan-server-buffer)
+ $(qt_use X feature-xcomposite-egl)
+ $(qt_use X feature-xcomposite-glx)
+ )
+ qt5-build_src_configure
+}
+
+src_install() {
+ qt5-build_src_install
+ rm "${D}${QT5_BINDIR}"/qtwaylandscanner || die
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 2d6c7cc2dd97..d2993ca983c0 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index 07dee81782bb..7cb5e1c13876 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -1 +1,2 @@
+DIST autoprefixer-rails-10.4.13.0.tar.gz 1386370 BLAKE2B a96eb20ebb940a63abf22819e7b2c1727816e4e70cffff5fce3f84c09b783c7f6aac3d6af2483670bbacf4e8032e71f8b144bdc41846464935dbf57fa23d98f5 SHA512 698e8f91875d7fe73d4843cd4dda65b695e3654b9bbf02070a0fd4d61ebf9fb00aaffa8ce63b738dc5d345c5536c79fa985adfa779f47d57412c791e3388cc97
DIST autoprefixer-rails-10.4.7.0.tar.gz 1372138 BLAKE2B 5d4ad1cb82fc0e82557232fc1a050f87fc2758967c21e2e566049686efec41b599e3cf7e2b432d164c6a29c2463ab3c695703878c23188ee97a46e5aff6a26a2 SHA512 c1d3a1200c05a3b1219716058eb28babef4bc26eaca1ebdc09a901709435f25f097d3c39398a07283a75ed37b30a45398fbe31095e649f6d94fdc6de2346aad6
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.13.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.13.0.ebuild
new file mode 100644
index 000000000000..a5f07fb4f9a8
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.13.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+RUBY_FAKEGEM_GEMSPEC="autoprefixer-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
+HOMEPAGE="https://github.com/ai/autoprefixer-rails"
+SRC_URI="https://github.com/ai/autoprefixer-rails/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+DEPEND+="test? ( net-libs/nodejs )"
+
+ruby_add_rdepend "dev-ruby/execjs"
+
+ruby_add_bdepend "test? (
+ >=dev-ruby/rails-5.0.0
+ dev-ruby/rake
+ dev-ruby/rspec-rails
+ dev-ruby/sprockets-rails
+)"
+
+all_ruby_prepare() {
+ sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+ sed -i -e "/Bundler/ s:^:#:" \
+ -e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
+ rm -f spec/rails_spec.rb || die
+}
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index ed1adfcaba06..2d412fae0f7c 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -9,3 +9,4 @@ DIST bundler-2.3.26.gem 411648 BLAKE2B 5ea0ff86e0e09bf0466e4bb21502a13519515f312
DIST bundler-2.3.8.gem 403968 BLAKE2B 80640d5032034be0511762c60832c85c65b7b97397eca49d2bc35977a85625104477606abd6d8b286dd4697906a5d97076cac30f7ab58f45b258ba1e637bbc2c SHA512 e04bc9762135bdab7eb70bde4f21289375b7ea9bee795775dc614f31a6f145a5406396dbc638bdac778ac7c39d60c953e5ba38376b8bc72e7a8cfd1c40b25585
DIST bundler-2.4.1.gem 408576 BLAKE2B 8bd574023dfdffa9ab02b4a0f86c922cf3c8bbcebee3b9ad77b9eba748a81219f8fbccb3eac667922e7dc23f73212e9f42f04eae6ee99b1869ab40537365e8f2 SHA512 244cf923838c9e2001fae5533df66457953d93943fc9a2c587a1d36b1aec3385a7cd50680bd0fe14e8abb2dc11b11a8636a1e1c0d36847c24080f63edfe8b1f5
DIST bundler-2.4.3.gem 409088 BLAKE2B df6991e9f4ef80899ac691d7a0ece268980bda7497482b207eba8e5e0f957fbc7b06f11755932f527d80ed199e79292b1a720a06f80b38d95685a4e6f2316e27 SHA512 a232c40656d05031b39390c72ae71596618e87d92cf86f1db45d75993ff8cb0625fef8055540ef14a8179211bdf17804028468c568e261d3dd43c0a5405ed4bf
+DIST bundler-2.4.6.gem 409600 BLAKE2B 5470a85b7ee0a88c13795516ee317eaf227ad49023f05dbbea1bbe0b2b4f2bb93fab85101128662845d8a2ad567bec04e5238e3a2d3b81c89aea81f18d552d4e SHA512 194d432a12bde41d7bdff5aefd187b539f4ab3932d6774f171147e4da907dc77f2ff56580c53151d5fdb77de2138b668f856e410cd63b1cda2fb996074771f35
diff --git a/dev-ruby/bundler/bundler-2.4.6.ebuild b/dev-ruby/bundler/bundler-2.4.6.ebuild
new file mode 100644
index 000000000000..75bc43c73caf
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.4.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/carlhuda/bundler"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git"
diff --git a/dev-ruby/date/date-3.3.3.ebuild b/dev-ruby/date/date-3.3.3.ebuild
index 303b2f58e831..1db724c49ba6 100644
--- a/dev-ruby/date/date-3.3.3.ebuild
+++ b/dev-ruby/date/date-3.3.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_BINWRAP=""
RUBY_FAKEGEM_EXTENSIONS=(ext/date/extconf.rb)
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/date/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/debug/Manifest b/dev-ruby/debug/Manifest
new file mode 100644
index 000000000000..0d8a5fde9597
--- /dev/null
+++ b/dev-ruby/debug/Manifest
@@ -0,0 +1 @@
+DIST debug-1.7.1.tar.gz 159697 BLAKE2B f3fc6b75c45992ef12d7bc6cbc3d3e65bde782ab399aa5c6643752c7337ab5e31dba5a22b3a36a0b345f3017147aed987b35184c789d8e32d3283cdff0f08a58 SHA512 6ff242862e05c48b2021b128d12c0ad9a6ed67954d0e7a60538eddabeef83253a613c13aac21b5b00516861fc0553351525fb190dfbc196e9da42e217d3b4e93
diff --git a/dev-ruby/debug/debug-1.7.1.ebuild b/dev-ruby/debug/debug-1.7.1.ebuild
new file mode 100644
index 000000000000..321e28ba17fd
--- /dev/null
+++ b/dev-ruby/debug/debug-1.7.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="TODO.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/debug/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/debug"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Debugging functionality for Ruby"
+HOMEPAGE="https://github.com/ruby/debug"
+SRC_URI="https://github.com/ruby/debug/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="$(ver_cut 1)"
+
+# Avoid tests for now since the results in a very deep dependency list for ruby32
+#ruby_add_depend "test? ( dev-ruby/rr )"
+RESTRICT="test"
+
+all_ruby_prepare() {
+ sed -i -e "s:require_relative ':require './:" -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+ sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/debug/metadata.xml b/dev-ruby/debug/metadata.xml
new file mode 100644
index 000000000000..864ac37653a0
--- /dev/null
+++ b/dev-ruby/debug/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ ruby@gentoo.org
+ Gentoo Ruby Project
+
+
+ ruby/debug
+ debug
+
+
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild
index 9f69b32f446e..e7ab53d29d40 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_RECIPE_DOC=""
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -17,7 +17,7 @@ SLOT="2.6"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/test-unit )"
all_ruby_prepare() {
sed -i -e '/bundler/ s:^:#:' Rakefile || die
diff --git a/dev-ruby/digest/digest-3.1.1.ebuild b/dev-ruby/digest/digest-3.1.1.ebuild
index 6d88ead03f6a..f44159e6f2c6 100644
--- a/dev-ruby/digest/digest-3.1.1.ebuild
+++ b/dev-ruby/digest/digest-3.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_BINWRAP=""
RUBY_FAKEGEM_EXTENSIONS=(ext/digest/extconf.rb ext/digest/bubblebabble/extconf.rb ext/digest/md5/extconf.rb ext/digest/rmd160/extconf.rb ext/digest/sha1/extconf.rb ext/digest/sha2/extconf.rb)
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/digest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/forwardable/forwardable-1.3.3.ebuild b/dev-ruby/forwardable/forwardable-1.3.3.ebuild
index d2525027f515..c107a607c55c 100644
--- a/dev-ruby/forwardable/forwardable-1.3.3.ebuild
+++ b/dev-ruby/forwardable/forwardable-1.3.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_BINWRAP=""
RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/forwardable/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/git/Manifest b/dev-ruby/git/Manifest
index d5b91e09a5ae..833e5b11787b 100644
--- a/dev-ruby/git/Manifest
+++ b/dev-ruby/git/Manifest
@@ -1,3 +1,4 @@
DIST git-1.13.0.tar.gz 219424 BLAKE2B 38d1821c59cbb743c50655e9426d77f76e77dda614a711b7d2185ed7f4caa853383ba85ecf05237da403061d002527c38a5c6e06cf5e6d482ac76bac49a0db56 SHA512 7920de37a3df67b743e91fb317bd0cba746d2343dfb77036398fc124d00eede7b9ade5dd2af5f26d65f1f24006608a29fca55d5be8a00557caaa31acd0b274d4
DIST git-1.13.1.tar.gz 219640 BLAKE2B c87fce3f83130f7a75a10a21c4c980ec1d3594b20afa7b482f21077083076df7b4c462908a05c7b2fb3091e1fda00857ae40c4809e89f059f63ce12b119f307b SHA512 58cd7f38a5c1d5ab3d68cf2d4b026a80073f5dba3cb4895e220ecad5dbdf6a2df4e1e44570bde9256371c5089b81523aca4a5c686348bd04638f4dd09927e876
DIST git-1.13.2.tar.gz 222112 BLAKE2B 13b2f8c67a27a147662fa019f6fac8f557e704fe1d0320188a097385f7692a190670ba375312e793d4d39fcf9ea7be8325394830c2c499b5132201f4a8f3f6ee SHA512 36425806c86e3c5d1a393ec657b60b8dafc88d92822270c299d3d1768c37d00e70b723d98a60127ab70de15809b27a49bcef5c8a972b88d7a516de093a643347
+DIST git-1.16.0.tar.gz 171700 BLAKE2B 92e518a9b282debad9a935882004f8047918ade0ceb660618e632087cfd44fbe952e45f0aa13d8b599e24c07a809622168637b58463578ec5882ec16afe194d5 SHA512 89e9180370b24e0240ba8226125c063ed008faf2c03905e3680a2e5e6b0dcb1d805f17755f259e9337e1418629057ba460e7ecadb8a4c98125a061b7f0116401
diff --git a/dev-ruby/git/git-1.13.2.ebuild b/dev-ruby/git/git-1.13.2.ebuild
index 0495304e5439..836e97e21a5c 100644
--- a/dev-ruby/git/git-1.13.2.ebuild
+++ b/dev-ruby/git/git-1.13.2.ebuild
@@ -18,7 +18,7 @@ RUBY_S="ruby-git-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
IUSE="test"
DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
diff --git a/dev-ruby/git/git-1.16.0.ebuild b/dev-ruby/git/git-1.16.0.ebuild
new file mode 100644
index 000000000000..12bd3c3a5b13
--- /dev/null
+++ b/dev-ruby/git/git-1.16.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="git.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for using Git in Ruby"
+HOMEPAGE="https://github.com/ruby-git/ruby-git"
+SRC_URI="https://github.com/ruby-git/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-git-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
+RDEPEND+=">=dev-vcs/git-1.6.0.0"
+
+ruby_add_rdepend ">=dev-ruby/addressable-2.8:0 >=dev-ruby/rchardet-1.8:1"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/minitar dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+ # Don't use hardcoded /tmp directory.
+ sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
+
+ sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+ git config --global user.email "git@example.com" || die
+ git config --global user.name "GitExample" || die
+ ${RUBY} -Ilib:.:tests -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/json/json-2.6.3.ebuild b/dev-ruby/json/json-2.6.3.ebuild
index 6fdae306ab6c..3c976f7b844d 100644
--- a/dev-ruby/json/json-2.6.3.ebuild
+++ b/dev-ruby/json/json-2.6.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/kpeg/kpeg-1.3.2.ebuild b/dev-ruby/kpeg/kpeg-1.3.2.ebuild
index 1ac41c869bde..202d15b44d1a 100644
--- a/dev-ruby/kpeg/kpeg-1.3.2.ebuild
+++ b/dev-ruby/kpeg/kpeg-1.3.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
inherit ruby-fakegem
diff --git a/dev-ruby/kramdown/kramdown-2.4.0.ebuild b/dev-ruby/kramdown/kramdown-2.4.0.ebuild
index 85ccf93bebcb..3bfa09cc05bf 100644
--- a/dev-ruby/kramdown/kramdown-2.4.0.ebuild
+++ b/dev-ruby/kramdown/kramdown-2.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS"
diff --git a/dev-ruby/matrix/matrix-0.4.2.ebuild b/dev-ruby/matrix/matrix-0.4.2.ebuild
index 27da3bcb74de..c5fc52a51622 100644
--- a/dev-ruby/matrix/matrix-0.4.2.ebuild
+++ b/dev-ruby/matrix/matrix-0.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/matrix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="$(ver_cut 1)"
all_ruby_prepare() {
diff --git a/dev-ruby/matrix/metadata.xml b/dev-ruby/matrix/metadata.xml
index 7a38fd1850ff..c16f2db61922 100644
--- a/dev-ruby/matrix/metadata.xml
+++ b/dev-ruby/matrix/metadata.xml
@@ -5,4 +5,8 @@
ruby@gentoo.org
Gentoo Ruby Project
+
+ ruby/matrix
+ matrix
+
diff --git a/dev-ruby/metaclass/metaclass-0.0.4-r2.ebuild b/dev-ruby/metaclass/metaclass-0.0.4-r2.ebuild
index 8942bd6c6211..6e76dd8f83fc 100644
--- a/dev-ruby/metaclass/metaclass-0.0.4-r2.ebuild
+++ b/dev-ruby/metaclass/metaclass-0.0.4-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/mini_portile2/mini_portile2-2.8.1.ebuild b/dev-ruby/mini_portile2/mini_portile2-2.8.1.ebuild
index 2a390c41c80f..13a8b37d1eda 100644
--- a/dev-ruby/mini_portile2/mini_portile2-2.8.1.ebuild
+++ b/dev-ruby/mini_portile2/mini_portile2-2.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
inherit ruby-fakegem
@@ -18,6 +18,7 @@ IUSE=""
ruby_add_bdepend "test? (
dev-ruby/minitar
dev-ruby/minitest-hooks
+ dev-ruby/net-ftp
dev-ruby/webrick
)"
diff --git a/dev-ruby/minitar/minitar-0.9-r1.ebuild b/dev-ruby/minitar/minitar-0.9-r1.ebuild
index 9424071e6df2..64a63b1d70e6 100644
--- a/dev-ruby/minitar/minitar-0.9-r1.ebuild
+++ b/dev-ruby/minitar/minitar-0.9-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_TASK_TEST=""
RUBY_FAKEGEM_RECIPE_DOC="none"
diff --git a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1-r1.ebuild b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1-r1.ebuild
index e791117905eb..ef3530ee0ff9 100644
--- a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1-r1.ebuild
+++ b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
inherit ruby-fakegem
diff --git a/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild b/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
index b0b6614ee02b..dcbfbfc7d307 100644
--- a/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
+++ b/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
# Skip tests since they require unpackaged sequel
RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index a4d099bb4ae9..277d1c1013c7 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -4,3 +4,4 @@ DIST minitest-5.15.0.gem 87040 BLAKE2B 71e7a7952c25fd37067a449867d74a2f18a8a42d1
DIST minitest-5.16.2.gem 93184 BLAKE2B 005af875bf38e3744bf9de90ec6e964487908a817c19094dcee658963ab2c8882bb1cc4e0b19124b83af9f5da019a8d9e611ba21856f50deca8d9eb1757640cb SHA512 714dc201e9a8a45eefa080ee1a45fa66acb2de0cf624e7c6233e7e1745c35ef9e1a8d24236ecf33f440c05c03f09e017c6ff1e077473b22e3abe5d1ff3126989
DIST minitest-5.16.3.gem 93184 BLAKE2B ce3b9f2177a56ab8ff0b61ec4266b67ecfe6e387c57c96eec20db0d7627ac9b73ebebfe148249a1c1c1c9631a63aad8a712b4892a6741a186300afdcd8135a01 SHA512 1463b12842a914df663d0d796bafd418ead038d32c935f3970062492f248f3f4fcf3a5c2f45e2fb71ac13e3b94fca1e6497e7cd7fe9e7050587b7efe2b275453
DIST minitest-5.17.0.gem 93696 BLAKE2B c5979a0d82c4658e4a1584450c899b6a09d99fa145348127902f187e03c6bba73f798fe815186c9ab87a119baa6f3b18acdc1606aa99ec2cf4a1fe548684e93f SHA512 00374b0d0c86d0ec2d285bc4053b6851e1a59e86f7a3ab3db8ccac1db222256edb58514c666763047cec95cf099b1738765a3e9eec9aee3386b187e9fe0f59f9
+DIST minitest-5.18.0.gem 95232 BLAKE2B 5b0f6fb2c304f0d96a6e98c5a4512acbff0a354290e1f2670773f8bdaa8d8b11b8504a15afd03a7bbe89ff1a9478599c2b0b4f0976bf5d52306655581c94ad4d SHA512 309f899b5c5c2573aaf1e84a2225f446e009923b864af8a006eb518f95e758fb6425ec1e5f1790ba8026e041a8fc601551c2f447fa06528399041de119fa2d1a
diff --git a/dev-ruby/minitest/metadata.xml b/dev-ruby/minitest/metadata.xml
index fa2983ac52a7..4116fc8fcb32 100644
--- a/dev-ruby/minitest/metadata.xml
+++ b/dev-ruby/minitest/metadata.xml
@@ -6,6 +6,7 @@
Gentoo Ruby Project
- seattlerb/minitest
+ minitest/minitest
+ minitest
diff --git a/dev-ruby/minitest/minitest-5.17.0.ebuild b/dev-ruby/minitest/minitest-5.17.0.ebuild
index 51749f32b89c..bcbeccce50ef 100644
--- a/dev-ruby/minitest/minitest-5.17.0.ebuild
+++ b/dev-ruby/minitest/minitest-5.17.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_DOCDIR="doc"
RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
diff --git a/dev-ruby/minitest/minitest-5.18.0.ebuild b/dev-ruby/minitest/minitest-5.18.0.ebuild
new file mode 100644
index 000000000000..3c5fd1ffae81
--- /dev/null
+++ b/dev-ruby/minitest/minitest-5.18.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
+HOMEPAGE="https://github.com/minitest/minitest"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+all_ruby_prepare() {
+ # Avoid a test dependency on dev-ruby/hoe, leading to circular dependencies
+ rm -f test/minitest/test_minitest_test_task.rb || die
+}
+
+each_ruby_test() {
+ export -n A
+ MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
diff --git a/dev-ruby/net-ftp/net-ftp-0.2.0.ebuild b/dev-ruby/net-ftp/net-ftp-0.2.0.ebuild
index 08924bfeeb0d..364ca2ed91c4 100644
--- a/dev-ruby/net-ftp/net-ftp-0.2.0.ebuild
+++ b/dev-ruby/net-ftp/net-ftp-0.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_BINWRAP=""
RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/net-ftp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend "
diff --git a/dev-ruby/net-imap/net-imap-0.3.4.ebuild b/dev-ruby/net-imap/net-imap-0.3.4.ebuild
index eaedc9142d36..346494ad130c 100644
--- a/dev-ruby/net-imap/net-imap-0.3.4.ebuild
+++ b/dev-ruby/net-imap/net-imap-0.3.4.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_BINWRAP=""
RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/net-imap/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend "
diff --git a/dev-ruby/net-pop/net-pop-0.1.2.ebuild b/dev-ruby/net-pop/net-pop-0.1.2.ebuild
index 2ba5246c18d7..201d7cd6f0cf 100644
--- a/dev-ruby/net-pop/net-pop-0.1.2.ebuild
+++ b/dev-ruby/net-pop/net-pop-0.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_BINWRAP=""
RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/net-pop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend "
diff --git a/dev-ruby/net-protocol/net-protocol-0.2.1.ebuild b/dev-ruby/net-protocol/net-protocol-0.2.1.ebuild
index 2f0df4b1cbb2..7740246d9f73 100644
--- a/dev-ruby/net-protocol/net-protocol-0.2.1.ebuild
+++ b/dev-ruby/net-protocol/net-protocol-0.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_BINWRAP=""
RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/net-protocol/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend "
diff --git a/dev-ruby/net-smtp/net-smtp-0.3.3.ebuild b/dev-ruby/net-smtp/net-smtp-0.3.3.ebuild
index f181ba494bc1..18fd17b1811b 100644
--- a/dev-ruby/net-smtp/net-smtp-0.3.3.ebuild
+++ b/dev-ruby/net-smtp/net-smtp-0.3.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_BINWRAP=""
RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/net-smtp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend "
diff --git a/dev-ruby/nokogiri/nokogiri-1.14.2-r1.ebuild b/dev-ruby/nokogiri/nokogiri-1.14.2-r1.ebuild
new file mode 100644
index 000000000000..576f9a9b647c
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.14.2-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
+
+RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
+
+inherit ruby-fakegem multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+HOMEPAGE="https://nokogiri.org/"
+LICENSE="MIT"
+SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+ >=dev-libs/libxml2-2.10.3:=
+ >=dev-libs/libxslt-1.1.37
+ sys-libs/zlib
+ virtual/libiconv"
+DEPEND="${DEPEND}
+ >=dev-libs/libxml2-2.10.3
+ >=dev-libs/libxslt-1.1.37
+ >=sys-libs/zlib-1.2.13
+ virtual/libiconv"
+
+ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
+
+ruby_add_bdepend "
+ dev-ruby/mini_portile2:2.8
+ >=dev-ruby/rexical-1.0.7
+ dev-ruby/rdoc
+ test? ( dev-ruby/minitest dev-ruby/rubyzip )"
+
+all_ruby_prepare() {
+ sed -i \
+ -e '/tasks\/cross_compile/s:^:#:' \
+ -e '/:test.*prerequisites/s:^:#:' \
+ -e '/license/ s:^:#:' \
+ Rakefile || die
+ # Remove the cross compilation options since they interfere with
+ # native building.
+ sed -i -e 's/cross_compile = true/cross_compile = false/' Rakefile || die
+ sed -i -e '/cross_config_options/d' Rakefile || die
+
+ sed -e '/simplecov/,/^end/ s:^:#:' \
+ -e '/reporters/I s:^:#:' \
+ -i test/helper.rb || die
+
+ # There is no need for mini_portile2 to be a runtime dependency on Gentoo
+ sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+ NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+ ${RUBY} -Cext/${PN} extconf.rb \
+ --with-zlib-include="${EPREFIX}"/usr/include \
+ --with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+ --with-iconv-include="${EPREFIX}"/usr/include \
+ --with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+ --with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+ --with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+ --with-xslt-dir="${EPREFIX}"/usr \
+ --with-iconvlib=iconv \
+ || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+ if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+ ${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+ fi
+
+ if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+ ${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+ fi
+
+ emake -Cext/${PN} \
+ V=1 \
+ CFLAGS="${CFLAGS} -fPIC" \
+ archflag="${LDFLAGS}" || die "make extension failed"
+ cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_test() {
+ ${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/power_assert/power_assert-2.0.3.ebuild b/dev-ruby/power_assert/power_assert-2.0.3.ebuild
index cd8b052576ad..1df0d3746bef 100644
--- a/dev-ruby/power_assert/power_assert-2.0.3.ebuild
+++ b/dev-ruby/power_assert/power_assert-2.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/prime/prime-0.1.2-r1.ebuild b/dev-ruby/prime/prime-0.1.2-r1.ebuild
index c3ae370514da..232551f4a7bc 100644
--- a/dev-ruby/prime/prime-0.1.2-r1.ebuild
+++ b/dev-ruby/prime/prime-0.1.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_BINWRAP=""
RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/prime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend "
diff --git a/dev-ruby/propshaft/Manifest b/dev-ruby/propshaft/Manifest
index a8b03693e954..efd6211c09ed 100644
--- a/dev-ruby/propshaft/Manifest
+++ b/dev-ruby/propshaft/Manifest
@@ -1,2 +1,3 @@
DIST propshaft-0.6.1-git.tgz 245087 BLAKE2B 6e04ebc0315c263f79dbfc9f836b270b8b693e1a7e332a97d8abe5cc6555d0acc9efe3ae7979c901ca2c502460e8ee67b83420863d5dabdf50fbc2028aacd5b9 SHA512 35600b7e051810c7f0798f29faab7c7bcabf04198fc56ee9a4492d18ddfabf543cfbf11c28f35eb5e2a64eb57c65b95567e00441852ac0f29d8538ad8d5cb1b4
DIST propshaft-0.6.4-git.tgz 245384 BLAKE2B 8089c7ee8f8d41f761a31bcd4751899da86302cdf7e1d5a9ba673e8a64431b0e35bbfa7d09fb0caa5ca06457b7134f27c3f37ade213922d616b374adac9824c5 SHA512 3302e1a0ef4bd47094566b393db77f1181e3e3b67c08b18694cea48b4518a45893dc16238ce1d86965d0b37894069ddbe7040392e7cdcad5caa80d7ff86bf2eb
+DIST propshaft-0.7.0-git.tgz 247111 BLAKE2B aecf4dcab9b57f1933e8f7066f4b229348cf60e4104cc82e14edb945e797a263012fe5b7b65de8ff0165e652256a0bd8fba24af8f08d8e9391050e36e56d5f31 SHA512 3d6dba7a3b5b522f3e4a9f43dc6b9981fbb475374be0b90c8abb2f19c587d025b58876ddb6a9e1b9992e3f357a96b50b6138173d10b8ae131e9457309b8cc0c9
diff --git a/dev-ruby/propshaft/propshaft-0.7.0.ebuild b/dev-ruby/propshaft/propshaft-0.7.0.ebuild
new file mode 100644
index 000000000000..6f3faa84c6cc
--- /dev/null
+++ b/dev-ruby/propshaft/propshaft-0.7.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="propshaft.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Deliver assets for Rails"
+HOMEPAGE="https://github.com/rails/propshaft"
+SRC_URI="https://github.com/rails/propshaft/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~ppc64 ~riscv"
+
+IUSE=""
+
+ruby_add_rdepend "
+ >=dev-ruby/actionpack-7.0.0:*
+ >=dev-ruby/activesupport-7.0.0:*
+ dev-ruby/rack:*
+ >=dev-ruby/railties-7.0.0:*
+"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rails-7.0.0 )"
+
+all_ruby_prepare() {
+ rm -f Gemfile.lock || die
+ sed -i -e '/debug/ s:^:#:' Gemfile || die
+
+ sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/psych/psych-5.1.0.ebuild b/dev-ruby/psych/psych-5.1.0.ebuild
index 4f5a5a2581c2..85a15bf9e98b 100644
--- a/dev-ruby/psych/psych-5.1.0.ebuild
+++ b/dev-ruby/psych/psych-5.1.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_BINWRAP=""
RUBY_FAKEGEM_EXTENSIONS=(ext/psych/extconf.rb)
diff --git a/dev-ruby/racc/racc-1.6.2.ebuild b/dev-ruby/racc/racc-1.6.2.ebuild
index 597b346fd30d..af3efbac439c 100644
--- a/dev-ruby/racc/racc-1.6.2.ebuild
+++ b/dev-ruby/racc/racc-1.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_RECIPE_DOC="none"
RUBY_FAKEGEM_EXTRADOC="README.rdoc README.ja.rdoc TODO ChangeLog"
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index c117a5b8af0e..6bfb3f03194c 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,2 +1,4 @@
DIST rack-2.2.6.2.tar.gz 278839 BLAKE2B 30cb5607bba97ef3a6a20f917b82c46de734cd0c248ae20bf3af266814e32250cf6cd77aea49de28a24651335cdc888385968cb4b9937843ffd99cad2283e896 SHA512 73202990bad9e34da84c45f70c71c45bd6291960d58a04ee4b013835d5c5a8a066f36d31275913744a63cb9836c5071bb237b7f613a717794f49236c195107a8
+DIST rack-2.2.6.3.tar.gz 279185 BLAKE2B 4757add4f591a5e9baca2db060736f1369b04be547a834360a5d84d210db2c550febf654eb6ee9878e38d802227b94e7ae2c38bfe4c5fa045582d905ade61c4a SHA512 e69de4dcbb97c9481ce55e3d1c43c7b1393314d2c42fbd7660abb939b74453ea77a4bf1eaaab2a7c9ac2cca46fc3ebff40eb5cd91b6567f50e3a05e2d40dac24
DIST rack-3.0.4.1.tar.gz 787073 BLAKE2B 532bd36dcb521da8387d464dca0983417a9a89a4d365e5652894003e38ffdf5939a903510be73aaf607c6a695909058aaef311967e6d66c525b26af3ea4c5e82 SHA512 6cfb35d78901fdb5e7b4571eb6b37b035014cfea705aeff280a73930793e53cd6d2d9b51ae86803567884b5509af358c95687eecc222a5df61dc80d0ada019af
+DIST rack-3.0.4.2.tar.gz 788276 BLAKE2B 9934c4e448ee09c9a910ef8259957737e4d213d7ae5b37380b87441eb00845f2793e23fa16da26a5fe441e8449a95a5893cc52a019087402e7cae7559a2f6fd5 SHA512 9cd2c9bcf41a6203e72b63fbd0e78f4a0f461751e45e643f40a4f823f3922b05fc0caaa10fe79885cd8fa48948e79e0ccd5727f9abeca2a4052a737d4632e76e
diff --git a/dev-ruby/rack/rack-2.2.6.3.ebuild b/dev-ruby/rack/rack-2.2.6.3.ebuild
new file mode 100644
index 000000000000..69ed3f130c1e
--- /dev/null
+++ b/dev-ruby/rack/rack-2.2.6.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="https://github.com/rack/rack"
+SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "test? (
+ dev-ruby/minitest:5
+ dev-ruby/minitest-global_expectations
+ dev-ruby/concurrent-ruby
+ =dev-ruby/psych-4*
+ dev-ruby/webrick
+)"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all.
+
+# Block against versions in older slots that also try to install a binary.
+RDEPEND="${RDEPEND} !!
-
- ruby@gentoo.org
- Gentoo Ruby Project
-
+
+ ruby@gentoo.org
+ Gentoo Ruby Project
+
+
+ ruby/ruby2_keywords
+ ruby2_keywords
+
diff --git a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5-r1.ebuild b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5-r1.ebuild
new file mode 100644
index 000000000000..f3f49755d9c2
--- /dev/null
+++ b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Shim library for Module#ruby2_keywords"
+HOMEPAGE="https://github.com/ruby/ruby2_keywords"
+
+LICENSE="|| ( BSD-2 Ruby-BSD )"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 93e5b5015ebe..724c4d477cec 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -6,3 +6,4 @@ DIST rubygems-3.3.26.tar.gz 12995476 BLAKE2B c06400d263f64ee988781b49628eebde2b7
DIST rubygems-3.3.8.tar.gz 12928096 BLAKE2B f09f7da32db03b9240515cbc114b94fdec0e7d9da6c4ac1ca297f76989be154da3dd6dbf4701e295d01dac957fbd4429ea39eee3ee66bc4fb6d4e6194ccec96a SHA512 bc5719204ac81d9a70df0c8affd99c6e45835f3aa140c9d262d34bee879a7b932a0b5069453e949054e9f3feeab7d376f1a02e1aeaed167b30bf59fe57d0af40
DIST rubygems-3.4.1.tar.gz 12999634 BLAKE2B 019364e3abd3b12f2a37b08a8d32546cd002c47653a4cdd4e06d8605010dcfcbf3f82f2d375c6bd51a8f1b462b624cefb85932c075b965d5038c26d6079de261 SHA512 2183f7d6ab914c47c02b53cafa6f39845986e4b38713d320402b98f0f0926dbbd957ef11c00b4fbe8f6c9985a1a5d9f551b2df9d47f00c389026e373dbd6f6ed
DIST rubygems-3.4.3.tar.gz 15002575 BLAKE2B be8dfb7233754e0ef9147eab1c64d363c38de5a6c296087a193b801c9fa1a12d2a21d7b3b01360f53a30caa6815b3bcdf3d14ecd19ac19dfd2e88115526b5a97 SHA512 7f3907b6ab8f001bd856c2b25b71c5ec32b21b2b5fa16ba369e3108c44698712ac3f5ace430554a4b15dc0adef2d87fa41bffa03dcd01f524fe8bbd80de9807b
+DIST rubygems-3.4.6.tar.gz 15011157 BLAKE2B a06178a1d5dbd8231493dce9d075451062edaa6b4affee6892d60c727e30ef4b7ff7933baf4ae49fedaa684f9898325ed1313648dac318bd62e9c733de374926 SHA512 d1c23b534f2254ff4dec564098f7eba83462eb9348da59a84de01fc4053ef3be02b2852af4542447de89a36d835f68634606040672d2a2f987c5670b9f373fe9
diff --git a/dev-ruby/rubygems/rubygems-3.4.6.ebuild b/dev-ruby/rubygems/rubygems-3.4.6.ebuild
new file mode 100644
index 000000000000..5b072395c248
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.4.6.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/json
+ dev-ruby/minitest:5
+ dev-ruby/rake
+ dev-ruby/rdoc
+ dev-ruby/webrick
+ )"
+
+all_ruby_prepare() {
+ # Remove unpackaged automatiek from Rakefile which stops it from working
+ sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
+
+ mkdir -p lib/rubygems/defaults || die
+ cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die
+
+ eprefixify lib/rubygems/defaults/operating_system.rb
+
+ # Disable broken tests when changing default values:
+ sed -i -e '/test_default_path/,/^ end/ s:^:#:' test/rubygems/test_gem.rb || die
+ sed -i -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' test/rubygems/test_gem_path_support.rb || die
+ # Avoid test that won't work as json is also installed as plain ruby code
+ sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die
+
+ # Avoid test that requires additional utility scripts
+ rm -f test/test_changelog_generator.rb || die
+
+ # Avoid tests that require a network connection (for crates.io)
+ rm -f test/rubygems/test_gem_ext_cargo_builder.rb || die
+
+ # Update manifest after changing files to avoid a test failure
+ if use test; then
+ rake update_manifest || die
+ fi
+}
+
+each_ruby_compile() {
+ # Not really a build but...
+ sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+ # Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+ #unset RUBYOPT
+
+ if [[ "${EUID}" -ne "0" ]]; then
+ RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+ -e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+ else
+ ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+ eerror "Testsuite will not be run."
+ fi
+}
+
+each_ruby_install() {
+ # Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+ unset RUBYOPT
+ export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+ pushd lib &>/dev/null
+ doruby -r *
+ popd &>/dev/null
+
+ local sld=$(ruby_rbconfig_value 'sitelibdir')
+ insinto "${sld#${EPREFIX}}" # bug #320813
+ newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+ newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+ dodoc CHANGELOG.md README.md
+
+ if use server; then
+ newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+ newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+ fi
+}
+
+pkg_postinst() {
+ if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+ eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+ fi
+
+ ewarn
+ ewarn "To switch between available Ruby profiles, execute as root:"
+ ewarn "\teselect ruby set ruby(25|26|...)"
+ ewarn
+}
diff --git a/dev-ruby/rubyzip/rubyzip-2.3.2-r1.ebuild b/dev-ruby/rubyzip/rubyzip-2.3.2-r1.ebuild
index 57ea97dbc291..c17c6782df47 100644
--- a/dev-ruby/rubyzip/rubyzip-2.3.2-r1.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-2.3.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_RECIPE_DOC="none"
RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md TODO"
diff --git a/dev-ruby/singleton/singleton-0.1.1.ebuild b/dev-ruby/singleton/singleton-0.1.1.ebuild
index cabbd7428cfa..880206c38d3b 100644
--- a/dev-ruby/singleton/singleton-0.1.1.ebuild
+++ b/dev-ruby/singleton/singleton-0.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_BINWRAP=""
RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/singleton/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/stringex/stringex-2.8.5-r2.ebuild b/dev-ruby/stringex/stringex-2.8.5-r2.ebuild
index aa996951c12b..8a1bc01b272d 100644
--- a/dev-ruby/stringex/stringex-2.8.5-r2.ebuild
+++ b/dev-ruby/stringex/stringex-2.8.5-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
inherit ruby-fakegem
diff --git a/dev-ruby/stringio/stringio-3.0.5.ebuild b/dev-ruby/stringio/stringio-3.0.5.ebuild
index b4432a6573c3..dce6f14bfb76 100644
--- a/dev-ruby/stringio/stringio-3.0.5.ebuild
+++ b/dev-ruby/stringio/stringio-3.0.5.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_EXTRADOC="README.md"
RUBY_FAKEGEM_EXTENSIONS=(ext/stringio/extconf.rb)
diff --git a/dev-ruby/strscan/strscan-3.0.6.ebuild b/dev-ruby/strscan/strscan-3.0.6.ebuild
index 5a0a7391432b..3a8741562659 100644
--- a/dev-ruby/strscan/strscan-3.0.6.ebuild
+++ b/dev-ruby/strscan/strscan-3.0.6.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/ruby/strscan"
SRC_URI="https://github.com/ruby/strscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="$(ver_cut 1)"
IUSE=""
diff --git a/dev-ruby/syntax/syntax-1.2.2.ebuild b/dev-ruby/syntax/syntax-1.2.2.ebuild
index 2b4a73dbc719..b22e4c3bc86c 100644
--- a/dev-ruby/syntax/syntax-1.2.2.ebuild
+++ b/dev-ruby/syntax/syntax-1.2.2.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
diff --git a/dev-ruby/test-unit/test-unit-3.5.7.ebuild b/dev-ruby/test-unit/test-unit-3.5.7.ebuild
index 1158489b93c2..8bce777f6e24 100644
--- a/dev-ruby/test-unit/test-unit-3.5.7.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.5.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_EXTRADOC="README.md doc-install/text/*.md"
diff --git a/dev-ruby/time/time-0.2.1.ebuild b/dev-ruby/time/time-0.2.1.ebuild
index 757f9b81ec81..3a2b095d7815 100644
--- a/dev-ruby/time/time-0.2.1.ebuild
+++ b/dev-ruby/time/time-0.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_BINWRAP=""
RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/time/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend "dev-ruby/date"
diff --git a/dev-ruby/timeout/timeout-0.3.1.ebuild b/dev-ruby/timeout/timeout-0.3.1.ebuild
index 8b2a780e6031..ea1f03d24422 100644
--- a/dev-ruby/timeout/timeout-0.3.1.ebuild
+++ b/dev-ruby/timeout/timeout-0.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_BINWRAP=""
RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/timeout/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/typeprof/typeprof-0.21.4.ebuild b/dev-ruby/typeprof/typeprof-0.21.4.ebuild
index f5fc0c182ca3..ed9dc0c2977c 100644
--- a/dev-ruby/typeprof/typeprof-0.21.4.ebuild
+++ b/dev-ruby/typeprof/typeprof-0.21.4.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_RECIPE_DOC="none"
RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/webrick/webrick-1.8.1.ebuild b/dev-ruby/webrick/webrick-1.8.1.ebuild
index 968dc189a545..5a8e1b8cf170 100644
--- a/dev-ruby/webrick/webrick-1.8.1.ebuild
+++ b/dev-ruby/webrick/webrick-1.8.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
RUBY_FAKEGEM_BINWRAP=""
RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index ca03430b2029..3e9ee791a640 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/guile-libyaml/guile-libyaml-20211124.ebuild b/dev-scheme/guile-libyaml/guile-libyaml-20211124.ebuild
index 36fd680e32a4..9a9d84dc8e24 100644
--- a/dev-scheme/guile-libyaml/guile-libyaml-20211124.ebuild
+++ b/dev-scheme/guile-libyaml/guile-libyaml-20211124.ebuild
@@ -1,14 +1,15 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-H=2bdacb72a65ab63264b2edc9dac9692df7ec9b3e
+[[ ${PV} == 20211124 ]] && COMMIT=2bdacb72a65ab63264b2edc9dac9692df7ec9b3e
DESCRIPTION="Simple yaml module for Guile using the ffi-helper from nyacc"
HOMEPAGE="https://github.com/mwette/guile-libyaml/"
-SRC_URI="https://github.com/mwette/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${H}"
+SRC_URI="https://github.com/mwette/${PN}/archive/${COMMIT}.tar.gz
+ -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COMMIT}
LICENSE="LGPL-3+"
SLOT="0"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a0f8f5782a70..4ebc1fb0bf73 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/android-udev-rules/Manifest b/dev-util/android-udev-rules/Manifest
index cf87be6e22f2..ef95cd8a2039 100644
--- a/dev-util/android-udev-rules/Manifest
+++ b/dev-util/android-udev-rules/Manifest
@@ -1,2 +1,3 @@
DIST android-udev-rules-20220903.tar.gz 21009 BLAKE2B 4f0375b574f123e7cbd18658582568f85e3278e9fe2b673e6c9193a16845737afc99d82d0df2f6a8d0daf784132e7d523bdf767761a5d467a66bf89f86cc1046 SHA512 ca09a1b49b6cbc7df2b8c6bea1e6fcf4886938c8567002054222795493bea036e3c5a139939e43cb965d45a8ecf74c0715583ef1aade2b7783751a75ab34d540
DIST android-udev-rules-20230104.tar.gz 21266 BLAKE2B bbae83511b1fa5e94a50ae3cc44920862de30873304c0a904b4f9d3796296deff419c05db5d716cc89587c3a7ae7a302b2b219564e452564c5f3bf092e7515af SHA512 dcc45755a5a20a74d2241b398dba0e65135bf9c5539396bd6a3415b15fd865f4d3134de53de1ae2019ffe9567c557b5a386fdfe0245107b29c234a2211e0a211
+DIST android-udev-rules-20230303.tar.gz 21458 BLAKE2B 6e9299d516fb6e69db526db0626f75580e2fcb5ebe798528a00f0fafb7f309f2b460b8f4ba7f1d4e17c08805e208272c1a06f773a4d2fe12fb64e7d84bfef6da SHA512 744aab41f3506281203ae8571d6c5d6b48b187df30df9fbbbf47b123a64dfe039f18b7f5b0e8632a2799d2f0f0b08a4975106dec2a24c7f8390dd60c0581c18b
diff --git a/dev-util/android-udev-rules/android-udev-rules-20230303.ebuild b/dev-util/android-udev-rules/android-udev-rules-20230303.ebuild
new file mode 100644
index 000000000000..62f49b941ae8
--- /dev/null
+++ b/dev-util/android-udev-rules/android-udev-rules-20230303.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit udev
+
+DESCRIPTION="Android udev rules list aimed to be the most comprehensive on the net"
+HOMEPAGE="https://github.com/M0Rf30/android-udev-rules"
+SRC_URI="https://github.com/M0Rf30/android-udev-rules/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# No tests
+RESTRICT="test"
+
+RDEPEND="
+ acct-group/android
+ virtual/udev
+"
+
+src_prepare() {
+ default
+
+ # Use the pre-existing android group
+ sed -i 's/GROUP="adbusers"/GROUP="android"/' 51-android.rules || die
+}
+
+src_install() {
+ udev_dorules 51-android.rules
+ einstalldocs
+}
+
+pkg_postinst() {
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 6379bf4e6bb6..5ade2d90604f 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,7 +1,5 @@
DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
-DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
-DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
+DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
DIST patch-5.19.12.xz 828424 BLAKE2B fa5c2a42443179dd36ee62b6b14415b261ff528296d8cf6c335012baf1408ab8b981236b247da2f8d0a68ecef5e8bc65b6e77bd8800ef1962b258fdf3f692ac1 SHA512 40ec4228cfac91607a645971ebd85e8b85d20c4d93d5fbe3fbecf87d51958c44ff218f931a1bd8f80157e66d3c956a5391cd9aef027098003b6724a6bc49b8bc
-DIST patch-6.0.12.xz 635356 BLAKE2B f7407d0f95ee70e7cbb80139e61b68d2da5467a95a3d4a3c9c434616f2c6420beea483b115c60ce645d4ba586188d8beb8a82ddb32de09816d6773ba89bc21aa SHA512 d604975d02735d6ba8f98268d418397d78bf49d129aabd326599196708bf05795b17d22398ddd0229bc2944f7b152902e9638ff9aa04977c46a229566894dd00
-DIST patch-6.1.7.xz 533812 BLAKE2B b08005dfaa1247378fa2b3d1955537bcbbc6ee8c9171552e27ce51716c4c414e6b442d6ee33344431275e6b0140f315a5ea986977d102b298bb7651e5dbbbcef SHA512 e824cca5bb1e98439b152b15674292f042a5df8567ba2439a111af58084277ff800df6b326d6ecf0e3ee325d5ab2d2ddddd9dc31db7a0176828f1690bd855b2a
+DIST patch-6.2.1.xz 5688 BLAKE2B 383ad7820e2b581b35c7b33e272782c1ea9588e050b2e306b7a31e82984c49f6da55dd10908c6c2d5cf0b524a7cfacc08b3ce0279e4ccd96286463ae28cb5e90 SHA512 e5777e2cb124ba5899c330135b25aaa4d612fed4af2230214c2311fe6ca03825e9c3f9be7ed84ac3712db6a4aad4fed43e88cbbf3d7b33d8d98000cba78f9085
DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b
diff --git a/dev-util/bpftool/bpftool-6.1.7.ebuild b/dev-util/bpftool/bpftool-6.1.7.ebuild
deleted file mode 100644
index 4f68a43259e9..000000000000
--- a/dev-util/bpftool/bpftool-6.1.7.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit estack linux-info optfeature python-any-r1 bash-completion-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and maps"
-HOMEPAGE="https://kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="caps"
-
-RDEPEND="
- sys-libs/binutils-libs:=
- sys-libs/zlib:=
- virtual/libelf:=
- caps? ( sys-libs/libcap:= )
-"
-DEPEND="
- ${RDEPEND}
- >=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
- ${LINUX_PATCH+dev-util/patchutils}
- ${PYTHON_DEPS}
- app-arch/tar
- dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
- local paths=(
- tools/bpf kernel/bpf
- tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib"
- )
-
- # We expect the tar implementation to support the -j and --wildcards option
- echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
- gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
- "${paths[@]/#/linux-${LINUX_VER}/}" || die
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- eshopts_push -o noglob
- ebegin "Filtering partial source patch"
- filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
- > ${P}.patch
- eend $? || die "filterdiff failed"
- eshopts_pop
- fi
-
- local a
- for a in ${A}; do
- [[ ${a} == ${LINUX_SOURCES} ]] && continue
- [[ ${a} == ${LINUX_PATCH} ]] && continue
- unpack ${a}
- done
-}
-
-src_prepare() {
- default
-
- if [[ -n ${LINUX_PATCH} ]] ; then
- pushd "${S_K}" >/dev/null || die
- eapply "${WORKDIR}"/${P}.patch
- popd || die
- fi
-
- pushd "${S_K}" >/dev/null || die
- # bug #890638
- eapply "${FILESDIR}"/5.19.12-no-stack-protector.patch
- popd || die
-
- # dev-python/docutils installs rst2man.py, not rst2man
- sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
-}
-
-bpftool_make() {
- local arch=$(tc-arch-kernel)
- tc-export AR CC LD
-
- emake V=1 VF=1 \
- HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
- EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \
- prefix="${EPREFIX}"/usr \
- bash_compdir="$(get_bashcompdir)" \
- feature-libcap="$(usex caps 1 0)" \
- "$@"
-}
-
-src_compile() {
- bpftool_make
- bpftool_make -C Documentation
-}
-
-src_install() {
- bpftool_make DESTDIR="${D}" install
- bpftool_make mandir="${ED}"/usr/share/man -C Documentation install
-}
-
-pkg_postinst() {
- optfeature "clang-bpf-co-re support" sys-devel/clang[llvm_targets_BPF]
-}
diff --git a/dev-util/bpftool/bpftool-6.0.12.ebuild b/dev-util/bpftool/bpftool-6.2.1.ebuild
similarity index 97%
rename from dev-util/bpftool/bpftool-6.0.12.ebuild
rename to dev-util/bpftool/bpftool-6.2.1.ebuild
index 4f68a43259e9..5e04ebcc3cf1 100644
--- a/dev-util/bpftool/bpftool-6.0.12.ebuild
+++ b/dev-util/bpftool/bpftool-6.2.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit estack linux-info optfeature python-any-r1 bash-completion-r1 toolchain-funcs
MY_PV="${PV/_/-}"
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
IUSE="caps"
RDEPEND="
diff --git a/dev-util/ccls/ccls-0.20220729-r1.ebuild b/dev-util/ccls/ccls-0.20220729-r1.ebuild
index e78d353ba345..f0ee79d37078 100644
--- a/dev-util/ccls/ccls-0.20220729-r1.ebuild
+++ b/dev-util/ccls/ccls-0.20220729-r1.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == *9999 ]] ; then
SRC_URI=""
else
SRC_URI="https://github.com/MaskRay/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~riscv"
+ KEYWORDS="amd64 ~riscv"
fi
LICENSE="Apache-2.0"
diff --git a/dev-util/cwdiff/metadata.xml b/dev-util/cwdiff/metadata.xml
index c212872b9af4..f4c293a02a6f 100644
--- a/dev-util/cwdiff/metadata.xml
+++ b/dev-util/cwdiff/metadata.xml
@@ -1,10 +1,7 @@
-
- junghans@gentoo.org
- Christoph Junghans
-
+
diff --git a/dev-util/dialog/dialog-1.3.20221229.ebuild b/dev-util/dialog/dialog-1.3.20221229.ebuild
index 63fd246dc1a7..ccb366c584ce 100644
--- a/dev-util/dialog/dialog-1.3.20221229.ebuild
+++ b/dev-util/dialog/dialog-1.3.20221229.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="LGPL-2.1"
SLOT="0/15"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="examples minimal nls unicode"
RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode(+)?]"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index e2486b1d6c87..8118a8cca231 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,2 @@
DIST diffoscope-229.tar.gz 3164192 BLAKE2B bee9fa1561ddcfde98cfa44cd6d66a28c636dbc7f3ec1f4895e91dfd3b66c039b68d53be0528b94c112552069886c3c81de4d9b9bc9038d183afdc9fdde6ddb9 SHA512 825c9c33f3088ba082ea3b998594445987558ee62b8b1fbfcded9b72a739faaa73908f8753b8772b3b1a8a43dbcfd52978265a18bdd92605defcd174884ccb23
-DIST diffoscope-235.tar.gz 3184698 BLAKE2B b6d99ea660668208dc82fccec64ffd84f8c83c86216afa9c03ae6d5bc37d759ba3a62e861b80ef87ab4101aac49afd6915a786ea9775f615f854776dea298ca5 SHA512 e11da6a6a6e8a5ec58c4dbae16383a451770a4b24d6915e5b030452fe350b041e45d97846d2dbf90bfaaea6d16f783efb6654a722701ecf9749da1652fa60f2f
-DIST diffoscope-236.tar.gz 3184697 BLAKE2B 0ad94bb913dcb30f53740a79000a049372749d141dc0ad05959ac9d5908b41c7e69c6ca2f6ae48505114a63e333d9c514dd6a6008c7b20f4b0375a8ce4baa950 SHA512 022e4833e162b5e757ac54109a5b1fe33bfb02f88a01edaea31e3caddb26c13f75c996d3153ca24de8a48de34e692e22ee7c9c5b58e79ed1a3f7a9e8f8999f51
+DIST diffoscope-238.tar.gz 3287285 BLAKE2B d745c0b279ce6e29cbe9c6655c48d2fb4c8d230c5d4931048be83b4d97f6b45bff5424409b559988c2efba2dcbb80778c97e3f726174ae154c479ec24b557c34 SHA512 8600a3a29f7d4a80f0a0b37e6277e46e377c6f056cf111356f80723f0e4a309e9bae087643019fe1c46f99430b35389083e1156911fa8d3375993b550342b25f
diff --git a/dev-util/diffoscope/diffoscope-235.ebuild b/dev-util/diffoscope/diffoscope-235.ebuild
deleted file mode 100644
index a69e36d1c939..000000000000
--- a/dev-util/diffoscope/diffoscope-235.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar test tcpdump zip zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-python/python-magic[${PYTHON_USEDEP}]
- dev-python/libarchive-c[${PYTHON_USEDEP}]
- dev-python/distro[${PYTHON_USEDEP}]
- dev-python/tlsh[${PYTHON_USEDEP}]
- acl? ( sys-apps/acl )
- binutils? ( sys-devel/binutils )
- bzip2? ( app-arch/bzip2 )
- libcaca? ( media-libs/libcaca )
- colord? ( x11-misc/colord )
- cpio? ( app-arch/cpio )
- diff? ( sys-apps/diffutils )
- docx? ( app-text/docx2txt )
- dtc? ( sys-apps/dtc )
- e2fsprogs? ( sys-fs/e2fsprogs )
- file? ( sys-apps/file )
- find? ( sys-apps/findutils )
- gettext? ( sys-devel/gettext )
- gif? ( media-libs/giflib )
- gpg? ( app-crypt/gnupg )
- haskell? ( dev-lang/ghc )
- hdf5? ( sci-libs/hdf5 )
- hex? ( app-editors/vim-core )
- imagemagick? ( media-gfx/imagemagick )
- iso? ( app-cdr/cdrtools )
- java? ( virtual/jdk )
- llvm? ( sys-devel/llvm )
- lzma? ( app-arch/xz-utils )
- mono? ( dev-lang/mono )
- opendocument? ( app-text/odt2txt )
- pascal? ( dev-lang/fpc )
- pdf? (
- app-text/pdftk
- app-text/poppler
- dev-python/pypdf[${PYTHON_USEDEP}]
- )
- postscript? ( app-text/ghostscript-gpl )
- R? ( dev-lang/R )
- rpm? ( app-arch/rpm )
- sqlite? ( dev-db/sqlite:3 )
- squashfs? ( sys-fs/squashfs-tools )
- ssh? ( net-misc/openssh )
- tar? ( app-arch/tar )
- tcpdump? ( net-analyzer/tcpdump )
- zip? ( app-arch/unzip )
- zlib? ( app-arch/gzip )
- zstd? ( app-arch/zstd )
-"
-# Presence of filemagic's magic.py breaks imports
-# of dev-python/python-magic: bug #716482
-RDEPEND+=" !dev-python/filemagic"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="
- test? (
- app-text/docx2txt
- app-text/html2text
- media-libs/libcaca
- virtual/imagemagick-tools[jpeg]
- )
-"
-
-EPYTEST_DESELECT=(
- # Test seems to use different tarball
- tests/test_presenters.py::test_text_proper_indentation
-
- # Needs triage
- tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
- tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
- tests/comparators/test_gif.py::test_has_visuals
-
- # img2txt based failures, bug #797688
- tests/comparators/test_ico_image.py::test_diff
- tests/comparators/test_ico_image.py::test_diff_meta
- tests/comparators/test_ico_image.py::test_diff_meta2
- tests/comparators/test_ico_image.py::test_has_visuals
- tests/comparators/test_jpeg_image.py::test_diff
- tests/comparators/test_jpeg_image.py::test_compare_non_existing
- tests/comparators/test_jpeg_image.py::test_diff_meta
- tests/comparators/test_jpeg_image.py::test_has_visuals
-
- # docx2txt based falures, bug #797688
- tests/comparators/test_docx.py::test_diff
-
- # Formatting
- tests/test_source.py::test_code_is_black_clean
-
- # Fails on ZFS
- tests/test_main.py::test_non_unicode_filename
-
- # Fails on (unreleased) LLVM 16 with minor difference
- tests/comparators/test_macho.py::test_llvm_diff
-)
-
-distutils_enable_tests pytest
diff --git a/dev-util/diffoscope/diffoscope-236.ebuild b/dev-util/diffoscope/diffoscope-238.ebuild
similarity index 97%
rename from dev-util/diffoscope/diffoscope-236.ebuild
rename to dev-util/diffoscope/diffoscope-238.ebuild
index fe066857da4a..f64abaa19dac 100644
--- a/dev-util/diffoscope/diffoscope-236.ebuild
+++ b/dev-util/diffoscope/diffoscope-238.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
mono opendocument pascal pdf postscript R rpm sqlite squashfs
@@ -114,6 +114,7 @@ EPYTEST_DESELECT=(
# Fails on (unreleased) LLVM 16 with minor difference
tests/comparators/test_macho.py::test_llvm_diff
+ tests/comparators/test_elf.py::test_libmix_differences
)
distutils_enable_tests pytest
diff --git a/dev-util/fuzz/fuzz-0.6-r2.ebuild b/dev-util/fuzz/fuzz-0.6-r3.ebuild
similarity index 78%
rename from dev-util/fuzz/fuzz-0.6-r2.ebuild
rename to dev-util/fuzz/fuzz-0.6-r3.ebuild
index 92ef90211b32..a0ae9281e5d1 100644
--- a/dev-util/fuzz/fuzz-0.6-r2.ebuild
+++ b/dev-util/fuzz/fuzz-0.6-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
DESCRIPTION="Stress-tests programs by giving them random input"
HOMEPAGE="http://fuzz.sourceforge.net/"
@@ -11,13 +11,14 @@ DEB_P="${PN}_${PV}"
DEB_PR="7.3"
SRC_URI="
mirror://sourceforge/${PN}/${P}.tar.gz
- mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}-${DEB_PR}.diff.gz"
+ mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}-${DEB_PR}.diff.gz
+"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-DEPEND="sys-libs/readline:0="
+DEPEND="sys-libs/readline:="
RDEPEND="${DEPEND}"
PATCHES=( "${WORKDIR}"/${DEB_P}-${DEB_PR}.diff )
@@ -25,6 +26,8 @@ PATCHES=( "${WORKDIR}"/${DEB_P}-${DEB_PR}.diff )
src_prepare() {
default
tc-export CC
+ # Clang 16, bug #898764
+ eautoreconf
}
src_install() {
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 746769091ad3..ec6d88290cbc 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,2 +1 @@
-DIST glslang-1.3.236.tar.gz 3659402 BLAKE2B 7ee37cf00e5d9bd821253d7c907d29422410cf6809f7ec09551b1d0b08e53924add24595a52b241017b69890037ea91660be1ea5645e18cb1e0bba80ad224a5b SHA512 4758b137a31bc6ef999c6b00f4d4a55c0edc879eb09082acbc22a56549a53e61ee5a67e705a40f679f2e25f3a5f1245c14a880e646febc5270e8374809debcb3
DIST glslang-1.3.239.tar.gz 3683945 BLAKE2B ffc690522814d7a28bea7168744d390a5a1c7e34e67f2037c72b2a040c8c48fbb9d46f37d74ea58b2bcf7621b0008498a9dd592da08e9e93037e3f45c5b920d6 SHA512 a7cd35c76dc4f3a4f2f1015e7495b87313472d7c766075256c0d2d0004f395f62d38d715675b49f13f66a12645175c421af4622129aeb588528397e92f51790b
diff --git a/dev-util/glslang/glslang-1.3.236.ebuild b/dev-util/glslang/glslang-1.3.236.ebuild
deleted file mode 100644
index 85c685266e96..000000000000
--- a/dev-util/glslang/glslang-1.3.236.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
- inherit git-r3
-else
- SNAPSHOT_COMMIT="sdk-${PV}.0"
- SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
- S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
-fi
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
-
-PATCHES=( "${FILESDIR}/${P}-Install-static-libs.patch" )
-
-LICENSE="BSD"
-SLOT="0/1"
-
-BDEPEND="${PYTHON_DEPS}"
-
-# Bug 698850
-RESTRICT="test"
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DENABLE_PCH=OFF
- )
- cmake_src_configure
-}
diff --git a/dev-util/glslang/glslang-1.3.239.ebuild b/dev-util/glslang/glslang-1.3.239.ebuild
index d5d99ff7cace..9a03e6499202 100644
--- a/dev-util/glslang/glslang-1.3.239.ebuild
+++ b/dev-util/glslang/glslang-1.3.239.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
else
SNAPSHOT_COMMIT="sdk-${PV}.0"
SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+ KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
fi
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index f60583ac2e4c..1edea9832f73 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -4,4 +4,5 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/dev-util/lldb/lldb-17.0.0_pre20230304.ebuild b/dev-util/lldb/lldb-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..1d8c4b56e83c
--- /dev/null
+++ b/dev-util/lldb/lldb-17.0.0_pre20230304.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org python-single-r1
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${LLVM_SOABI}"
+KEYWORDS=""
+IUSE="debug +libedit lzma ncurses +python test +xml"
+RESTRICT="test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+ libedit? ( dev-libs/libedit:0= )
+ lzma? ( app-arch/xz-utils:= )
+ ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+ xml? ( dev-libs/libxml2:= )
+ ~sys-devel/clang-${PV}
+ ~sys-devel/llvm-${PV}
+"
+RDEPEND="
+ ${DEPEND}
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/six[${PYTHON_USEDEP}]
+ ')
+ ${PYTHON_DEPS}
+ )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-util/cmake-3.16
+ python? (
+ >=dev-lang/swig-3.0.11
+ $(python_gen_cond_dep '
+ dev-python/six[${PYTHON_USEDEP}]
+ ')
+ )
+ test? (
+ $(python_gen_cond_dep "
+ ~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+ dev-python/psutil[\${PYTHON_USEDEP}]
+ ")
+ sys-devel/lld
+ )
+"
+
+LLVM_COMPONENTS=( lldb cmake llvm/utils )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+ local mycmakeargs=(
+ -DLLDB_ENABLE_CURSES=$(usex ncurses)
+ -DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+ -DLLDB_ENABLE_PYTHON=$(usex python)
+ -DLLDB_ENABLE_LUA=OFF
+ -DLLDB_ENABLE_LZMA=$(usex lzma)
+ -DLLDB_ENABLE_LIBXML2=$(usex xml)
+ -DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+ -DLLDB_INCLUDE_TESTS=$(usex test)
+
+ -DCLANG_LINK_CLANG_DYLIB=ON
+ # TODO: fix upstream to detect this properly
+ -DHAVE_LIBDL=ON
+ -DHAVE_LIBPTHREAD=ON
+
+ # normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+ # and TERMINFO_LIBS... so just force FindCurses.cmake to use
+ # ncurses with complete library set (including autodetection
+ # of -ltinfo)
+ -DCURSES_NEED_NCURSES=ON
+
+ -DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_MAJOR}"
+
+ -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+ -DPython3_EXECUTABLE="${PYTHON}"
+ )
+ use test && mycmakeargs+=(
+ -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+ -DLLVM_LIT_ARGS="$(get_lit_flags)"
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ local -x LIT_PRESERVES_TMP=1
+ cmake_build check-lldb-{shell,unit}
+ # failures + hangs
+ #use python && cmake_build check-lldb-api
+}
+
+src_install() {
+ cmake_src_install
+ find "${D}" -name '*.a' -delete || die
+
+ use python && python_optimize
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index dbdc1f6692a6..a3d0627d347f 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,3 +1,4 @@
DIST meson-0.63.3.tar.gz 2067612 BLAKE2B aa6052330f15aa6b1f64598a60075ea3b245ba4b53d65e760670fd526e3e462c110f95e710a83f91ab32f316fdb66dff1783c79ea832ed11d263fe0a3304eaa8 SHA512 6855b2bfe05d592419bfeaf4346c3d1079319f14de995109c09a7e5e9770cef829f66d659553337b3e54ca0dd6c497bccd4abef720f299173077b664d905864b
DIST meson-0.64.1.tar.gz 2089752 BLAKE2B e444df936738ddbbc8af1cc203417ee8f6063bf36a953158295da0c0a40aeb05e6c9a8677a17440c3a4153e0e479fb7215e18b5f0ce7c896fd928f841637ce07 SHA512 4896f5a09f89cadce028080f70e5ca005fd3bb2141a730a0ad71ded63d1bde6d1254957fe079f5e4c6e3b9420a9fcc4525b01e689979f0bab6d09d6483ca42ec
DIST meson-1.0.0.tar.gz 2099642 BLAKE2B 0be89aeaf103b19c21a6eaf9cba43608436986ba045198b9dbe73778e925b8340c92f24ec12f480a8527e9d10da422122f17ff4469bd1076c3e85903c0ed9610 SHA512 9b1195cfe856c1aa51bc79f6eb4d0f94925bb02d0a9fbd68a6a6ced6e5c252b09b22d9aac812640687e49b8d64a313ce48d0a69a3bf83ea8ffb8c9dab559fc23
+DIST meson-1.0.1.tar.gz 2104183 BLAKE2B 23b47a2231da966de8da3032887a81458b795d5c0c1d35cf9e3ea1499f7ddbc28d1cc3ca469052c4b33c51fcf9f92a36dab44da0133d748afdbf4e5b260427f1 SHA512 3d2e2630f9eacf2fd999d5068d82b2a719400a55cfdea5d38253410a3ee74def638ac09622bceb72edf7bc867ae3de6a5f48c1846601e7e4b5afdf3ac9339ebc
diff --git a/dev-util/meson/meson-1.0.0.ebuild b/dev-util/meson/meson-1.0.0.ebuild
index f14de1f9d52d..041c8396d96c 100644
--- a/dev-util/meson/meson-1.0.0.ebuild
+++ b/dev-util/meson/meson-1.0.0.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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"
fi
fi
diff --git a/dev-util/meson/meson-1.0.1.ebuild b/dev-util/meson/meson-1.0.1.ebuild
new file mode 100644
index 000000000000..97dcdaf7e9fa
--- /dev/null
+++ b/dev-util/meson/meson-1.0.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 2016-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+ inherit git-r3
+else
+ inherit pypi
+
+ MY_P=${P/_/}
+ S=${WORKDIR}/${MY_P}
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
+ fi
+fi
+
+inherit bash-completion-r1 distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ test? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ dev-util/ninja
+ dev-vcs/git
+ sys-libs/zlib[static-libs(+)]
+ virtual/pkgconfig
+ )
+"
+RDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.63-xtools-support.patch
+)
+
+python_prepare_all() {
+ local disable_unittests=(
+ # ASAN and sandbox both want control over LD_PRELOAD
+ # https://bugs.gentoo.org/673016
+ -e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+ # ASAN is unsupported on some targets
+ # https://bugs.gentoo.org/692822
+ -e 's/test_pch_with_address_sanitizer/_&/'
+
+ # https://github.com/mesonbuild/meson/issues/7203
+ -e 's/test_templates/_&/'
+
+ # Broken due to python2 wrapper
+ -e 's/test_python_module/_&/'
+ )
+
+ sed -i "${disable_unittests[@]}" unittests/*.py || die
+
+ # Broken due to python2 script created by python_wrapper_setup
+ rm -r "test cases/frameworks/1 boost" || die
+
+ distutils-r1_python_prepare_all
+}
+
+src_test() {
+ tc-export PKG_CONFIG
+ if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+ ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+ else
+ distutils-r1_src_test
+ fi
+}
+
+python_test() {
+ (
+ # test_meson_installed
+ unset PYTHONDONTWRITEBYTECODE
+
+ # https://bugs.gentoo.org/687792
+ unset PKG_CONFIG
+
+ # test_cross_file_system_paths
+ unset XDG_DATA_HOME
+
+ # 'test cases/unit/73 summary' expects 80 columns
+ export COLUMNS=80
+
+ # If JAVA_HOME is not set, meson looks for javac in PATH.
+ # If javac is in /usr/bin, meson assumes /usr/include is a valid
+ # JDK include path. Setting JAVA_HOME works around this broken
+ # autodetection. If no JDK is installed, we should end up with an empty
+ # value in JAVA_HOME, and the tests should get skipped.
+ export JAVA_HOME=$(java-config -O 2>/dev/null)
+
+ # Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
+ python3 run_tests.py
+ ) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ insinto /usr/share/vim/vimfiles
+ doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+
+ insinto /usr/share/zsh/site-functions
+ doins data/shell-completions/zsh/_meson
+
+ dobashcomp data/shell-completions/bash/meson
+}
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 8140364c2c1b..97dcdaf7e9fa 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -10,9 +10,10 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/mesonbuild/meson"
inherit git-r3
else
+ inherit pypi
+
MY_P=${P/_/}
S=${WORKDIR}/${MY_P}
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
if [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
diff --git a/dev-util/pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch b/dev-util/pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch
new file mode 100644
index 000000000000..387da2374107
--- /dev/null
+++ b/dev-util/pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch
@@ -0,0 +1,37 @@
+diff --git a/src/pkgcheck/checks/python.py b/src/pkgcheck/checks/python.py
+index 291a56b4..19b87ef5 100644
+--- a/src/pkgcheck/checks/python.py
++++ b/src/pkgcheck/checks/python.py
+@@ -234,16 +234,16 @@ class PythonAnyMismatchedDepHasVersionCheck(results.VersionResult, results.Warni
+
+
+ class PythonMissingSCMDependency(results.VersionResult, results.Warning):
+- """Package is missing BDEPEND on setuptools_scm or alike.
++ """Package is missing BDEPEND on setuptools-scm or alike.
+
+ Packages which define ``SETUPTOOLS_SCM_PRETEND_VERSION`` should BDEPEND
+- on ``dev-python/setuptools_scm`` or a similar package [#]_.
++ on ``dev-python/setuptools-scm`` or a similar package [#]_.
+
+ .. [#] https://projects.gentoo.org/python/guide/distutils.html#setuptools-scm-flit-scm-hatch-vcs-and-snapshots
+ """
+
+ desc = (
+- "defines SETUPTOOLS_SCM_PRETEND_VERSION but is missing BDEPEND on setuptools_scm or alike"
++ "defines SETUPTOOLS_SCM_PRETEND_VERSION but is missing BDEPEND on setuptools-scm or alike"
+ )
+
+
+@@ -291,8 +291,10 @@ class PythonCheck(Check):
+
+ setuptools_scm = frozenset(
+ {
+- "dev-python/setuptools_scm",
+- "dev-python/flit_scm",
++ "dev-python/setuptools-scm",
++ "dev-python/setuptools_scm", # legacy old name
++ "dev-python/flit-scm",
++ "dev-python/flit_scm", # legacy old name
+ "dev-python/hatch-vcs",
+ }
+ )
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.21.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.21-r1.ebuild
similarity index 97%
rename from dev-util/pkgcheck/pkgcheck-0.10.21.ebuild
rename to dev-util/pkgcheck/pkgcheck-0.10.21-r1.ebuild
index 66e807c20cc1..6c5f4ff38cef 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.21.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.21-r1.ebuild
@@ -55,6 +55,10 @@ BDEPEND="${RDEPEND}
)
"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.10.21-fix-scm.patch"
+)
+
SITEFILE="50${PN}-gentoo.el"
distutils_enable_tests pytest
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.22.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.22-r1.ebuild
similarity index 93%
rename from dev-util/pkgcheck/pkgcheck-0.10.22.ebuild
rename to dev-util/pkgcheck/pkgcheck-0.10.22-r1.ebuild
index 582d6f268d39..720d751b9336 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.22.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.22-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
https://github.com/pkgcore/pkgcheck.git"
inherit git-r3
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
fi
@@ -55,6 +55,10 @@ BDEPEND="${RDEPEND}
)
"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.10.21-fix-scm.patch"
+)
+
SITEFILE="50${PN}-gentoo.el"
distutils_enable_tests pytest
diff --git a/dev-util/pkgdev/pkgdev-0.2.4.ebuild b/dev-util/pkgdev/pkgdev-0.2.4.ebuild
index f6989d35b829..4b29fa2379bd 100644
--- a/dev-util/pkgdev/pkgdev-0.2.4.ebuild
+++ b/dev-util/pkgdev/pkgdev-0.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
https://github.com/pkgcore/pkgdev.git"
inherit git-r3
else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ inherit pypi
KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
fi
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 3ce9dec619cb..7b8c02772dba 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
https://github.com/pkgcore/pkgdev.git"
inherit git-r3
else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ inherit pypi
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
fi
@@ -31,9 +31,9 @@ if [[ ${PV} == *9999 ]] ; then
"
else
RDEPEND="
- >=dev-python/snakeoil-0.10.3[${PYTHON_USEDEP}]
- >=dev-util/pkgcheck-0.10.16[${PYTHON_USEDEP}]
+ >=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]
>=sys-apps/pkgcore-0.12.16[${PYTHON_USEDEP}]
+ >=dev-util/pkgcheck-0.10.16[${PYTHON_USEDEP}]
"
fi
@@ -69,4 +69,5 @@ python_install_all() {
pkg_postinst() {
optfeature "sending email support" x11-misc/xdg-utils
+ optfeature "tatt subcommand" "app-portage/nattka dev-python/jinja"
}
diff --git a/dev-util/pwndbg/pwndbg-20221219-r2.ebuild b/dev-util/pwndbg/pwndbg-20221219-r2.ebuild
index 2c9a6ddb9ae8..b78429bf9f65 100644
--- a/dev-util/pwndbg/pwndbg-20221219-r2.ebuild
+++ b/dev-util/pwndbg/pwndbg-20221219-r2.ebuild
@@ -20,7 +20,7 @@ else
https://github.com/pwndbg/pwndbg/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
https://github.com/martinradev/gdb-pt-dump/archive/${GDB_PT_DUMP_COMMIT}.tar.gz -> gdb-pt-dump-${GDB_PT_DUMP_COMMIT}.tar.gz
"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
S="${WORKDIR}/${PN}-${MY_PV}"
fi
diff --git a/dev-util/pwntools/pwntools-4.9.0-r2.ebuild b/dev-util/pwntools/pwntools-4.9.0-r2.ebuild
index 716ef0f390c1..cca036676bc2 100644
--- a/dev-util/pwntools/pwntools-4.9.0-r2.ebuild
+++ b/dev-util/pwntools/pwntools-4.9.0-r2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/Gallopsled/pwntools.git"
else
SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.gh.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
S="${WORKDIR}/${PN}-${PV/_beta/beta}"
fi
diff --git a/dev-util/rocm-clang-ocl/Manifest b/dev-util/rocm-clang-ocl/Manifest
deleted file mode 100644
index 827fc6d22060..000000000000
--- a/dev-util/rocm-clang-ocl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rocm-clang-ocl-5.0.2.tar.gz 3908 BLAKE2B b348c047d2dcea9524847cbb44d37e56c16fa05d5ab7f1b798e22c1f3d61b38aa725436f3ef44491898f4afd675716036efaf3959cac310b2905a2d16fc6e911 SHA512 582b9ff425c1f9ff4fb32cf7b64c8357f8f585ab75b31b63cfa8705725f823cd0cc60f0d0a641f66c6760d8a5378444f29f3f57b8989d36f4fd32bb7b397d167
diff --git a/dev-util/rocm-clang-ocl/files/rocm-clang-ocl-5.0.2-system-llvm.patch b/dev-util/rocm-clang-ocl/files/rocm-clang-ocl-5.0.2-system-llvm.patch
deleted file mode 100644
index 5f052f4282e0..000000000000
--- a/dev-util/rocm-clang-ocl/files/rocm-clang-ocl-5.0.2-system-llvm.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Use system clang.
-
-Forwarded: not yet.
-
-Index: clang-ocl-rocm-5.0.2/CMakeLists.txt
-===================================================================
---- clang-ocl-rocm-5.0.2.orig/CMakeLists.txt
-+++ clang-ocl-rocm-5.0.2/CMakeLists.txt
-@@ -20,7 +20,7 @@ if(hcc_FOUND)
- set(CLANG_BIN "${hcc_LIB_INSTALL_DIR}/../bin" CACHE STRING "")
- set(BITCODE_DIR "${hcc_LIB_INSTALL_DIR}" CACHE STRING "")
- else()
-- find_program(CLANG_EXE NAMES clang HINTS ${CXX_COMPILER_PATH}/bin PATHS /opt/rocm/llvm/bin)
-+ find_program(CLANG_EXE NAMES clang)
- get_filename_component(CLANG_EXE_DIR ${CLANG_EXE} DIRECTORY)
- find_package(AMDDeviceLibs PATHS /opt/rocm)
- set(CLANG_BIN "${CLANG_EXE_DIR}" CACHE STRING "")
diff --git a/dev-util/rocm-clang-ocl/metadata.xml b/dev-util/rocm-clang-ocl/metadata.xml
deleted file mode 100644
index e74d41fd607c..000000000000
--- a/dev-util/rocm-clang-ocl/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- sci@gentoo.org
-
-
- gentoo@holzke.net
- Wilfried Holzke
-
-
- xgreenlandforwyy@gmail.com
- Yiyang Wu
-
-
diff --git a/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2-r1.ebuild b/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2-r1.ebuild
deleted file mode 100644
index 40be9d9dd7df..000000000000
--- a/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="OpenCL compilation with clang compiler"
-HOMEPAGE="https://github.com/RadeonOpenCompute/clang-ocl.git"
-SRC_URI="https://github.com/RadeonOpenCompute/clang-ocl/archive/rocm-${PV}.tar.gz -> rocm-clang-ocl-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-libs/rocm-opencl-runtime:${SLOT}"
-DEPEND="
- dev-util/rocm-cmake:${SLOT}
- ${RDEPEND}"
-
-S="${WORKDIR}/clang-ocl-rocm-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.0.2-system-llvm.patch )
-
-src_prepare() {
- cmake_src_prepare
-
- sed \
- -e "/AMDDeviceLibs PATHS/s:/opt/rocm:${EPREFIX}/usr/lib/cmake/AMDDeviceLibs:" \
- -e "s:\${AMD_DEVICE_LIBS_PREFIX}/amdgcn/bitcode:${EPREFIX}/usr/lib/amdgcn/bitcode:" \
- -i CMakeLists.txt || die
-}
diff --git a/dev-util/seer/Manifest b/dev-util/seer/Manifest
index c871b88c8cc1..a6991b24a539 100644
--- a/dev-util/seer/Manifest
+++ b/dev-util/seer/Manifest
@@ -1,2 +1,2 @@
-DIST seer-1.13.tar.gz 396675 BLAKE2B 9dd844688a84645c5c105f5296c86c71335ccced3880a3636c8e6904be85253b1dd4da51035e5d93f6f6415584763cdf40dd27cfb5d617ee6a2fd2b64685752a SHA512 1c54c4c304ca3a378aaf1f2e2e8de49cf41886de76257cb9f746ff85a15ec2bf9abe0d4311ca6a2e585d2c13740ec815e63f3a8dc4df7478c71bc0e2261b5d4e
DIST seer-1.14.tar.gz 400391 BLAKE2B 9134bd62eae35e965601af56e734a29d5f0d12af2c9383e287c0ba41a6285587b24b84b49c588bb497b8b55154ebef74ac78b1ace282d018d40d544ed070e343 SHA512 1657ce26e676cb03e514e69f79e4aef614f489918329b1421d8017284387bb155b750d18b00ff8244ad73104cd0b7e078360a22c692e9ec5cfd4aa258c778dc3
+DIST seer-1.15.tar.gz 401292 BLAKE2B d0bfd13947582585e5f99a86e4a03ea58fc3b1a06879dd75136d724f28944d0fca21a71cca3be269dcd2d5a04e6275e967dce18687ecaa87b1d2aaff58ed1643 SHA512 ff3ad9c5bb35f2afe5c07917b276e1653bfecbfac7473dd1bac6d441c47ef0b9ae86775ff663f2f653057a8a848ce48aefcdb7c5b2b7d680e7e53d2398660300
diff --git a/dev-util/seer/seer-1.13.ebuild b/dev-util/seer/seer-1.15.ebuild
similarity index 93%
rename from dev-util/seer/seer-1.13.ebuild
rename to dev-util/seer/seer-1.15.ebuild
index ecf4ab10dc4a..207362f81cdd 100644
--- a/dev-util/seer/seer-1.13.ebuild
+++ b/dev-util/seer/seer-1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
else
SRC_URI="https://github.com/epasveer/seer/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~ppc64"
fi
S="${WORKDIR}"/${P}/src
diff --git a/dev-util/shards/shards-0.15.0-r1.ebuild b/dev-util/shards/shards-0.15.0-r1.ebuild
index cd40186df456..114ec2df8040 100644
--- a/dev-util/shards/shards-0.15.0-r1.ebuild
+++ b/dev-util/shards/shards-0.15.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
DEPEND="
>dev-lang/crystal-0.11.1
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index bbed1df7d890..aaf854046396 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,2 +1 @@
-DIST spirv-headers-1.3.236.tar.gz 445166 BLAKE2B cf64f91a3d4368f876fb5834c0fa42d36861519b842fee8789515752dc8cb519266579cec8be26f3e0ea2917884b3bad2644f337adf9184cda139224cbc33240 SHA512 0cd35cbff41b5dc6f78c5129c138c83e099c8bea63eca9dfc8fdf0a19fed015b9d4435fc8e1c8d98997f1c673162b289842e0bbe3ba243f798bc631cd92d85d2
DIST spirv-headers-1.3.239.tar.gz 446227 BLAKE2B 43c115f2b9661b682455034479a056cbef9cb9d4d9e60be88a1d5e16354dbfc907c1719f0d90cb0a0d243e420b552b150b915baaa9aecf998604197f26ba214b SHA512 f537becf7940cc31bc7b578f33be1ca55264414f205582dff0c569bdbae085e78760ea317a32e6d3fe3510e29554ea1b1a00bf9e4df3e20cd4de6e998a891a5d
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.236.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.236.ebuild
deleted file mode 100644
index 9cd897229506..000000000000
--- a/dev-util/spirv-headers/spirv-headers-1.3.236.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="sdk-${PV}"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-
-S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.239.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.239.ebuild
index 23d3f350b5d2..b074631e4c45 100644
--- a/dev-util/spirv-headers/spirv-headers-1.3.239.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.3.239.ebuild
@@ -13,4 +13,4 @@ S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index fa0b789aad1d..38fb433a108d 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,2 +1 @@
-DIST spirv-tools-1.3.236.tar.gz 3079909 BLAKE2B 97c773b3bee60d3889f9bda49d0b729ce199fab1d6ac211f0bcc9fd0ec2d1d770ed6dccd603cf9beae82541d009fa37bc6d5e1a3a8cae82985c84e3bcfbc4149 SHA512 c70287582cc42eca1a4b81259217f02e4d7003503d43a2aabc24b3c6c50b9081768bdd69ed8a9c8489b1e9a52e9762629c920a96eb2ef43a96e9ead7a1438674
DIST spirv-tools-1.3.239.tar.gz 3088996 BLAKE2B b7900fee1b5fca47802cd168766c3bc2f316fd69380670a8f0241df607c8fb41e8534d699330e38fa33ca1632a63fe54fb6c69def68d5b7a30b4229598fdcd21 SHA512 77c06e9127e9f5ab5c83b2bae181a9e626adc4f37d10122a1ed62904dd7e05f78f5eb75f4213d8d986bc78f60f247ed23ddc2552fcbb8355c0160fb559d32707
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.236.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.236.ebuild
deleted file mode 100644
index 07404b32ae4d..000000000000
--- a/dev-util/spirv-tools/spirv-tools-1.3.236.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=SPIRV-Tools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
- inherit git-r3
-else
- EGIT_COMMIT="sdk-${PV}.0"
- SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
- S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
-fi
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests fail upon finding symbols that do not match a regular expression
-# in the generated library. Easily hit with non-standard compiler flags
-RESTRICT="test"
-COMMON_DEPEND="~dev-util/spirv-headers-${PV}"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
- ${COMMON_DEPEND}"
-
-multilib_src_configure() {
- local mycmakeargs=(
- "-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/"
- "-DSPIRV_WERROR=OFF"
- "-DSPIRV_TOOLS_BUILD_STATIC=OFF"
- "-DBUILD_SHARED_LIBS=ON"
- )
-
- cmake_src_configure
-}
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.239.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.239.ebuild
index 414c2a0ec445..a8099b02d704 100644
--- a/dev-util/spirv-tools/spirv-tools-1.3.239.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-1.3.239.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
else
EGIT_COMMIT="sdk-${PV}.0"
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+ KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
fi
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 120b752aed2a..b2a1a68be62b 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,2 +1 @@
-DIST vulkan-headers-1.3.236.tar.gz 1764629 BLAKE2B bcab4628979aba6121779f876010cca18308b42b2eea5f7e2c9ab45855914a5ef8f2f217a9853feca461c2fd002ad44696b60ef229c4a2f187aacb7e68ae3dd4 SHA512 f4623a9076896403ceff2c97b02bbda0692535be01dba0a51a1faaa015d9c57c47aaa0960505b94553f24b4efb9ebb84adac5a949d341bbb13898d734e6c722c
DIST vulkan-headers-1.3.239.tar.gz 1804393 BLAKE2B ea7ab92539aa32a6973bb590b84e4004195eea1f41b3499b33c1f915514243e7d06c603f0dd9feb4d04a455dd732940f512d2acca150372ebf02b007e670b27d SHA512 d7b0bf3f41f0f4a43c89c13cabfeb99401b069e6d0358b03befef465cba7e6a34e1608e62d981d0d905f5cc6327334cdca4e249ebb2305ce1ae81ebcfb62dc20
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.236.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.236.ebuild
deleted file mode 100644
index f0c4031a7ba5..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.3.236.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Headers
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
- S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.239.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.239.ebuild
index c5f1434ff61e..872d26d1d2b5 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.3.239.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.3.239.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+ KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
fi
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 6d5e18f044c4..ba1eaee5fb24 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,2 +1 @@
-DIST vulkan-tools-1.3.236.tar.gz 880927 BLAKE2B 0d2b885057d063946140489eae4fb08ad8ff3172d23243f746c74090a20990901b18126cfb41efdd38b24f7c2e7dcd62dd3453f0f6130c618632592a4ecb1d31 SHA512 aa3b934ab084a29ae2503be96f0af69c52b693525cd5bd641c85b5a6f79ec3b7a48ba1b08a1a898229f80086bd5fc819b8ad4019835490653edadcf2d086b9f3
DIST vulkan-tools-1.3.239.tar.gz 775603 BLAKE2B ff2b07454b603a72f0f07c575c09b431f0ec996bab2d5adc66d8d5f1456b0897f3796a33c5658949c92f895b67cbc67ad777975697693cc677db69400549e824 SHA512 9397f71dba2b741dd43c101472ab5961e64b46a7252fca1aa2f3b7c2afbe44b789a25c13536c8eb5dbd6600d0c741330493b73177d805db38ff1542364ef4764
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.236.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.236.ebuild
deleted file mode 100644
index 223c7aa75fbf..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.3.236.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Tools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
- EGIT_SUBMODULES=()
- inherit git-r3
-else
- SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv"
- S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cube wayland +X"
-
-# Cube demo only supports one window system at a time
-REQUIRED_USE="cube? ( ^^ ( X wayland ) )"
-
-BDEPEND="${PYTHON_DEPS}
- >=dev-util/cmake-3.10.2
- cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
- ~media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
- wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
- X? (
- x11-libs/libX11:=[${MULTILIB_USEDEP}]
- x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
- )
-"
-DEPEND="${RDEPEND}
- ~dev-util/vulkan-headers-${PV}
-"
-
-pkg_setup() {
- MULTILIB_CHOST_TOOLS=(
- /usr/bin/vulkaninfo
- )
-
- use cube && MULTILIB_CHOST_TOOLS+=(
- /usr/bin/vkcube
- /usr/bin/vkcubepp
- )
-
- python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
- -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
- -DCMAKE_SKIP_RPATH=ON
- -DBUILD_VULKANINFO=ON
- -DBUILD_CUBE=$(usex cube)
- -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
- -DBUILD_WSI_XCB_SUPPORT=$(usex X)
- -DBUILD_WSI_XLIB_SUPPORT=$(usex X)
- -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
- )
-
- use cube && mycmakeargs+=(
- -DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
- -DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
- )
-
- cmake_src_configure
-}
-
-multilib_src_install() {
- cmake_src_install
-}
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.239.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.239.ebuild
index e080f1475cd2..e868c43fde5b 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.3.239.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.239.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv"
+ KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv"
S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
fi
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index 09a9ba5b1a4c..36b41f971162 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,3 +1,4 @@
DIST xfce4-dev-tools-4.16.0.tar.bz2 340107 BLAKE2B 93919e1b705858770f5c98cab080ba86785d524dc7371f09fba065f2bdf549d9a3ada66cdef3e1bbd344fb62cecb70661a1b6ce8c8bb51ada0be9459604d4d4f SHA512 54d9b45535c174ab0d13a3061ba2ff247c788a1190a6622b0adb4242d12e1fe42715256a18168d42fd5e425bbc7e9e81de30aa507da04f3e8d9b6f1ae5a5a7a7
DIST xfce4-dev-tools-4.17.2.tar.bz2 353571 BLAKE2B af3ec3e603b2224ee47feefd63eb3e0be6a83dd2d442e8372d71c2aff910a5fb7818c9c93d0347ed239749d14f83f9443c2bde05a815e7449b6ae564186a1b6d SHA512 f08cdfca8c5753fd58fa3eefa56a3ba94bbc708ecf93d4872f3d843720840ef6d57d0af7fa7fdb11d8645f082338d7668bb01c6e531aec8ad89c6cd627529124
DIST xfce4-dev-tools-4.18.0.tar.bz2 349125 BLAKE2B c82496de1a279a3ce57f895a52ee4eab98d2d174cf7109ac70790d9f1c8a6812196f4ff5bd951352b2345496f0ebf4113472a7e1f9e3826a1d02b163e4108f6e SHA512 59f858b633d95585a74c9b9515a0994744f4355ab3813e582e10c776454ac41c86296a9fbd935d5dae88929ec09ec9c30f48629c7addb5729e6bea108d304f7c
+DIST xfce4-dev-tools-4.19.0.tar.bz2 368601 BLAKE2B 349e3dcf69c1fc1f0af052546d78b86ffc89ca81b66c27e8b7058f549adb0c6a16e6c462a6f5e00e66dc4b419dd2ea7fa43c210d83153e23254b8b5ae5a77fbf SHA512 7372efcb686fe6c1e42f17564d693cbe24792d00fbf131faff46040c8940ad355067d4a4cc5d5de5ec6b9707943c5db5de84eee4a4ff894ef8c33c3616a26044
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.19.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.19.0.ebuild
new file mode 100644
index 000000000000..8cc84c957f67
--- /dev/null
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.19.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
+HOMEPAGE="
+ https://docs.xfce.org/xfce/xfce4-dev-tools/start
+ https://gitlab.xfce.org/xfce/xfce4-dev-tools/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+DEPEND="
+ >=dev-libs/glib-2.66.0
+"
+RDEPEND="
+ ${DEPEND}
+"
+# libxslt for xsltproc
+BDEPEND="
+ dev-libs/libxslt
+ virtual/pkgconfig
+"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 24c8de4ed97d..7c8b26f2814d 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git-lfs/git-lfs-3.2.0.ebuild b/dev-vcs/git-lfs/git-lfs-3.2.0.ebuild
index 902cc0ce27e5..f1b4691ef003 100644
--- a/dev-vcs/git-lfs/git-lfs-3.2.0.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ if [[ "${PV}" = 9999* ]]; then
inherit git-r3
else
SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
fi
LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT"
diff --git a/dev-vcs/git-machete/Manifest b/dev-vcs/git-machete/Manifest
index e4374a3e090f..0e6064fe3c7b 100644
--- a/dev-vcs/git-machete/Manifest
+++ b/dev-vcs/git-machete/Manifest
@@ -1,3 +1,4 @@
DIST git-machete-3.13.0.gh.tar.gz 1388145 BLAKE2B e12c12ff5a34b7dee0ea14f4260154dc5c94a356a584c3bd00688777b4425a4c45fd39ece0c76751ff8b9b45c131ccd3d4ea25c3f14711ac91f75fa6a47e651e SHA512 85d719e9a983db9aea7bb7540c85aeb6ac5bfcbf94e4920683b37bae22714078f5e8b9a39d63fa397a03ddf139c52acd970310e499a26296fbdb1091672873f9
DIST git-machete-3.14.3.gh.tar.gz 1397234 BLAKE2B 827d3234260461d5cba6b192767e9923b79cc70afb0e7d0bd24e3f307559e3c0774499b34651dd6da7e52157c18becb69c15de9246b99bb35d47104787e6164e SHA512 a4e6015832b4fefa48b75dbd2f3aa50f53788c3a612beada971c0da9da722d49b48e891ddfa3f7d6c91ed4d461b16504ecab9f64b4da84d319b08bb06b1ee8c2
DIST git-machete-3.15.2.gh.tar.gz 1399230 BLAKE2B f10ff0678b80e5a940a5746771addb1ef9f425faa49c64fd1c808c2f9236c8fb6973ddb662950582718a25b034eba9c3dba6a4008ae4702e5d662cd8796543f7 SHA512 64115f9bb2af7f0596d0327067adfe01ceb17e96325ae2ae31c377f1a86cd4f7eb6e5a5940efb46a9e9d6805ae0b61a8d1d52e0ed7e4f65250783c290d8989cc
+DIST git-machete-3.16.0.gh.tar.gz 1400708 BLAKE2B c0756c997ed287fb64c561ca21dcfc5f126fd98b51e839613c47ca537ceaa5e66dc1b99e22c10d5e54be57d81ac1e729bf5eab819792b7c0125589b4cdde0a79 SHA512 0b0e4c3b675d1d6728fb48ed69085a7f1c052af3a3fb6b565ef7730d6734c3badafef83f8bd4ce866e41cbb3d087cd1e7246ac07888d515cd0cf62b547ea99ce
diff --git a/dev-vcs/git-machete/git-machete-3.16.0.ebuild b/dev-vcs/git-machete/git-machete-3.16.0.ebuild
new file mode 100644
index 000000000000..9964c2ef2ad2
--- /dev/null
+++ b/dev-vcs/git-machete/git-machete-3.16.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Probably the sharpest git repo organizer & rebase/merge workflow automation tool"
+HOMEPAGE="https://github.com/VirtusLab/git-machete https://pypi.org/project/git-machete/"
+# No tests in PyPI tarballs
+SRC_URI="https://github.com/VirtusLab/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="dev-vcs/git"
+BDEPEND="test? (
+ >=dev-python/pytest-mock-3.8.2[${PYTHON_USEDEP}]
+ >=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}]
+)"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+src_install() {
+ distutils-r1_src_install
+
+ newbashcomp completion/${PN}.completion.bash ${PN}
+
+ insinto /usr/share/fish/vendor_completions.d
+ doins completion/${PN}.fish
+
+ insinto /usr/share/zsh/site-functions
+ newins completion/${PN}.completion.zsh _${PN}
+}
diff --git a/dev-vcs/mercurial/mercurial-6.3.2.ebuild b/dev-vcs/mercurial/mercurial-6.3.2.ebuild
index 606ff35a8f45..a1c6803fcea1 100644
--- a/dev-vcs/mercurial/mercurial-6.3.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.3.2.ebuild
@@ -156,7 +156,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz
LICENSE="GPL-2+
rust? ( BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 ISC MIT MPL-2.0 PSF-2 Unlicense ZLIB )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+chg emacs gpg test tk rust"
BDEPEND="rust? ( ${RUST_DEPEND} )"
diff --git a/dev-vcs/python-gitlab/Manifest b/dev-vcs/python-gitlab/Manifest
index 6acc87f4d9ae..74499464b158 100644
--- a/dev-vcs/python-gitlab/Manifest
+++ b/dev-vcs/python-gitlab/Manifest
@@ -1 +1,2 @@
DIST python-gitlab-3.12.0.tar.gz 264005 BLAKE2B 64215b0c2950b1d238ff0e69e88de463ce2645d7c3911963e516b50874b49c4e822f8e27625fa33e6d27a703cc3bb3377151a9bc9c49b0b49ee7bc57db5dfd65 SHA512 76f55945a821553b4b477629dea674956459836df227e70817480b031559317ec97fef6c332d0dc42c4dba0d556ed1118e1cded8f116f4813bebe411db9e7a47
+DIST python-gitlab-3.13.0.tar.gz 270646 BLAKE2B ff7e3c35525ac1bf1cb6dc6e668ca9c8aeefb12073636f115c8e078aa4b9f623f6d847d8487e85e9a325b6f0ad1ef93826631cb32fd86c0bd9023688aac5add9 SHA512 373347392d7030c817a8dcb4cceea71d0609f9e09dce348514c1ca024307094b1a72e287c871ce5fcba9b9d4cdfcc7dc6b4495e2b225b845a3dff2e2dfc4fe82
diff --git a/dev-vcs/python-gitlab/python-gitlab-3.13.0.ebuild b/dev-vcs/python-gitlab/python-gitlab-3.13.0.ebuild
new file mode 100644
index 000000000000..2fad79ea4fa9
--- /dev/null
+++ b/dev-vcs/python-gitlab/python-gitlab-3.13.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Python command line interface to gitlab API"
+HOMEPAGE="https://github.com/python-gitlab/python-gitlab/"
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/python-gitlab/python-gitlab"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+
+BDEPEND="test? (
+ dev-python/coverage[${PYTHON_USEDEP}]
+ >=dev-python/pytest-console-scripts-1.3.1[${PYTHON_USEDEP}]
+ dev-python/pytest-cov[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.2[${PYTHON_USEDEP}]
+ dev-python/responses[${PYTHON_USEDEP}]
+ )"
+
+RDEPEND=">=dev-python/requests-2.28.2[${PYTHON_USEDEP}]
+ >=dev-python/requests-toolbelt-0.10.1[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+ distutils-r1_python_install_all
+ dodoc -r *.rst docs
+}
diff --git a/dev-vcs/tortoisehg/tortoisehg-6.3.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-6.3.2.ebuild
index b14e5b79045a..082bf4853066 100644
--- a/dev-vcs/tortoisehg/tortoisehg-6.3.2.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-6.3.2.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_USE_PEP517=setuptools
inherit desktop distutils-r1 optfeature xdg-utils
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64 x86"
SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${PV}/thg-${PV}.tar.gz -> ${P}.tar.gz"
HG_DEPEND=">=dev-vcs/mercurial-5.9[${PYTHON_USEDEP}]
$(python_gen_cond_dep '>=dev-vcs/mercurial-6.3.2[${PYTHON_USEDEP}]' python3_11 )
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index b585eb0a9d78..3188733f9162 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index 918ba1cf27f8..94302ea1b4af 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -93,6 +93,9 @@ if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then
17.0.0_pre20230225)
EGIT_COMMIT=b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817
;;
+ 17.0.0_pre20230304)
+ EGIT_COMMIT=2708869801ae00f4681f6b2d9d69b25b3fce26b6
+ ;;
*)
die "Unknown snapshot: ${PV}"
;;
diff --git a/eclass/mercurial.eclass b/eclass/mercurial.eclass
index 2616b88311cf..776ed2d9a1f0 100644
--- a/eclass/mercurial.eclass
+++ b/eclass/mercurial.eclass
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: mercurial.eclass
# @MAINTAINER:
-# Christoph Junghans
+# No maintainer
# Original author: Aron Griffis
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index fe2cb23bd896..c659e2b3847a 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/spout/spout-1.3-r2.ebuild b/games-arcade/spout/spout-1.3-r3.ebuild
similarity index 88%
rename from games-arcade/spout/spout-1.3-r2.ebuild
rename to games-arcade/spout/spout-1.3-r3.ebuild
index 9ed65f4f461f..9f30a8242b0d 100644
--- a/games-arcade/spout/spout-1.3-r2.ebuild
+++ b/games-arcade/spout/spout-1.3-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit desktop readme.gentoo-r1
+inherit autotools desktop readme.gentoo-r1
MY_P="spout-unix-${PV}"
@@ -25,6 +25,12 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.3-Fix-implicit-function-declarations.patch
)
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
src_install() {
dobin spout
einstalldocs
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 235eb9f79166..9242ea760242 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/bsnes-jg/Manifest b/games-emulation/bsnes-jg/Manifest
index e31fa8485c2e..be59e5809a5e 100644
--- a/games-emulation/bsnes-jg/Manifest
+++ b/games-emulation/bsnes-jg/Manifest
@@ -1 +1 @@
-DIST bsnes-1.1.1.tar.bz2 4182487 BLAKE2B dfcad14019ae8f6bee6a12f4e35b0cfc5338215d41028655c230faa7a481eb0ef09428192f244471887a3f7326d3fbf9ea713c642aab97989caa391ad41aa4ac SHA512 e1c24d9154ef8285ab2c9d0b03860cb8e7396fffe1f575d25239816e6ec8183ab05ec2adc31c2c4e09c5a3ff8a439909860f704174c132f9ff343dbbf55ca034
+DIST bsnes-1.1.2.tar.bz2 4183035 BLAKE2B 09e01845fb9e6208f5262e2abef14c46e9fa53cfdd025821345507fc68e520dc21ca69e5d712a7f821936166975865c26dc0be42549b551abdbb941e748949b1 SHA512 77cb82b6cba2941813de25273bd74b928ad380dccadb909ae3500ddf6f8906504f5400df95381569d35fc7b06e0330f9eb4d54d88d64a5c698925d54df62bada
diff --git a/games-emulation/bsnes-jg/bsnes-jg-1.1.1.ebuild b/games-emulation/bsnes-jg/bsnes-jg-1.1.2.ebuild
similarity index 100%
rename from games-emulation/bsnes-jg/bsnes-jg-1.1.1.ebuild
rename to games-emulation/bsnes-jg/bsnes-jg-1.1.2.ebuild
diff --git a/games-emulation/ppsspp/ppsspp-1.14.4-r1.ebuild b/games-emulation/ppsspp/ppsspp-1.14.1-r3.ebuild
similarity index 98%
rename from games-emulation/ppsspp/ppsspp-1.14.4-r1.ebuild
rename to games-emulation/ppsspp/ppsspp-1.14.1-r3.ebuild
index 53b2b98de0bc..9653b9ec6119 100644
--- a/games-emulation/ppsspp/ppsspp-1.14.4-r1.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.14.1-r3.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
app-arch/snappy:=
app-arch/zstd:=
dev-libs/libzip:=
- dev-util/glslang:0/1
media-libs/glew:=
media-libs/libpng:=
media-libs/libsdl2[joystick]
@@ -52,13 +51,14 @@ pkg_setup() {
src_configure() {
local -a mycmakeargs=(
+ -DBUILD_SHARED_LIBS=OFF
-DCMAKE_SKIP_RPATH=ON
-DHEADLESS=false
- -DUSE_DISCORD=$(usex discord)
-DUSE_SYSTEM_FFMPEG=ON
-DUSE_SYSTEM_LIBZIP=ON
-DUSE_SYSTEM_SNAPPY=ON
-DUSE_SYSTEM_ZSTD=ON
+ -DUSE_DISCORD=$(usex discord)
-DUSING_QT_UI=$(usex qt5)
)
cmake_src_configure
diff --git a/games-emulation/ppsspp/ppsspp-1.14.1-r2.ebuild b/games-emulation/ppsspp/ppsspp-1.14.2-r2.ebuild
similarity index 98%
rename from games-emulation/ppsspp/ppsspp-1.14.1-r2.ebuild
rename to games-emulation/ppsspp/ppsspp-1.14.2-r2.ebuild
index 53b2b98de0bc..9653b9ec6119 100644
--- a/games-emulation/ppsspp/ppsspp-1.14.1-r2.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.14.2-r2.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
app-arch/snappy:=
app-arch/zstd:=
dev-libs/libzip:=
- dev-util/glslang:0/1
media-libs/glew:=
media-libs/libpng:=
media-libs/libsdl2[joystick]
@@ -52,13 +51,14 @@ pkg_setup() {
src_configure() {
local -a mycmakeargs=(
+ -DBUILD_SHARED_LIBS=OFF
-DCMAKE_SKIP_RPATH=ON
-DHEADLESS=false
- -DUSE_DISCORD=$(usex discord)
-DUSE_SYSTEM_FFMPEG=ON
-DUSE_SYSTEM_LIBZIP=ON
-DUSE_SYSTEM_SNAPPY=ON
-DUSE_SYSTEM_ZSTD=ON
+ -DUSE_DISCORD=$(usex discord)
-DUSING_QT_UI=$(usex qt5)
)
cmake_src_configure
diff --git a/games-emulation/ppsspp/ppsspp-1.14.2-r1.ebuild b/games-emulation/ppsspp/ppsspp-1.14.4-r2.ebuild
similarity index 98%
rename from games-emulation/ppsspp/ppsspp-1.14.2-r1.ebuild
rename to games-emulation/ppsspp/ppsspp-1.14.4-r2.ebuild
index 53b2b98de0bc..9653b9ec6119 100644
--- a/games-emulation/ppsspp/ppsspp-1.14.2-r1.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.14.4-r2.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
app-arch/snappy:=
app-arch/zstd:=
dev-libs/libzip:=
- dev-util/glslang:0/1
media-libs/glew:=
media-libs/libpng:=
media-libs/libsdl2[joystick]
@@ -52,13 +51,14 @@ pkg_setup() {
src_configure() {
local -a mycmakeargs=(
+ -DBUILD_SHARED_LIBS=OFF
-DCMAKE_SKIP_RPATH=ON
-DHEADLESS=false
- -DUSE_DISCORD=$(usex discord)
-DUSE_SYSTEM_FFMPEG=ON
-DUSE_SYSTEM_LIBZIP=ON
-DUSE_SYSTEM_SNAPPY=ON
-DUSE_SYSTEM_ZSTD=ON
+ -DUSE_DISCORD=$(usex discord)
-DUSING_QT_UI=$(usex qt5)
)
cmake_src_configure
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 4abcd9411790..6dfcc570303a 100644
Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ
diff --git a/games-puzzle/freesweep/freesweep-1.0.2.ebuild b/games-puzzle/freesweep/freesweep-1.0.2-r1.ebuild
similarity index 72%
rename from games-puzzle/freesweep/freesweep-1.0.2.ebuild
rename to games-puzzle/freesweep/freesweep-1.0.2-r1.ebuild
index abe5e0cb0e2b..b2a002295f08 100644
--- a/games-puzzle/freesweep/freesweep-1.0.2.ebuild
+++ b/games-puzzle/freesweep/freesweep-1.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
DESCRIPTION="Console Minesweeper"
HOMEPAGE="https://github.com/rwestlund/freesweep"
@@ -17,6 +17,14 @@ RDEPEND="sys-libs/ncurses:="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+src_prepare() {
+ default
+
+ sed -i -e "s:configure.in:configure.ac:" Makefile.in || die
+ # Clang 16, bug #899002
+ eautoreconf
+}
+
src_compile() {
emake LIBS="$($(tc-getPKG_CONFIG) --libs ncurses || die)"
}
diff --git a/games-puzzle/xblockout/files/xblockout-1.1.6-configure-clang16.patch b/games-puzzle/xblockout/files/xblockout-1.1.6-configure-clang16.patch
new file mode 100644
index 000000000000..af322fedd337
--- /dev/null
+++ b/games-puzzle/xblockout/files/xblockout-1.1.6-configure-clang16.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/899012
+--- a/configure.in
++++ b/configure.in
+@@ -127,6 +127,7 @@ dnl AC_TRY_COMPILE("Prototypes",,extern int y(int z);y(5);}y(z)int z;{,CFLA="$CF
+
+ AC_TEST_PROGRAM([
+ #include
++#include
+ int main()
+ {
+ fd_set i,j,k ;
+@@ -151,6 +152,7 @@ AC_TEST_PROGRAM([
+ #include
+ #include
+ #include
++#include
+
+ volatile int c = 0 ;
+ void fct(i) int i ; { c++ ; signal(SIGALRM, fct) ; }
diff --git a/games-puzzle/xblockout/xblockout-1.1.6-r2.ebuild b/games-puzzle/xblockout/xblockout-1.1.6-r3.ebuild
similarity index 93%
rename from games-puzzle/xblockout/xblockout-1.1.6-r2.ebuild
rename to games-puzzle/xblockout/xblockout-1.1.6-r3.ebuild
index 914ab6d1ac1c..f433fd8aaccd 100644
--- a/games-puzzle/xblockout/xblockout-1.1.6-r2.ebuild
+++ b/games-puzzle/xblockout/xblockout-1.1.6-r3.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools desktop flag-o-matic toolchain-funcs
DESCRIPTION="X Window block dropping game in 3 Dimension"
HOMEPAGE="http://perso.univ-lyon1.fr/thierry.excoffier/XBL/"
SRC_URI="http://perso.univ-lyon1.fr/thierry.excoffier/XBL/xbl-${PV}.tar.gz"
+S="${WORKDIR}/xbl-${PV}"
LICENSE="GPL-1"
SLOT="0"
@@ -19,10 +20,9 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-S="${WORKDIR}/xbl-${PV}"
-
PATCHES=(
"${FILESDIR}"/${P}-font.patch
+ "${FILESDIR}"/${P}-configure-clang16.patch
)
src_prepare() {
diff --git a/games-puzzle/xwelltris/files/xwelltris-1.0.1-c++17.patch b/games-puzzle/xwelltris/files/xwelltris-1.0.1-c++17.patch
new file mode 100644
index 000000000000..2c62d4752975
--- /dev/null
+++ b/games-puzzle/xwelltris/files/xwelltris-1.0.1-c++17.patch
@@ -0,0 +1,106 @@
+--- a/src/image/convert.cxx
++++ b/src/image/convert.cxx
+@@ -273,9 +273,9 @@ static void slow_fill_histogram (byte* pic24,int numpixels)
+
+ static boxptr find_biggest_color_pop (boxptr boxlist, int numboxes)
+ {
+- register boxptr boxp;
+- register int i;
+- register long maxc = 0;
++ boxptr boxp;
++ int i;
++ long maxc = 0;
+ boxptr which = NULL;
+
+ for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) {
+@@ -290,9 +290,9 @@ static boxptr find_biggest_color_pop (boxptr boxlist, int numboxes)
+
+ static boxptr find_biggest_volume (boxptr boxlist, int numboxes)
+ {
+- register boxptr boxp;
+- register int i;
+- register INT32 maxv = 0;
++ boxptr boxp;
++ int i;
++ INT32 maxv = 0;
+ boxptr which = NULL;
+
+ for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) {
+@@ -407,7 +407,7 @@ static int median_cut (boxptr boxlist, int numboxes, int desired_colors)
+ {
+ int n,lb;
+ int c0,c1,c2,cmax;
+- register boxptr b1,b2;
++ boxptr b1,b2;
+
+ while (numboxes < desired_colors) {
+ /* Select box to split.
+@@ -642,12 +642,12 @@ static void find_best_colors (int minc0,int minc1,int minc2,int numcolors,
+ {
+ int ic0, ic1, ic2;
+ int i, icolor;
+- register INT32 * bptr; /* pointer into bestdist[] array */
++ INT32 * bptr; /* pointer into bestdist[] array */
+ JSAMPLE * cptr; /* pointer into bestcolor[] array */
+ INT32 dist0, dist1; /* initial distance values */
+- register INT32 dist2; /* current distance in inner loop */
++ INT32 dist2; /* current distance in inner loop */
+ INT32 xx0, xx1; /* distance increments */
+- register INT32 xx2;
++ INT32 xx2;
+ INT32 inc0, inc1, inc2; /* initial values for increments */
+ /* This array holds the distance to the nearest-so-far color for each cell */
+ INT32 bestdist[BOX_C0_ELEMS * BOX_C1_ELEMS * BOX_C2_ELEMS];
+@@ -710,8 +710,8 @@ static void fill_inverse_cmap (int c0, int c1, int c2)
+ hist2d * histogram = sl_histogram;
+ int minc0, minc1, minc2; /* lower left corner of update box */
+ int ic0, ic1, ic2;
+- register JSAMPLE * cptr; /* pointer into bestcolor[] array */
+- register histptr cachep; /* pointer into main cache array */
++ JSAMPLE * cptr; /* pointer into bestcolor[] array */
++ histptr cachep; /* pointer into main cache array */
+ /* This array lists the candidate colormap indexes. */
+ JSAMPLE colorlist[MAXNUMCOLORS];
+ int numcolors; /* number of candidate colors */
+@@ -749,10 +749,10 @@ static void fill_inverse_cmap (int c0, int c1, int c2)
+
+ static void slow_map_pixels (byte *pic24,int width,int height, byte* pic8)
+ {
+- register LOCFSERROR cur0, cur1, cur2; /* current error or pixel value */
++ LOCFSERROR cur0, cur1, cur2; /* current error or pixel value */
+ LOCFSERROR belowerr0, belowerr1, belowerr2; /* error for pixel below cur */
+ LOCFSERROR bpreverr0, bpreverr1, bpreverr2; /* error for below/prev col */
+- register FSERRPTR errorptr; /* => fserrors[] at column before current */
++ FSERRPTR errorptr; /* => fserrors[] at column before current */
+ JSAMPROW inptr; /* => current input pixel */
+ JSAMPROW outptr; /* => current output pixel */
+ histptr cachep;
+@@ -814,7 +814,7 @@ static void slow_map_pixels (byte *pic24,int width,int height, byte* pic8)
+ if (*cachep == 0)
+ fill_inverse_cmap(cur0>>C0_SHIFT, cur1>>C1_SHIFT, cur2>>C2_SHIFT);
+ /* Now emit the colormap index for this cell */
+- { register int pixcode = *cachep - 1;
++ { int pixcode = *cachep - 1;
+ *outptr = (JSAMPLE) pixcode;
+ /* Compute representation error for this pixel */
+ cur0 -= (int) colormap0[pixcode];
+@@ -825,7 +825,7 @@ static void slow_map_pixels (byte *pic24,int width,int height, byte* pic8)
+ * Add these into the running sums, and simultaneously shift the
+ * next-line error sums left by 1 column.
+ */
+- { register LOCFSERROR bnexterr, delta;
++ { LOCFSERROR bnexterr, delta;
+
+ bnexterr = cur0; /* Process component 0 */
+ delta = cur0 * 2;
+--- a/src/image/sublib/IMG_gif.c
++++ b/src/image/sublib/IMG_gif.c
+@@ -406,7 +406,7 @@ LWZReadByte(SDL_RWops *src, int flag, int input_code_size)
+ static int clear_code, end_code;
+ static int table[2][(1 << MAX_LWZ_BITS)];
+ static int stack[(1 << (MAX_LWZ_BITS)) * 2], *sp;
+- register int i;
++ int i;
+
+ if (flag) {
+ set_code_size = input_code_size;
diff --git a/games-puzzle/xwelltris/files/xwelltris-1.0.1-configure-autoconf-2.72.patch b/games-puzzle/xwelltris/files/xwelltris-1.0.1-configure-autoconf-2.72.patch
new file mode 100644
index 000000000000..bfcfd9ddd3c3
--- /dev/null
+++ b/games-puzzle/xwelltris/files/xwelltris-1.0.1-configure-autoconf-2.72.patch
@@ -0,0 +1,106 @@
+Drop incorrectly quoted chunks which aren't relevant for remotely modern
+systems. Breaks with autoconf-2.72/9999.
+--- a/configure.in
++++ b/configure.in
+@@ -48,24 +48,6 @@ dnl On SCO Unix, there are ELF and COFF binaries. We want elf to
+ dnl provide for dlopen() and friends. With help from Tamas Laufer!
+ dnl ****************************************************************
+
+-case "$ARCH" in
+- *sco*|*SCO*)
+- AC_MSG_CHECKING("SCO-Unix. See if we need -belf")
+- old_cflags="$CFLAGS"
+- CFLAGS="$CFLAGS -belf"
+- AC_TRY_COMPILE(
+- [
+- ],
+- [
+- ],
+- CMFLAGS="$CMFLAGS -belf"
+- AC_MSG_RESULT(yes),
+- AC_MSG_RESULT(no)
+- CFLAGS="$old_cflags")
+- ;;
+-esac
+-
+-
+ dnl Checks for header files.
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+@@ -105,23 +87,22 @@ fi
+
+
+ AC_ARG_WITH(sdl, [ --with-sdl Turn on SDL support instead of X11],
+- sdl_support=yes,
+- sdl_support=no)
++ [sdl_support=yes],
++ [sdl_support=no])
+
+-if test "x$sdl_support" = "xyes"; then
++AS_IF([test "x$sdl_support" = "xyes"], [
+ echo "SDL is ENABLED *******************"
+ IFACEOBJS='$(SDLOBJS)'
+ IFACELIBS='`sdl-config --libs` -lSDL_image'
+ IFACEINC='`sdl-config --cflags` -I./sdl'
+-else
++], [
+ echo "X11 is ENABLED *******************"
+ AC_PATH_X
+ AC_PATH_XTRA
+ IFACEOBJS='$(X11OBJS) $(X11IMAGE)'
+ IFACELIBS='$(XLIBS)'
+ IFACEINC='$(XINC) -I./x11'
+-fi
+-
++])
+
+ out_lib=${LIBS}
+
+@@ -169,47 +150,6 @@ MCOMMON=./src/Make.common
+ AC_SUBST_FILE(MCOMMON)
+
+
+-dnl Some specific OS stuff
+-
+-case "$ARCH" in
+- *hppa*|*hpux*)
+- # do nothing
+- ;;
+- *solaris*)
+- if test "$GCC" = "yes"; then
+- AC_MSG_CHECKING("whether we need -fpermissive")
+- old_cflags="$CFLAGS"
+- CFLAGS="-fpermissive $CFLAGS"
+- AC_TRY_RUN(
+- main()
+- { exit(0);
+- },
+- if grep 'option `-fpermissive'"'" config.log >/dev/null; then
+- AC_MSG_RESULT(no)
+- CFLAGS="$old_cflags"
+- else
+- CFLAGS="$old_cflags -fpermissive"
+- AC_MSG_RESULT(yes)
+- fi,
+- AC_MSG_RESULT(no)
+- CFLAGS="$old_cflags",
+- AC_MSG_RESULT(no)
+- CFLAGS="$old_cflags")
+- fi
+- ;;
+- *aix*)
+- # do nothing
+- ;;
+- *darwin*)
+- # do nothing
+- ;;
+- *)
+- # do nothing
+- ;;
+-esac
+-
+-
+-
+ AC_CONFIG_HEADER(src/include/config.h)
+ AC_OUTPUT( \
+ src/Make.common \
diff --git a/games-puzzle/xwelltris/xwelltris-1.0.1-r1.ebuild b/games-puzzle/xwelltris/xwelltris-1.0.1-r2.ebuild
similarity index 84%
rename from games-puzzle/xwelltris/xwelltris-1.0.1-r1.ebuild
rename to games-puzzle/xwelltris/xwelltris-1.0.1-r2.ebuild
index 6d69ef032900..8f50a97e4b6a 100644
--- a/games-puzzle/xwelltris/xwelltris-1.0.1-r1.ebuild
+++ b/games-puzzle/xwelltris/xwelltris-1.0.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit toolchain-funcs prefix
+inherit autotools toolchain-funcs prefix
DESCRIPTION="2.5D tetris like game"
HOMEPAGE="http://xnc.jinr.ru/xwelltris/"
@@ -26,6 +26,8 @@ PATCHES=(
# Look in ${EPREFIX}/var/lib/xwelltris for score file
"${FILESDIR}"/${PN}-1.0.1-scorefile-dir.patch
"${FILESDIR}"/${PN}-1.0.1-gcc-11.patch
+ "${FILESDIR}"/${PN}-1.0.1-c++17.patch
+ "${FILESDIR}"/${PN}-1.0.1-configure-autoconf-2.72.patch
)
src_prepare() {
@@ -41,6 +43,9 @@ src_prepare() {
# Ensure we look in ${EPREFIX}/var/lib/${PN} for score file
eprefixify src/commonfuncs.cxx
+
+ # Needed for autotools-2.72 patch + clang 16 (bug #899014)
+ eautoreconf
}
src_configure() {
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 2380c36cf1f1..3df65747a5da 100644
Binary files a/games-roguelike/Manifest.gz and b/games-roguelike/Manifest.gz differ
diff --git a/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild b/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild
index 7d2e05402a44..61ab7b0bd76c 100644
--- a/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.30.0_pre20230129.ebuild
@@ -51,7 +51,7 @@ SRC_URI="
# Public Domain|CC0: most of tiles
# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="advpng debug ncurses sound test +tiles"
RESTRICT="!test? ( test )"
REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index c042247dde71..8b563fe95e13 100644
Binary files a/games-simulation/Manifest.gz and b/games-simulation/Manifest.gz differ
diff --git a/games-simulation/lincity/lincity-1.13.1-r3.ebuild b/games-simulation/lincity/lincity-1.13.1-r4.ebuild
similarity index 88%
rename from games-simulation/lincity/lincity-1.13.1-r3.ebuild
rename to games-simulation/lincity/lincity-1.13.1-r4.ebuild
index c80cf4adcb21..29d3d9a64773 100644
--- a/games-simulation/lincity/lincity-1.13.1-r3.ebuild
+++ b/games-simulation/lincity/lincity-1.13.1-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit desktop
+inherit autotools desktop
DESCRIPTION="City simulation game for X"
HOMEPAGE="http://lincity.sourceforge.net/"
@@ -30,6 +30,13 @@ PATCHES=(
"${FILESDIR}"/${P}-Fix-prototypes-and-implicit-function-declarations.patch
)
+src_prepare() {
+ default
+
+ # Clang 16, bug #899020
+ eautoreconf
+}
+
src_configure() {
local econfargs=(
--with-gzip
diff --git a/games-simulation/senken/files/senken-0.3.0-implicit-function-decl.patch b/games-simulation/senken/files/senken-0.3.0-implicit-function-decl.patch
new file mode 100644
index 000000000000..f4792cfb0649
--- /dev/null
+++ b/games-simulation/senken/files/senken-0.3.0-implicit-function-decl.patch
@@ -0,0 +1,29 @@
+--- a/src/callbacks.c
++++ b/src/callbacks.c
+@@ -47,6 +47,7 @@
+ #include "client.h"
+ #include "landvalue.h"
+ #include "gtkhelp_reports.h"
++#include "support.h"
+
+ #include "sdlwin.h"
+ #include "utils.h"
+--- a/src/gtkhelp_reports.c
++++ b/src/gtkhelp_reports.c
+@@ -5,6 +5,7 @@
+ #include "player.h"
+ #include "client.h"
+ #include "gtkhelp_reports.h"
++#include "support.h"
+
+ /**** HELPERS ****/
+
+--- a/src/gtkhelp_reports.h
++++ b/src/gtkhelp_reports.h
+@@ -17,4 +17,6 @@ extern void update_population_report(GtkWidget *window, client_t *client);
+ extern void setup_info_treeview(GtkWidget *window);
+ extern void update_info_report(GtkWidget *window, client_t *client, int mapx, int mapy);
+
++extern void update_info_window(GtkWidget *window, client_t *client, int mapx, int mapy);
++
+ #endif /* GTKHELP_REPORTS */
diff --git a/games-simulation/senken/metadata.xml b/games-simulation/senken/metadata.xml
index 1c3ba213c494..36d202f38fa2 100644
--- a/games-simulation/senken/metadata.xml
+++ b/games-simulation/senken/metadata.xml
@@ -5,4 +5,7 @@
games@gentoo.org
Gentoo Games Project
+
+senken
+
diff --git a/games-simulation/senken/senken-0.3.0-r1.ebuild b/games-simulation/senken/senken-0.3.0-r2.ebuild
similarity index 73%
rename from games-simulation/senken/senken-0.3.0-r1.ebuild
rename to games-simulation/senken/senken-0.3.0-r2.ebuild
index 206d6b75324d..a9c9fdf39deb 100644
--- a/games-simulation/senken/senken-0.3.0-r1.ebuild
+++ b/games-simulation/senken/senken-0.3.0-r2.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-DESCRIPTION="city simulation game"
+inherit autotools
+
+DESCRIPTION="City simulation game"
HOMEPAGE="https://savannah.nongnu.org/projects/senken/"
SRC_URI="mirror://gentoo/${P}.tar.gz"
@@ -16,13 +18,17 @@ RDEPEND="
>=media-libs/libsdl-1.2.4
media-libs/sdl-image
x11-libs/gtk+:2
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
+ nls? ( virtual/libintl )
+"
+DEPEND="
+ ${RDEPEND}
+ nls? ( sys-devel/gettext )
+"
PATCHES=(
"${FILESDIR}"/${P}-as-needed.patch
"${FILESDIR}"/${P}-warnings.patch
+ "${FILESDIR}"/${P}-implicit-function-decl.patch
)
src_prepare() {
@@ -31,7 +37,12 @@ src_prepare() {
sed -i \
-e "s:/usr/local/share:/usr/share:" \
lib/utils.h || die
+
+ # Clang 16, bug #899022
+ sed -i -e "s:configure.in:configure.ac:" Makefile.in || die
+ eautoconf
}
+
src_configure() {
econf $(use_enable nls)
}
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index bf50f7640355..64b7914ad676 100644
Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ
diff --git a/games-util/etswitch/etswitch-0.1.14-r1.ebuild b/games-util/etswitch/etswitch-0.1.14-r2.ebuild
similarity index 83%
rename from games-util/etswitch/etswitch-0.1.14-r1.ebuild
rename to games-util/etswitch/etswitch-0.1.14-r2.ebuild
index 61b5ce230018..51497a7c6f71 100644
--- a/games-util/etswitch/etswitch-0.1.14-r1.ebuild
+++ b/games-util/etswitch/etswitch-0.1.14-r2.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
+inherit autotools
DESCRIPTION="*nix minimizer for a few games"
HOMEPAGE="http://hem.bredband.net/b400150/"
@@ -25,3 +27,9 @@ PATCHES=(
"${FILESDIR}"/${P}-glibc.patch
"${FILESDIR}"/${P}-fno-common.patch
)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
diff --git a/games-util/gamepick/gamepick-0.35-r1.ebuild b/games-util/gamepick/gamepick-0.35-r2.ebuild
similarity index 82%
rename from games-util/gamepick/gamepick-0.35-r1.ebuild
rename to games-util/gamepick/gamepick-0.35-r2.ebuild
index 097f39d276ab..5c150da179cb 100644
--- a/games-util/gamepick/gamepick-0.35-r1.ebuild
+++ b/games-util/gamepick/gamepick-0.35-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit desktop
+inherit autotools desktop
DESCRIPTION="Launch opengl games with custom graphic settings"
HOMEPAGE="http://www.rillion.net/gamepick/index.html"
@@ -19,9 +19,13 @@ BDEPEND="virtual/pkgconfig"
src_prepare() {
default
+
sed -i \
-e 's/-O2//' \
src/Makefile.in || die
+
+ # Clang 16, bug #898998
+ eautoreconf
}
src_install() {
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 9c67abc19ba3..a268975b3fa8 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-43.0.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-43.0.1.ebuild
index a16edfb257c2..4e1076f78454 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-43.0.1.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-43.0.1.ebuild
@@ -59,7 +59,7 @@ src_configure() {
}
src_test() {
- virtx meson_src_test
+ virtx dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
}
pkg_postinst() {
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 0efbab9482ee..e460c0db0f81 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index 3e90e7060d61..0f599c00d73b 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1 +1,2 @@
+DIST gtk-4.10.0.tar.xz 20471568 BLAKE2B 8fed349e7854a7845232da556b2949bc4eaf5d3aaface86c6e2c3a505aefeb754e3147c7a10f82e0fee713418bc8d78186942e98d59a42ed7288d48d88e52f28 SHA512 1283985ed64035e3b183cccc341dd38029112e8277065f8b39be56b4f489aaf03efc0ce5f9c36ddd746a776be3772f7606f1c54fd84292479d63d86b94281159
DIST gtk-4.8.3.tar.xz 20297060 BLAKE2B ad0f9e2998f3748afe4a03317e6d0438bfd9eaf804f202e96724541cce20597b7b6e69d5c50ce319450feed4f4a5653c0d99b949b23ce3a40c46a12da7e2d85f SHA512 56be0f5ce85a9cbbda4a5de53baeeb6b8cc527a5d34723ae5548759ec7c28f03d204b6b6758dffed02a9e226f3bfcd1f15971105c2f2f7be7cef22538be27754
diff --git a/gui-libs/gtk/gtk-4.10.0.ebuild b/gui-libs/gtk/gtk-4.10.0.ebuild
new file mode 100644
index 000000000000..162cca71d230
--- /dev/null
+++ b/gui-libs/gtk/gtk-4.10.0.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
+
+DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
+HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
+
+LICENSE="LGPL-2+"
+SLOT="4"
+IUSE="aqua broadway cloudproviders colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c"
+REQUIRED_USE="
+ || ( aqua wayland X )
+ test? ( introspection )
+"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.72.0:2
+ >=x11-libs/cairo-1.17.6[aqua?,glib,svg(+),X?]
+ >=x11-libs/pango-1.50.0[introspection?]
+ >=dev-libs/fribidi-1.0.6
+ >=media-libs/harfbuzz-2.6.0:=
+ >=x11-libs/gdk-pixbuf-2.30:2[introspection?]
+ media-libs/libpng:=
+ media-libs/tiff:=
+ media-libs/libjpeg-turbo:=
+ >=media-libs/libepoxy-1.4[egl,X(+)?]
+ >=media-libs/graphene-1.10.0[introspection?]
+ app-text/iso-codes
+ x11-misc/shared-mime-info
+
+ cloudproviders? ( net-libs/libcloudproviders )
+ colord? ( >=x11-misc/colord-0.1.9:0= )
+ cups? ( >=net-print/cups-2.0 )
+ ffmpeg? ( media-video/ffmpeg:= )
+ gstreamer? (
+ >=media-libs/gst-plugins-bad-1.12.3:1.0
+ >=media-libs/gst-plugins-base-1.12.3:1.0[opengl]
+ )
+ introspection? ( >=dev-libs/gobject-introspection-1.72:= )
+ vulkan? ( media-libs/vulkan-loader:= )
+ wayland? (
+ >=dev-libs/wayland-1.21.0
+ >=dev-libs/wayland-protocols-1.25
+ media-libs/mesa[wayland]
+ >=x11-libs/libxkbcommon-0.2
+ )
+ X? (
+ >=app-accessibility/at-spi2-core-2.46.0
+ media-libs/fontconfig
+ media-libs/mesa[X(+)]
+ x11-libs/libX11
+ >=x11-libs/libXi-1.8
+ x11-libs/libXext
+ >=x11-libs/libXrandr-1.5
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXdamage
+ x11-libs/libXinerama
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+ X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=dev-util/gtk-update-icon-cache-3
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+ gnome-base/librsvg
+ >=x11-themes/adwaita-icon-theme-3.14
+"
+BDEPEND="
+ dev-libs/gobject-introspection-common
+ introspection? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ ')
+ )
+ dev-python/docutils
+ >=dev-util/gdbus-codegen-2.48
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.7
+ virtual/pkgconfig
+ test? (
+ dev-libs/glib:2
+ media-fonts/cantarell
+ wayland? ( dev-libs/weston[headless] )
+ )
+"
+
+python_check_deps() {
+ python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+}
+
+pkg_setup() {
+ use introspection && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ xdg_environment_reset
+
+ # Nothing should use gtk4-update-icon-cache and an unversioned one is shipped by dev-util/gtk-update-icon-cache
+ sed -i -e '/gtk4-update-icon-cache/d' tools/meson.build || die
+ # Workaround RWX ELF sections, https://gitlab.gnome.org/GNOME/gtk/-/issues/4598
+ sed -i -e 's/^ld =.*/ld = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
+ sed -i -e 's/^objcopy =.*/objcopy = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ # GDK backends
+ $(meson_use X x11-backend)
+ $(meson_use wayland wayland-backend)
+ $(meson_use broadway broadway-backend)
+ -Dwin32-backend=false
+ $(meson_use aqua macos-backend)
+
+ # Media backends
+ $(meson_feature ffmpeg media-ffmpeg)
+ $(meson_feature gstreamer media-gstreamer)
+
+ # Print backends
+ -Dprint-cpdb=disabled
+ $(meson_feature cups print-cups)
+
+ # Optional dependencies
+ $(meson_feature vulkan)
+ $(meson_feature cloudproviders)
+ $(meson_feature sysprof)
+ -Dtracker=disabled # tracker3 is not packaged in Gentoo yet
+ $(meson_feature colord)
+ # Expected to fail with GCC < 11
+ # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71993
+ $(meson_feature cpu_flags_x86_f16c f16c)
+
+ # Documentation and introspection
+ -Dgtk_doc=false # we ship pregenerated API docs from tarball
+ -Dupdate_screenshots=false
+ -Dman-pages=true
+ $(meson_feature introspection)
+
+ # Demos and binaries
+ $(meson_use test build-testsuite)
+ $(meson_use examples build-examples)
+ $(meson_use examples demos)
+ -Dbuild-tests=false
+ )
+ meson_src_configure
+}
+
+src_test() {
+ "${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+ if use X; then
+ einfo "Running tests under X"
+ GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --setup=x11
+ fi
+
+ if use wayland; then
+ einfo "Running tests under Weston"
+
+ export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+
+ weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
+ compositor=$!
+ export WAYLAND_DISPLAY=wayland-5
+
+ GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --setup=wayland
+
+ exit_code=$?
+ kill ${compositor}
+ fi
+}
+
+src_install() {
+ meson_src_install
+
+ insinto /usr/share/gtk-doc/html
+ # This will install API docs specific to X11 and wayland regardless of USE flags, but this is intentional
+ doins -r "${S}"/docs/reference/{gtk/gtk4,gsk/gsk4,gdk/gdk4{,-wayland,-x11}}
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
+ gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+
+ if ! has_version "app-text/evince"; then
+ elog "Please install app-text/evince for print preview functionality."
+ elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+ elog "add it to your settings.ini file."
+ fi
+
+ if use examples ; then
+ optfeature "syntax highlighting in gtk4-demo" app-text/highlight
+ fi
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/gui-libs/gtk/metadata.xml b/gui-libs/gtk/metadata.xml
index ba004a3523be..738bf162e983 100644
--- a/gui-libs/gtk/metadata.xml
+++ b/gui-libs/gtk/metadata.xml
@@ -7,6 +7,7 @@
+
+ oath-toolkit/oath-toolkit
+ oath-toolkit
+
diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.7.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.7.ebuild
new file mode 100644
index 000000000000..f8cb28b09ce9
--- /dev/null
+++ b/sys-auth/oath-toolkit/oath-toolkit-2.6.7.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pam
+
+DESCRIPTION="Toolkit for using one-time password authentication with HOTP/TOTP algorithms"
+HOMEPAGE="https://www.nongnu.org/oath-toolkit/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="pam pskc static-libs test"
+REQUIRED_USE="test? ( pskc )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ dev-libs/icu:=
+ pam? ( sys-libs/pam )
+ pskc? (
+ dev-libs/libxml2
+ dev-libs/xmlsec
+ )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-util/gtk-doc-am
+ test? ( dev-libs/libxml2 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-new-xmlsec-tests.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ MIN # glibc fp
+)
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable test xmltest)
+ $(use_enable pam)
+ $(use_with pam pam-dir $(getpam_mod_dir))
+ $(use_enable pskc)
+ $(use_enable static-libs static)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ # Without keep-going, it will bail out after the first testsuite failure,
+ # skipping the other testsuites. as they are mostly independent, this sucks.
+ emake --keep-going check
+
+ # Avoid errant QA notice for no tests run on these
+ rm -f libpskc/gtk-doc/test-suite.log liboath/gtk-doc/test-suite.log || die
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -type f -delete || die
+
+ if use pam; then
+ newdoc pam_oath/README README.pam
+ fi
+
+ if use pskc; then
+ doman pskctool/pskctool.1
+ fi
+}
diff --git a/sys-auth/pam_u2f/Manifest b/sys-auth/pam_u2f/Manifest
index f7175d560ae8..f3f9f14b29ce 100644
--- a/sys-auth/pam_u2f/Manifest
+++ b/sys-auth/pam_u2f/Manifest
@@ -1,2 +1,3 @@
DIST pam_u2f-1.1.1.tar.gz 429822 BLAKE2B 8ed44f82295ea24fe30c5830971afd29a23b48e173c3cb69d3dcaf73b142de36f86087eaee69b1793a8846fdb2efc5530d52fa9f40e4357e6cd2ea9960b9bb39 SHA512 ca81c78e67c17c369117e9d38e50033eaa96e0b15673521db2c382de1aa2566f7406fb43801a5938758480966c5e7316943769db5be826983d3865710e0274c1
DIST pam_u2f-1.2.0.tar.gz 442214 BLAKE2B 17dadcb4325a130da67caf2fbf9bb2bf5d76706b28540ddda6ab8904ec5924d14fc752b7e079940989a8208d27fe0e5d46ea4365426debd5076588c51f46a60a SHA512 a00135e49b22dad5ec2513236a64dca67f04062fd8fa4c8d5ac7cb05d93b4d743ceb8ac5ee99a19667bdbfe8c0be9de904fb50110bed0b55ba8d5fd2aa5fcf28
+DIST pam_u2f-1.2.1.tar.gz 450747 BLAKE2B 6e20ad67d00fb4cb83b73a4bc96f5b2bd96c46ba800660face2f877006691723312c3d53d2db2a66f0a7c74e656960d43ef559dfdb47872f00acac1daf01d1c9 SHA512 c81b87dfd56221b3c842d9969b93bc194689b9eca52e855531830b8725135f533c902f0b56e88bed9944ab3047b0a3b08d62718c621b08f865867f38c300a83f
diff --git a/sys-auth/pam_u2f/pam_u2f-1.2.1.ebuild b/sys-auth/pam_u2f/pam_u2f-1.2.1.ebuild
new file mode 100644
index 000000000000..c63693e01365
--- /dev/null
+++ b/sys-auth/pam_u2f/pam_u2f-1.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic pam
+
+DESCRIPTION="PAM module for FIDO2 and U2F keys"
+HOMEPAGE="https://github.com/Yubico/pam-u2f"
+SRC_URI="https://developers.yubico.com/${PN/_/-}/Releases/${P}.tar.gz"
+
+LICENSE="BSD ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+ dev-libs/libfido2:=
+ dev-libs/openssl:=
+ sys-libs/pam"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+ use debug || append-cppflags -UDEBUG_PAM -UPAM_DEBUG
+ econf --with-pam-dir=$(getpam_mod_dir)
+}
diff --git a/sys-auth/polkit/polkit-122.ebuild b/sys-auth/polkit/polkit-122.ebuild
index 16ef0ad26c8c..65f7240d5df0 100644
--- a/sys-auth/polkit/polkit-122.ebuild
+++ b/sys-auth/polkit/polkit-122.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="+daemon +duktape examples gtk +introspection kde pam selinux systemd test"
# https://gitlab.freedesktop.org/polkit/polkit/-/issues/181 for test restriction
RESTRICT="!test? ( test ) test"
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 14daeaa1fbb1..91bbcef946a4 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/libcircle/metadata.xml b/sys-cluster/libcircle/metadata.xml
index 31b8665388a1..9bfb7732ed85 100644
--- a/sys-cluster/libcircle/metadata.xml
+++ b/sys-cluster/libcircle/metadata.xml
@@ -1,10 +1,6 @@
-
- junghans@gentoo.org
- Christoph Junghans
-
cluster@gentoo.org
Gentoo Cluster Project
diff --git a/sys-cluster/libquo/metadata.xml b/sys-cluster/libquo/metadata.xml
index 97747862bd39..91bd0e1ac85b 100644
--- a/sys-cluster/libquo/metadata.xml
+++ b/sys-cluster/libquo/metadata.xml
@@ -1,10 +1,6 @@
-
- junghans@gentoo.org
- Christoph Junghans
-
sci@gentoo.org
Gentoo Science Project
diff --git a/sys-cluster/nullmpi/metadata.xml b/sys-cluster/nullmpi/metadata.xml
index a8c5bc27de73..d7006d2555f8 100644
--- a/sys-cluster/nullmpi/metadata.xml
+++ b/sys-cluster/nullmpi/metadata.xml
@@ -1,11 +1,7 @@
-
- junghans@gentoo.org
- Christoph Junghans
-
-
+
cluster@gentoo.org
Gentoo Cluster Project
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 226c98d3ba7c..fe654350944c 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 95d5d4a04272..2cd9924d32f9 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,3 +1,3 @@
DIST bmake-20220928.tar.gz 821224 BLAKE2B 9b377a9a8d329d229aae37fd852a68629edb78f7f0f16bf8aeb59df4da886fe89d8b7defd8294fa49fca397d4726e704eb9c95936561fe8a3a0a1fdfe4e5b861 SHA512 13fde6517d79080c5a548b1e47e4fbf00d54752f48b40d10542926b26a3be22da70877ca2b977b43366ec1b632a76a6974c78155c39895910e01e4142e7675a0
-DIST bmake-20230120.tar.gz 823514 BLAKE2B 45e96f4911b8965b44ebe30c636819b36cb33a9733304f3bb8a99a806356ef1f01925c48a0fd25cf57b65524ae6ef544b6a79974bf1f92b749a242323a068fdd SHA512 b3c54f723adaf3329af14247d9891b1732d2b6dc9856e30be6fd65f3cd7aab85c4fcef1ef9799eaca5203357e2be5a6564d7e9108844b459654b1fa3767f721a
+DIST bmake-20230303.tar.gz 831628 BLAKE2B b93153c97713e492dabd827aad9f9089c2d7c133a4f77592039261b56d8efea43286012ade39cc822c53a0daa2f7a44c1f2dbf5e441c3cc052f43c3e0eed1d95 SHA512 d4595f3b19eac828de9a3ba6901ae883b147de441dc2707da24187860136ae4fcd4cfa343dcc9f52be3b96abf54b165f9808ae863b3a70fabec051257525994f
DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
diff --git a/sys-devel/bmake/bmake-20230120.ebuild b/sys-devel/bmake/bmake-20230303.ebuild
similarity index 100%
rename from sys-devel/bmake/bmake-20230120.ebuild
rename to sys-devel/bmake/bmake-20230303.ebuild
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index f60583ac2e4c..1edea9832f73 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -4,4 +4,5 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-devel/clang-common/clang-common-17.0.0_pre20230304.ebuild b/sys-devel/clang-common/clang-common-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..3165f42a329f
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-17.0.0_pre20230304.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="
+ default-compiler-rt default-libcxx default-lld llvm-libunwind
+ hardened stricter
+"
+
+PDEPEND="
+ sys-devel/clang:*
+ default-compiler-rt? (
+ sys-devel/clang-runtime[compiler-rt]
+ llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
+ !llvm-libunwind? ( sys-libs/libunwind[static-libs] )
+ )
+ !default-compiler-rt? ( sys-devel/gcc )
+ default-libcxx? ( >=sys-libs/libcxx-${PV} )
+ !default-libcxx? ( sys-devel/gcc )
+ default-lld? ( sys-devel/lld )
+ !default-lld? ( sys-devel/binutils )
+"
+IDEPEND="
+ !default-compiler-rt? ( sys-devel/gcc-config )
+ !default-libcxx? ( sys-devel/gcc-config )
+"
+
+LLVM_COMPONENTS=( clang/utils )
+llvm.org_set_globals
+
+pkg_pretend() {
+ [[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
+
+ local flag missing_flags=()
+ for flag in default-{compiler-rt,libcxx,lld}; do
+ if ! use "${flag}" && has_version "sys-devel/clang[${flag}]"; then
+ missing_flags+=( "${flag}" )
+ fi
+ done
+
+ if [[ ${missing_flags[@]} ]]; then
+ eerror "It seems that you have the following flags set on sys-devel/clang:"
+ eerror
+ eerror " ${missing_flags[*]}"
+ eerror
+ eerror "The default runtimes are now set via flags on sys-devel/clang-common."
+ eerror "The build is being aborted to prevent breakage. Please either set"
+ eerror "the respective flags on this ebuild, e.g.:"
+ eerror
+ eerror " sys-devel/clang-common ${missing_flags[*]}"
+ eerror
+ eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
+ die "Mismatched defaults detected between sys-devel/clang and sys-devel/clang-common"
+ fi
+}
+
+src_install() {
+ newbashcomp bash-autocomplete.sh clang
+
+ insinto /etc/clang
+ newins - gentoo-runtimes.cfg <<-EOF
+ # This file is initially generated by sys-devel/clang-runtime.
+ # It is used to control the default runtimes using by clang.
+
+ --rtlib=$(usex default-compiler-rt compiler-rt libgcc)
+ --unwindlib=$(usex default-compiler-rt libunwind libgcc)
+ --stdlib=$(usex default-libcxx libc++ libstdc++)
+ -fuse-ld=$(usex default-lld lld bfd)
+ EOF
+
+ newins - gentoo-gcc-install.cfg <<-EOF
+ # This file is maintained by gcc-config.
+ # It is used to specify the selected GCC installation.
+ EOF
+
+ newins - gentoo-common.cfg <<-EOF
+ # This file contains flags common to clang, clang++ and clang-cpp.
+ @gentoo-runtimes.cfg
+ @gentoo-gcc-install.cfg
+ @gentoo-hardened.cfg
+ EOF
+
+ # Baseline hardening (bug #851111)
+ newins - gentoo-hardened.cfg <<-EOF
+ # Some of these options are added unconditionally, regardless of
+ # USE=hardened, for parity with sys-devel/gcc.
+ -fstack-clash-protection
+ -fstack-protector-strong
+ -fPIE
+ -include "${EPREFIX}/usr/include/gentoo/fortify.h"
+ EOF
+
+ dodir /usr/include/gentoo
+
+ local fortify_level=$(usex hardened 3 2)
+ # We have to do this because glibc's headers warn if F_S is set
+ # without optimization and that would at the very least be very noisy
+ # during builds and at worst trigger many -Werror builds.
+ cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
+ #ifndef _FORTIFY_SOURCE
+ #if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
+ #define _FORTIFY_SOURCE ${fortify_level}
+ #endif
+ #endif
+ EOF
+
+ if use hardened ; then
+ cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
+ # Options below are conditional on USE=hardened.
+ -D_GLIBCXX_ASSERTIONS
+
+ # Analogue to GLIBCXX_ASSERTIONS
+ # https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
+ -D_LIBCPP_ENABLE_ASSERTIONS=1
+ EOF
+ fi
+
+ if use stricter; then
+ newins - gentoo-stricter.cfg <<-EOF
+ # This file increases the strictness of older clang versions
+ # to match the newest upstream version.
+
+ # clang-16 defaults
+ -Werror=implicit-function-declaration
+ -Werror=implicit-int
+ -Werror=incompatible-function-pointer-types
+
+ # constructs banned by C2x
+ -Werror=deprecated-non-prototype
+
+ # deprecated but large blast radius
+ #-Werror=strict-prototypes
+ EOF
+
+ cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+ @gentoo-stricter.cfg
+ EOF
+ fi
+
+ local tool
+ for tool in clang{,++,-cpp}; do
+ newins - "${tool}.cfg" <<-EOF
+ # This configuration file is used by ${tool} driver.
+ @gentoo-common.cfg
+ EOF
+ done
+}
+
+pkg_preinst() {
+ if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
+ then
+ local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
+ if [[ -n ${gcc_path} ]]; then
+ cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
+ --gcc-install-dir="${gcc_path%%:*}"
+ EOF
+ fi
+ fi
+}
diff --git a/sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230304.ebuild b/sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..67b42357665e
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230304.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build toolchain-funcs
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+
+LICENSE="metapackage"
+SLOT="${PV%%.*}"
+KEYWORDS=""
+IUSE="+compiler-rt libcxx openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+PROPERTIES="live"
+
+RDEPEND="
+ compiler-rt? (
+ ~sys-libs/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+ sanitize? (
+ ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+ )
+ )
+ libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+ openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )
+"
+
+pkg_pretend() {
+ if tc-is-clang; then
+ ewarn "You seem to be using clang as a system compiler. As of clang-16,"
+ ewarn "upstream has turned a few warnings that commonly occur during"
+ ewarn "configure script runs into errors by default. This causes some"
+ ewarn "configure tests to start failing, sometimes resulting in silent"
+ ewarn "breakage, missing functionality or runtime misbehavior. It is"
+ ewarn "not yet clear whether the change will remain or be reverted."
+ ewarn
+ ewarn "For more information, please see:"
+ ewarn "https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213"
+ fi
+}
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 54a74bc2f1be..c70f2d89ef6c 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -8,4 +8,5 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-devel/clang/clang-17.0.0_pre20230304.ebuild b/sys-devel/clang/clang-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..4c59778e088a
--- /dev/null
+++ b/sys-devel/clang/clang-17.0.0_pre20230304.ebuild
@@ -0,0 +1,481 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org multilib multilib-minimal \
+ prefix python-single-r1 toolchain-funcs flag-o-matic
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS=""
+IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ ~sys-devel/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
+ static-analyzer? ( dev-lang/perl:* )
+ xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ ${DEPEND}
+ >=sys-devel/clang-common-${PV}
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-util/cmake-3.16
+ doc? ( $(python_gen_cond_dep '
+ dev-python/recommonmark[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ ') )
+ xml? ( virtual/pkgconfig )
+"
+PDEPEND="
+ ~sys-devel/clang-runtime-${PV}
+ sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR}
+"
+
+LLVM_COMPONENTS=(
+ clang clang-tools-extra cmake
+ llvm/lib/Transforms/Hello
+)
+LLVM_MANPAGES=1
+LLVM_TEST_COMPONENTS=(
+ llvm/lib/Testing
+ llvm/utils
+ third-party
+)
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+# target. However, you will need appropriate crt* files (installed
+# e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+# in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # create extra parent dir for relative CLANG_RESOURCE_DIR access
+ mkdir -p x/y || die
+ BUILD_DIR=${WORKDIR}/x/y/clang
+
+ llvm.org_src_prepare
+
+ # add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+ eprefixify \
+ lib/Lex/InitHeaderSearch.cpp \
+ lib/Driver/ToolChains/Darwin.cpp || die
+
+ if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
+ sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
+ fi
+}
+
+check_distribution_components() {
+ if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+ local all_targets=() my_targets=() l
+ cd "${BUILD_DIR}" || die
+
+ while read -r l; do
+ if [[ ${l} == install-*-stripped:* ]]; then
+ l=${l#install-}
+ l=${l%%-stripped*}
+
+ case ${l} in
+ # meta-targets
+ clang-libraries|distribution)
+ continue
+ ;;
+ # tools
+ clang|clangd|clang-*)
+ ;;
+ # static libraries
+ clang*|findAllSymbols)
+ continue
+ ;;
+ # conditional to USE=doc
+ docs-clang-html|docs-clang-tools-html)
+ use doc || continue
+ ;;
+ esac
+
+ all_targets+=( "${l}" )
+ fi
+ done < <(${NINJA} -t targets all)
+
+ while read -r l; do
+ my_targets+=( "${l}" )
+ done < <(get_distribution_components $"\n")
+
+ local add=() remove=()
+ for l in "${all_targets[@]}"; do
+ if ! has "${l}" "${my_targets[@]}"; then
+ add+=( "${l}" )
+ fi
+ done
+ for l in "${my_targets[@]}"; do
+ if ! has "${l}" "${all_targets[@]}"; then
+ remove+=( "${l}" )
+ fi
+ done
+
+ if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+ eqawarn "get_distribution_components() is outdated!"
+ eqawarn " Add: ${add[*]}"
+ eqawarn "Remove: ${remove[*]}"
+ fi
+ cd - >/dev/null || die
+ fi
+}
+
+get_distribution_components() {
+ local sep=${1-;}
+
+ local out=(
+ # common stuff
+ clang-cmake-exports
+ clang-headers
+ clang-resource-headers
+ libclang-headers
+
+ aarch64-resource-headers
+ arm-common-resource-headers
+ arm-resource-headers
+ core-resource-headers
+ cuda-resource-headers
+ hexagon-resource-headers
+ hip-resource-headers
+ hlsl-resource-headers
+ mips-resource-headers
+ opencl-resource-headers
+ openmp-resource-headers
+ ppc-htm-resource-headers
+ ppc-resource-headers
+ riscv-resource-headers
+ systemz-resource-headers
+ utility-resource-headers
+ ve-resource-headers
+ webassembly-resource-headers
+ windows-resource-headers
+ x86-resource-headers
+
+ # libs
+ clang-cpp
+ libclang
+ )
+
+ if multilib_is_native_abi; then
+ out+=(
+ # common stuff
+ bash-autocomplete
+ libclang-python-bindings
+
+ # tools
+ amdgpu-arch
+ c-index-test
+ clang
+ clang-format
+ clang-offload-bundler
+ clang-offload-packager
+ clang-refactor
+ clang-repl
+ clang-rename
+ clang-scan-deps
+ diagtool
+ hmaptool
+ nvptx-arch
+
+ # needed for cross-compiling Clang
+ clang-tblgen
+ )
+
+ if use extra; then
+ out+=(
+ # extra tools
+ clang-apply-replacements
+ clang-change-namespace
+ clang-doc
+ clang-include-cleaner
+ clang-include-fixer
+ clang-move
+ clang-pseudo
+ clang-query
+ clang-reorder-fields
+ clang-tidy
+ clang-tidy-headers
+ clangd
+ find-all-symbols
+ modularize
+ pp-trace
+ )
+ fi
+
+ if llvm_are_manpages_built; then
+ out+=( docs-clang-man )
+ use extra && out+=( docs-clang-tools-man )
+ fi
+
+ if use doc; then
+ out+=( docs-clang-html )
+ use extra && out+=( docs-clang-tools-html )
+ fi
+
+ use static-analyzer && out+=(
+ clang-check
+ clang-extdef-mapping
+ scan-build
+ scan-build-py
+ scan-view
+ )
+ fi
+
+ printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+ tc-is-gcc && filter-lto # GCC miscompiles LLVM, bug #873670
+
+ local mycmakeargs=(
+ -DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+ -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+ -DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
+ # relative to bindir
+ -DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
+
+ -DBUILD_SHARED_LIBS=OFF
+ -DCLANG_LINK_CLANG_DYLIB=ON
+ -DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+ -DCLANG_INCLUDE_TESTS=$(usex test)
+
+ -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+
+ # these are not propagated reliably, so redefine them
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+
+ -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+ # libgomp support fails to find headers without explicit -I
+ # furthermore, it provides only syntax checking
+ -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+ # disable using CUDA to autodetect GPU, just build for all
+ -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
+ # disable linking to HSA to avoid automagic dep,
+ # load it dynamically instead
+ -DCMAKE_DISABLE_FIND_PACKAGE_hsa-runtime64=ON
+
+ -DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
+
+ -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+ -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+
+ -DPython3_EXECUTABLE="${PYTHON}"
+ )
+
+ if ! use elibc_musl; then
+ mycmakeargs+=(
+ -DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
+ )
+ fi
+
+ use test && mycmakeargs+=(
+ -DLLVM_BUILD_TESTS=ON
+ -DLLVM_LIT_ARGS="$(get_lit_flags)"
+ )
+
+ if multilib_is_native_abi; then
+ local build_docs=OFF
+ if llvm_are_manpages_built; then
+ build_docs=ON
+ mycmakeargs+=(
+ -DLLVM_BUILD_DOCS=ON
+ -DLLVM_ENABLE_SPHINX=ON
+ -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+ -DSPHINX_WARNINGS_AS_ERRORS=OFF
+ )
+ if use extra; then
+ mycmakeargs+=(
+ -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+ )
+ fi
+ fi
+ mycmakeargs+=(
+ -DCLANG_INCLUDE_DOCS=${build_docs}
+ )
+ fi
+ if multilib_native_use extra; then
+ mycmakeargs+=(
+ -DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
+ -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
+ )
+ else
+ mycmakeargs+=(
+ -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+ )
+ fi
+
+ if [[ -n ${EPREFIX} ]]; then
+ mycmakeargs+=(
+ -DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+ )
+ fi
+
+ if tc-is-cross-compiler; then
+ has_version -b sys-devel/clang:${LLVM_MAJOR} ||
+ die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
+ local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
+ mycmakeargs+=(
+ -DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
+ -DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
+ )
+ fi
+
+ # LLVM can have very high memory consumption while linking,
+ # exhausting the limit on 32-bit linker executable
+ use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+ cmake_src_configure
+
+ multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+ cmake_build distribution
+
+ # provide a symlink for tests
+ if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+ mkdir -p "${WORKDIR}"/lib || die
+ ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+ fi
+}
+
+multilib_src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+ local test_targets=( check-clang )
+ if multilib_native_use extra; then
+ test_targets+=(
+ check-clang-tools
+ check-clangd
+ )
+ fi
+ cmake_build "${test_targets[@]}"
+}
+
+src_install() {
+ MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/clang/Config/config.h
+ )
+
+ multilib-minimal_src_install
+
+ # Move runtime headers to /usr/lib/clang, where they belong
+ mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
+ # move (remaining) wrapped headers back
+ if use extra; then
+ mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
+ fi
+ mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
+
+ # Apply CHOST and version suffix to clang tools
+ local clang_tools=( clang clang++ clang-cl clang-cpp )
+ local abi i
+
+ # cmake gives us:
+ # - clang-X
+ # - clang -> clang-X
+ # - clang++, clang-cl, clang-cpp -> clang
+ # we want to have:
+ # - clang-X
+ # - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+ # - clang, clang++, clang-cl, clang-cpp -> clang*-X
+ # also in CHOST variant
+ for i in "${clang_tools[@]:1}"; do
+ rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
+ dosym "clang-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
+ dosym "${i}-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
+ done
+
+ # now create target symlinks for all supported ABIs
+ for abi in $(get_all_abis); do
+ local abi_chost=$(get_abi_CHOST "${abi}")
+ for i in "${clang_tools[@]}"; do
+ dosym "${i}-${LLVM_MAJOR}" \
+ "/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
+ dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
+ "/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
+ done
+ done
+}
+
+multilib_src_install() {
+ DESTDIR=${D} cmake_build install-distribution
+
+ # move headers to /usr/include for wrapping & ABI mismatch checks
+ # (also drop the version suffix from runtime headers)
+ rm -rf "${ED}"/usr/include || die
+ mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
+ mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
+ if multilib_native_use extra; then
+ # don't wrap clang-tidy headers, the list is too long
+ # (they're fine for non-native ABI but enabling the targets is problematic)
+ mv "${ED}"/usr/include/clang-tidy "${T}/" || die
+ fi
+}
+
+multilib_src_install_all() {
+ python_fix_shebang "${ED}"
+ if use static-analyzer; then
+ python_optimize "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
+ fi
+
+ docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+ llvm_install_manpages
+ # match 'html' non-compression
+ use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+ # +x for some reason; TODO: investigate
+ use static-analyzer && fperms a-x "/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+ if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+ eselect compiler-shadow update all
+ fi
+
+ elog "You can find additional utility scripts in:"
+ elog " ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
+ if use extra; then
+ elog "Some of them are vim integration scripts (with instructions inside)."
+ elog "The run-clang-tidy.py script requires the following additional package:"
+ elog " dev-python/pyyaml"
+ fi
+}
+
+pkg_postrm() {
+ if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+ eselect compiler-shadow clean all
+ fi
+}
diff --git a/sys-devel/crossdev/crossdev-20230209-r1.ebuild b/sys-devel/crossdev/crossdev-20230209-r1.ebuild
new file mode 100644
index 000000000000..d15bf1ee5010
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-20230209-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+if [[ ${PV} == "99999999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="
+ https://anongit.gentoo.org/git/proj/crossdev.git
+ https://github.com/gentoo/crossdev
+ "
+else
+ SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
+ https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo Cross-toolchain generator"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+ >=sys-apps/portage-2.1
+ app-shells/bash
+ sys-apps/gentoo-functions
+ sys-apps/config-site
+"
+BDEPEND="app-arch/xz-utils"
+
+src_install() {
+ default
+
+ if [[ ${PV} == "99999999" ]] ; then
+ sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
+ fi
+
+ dodir /usr/share/config.site.d
+ mv "${ED}"/usr/share/config.site{,.d/80crossdev.conf} || die
+}
diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild
index 4cb66350d4ce..d15bf1ee5010 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
>=sys-apps/portage-2.1
app-shells/bash
sys-apps/gentoo-functions
+ sys-apps/config-site
"
BDEPEND="app-arch/xz-utils"
@@ -34,4 +35,7 @@ src_install() {
if [[ ${PV} == "99999999" ]] ; then
sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
fi
+
+ dodir /usr/share/config.site.d
+ mv "${ED}"/usr/share/config.site{,.d/80crossdev.conf} || die
}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 926fbae896ca..80a8d8c5627d 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,39 +1,27 @@
-DIST gcc-10-20221208.tar.xz 72098912 BLAKE2B 8167b3d91fb95c727caa3a76d8bd6d70e0d0bd79eda72305f3005c9f7163dcd425c75386ba55b2d71644ecf83d998a4bccb6fd265bb615dcdd104f27cadb8e76 SHA512 5e49159d86300eaa4c2f34fb3537b5f257931e861a1a1217dbabcfcd5ef9da224d4a6023aaf8d24c8893ecd204ec0cd6e96349ae0dd445d62d92ebb041aeb054
DIST gcc-10-20230119.tar.xz 72112952 BLAKE2B 6e28cba9f6ff5c9f9231828bb400c82b8658a4f9c0166c28a6a12d71728d4460904152a8c84bbeff88c06b7f9378937b7b61bf4a871a10c56bd005170dc5fde2 SHA512 6cbb567ef1da1b6fa65892b6e71c3b7cd37e0c483e049720ea1987d444a0e7b4eb15d1e99f4e35995acdce560a811a779574eeba52bb252c61325accedd6a5c5
-DIST gcc-10-20230209.tar.xz 72120748 BLAKE2B 618cc9d70ead60a978e81f1b71cf9f78b1619c3b1322f321d73de1891c6e841ca771e35fefb5905d56540bcff5857682eb4adfa134588e5afd26cda2ad8e8142 SHA512 ff78b3f57ed2121c484f8dbea9c3024aa039affcec3b04738f92fc6f80696b02aea9ecd0fc72c6fec1a1a3a47a912381b89a332a44421c39506493d89d766d91
-DIST gcc-10-20230216.tar.xz 72119568 BLAKE2B 410e3a08d9ca81492228581d2a672e5cd2a4c3f1ecc5f0169f1bfc352746922c82ea188cded4358e714d5d3583dfd1f740dc49c019cb75ecc611f2f7a950121a SHA512 d9c7ed18311e502d9c22d658cc3f295212318d100603695bb6e97351d55652b7fd6be0bfe87e11ed314117a0909c82274bc4147b082e2d75a67dd2889b95777a
-DIST gcc-10-20230223.tar.xz 72128452 BLAKE2B 52b07a0640e560b1f8a306a86bd939d067727ee3781ae5d51d4e241b135a9b7093c92f6cce53e15fd06be42f698b71f38f0cda15fbc5181d2b69ba7c3b3d11ec SHA512 ea447775e0b1b29b04cea19660c51f0e233569baff2dbe5a8848e7d27c6fb7e6cc3b945eae790479ae6b3eb31e2d5cdc116a12f0d43966d3a03e04cd2819d722
DIST gcc-10-20230302.tar.xz 72112120 BLAKE2B 8647639d9c6aef31b63566b006bb2980ca974e4aac4f5ced5f12a4f7fe0e9bda1e456d31f13dc478ab187d5e739ac850dd7dcc9db421ece1cadc50c952dbbed4 SHA512 97f72699b1a38de0dfb95253dc1602400fb05c2466b3682e51a4793d17db62e1d55b8d19211c3326e5369aace2a74345059b4b1c1a61a1f2c1c75a0aa9ec3e0e
DIST gcc-10.4.0-musl-patches-1.tar.xz 3808 BLAKE2B 804d1fcc451dcd03be71240dd498ec2d179869571d44012967c48dccf5a478dd8c55000a964a80fdd5584d739a777dee1c83241cffce514ef002df2572854a67 SHA512 83e4a9c0f7062baf0c606a2bcc56a818494991403d7577dea65f04bbc25bdb786a5889b80d45d80e7f4be07c1aef786802cbfcfafd1a17ec255a2d4e93a77570
DIST gcc-10.4.0-patches-5.tar.xz 17056 BLAKE2B f336d69a8ad105b8c4a84e8248a5b8a88175d3f1d67d32c6bee1780d252d86947059bd624992e6292610e86c9012f4d901a1a54df0d184dd023d404a0707700e SHA512 aa8fb42f20587f8519e7b06037da4d8f7d386b63e228b239a0445a51df4e401940fcd81482381d966622054aef3e0db06d1def5c74ac3d3dcc9c75c3b966c758
DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529fc7e120c6bc3a3eb1db5cf938ebde347c1e595a8ff7d4081e79ded6252702d7a1a09648449b7a0783188e434 SHA512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648
DIST gcc-10.5.0-musl-patches-2.tar.xz 3452 BLAKE2B 5387e516d07d81477b3f39b8b3bd986bf861d32cd25dc5481c97bd3620d00c918c5661e86857f66dbf28a655401a53e43417f638c443e44cbfdbf5e950caac4d SHA512 86f2ce31cc4fc4fb5a6043fb527bf822d895e1a6220652024f78a1cbd5a962edb6be8dc5f43c32053e075f39bb2350ea8f14e7d57e0473dd2933a7b44676bde5
-DIST gcc-10.5.0-patches-1.tar.xz 17180 BLAKE2B d8ecc7cc15fa1ab420fa9eff11173a1d5544b369720e8c54fc59375e591ebd0a429b7e81a2a3df86bd2eaf19e4b8148bf2e1b0c8410de3944d4801ce412016b2 SHA512 5855aa23ee0b262c20a1b6fd2d4a947180c079dc00e0fa675043edceee0c822eec0dc752f5fcb281b70c04e50c6fcaf6c5d5160ab15d3f0c51fa030eb2d79d26
DIST gcc-10.5.0-patches-4.tar.xz 17880 BLAKE2B f368b741fd42199c85b770ec45a5232d27295cf7796163251f24fa963f2264c473e161bb34e66b43c4b227e41859d540a66331111392478b280b289d359806c6 SHA512 94f7fbd1b4672f0378c85ac3a96f7954cd22bd7cc1013c32519bbe1cae0ebb5183e14469c61dfc9d931b8d1c261f2ead1c4b47278104d1b5189a0c787aabc40e
DIST gcc-10.5.0-patches-5.tar.xz 17324 BLAKE2B e97b471fb6115fd0421be8a6390f7d88312de7ac0132fde3aa43dbf2a49d3bc640ec05f766f20363f033adeaf0430e90c42b5a6f92a422d1a82128f119e769f6 SHA512 2589b8a3be0bc60dd7b205ef9955dfd1ba525508879b30ee8057779d2677783c7c13a0bf901bc2a126e15c52d440663e6fe22a299d935e0706a037406e1cfb31
DIST gcc-11-20221209.tar.xz 76240768 BLAKE2B 3be0f1ece4473bbbf10f7242102f330a6e246c8481da5bd32620dcb15d2acd008bad60d2576a301f03e444e3d93a3c72d5184740c6fb3de2bc05e1863b68a0bc SHA512 33d9581d434c012526eb4d49a4453cf77c57b459fd43f84e49bc764745e0772939eac007e119269f4f1989755df8678613732a84474c691b0c2452237c5b38a3
DIST gcc-11-20230120.tar.xz 76201244 BLAKE2B 07bc819dad3e2ee3747f09f43fd73a4263f06274362728174b32d9ead52ea95c25ea6a192397378b9b4c4f958285d97488d28e425c26129d23f143b1a8668fbc SHA512 81f71aeb706b4ccb89e2af5201770fd72cc3190b9b5eac0b5a25a522626b9c4015a2e5d13e4bd1360ac0f7f1be27df51fc530c15ce3c3d782f39f34d5c58803e
-DIST gcc-11-20230210.tar.xz 76141600 BLAKE2B 04fc4d3cd23ce3abc47adaaf256fcde56891b1dd1ee70906714e92f4dadd2ae1f40852c17e17a8814bc1f5e642137d0f9660d410dc7f93b4541372895b99d617 SHA512 714eff2d949a615049aa2ac3a98fc4546dd8a0d94975fe69de411056dd540ecb9fd3d13818c213f2c407b737af5ca0028247769dbe3bd0493a97d2b80e6975e5
-DIST gcc-11-20230217.tar.xz 76150824 BLAKE2B 47258dc684f07bf402bd150e826c66abd69b7a6c3678af3038b1a2ea92091180a3ed3767c91f6909912f422d2fba6361f7b8beba2477839a164088673be50864 SHA512 5a7541788f8d824a49ac49252749b9e7dbbb26278b8ea021bbb49b011bb5592f01852972b1ee77cd9f8f5d4f4a07e960883cc04774b9b629d55124d246f69d6a
-DIST gcc-11-20230224.tar.xz 76153952 BLAKE2B 58e779173b9b28ff13f1683d4e69b857c03a83bcfbda402019b52041a11ce112258aaa62d4b47089f2901518e3c7994e354da70c8b562afc66cb0c3dffc7b357 SHA512 fea3a0ef2fcdfe180650b01855f35fbe795cc520845b8e65876f13bf46e8f757ec1adb5a01b8db68f1f380ed3ad45edb795750393b2f15a2c7f9295129b59ebc
+DIST gcc-11-20230303.tar.xz 76131828 BLAKE2B ad73cf9b11f4a70be922ebc2a934e8d5f863582ebb662fe74c71b5880c9d6617cc80233456bde70a7867d788fa1f72262f1ef069f23ff85a423c5eede3e7d3c7 SHA512 3b310b87f7d7423a727f2348038add5b76f923b0baf528d061e45a1030eefb538f4175866dc6e7e70852a794de0ab62798965ea1e574bfe62ccae35fe4b2b00b
DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607 SHA512 17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c
DIST gcc-11.4.0-patches-3.tar.xz 15200 BLAKE2B a393df941a2a31164f477d6bc0032e28319e8f0bd87200eb453708f85aa8c0bf5d67e733ee7b75cf6d14743e18cc941cee1b77a8247f8c5683d17a98cbeb280f SHA512 6f6096d95c7c62780d1070097739882393a8df5172c3a5ae811a8d4d1c98a0cd14a34f3f7e95410c8f210aec434330ac3b8876c688faeb130d7bb8fa3333ece9
DIST gcc-11.4.0-patches-7.tar.xz 14416 BLAKE2B 3ebf62cba04cac8830a93a99d11c21347c38891db3a81493a10e02e8b7af0c86389ffbede50672dfe1189a77a67b832f8f97a1d95d43eff11db131a143b1d03d SHA512 41e2ed1ccf6d3631accccdab057877c79c99eb1b3c32f9d35628bca6c633c4f8dadb1d7f93bed2e4d7ff9f36cc9e46ea00f0e57e8af64b2e5f4b3b01285c6da3
DIST gcc-11.4.0-patches-8.tar.xz 13788 BLAKE2B a1406d5dcd906ed51ef06bb6571c216d83f74ab5ba05d2f1783d20619ee4ae9a4aa60c15917c861c24b708621b1605411011df9d217472f92001ec1c59a22b5b SHA512 b18b068422911216063948e21f0ec01073edb45c828a351282730111642638a0a42b97394a3f7522f892fe79e30b391372c829b542ce64fd0dc58c2a83f091bf
-DIST gcc-12-20221126.tar.xz 79631864 BLAKE2B 3bb97ef4a1a17ab8b92b431b1f792c11131085a1b523efa08c5b4f995b44bf628be371564813e5affb1f8e2320bb8a9b04532e57b2deeef26b33f517783daa5e SHA512 163e0aa39dc5c24980f84000bd6ccd4b7c24581831b7a4cdbd63e4726be5c2b1933d034ce12c65cf95e4c0ebe1175af7e32facace465bfd7c7c377401350a2df
DIST gcc-12-20230121.tar.xz 79652428 BLAKE2B f4f0e6474d179454dc56dd05c823fca919a894e9efdc64625bb13045c7bd549a7bab59dfb4052d45d594d4484801ab5b18cf3f3d6277be54eaec24a53abd439c SHA512 b6c2486916418a64fab64c3655329bc18ca93ee4eca240e8779bd6d8280124fcd07b1aa8eff979fd317656646ecdba9353107887338354d8bd2c1f68c1609349
-DIST gcc-12-20230211.tar.xz 79698020 BLAKE2B 0de8d0b8f8823276fc7b0c70225a1c957455645cafd9c46ab8d3cd80d4e641a0d48df03a9d1d5206fde65e9f0dca09a481311b9b68a7993899e4060d44e08cf6 SHA512 6ae3979cfff1376ba2ea639d9a01428e55a67a2cc6582bc77a476b050bfd3ba00e078907067b74a1f59188014febc3fd1e4c5e98fae00421e0c82c9db54f1028
-DIST gcc-12-20230218.tar.xz 79705112 BLAKE2B 28b230d4e66f773a6ea32a3112f66c81ffb787f16ba1c36d3d4d2498b03031a9dbe3c2aefb40b07aab1eca64a32636c1cff2497eae996565d633fa1d70ac890e SHA512 bf2b109a12a981ae97ca4c6d9a27b11adcf1c7acaf167c532936a027dad4217e75b197fd12b2c5e37f6e89fe39a54f483984023accfb76f7517cc3d35ced416a
-DIST gcc-12-20230225.tar.xz 79694748 BLAKE2B 13684d572c3077740639ea10fed3cabf4473cb1913e9e3d90f4d40dad2e1e5d46b12d66fdf864367c4f4bd6a92009b1a11daf1635ed94c6aa5d8c758c36a79a5 SHA512 25889487fe3a03dc4fcce80c6048ef02453aaa0770662b078e1fd4a3c2aaebb8fdf2b77a0898abdb42b2ea1e3ebc03ac720595ddcc22a64a6bf910cf2ece4e16
+DIST gcc-12-20230304.tar.xz 79683276 BLAKE2B e02622f1193ba17dd1041eae0c2f594b26806b00cfb269e683cc356d6d405ae8a49e60823ed6f814d2aac820ef01d9004f68d628a853be139fa6a70e8601ba2a SHA512 0c23a8845c8f202b0c0e4aceb3104bf76c0aca9171ba65d292057703d160fc4ce0b0d7c8876cf1bb30f998c4a5a0a8f3c4165dd4d8d316019cff0dc19aa62182
DIST gcc-12.2.0-musl-patches-7.tar.xz 3652 BLAKE2B 295ea907efea854a3c2447d472bedb24714d78b7b725476b1eac3898d89c0c549da8e69db28911205bb3293f62cf344a90ade0898ecf5fed57ff00fcf8547a9f SHA512 7a7a440bc08de8dcb37c080ea0c27904adaaadaaaafaab24d90becd2d009243dcfc886d8f674ce3ccddb4ebb5ad17f04d841064d9ec2e2e2e96a1afac3002111
DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258
DIST gcc-12.2.0-patches-10.tar.xz 14252 BLAKE2B 99368db982227728a6a9e2b1f694999f041f38db4a3806b6a740c86218735f9b561197bc150423a3caad0b5fd335c95d1aca130a519754423cd44a083e655373 SHA512 f7f0d8185e908926046f579793dba5916dc27392b85bfe50a7e70c213c3ba29479dfdb1b27514765b76bc897c4dbb530680e59c4deca7a245a808ed566120e4c
DIST gcc-12.2.0-patches-13.tar.xz 13756 BLAKE2B df0388a669458f2991951d2f4027badbff3f802e6a0422478206b5cdda76e70b531a474d2ac42817e9e7f8200e9ac35ca8276af539839b4ebb2e22903ec25a23 SHA512 2970de9d2806d59c5d0f77e66000860c816ebd674489db8114f48f6aa11575644154431480222580b520b9e312647b06f94ab38959a49a8cda818158d6babf1d
-DIST gcc-12.2.0-patches-2.tar.xz 13952 BLAKE2B a9e798911acaf45c3f585f69721130cfbecec016727a50ac0f4767b37a2ab9df39e0828abb07f1e429619cc102808f81af8422fef0265415c287d303d9d97fc0 SHA512 1808a05e98094577099d115ff5f3e136e3fc8f39fbe35c5183fd7775383f94439212e5e4174ab8d0ae8c0874e227ff84a958ffdfa1c99c9a8306a9842d126ef9
DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
-DIST gcc-13-20230212.tar.xz 83949608 BLAKE2B 2c794044b6dc220b109bcb86ed1315f9413ef86e399b7062c4cb918d6ca7eede34db947c854d670201a25034471f57b9feaf2c23ea8f9714d272a1678311966d SHA512 2ed0656ab75abe5aa60f087c1ce5a2e41395cb5d827279d4d67192e6b9e85890849e42982e7b89b89ff5eaf6a81aef292ccf618f29a8b9ccb2d6a8bd56dc76f9
-DIST gcc-13-20230219.tar.xz 84151776 BLAKE2B 3fe1c7926e95072c28374f32eecb4c88cdc04d73e1462de3b560249f5fd7795d0ca911219061386e43114c391f0f9b145bdcc05c8b5c6b267462dd290111ab7e SHA512 7d94e71e7608693569908d24ae7e8648a9d11fbfd366e21a802b9e24294ff8e214802e23b47c7030d41e1273dfae052d125a7634a02cc1f7999c5fd17a6cd3a1
DIST gcc-13-20230226.tar.xz 84264388 BLAKE2B fea763a1627bff19eb0f7869b83c00337dc2a203178d17143c98c2c1d3fd385d2f853f195ff79ecc1cae659a1f8704c88e7fd77456eed4510bdcba7631e49353 SHA512 38de82dd54e1b57490f5492a4adcd05b9da3ace2235654dff19bade8d378e75be1495f3b2b4e7f7e57ea144351c4ade1e9a5b141546259024f0359f43b2025ac
+DIST gcc-13-20230305.tar.xz 84314220 BLAKE2B cf4971cddea6981e3dfb62dd7d69b85b85df0a137e0596f71530966186f2919e800e60b6712b1d676b4250e835db8601af5376a77dad82fff7b1d9faae012da8 SHA512 39320f90bcdc2d8f5cefa2c8ac551d7a6f0d20744cdff5ed8956321d6b0813bbc44d18266bf7bb7ebbe642078a6d9677216e6db939dd56186959e5454d7d3a85
DIST gcc-13.1.0-musl-patches-1.tar.xz 3528 BLAKE2B c572ab4a0fb929b16ec36b3a3616cdcccd62f7ee27ded8077008b9beb50539db64cc251ff8a3eade54e8ebfe1012f8f32d0802379bf8ffb0f1b8ce7c8457da37 SHA512 ffb7dfa54a9d23b5333664e915efd9f18a43cd696f4ff5669a8b072a0e9cf4978de53e315123542441a2533e4f269de0bb7d90ee7a37d3a7517b7cda6ea06681
DIST gcc-13.1.0-patches-8.tar.xz 11644 BLAKE2B aaa135a7d22badc22eeba42fe92c2de40e1a779836f42b5ba15884ad3d756020421b99e29b9a27f40368013fb9d8348e3ca1ef3541a6de55129d66f4645caf8f SHA512 a71ef0f215451c840a99d7100489e8364e4e7a71d83e9be42e35fb06d4276afadb64834801ef3469a4edb78eede5a03c18104215fef3039f98da3b3d0c8e69af
DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7 SHA512 1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6
diff --git a/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild b/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild
deleted file mode 100644
index d109ff1e84d4..000000000000
--- a/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="10.5.0"
-PATCH_VER="1"
-MUSL_VER="2"
-MUSL_GCC_VER="10.5.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
- MY_PV_2=$(ver_cut 2)
- if [[ ${MY_PV_2} == 0 ]] ; then
- MY_PV_2=0
- else
- MY_PV_2=$(($(ver_cut 2) - 1))
- fi
-
- # e.g. 12.2.9999 -> 12.1.1
- TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
- # Cheesy hack for RCs
- MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
- MY_P=${PN}-${MY_PV}
- GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
- TOOLCHAIN_SET_S=no
- S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
- local p upstreamed_patches=(
- # add them here
- )
- for p in "${upstreamed_patches[@]}"; do
- rm -v "${WORKDIR}/patch/${p}" || die
- done
-
- if has_version '>=sys-libs/glibc-2.32-r1'; then
- rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
- fi
-
- toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-10.4.1_p20230209.ebuild b/sys-devel/gcc/gcc-10.4.1_p20230209.ebuild
deleted file mode 100644
index 68d9c2522686..000000000000
--- a/sys-devel/gcc/gcc-10.4.1_p20230209.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="10.5.0"
-PATCH_VER="5"
-MUSL_VER="2"
-MUSL_GCC_VER="10.5.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
- MY_PV_2=$(ver_cut 2)
- if [[ ${MY_PV_2} == 0 ]] ; then
- MY_PV_2=0
- else
- MY_PV_2=$(($(ver_cut 2) - 1))
- fi
-
- # e.g. 12.2.9999 -> 12.1.1
- TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
- # Cheesy hack for RCs
- MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
- MY_P=${PN}-${MY_PV}
- GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
- TOOLCHAIN_SET_S=no
- S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-# KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
-#fi
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
- local p upstreamed_patches=(
- # add them here
- )
- for p in "${upstreamed_patches[@]}"; do
- rm -v "${WORKDIR}/patch/${p}" || die
- done
-
- if has_version '>=sys-libs/glibc-2.32-r1'; then
- rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
- fi
-
- toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-10.4.1_p20230216.ebuild b/sys-devel/gcc/gcc-10.4.1_p20230216.ebuild
deleted file mode 100644
index 68d9c2522686..000000000000
--- a/sys-devel/gcc/gcc-10.4.1_p20230216.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="10.5.0"
-PATCH_VER="5"
-MUSL_VER="2"
-MUSL_GCC_VER="10.5.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
- MY_PV_2=$(ver_cut 2)
- if [[ ${MY_PV_2} == 0 ]] ; then
- MY_PV_2=0
- else
- MY_PV_2=$(($(ver_cut 2) - 1))
- fi
-
- # e.g. 12.2.9999 -> 12.1.1
- TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
- # Cheesy hack for RCs
- MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
- MY_P=${PN}-${MY_PV}
- GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
- TOOLCHAIN_SET_S=no
- S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-# KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
-#fi
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
- local p upstreamed_patches=(
- # add them here
- )
- for p in "${upstreamed_patches[@]}"; do
- rm -v "${WORKDIR}/patch/${p}" || die
- done
-
- if has_version '>=sys-libs/glibc-2.32-r1'; then
- rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
- fi
-
- toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-10.4.1_p20230223.ebuild b/sys-devel/gcc/gcc-10.4.1_p20230223.ebuild
deleted file mode 100644
index 68d9c2522686..000000000000
--- a/sys-devel/gcc/gcc-10.4.1_p20230223.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="10.5.0"
-PATCH_VER="5"
-MUSL_VER="2"
-MUSL_GCC_VER="10.5.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
- MY_PV_2=$(ver_cut 2)
- if [[ ${MY_PV_2} == 0 ]] ; then
- MY_PV_2=0
- else
- MY_PV_2=$(($(ver_cut 2) - 1))
- fi
-
- # e.g. 12.2.9999 -> 12.1.1
- TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
- # Cheesy hack for RCs
- MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
- MY_P=${PN}-${MY_PV}
- GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
- TOOLCHAIN_SET_S=no
- S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-# KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
-#fi
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
- local p upstreamed_patches=(
- # add them here
- )
- for p in "${upstreamed_patches[@]}"; do
- rm -v "${WORKDIR}/patch/${p}" || die
- done
-
- if has_version '>=sys-libs/glibc-2.32-r1'; then
- rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
- fi
-
- toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-10.4.1_p20230302.ebuild b/sys-devel/gcc/gcc-10.4.1_p20230302.ebuild
index 68d9c2522686..d8319f4435d4 100644
--- a/sys-devel/gcc/gcc-10.4.1_p20230302.ebuild
+++ b/sys-devel/gcc/gcc-10.4.1_p20230302.ebuild
@@ -35,9 +35,9 @@ inherit toolchain
EGIT_BRANCH=releases/gcc-$(ver_cut 1)
# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-# KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
-#fi
+if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
RDEPEND=""
BDEPEND="${CATEGORY}/binutils"
diff --git a/sys-devel/gcc/gcc-11.3.1_p20230217.ebuild b/sys-devel/gcc/gcc-11.3.1_p20230217.ebuild
deleted file mode 100644
index 3029159b6f13..000000000000
--- a/sys-devel/gcc/gcc-11.3.1_p20230217.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="8"
-PATCH_GCC_VER="11.4.0"
-MUSL_VER="2"
-MUSL_GCC_VER="11.4.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
- MY_PV_2=$(ver_cut 2)
- if [[ ${MY_PV_2} == 0 ]] ; then
- MY_PV_2=0
- else
- MY_PV_2=$(($(ver_cut 2) - 1))
- fi
-
- # e.g. 12.2.9999 -> 12.1.1
- TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-# KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
-#fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
-
-src_prepare() {
- local p upstreamed_patches=(
- # add them here
- )
- for p in "${upstreamed_patches[@]}"; do
- rm -v "${WORKDIR}/patch/${p}" || die
- done
-
- toolchain_src_prepare
-
- eapply_user
-}
diff --git a/sys-devel/gcc/gcc-11.3.1_p20230224.ebuild b/sys-devel/gcc/gcc-11.3.1_p20230224.ebuild
deleted file mode 100644
index 3029159b6f13..000000000000
--- a/sys-devel/gcc/gcc-11.3.1_p20230224.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="8"
-PATCH_GCC_VER="11.4.0"
-MUSL_VER="2"
-MUSL_GCC_VER="11.4.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
- MY_PV_2=$(ver_cut 2)
- if [[ ${MY_PV_2} == 0 ]] ; then
- MY_PV_2=0
- else
- MY_PV_2=$(($(ver_cut 2) - 1))
- fi
-
- # e.g. 12.2.9999 -> 12.1.1
- TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-# KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
-#fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
-
-src_prepare() {
- local p upstreamed_patches=(
- # add them here
- )
- for p in "${upstreamed_patches[@]}"; do
- rm -v "${WORKDIR}/patch/${p}" || die
- done
-
- toolchain_src_prepare
-
- eapply_user
-}
diff --git a/sys-devel/gcc/gcc-11.3.1_p20230210.ebuild b/sys-devel/gcc/gcc-11.3.1_p20230303.ebuild
similarity index 87%
rename from sys-devel/gcc/gcc-11.3.1_p20230210.ebuild
rename to sys-devel/gcc/gcc-11.3.1_p20230303.ebuild
index 3029159b6f13..b21f06c867a2 100644
--- a/sys-devel/gcc/gcc-11.3.1_p20230210.ebuild
+++ b/sys-devel/gcc/gcc-11.3.1_p20230303.ebuild
@@ -27,9 +27,9 @@ inherit toolchain
EGIT_BRANCH=releases/gcc-$(ver_cut 1)
# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-# KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
-#fi
+if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
# Technically only if USE=hardened *too* right now, but no point in complicating it further.
# If GCC is enabling CET by default, we need glibc to be built with support for it.
diff --git a/sys-devel/gcc/gcc-12.2.1_p20230211.ebuild b/sys-devel/gcc/gcc-12.2.1_p20230211.ebuild
deleted file mode 100644
index 3a7a472a2f2f..000000000000
--- a/sys-devel/gcc/gcc-12.2.1_p20230211.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="13"
-PATCH_GCC_VER="12.2.0"
-MUSL_VER="7"
-MUSL_GCC_VER="12.2.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
- MY_PV_2=$(ver_cut 2)
- if [[ ${MY_PV_2} == 0 ]] ; then
- MY_PV_2=0
- else
- MY_PV_2=$(($(ver_cut 2) - 1))
- fi
-
- # e.g. 12.2.9999 -> 12.1.1
- TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
- # Cheesy hack for RCs
- MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
- MY_P=${PN}-${MY_PV}
- GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
- TOOLCHAIN_SET_S=no
- S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
-
-src_prepare() {
- toolchain_src_prepare
-
- eapply_user
-}
diff --git a/sys-devel/gcc/gcc-12.2.1_p20230218.ebuild b/sys-devel/gcc/gcc-12.2.1_p20230218.ebuild
deleted file mode 100644
index 3a7a472a2f2f..000000000000
--- a/sys-devel/gcc/gcc-12.2.1_p20230218.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="13"
-PATCH_GCC_VER="12.2.0"
-MUSL_VER="7"
-MUSL_GCC_VER="12.2.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
- MY_PV_2=$(ver_cut 2)
- if [[ ${MY_PV_2} == 0 ]] ; then
- MY_PV_2=0
- else
- MY_PV_2=$(($(ver_cut 2) - 1))
- fi
-
- # e.g. 12.2.9999 -> 12.1.1
- TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
- # Cheesy hack for RCs
- MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
- MY_P=${PN}-${MY_PV}
- GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
- TOOLCHAIN_SET_S=no
- S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
-
-src_prepare() {
- toolchain_src_prepare
-
- eapply_user
-}
diff --git a/sys-devel/gcc/gcc-12.2.1_p20230225.ebuild b/sys-devel/gcc/gcc-12.2.1_p20230225.ebuild
deleted file mode 100644
index 3a7a472a2f2f..000000000000
--- a/sys-devel/gcc/gcc-12.2.1_p20230225.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="13"
-PATCH_GCC_VER="12.2.0"
-MUSL_VER="7"
-MUSL_GCC_VER="12.2.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
- MY_PV_2=$(ver_cut 2)
- if [[ ${MY_PV_2} == 0 ]] ; then
- MY_PV_2=0
- else
- MY_PV_2=$(($(ver_cut 2) - 1))
- fi
-
- # e.g. 12.2.9999 -> 12.1.1
- TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
- # Cheesy hack for RCs
- MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
- MY_P=${PN}-${MY_PV}
- GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
- TOOLCHAIN_SET_S=no
- S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
-
-src_prepare() {
- toolchain_src_prepare
-
- eapply_user
-}
diff --git a/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild b/sys-devel/gcc/gcc-12.2.1_p20230304.ebuild
similarity index 98%
rename from sys-devel/gcc/gcc-12.2.1_p20221126.ebuild
rename to sys-devel/gcc/gcc-12.2.1_p20230304.ebuild
index 18f3ae78e0cf..3924d524ff38 100644
--- a/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild
+++ b/sys-devel/gcc/gcc-12.2.1_p20230304.ebuild
@@ -4,7 +4,7 @@
EAPI=8
TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="2"
+PATCH_VER="13"
PATCH_GCC_VER="12.2.0"
MUSL_VER="7"
MUSL_GCC_VER="12.2.0"
diff --git a/sys-devel/gcc/gcc-13.0.1_pre20230219.ebuild b/sys-devel/gcc/gcc-13.0.1_pre20230219.ebuild
deleted file mode 100644
index 6b843430b057..000000000000
--- a/sys-devel/gcc/gcc-13.0.1_pre20230219.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="8"
-PATCH_GCC_VER="13.1.0"
-MUSL_VER="1"
-MUSL_GCC_VER="13.1.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
- MY_PV_2=$(ver_cut 2)
- MY_PV_3=$(($(ver_cut 3) - 9998))
- if [[ ${MY_PV_2} == 0 ]] ; then
- MY_PV_2=0
- MY_PV_3=0
- else
- MY_PV_2=$(($(ver_cut 2) - 1))
- fi
-
- # e.g. 12.2.9999 -> 12.1.1
- TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=master
-
-# Don't keyword live ebuilds
-if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
- KEYWORDS="~loong"
-fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
-
-src_prepare() {
- local p upstreamed_patches=(
- # add them here
- )
- for p in "${upstreamed_patches[@]}"; do
- rm -v "${WORKDIR}/patch/${p}" || die
- done
-
- toolchain_src_prepare
-
- eapply_user
-}
diff --git a/sys-devel/gcc/gcc-13.0.1_pre20230212.ebuild b/sys-devel/gcc/gcc-13.0.1_pre20230305.ebuild
similarity index 100%
rename from sys-devel/gcc/gcc-13.0.1_pre20230212.ebuild
rename to sys-devel/gcc/gcc-13.0.1_pre20230305.ebuild
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index f60583ac2e4c..1edea9832f73 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -4,4 +4,5 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-devel/lld/lld-17.0.0_pre20230304.ebuild b/sys-devel/lld/lld-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..d22c1fb13951
--- /dev/null
+++ b/sys-devel/lld/lld-17.0.0_pre20230304.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS=""
+IUSE="debug test zstd"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ ~sys-devel/llvm-${PV}[zstd=]
+ sys-libs/zlib:=
+ zstd? ( app-arch/zstd:= )
+"
+RDEPEND="
+ ${DEPEND}
+ !sys-devel/lld:0
+"
+BDEPEND="
+ sys-devel/llvm:${LLVM_MAJOR}
+ test? (
+ >=dev-util/cmake-3.16
+ $(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+ )
+"
+PDEPEND="
+ >=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
+"
+
+LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
+LLVM_TEST_COMPONENTS=( llvm/utils third-party )
+llvm.org_set_globals
+
+python_check_deps() {
+ python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+ use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+ llvm.org_src_unpack
+
+ # Directory ${WORKDIR}/llvm does not exist with USE="-test",
+ # but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
+ # and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
+ # (lld/MachO/CMakeLists.txt) and is expected to be resolvable
+ # to existent directory ${WORKDIR}/libunwind/include.
+ mkdir -p "${WORKDIR}/llvm" || die
+}
+
+src_configure() {
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+ use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+ -DBUILD_SHARED_LIBS=ON
+ -DLLVM_INCLUDE_TESTS=$(usex test)
+ )
+
+ use test && mycmakeargs+=(
+ -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+ -DLLVM_LIT_ARGS="$(get_lit_flags)"
+ -DPython3_EXECUTABLE="${PYTHON}"
+ )
+
+ tc-is-cross-compiler && mycmakeargs+=(
+ -DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ local -x LIT_PRESERVES_TMP=1
+ cmake_build check-lld
+}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index f60583ac2e4c..1edea9832f73 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -4,4 +4,5 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-devel/llvm-common/llvm-common-17.0.0_pre20230304.ebuild b/sys-devel/llvm-common/llvm-common-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..ce5f03ca34a5
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-17.0.0_pre20230304.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND="
+ !sys-devel/llvm:0
+"
+
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
+
+src_install() {
+ insinto /usr/share/vim/vimfiles
+ doins -r */
+ # some users may find it useful
+ newdoc README README.vim
+ dodoc vimrc
+}
diff --git a/sys-devel/llvm-roc/Manifest b/sys-devel/llvm-roc/Manifest
deleted file mode 100644
index b9b116396d77..000000000000
--- a/sys-devel/llvm-roc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST llvm-rocm-ocl-5.0.2.tar.gz 150281451 BLAKE2B e4363266e05e13af761dd6f440dbfc30905f219e428fa3b2595800ba0c80c97cd7e2615d68acd9aea4fc66454ee8a3ff7a52a60d3aed4e93af5007050277e5fe SHA512 9be9f1a0ad1a0089aa27858174ce37c7a02902b6dedc338382f42ed0567823cc4bb11b68c130470590c16d4d92ab2735a06c27d248237ffa2d394253328f6705
diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.0.0-remove-isystem-usr-include.patch b/sys-devel/llvm-roc/files/llvm-roc-4.0.0-remove-isystem-usr-include.patch
deleted file mode 100644
index f14ec4ac0db2..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-4.0.0-remove-isystem-usr-include.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Author: Wilfried (justxi) Holzke
-
-Adopted from https://github.com/justxi/rocm/blob/master/sys-devel/llvm-roc/files/llvm-roc-4.0.0-remove-isystem-usr-include.patch
-
-Index: llvm-project-rocm-4.0.0/clang/lib/Driver/ToolChains/AMDGPU.cpp
-===================================================================
---- llvm-project-rocm-4.0.0.orig/clang/lib/Driver/ToolChains/AMDGPU.cpp
-+++ llvm-project-rocm-4.0.0/clang/lib/Driver/ToolChains/AMDGPU.cpp
-@@ -326,11 +326,6 @@ void RocmInstallationDetector::AddHIPInc
- //
- // ROCm 3.5 does not fully support the wrapper headers. Therefore it needs
- // a workaround.
-- SmallString<128> P(D.ResourceDir);
-- if (UsesRuntimeWrapper)
-- llvm::sys::path::append(P, "include", "cuda_wrappers");
-- CC1Args.push_back("-internal-isystem");
-- CC1Args.push_back(DriverArgs.MakeArgString(P));
- }
-
- if (DriverArgs.hasArg(options::OPT_nogpuinc))
-@@ -341,8 +336,6 @@ void RocmInstallationDetector::AddHIPInc
- return;
- }
-
-- CC1Args.push_back("-internal-isystem");
-- CC1Args.push_back(DriverArgs.MakeArgString(getIncludePath()));
- if (UsesRuntimeWrapper)
- CC1Args.append({"-include", "__clang_hip_runtime_wrapper.h"});
- }
diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.2.0-current_pos.patch b/sys-devel/llvm-roc/files/llvm-roc-4.2.0-current_pos.patch
deleted file mode 100644
index 0f3398951b07..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-4.2.0-current_pos.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur a/include/llvm/Support/raw_ostream.h b/include/llvm/Support/raw_ostream.h
---- a/include/llvm/Support/raw_ostream.h 2021-05-22 19:56:44.779955686 +0200
-+++ b/include/llvm/Support/raw_ostream.h 2021-05-22 20:00:49.449954752 +0200
-@@ -610,9 +610,7 @@
- /// See raw_ostream::write_impl.
- void write_impl(const char *Ptr, size_t Size) override;
-
-- /// Return the current position within the stream, not counting the bytes
-- /// currently in the buffer.
-- uint64_t current_pos() const override { return OS.size(); }
-+ uint64_t current_pos() const override;
-
- public:
- explicit raw_string_ostream(std::string &O) : OS(O) {
-diff -Naur a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp
---- a/lib/Support/raw_ostream.cpp 2021-05-22 19:59:05.651955148 +0200
-+++ b/lib/Support/raw_ostream.cpp 2021-05-22 20:01:22.929954625 +0200
-@@ -938,6 +938,10 @@
- // raw_string_ostream
- //===----------------------------------------------------------------------===//
-
-+/// Return the current position within the stream, not counting the bytes
-+/// currently in the buffer.
-+uint64_t raw_string_ostream::current_pos() const { return OS.size(); }
-+
- raw_string_ostream::~raw_string_ostream() {
- flush();
- }
diff --git a/sys-devel/llvm-roc/files/llvm-roc-5.0.0-add_GNU-stack.patch b/sys-devel/llvm-roc/files/llvm-roc-5.0.0-add_GNU-stack.patch
deleted file mode 100644
index f57989c8c8a3..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-5.0.0-add_GNU-stack.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Add .note.GNU-stack to mitigate QA notice according to
-https://wiki.gentoo.org/wiki/Hardened/GNU_stack_quickstart
-===================================================================
---- llvm-project-rocm-5.0.0.orig/compiler-rt/lib/orc/elfnix_tls.x86-64.S
-+++ llvm-project-rocm-5.0.0/compiler-rt/lib/orc/elfnix_tls.x86-64.S
-@@ -61,4 +61,8 @@ ___orc_rt_elfnix_tls_get_addr:
- popq %rbp
- ret
-
-+#if defined(__linux__) && defined(__ELF__)
-+ .section .note.GNU-stack,"",%progbits
-+#endif
-+
- #endif // defined(__x86_64__)
diff --git a/sys-devel/llvm-roc/files/llvm-roc-5.0.0-hip-location.patch b/sys-devel/llvm-roc/files/llvm-roc-5.0.0-hip-location.patch
deleted file mode 100644
index 614a16d1e810..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-5.0.0-hip-location.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-replace hardcoded hip finder with Gentoo paths.
-
-It is not necessary to check HIP runtime each time.
-
-Author: Benda Xu
-Author: Yiyang Wu
-
-Index: llvm-project-rocm-5.0.1/clang/lib/Driver/ToolChains/AMDGPU.cpp
-===================================================================
---- llvm-project-rocm-5.0.1.orig/clang/lib/Driver/ToolChains/AMDGPU.cpp
-+++ llvm-project-rocm-5.0.1/clang/lib/Driver/ToolChains/AMDGPU.cpp
-@@ -169,139 +169,8 @@ bool RocmInstallationDetector::parseHIPV
- /// cached and populated only once.
- const SmallVectorImpl &
- RocmInstallationDetector::getInstallationPathCandidates() {
--
-- // Return the cached candidate list if it has already been populated.
-- if (!ROCmSearchDirs.empty())
-- return ROCmSearchDirs;
--
-- auto DoPrintROCmSearchDirs = [&]() {
-- if (PrintROCmSearchDirs)
-- for (auto Cand : ROCmSearchDirs) {
-- llvm::errs() << "ROCm installation search path";
-- if (Cand.isSPACK())
-- llvm::errs() << " (Spack " << Cand.SPACKReleaseStr << ")";
-- llvm::errs() << ": " << Cand.Path << '\n';
-- }
-- };
--
-- // For candidate specified by --rocm-path we do not do strict check, i.e.,
-- // checking existence of HIP version file and device library files.
-- if (!RocmPathArg.empty()) {
-- ROCmSearchDirs.emplace_back(RocmPathArg.str());
-- DoPrintROCmSearchDirs();
-- return ROCmSearchDirs;
-- } else if (const char *RocmPathEnv = ::getenv("ROCM_PATH")) {
-- if (!StringRef(RocmPathEnv).empty()) {
-- ROCmSearchDirs.emplace_back(RocmPathEnv);
-- DoPrintROCmSearchDirs();
-- return ROCmSearchDirs;
-- }
-- }
--
-- // Try to find relative to the compiler binary.
-- const char *InstallDir = D.getInstalledDir();
--
-- // Check both a normal Unix prefix position of the clang binary, as well as
-- // the Windows-esque layout the ROCm packages use with the host architecture
-- // subdirectory of bin.
-- auto DeduceROCmPath = [](StringRef ClangPath) {
-- // Strip off directory (usually bin)
-- StringRef ParentDir = llvm::sys::path::parent_path(ClangPath);
-- StringRef ParentName = llvm::sys::path::filename(ParentDir);
--
-- // Some builds use bin/{host arch}, so go up again.
-- if (ParentName == "bin") {
-- ParentDir = llvm::sys::path::parent_path(ParentDir);
-- ParentName = llvm::sys::path::filename(ParentDir);
-- }
--
-- // Detect ROCm packages built with SPACK.
-- // clang is installed at
-- // /llvm-amdgpu--/bin directory.
-- // We only consider the parent directory of llvm-amdgpu package as ROCm
-- // installation candidate for SPACK.
-- if (ParentName.startswith("llvm-amdgpu-")) {
-- auto SPACKPostfix =
-- ParentName.drop_front(strlen("llvm-amdgpu-")).split('-');
-- auto SPACKReleaseStr = SPACKPostfix.first;
-- if (!SPACKReleaseStr.empty()) {
-- ParentDir = llvm::sys::path::parent_path(ParentDir);
-- return Candidate(ParentDir.str(), /*StrictChecking=*/true,
-- SPACKReleaseStr);
-- }
-- }
--
-- // Some versions of the rocm llvm package install to /opt/rocm/llvm/bin
-- // Some versions of the aomp package install to /opt/rocm/aomp/bin
-- if (ParentName == "llvm" || ParentName.startswith("aomp"))
-- ParentDir = llvm::sys::path::parent_path(ParentDir);
-- // Some versions of the aomp package install to /opt/rocm/aomp/bin
-- // and it seems ParentDir is already pointing to correct place.
-- return Candidate(ParentDir.str(), /*StrictChecking=*/true);
-- };
--
-- // Deduce ROCm path by the path used to invoke clang. Do not resolve symbolic
-- // link of clang itself.
-- ROCmSearchDirs.emplace_back(DeduceROCmPath(InstallDir));
--
-- // Deduce ROCm path by the real path of the invoked clang, resolving symbolic
-- // link of clang itself.
-- llvm::SmallString<256> RealClangPath;
-- llvm::sys::fs::real_path(D.getClangProgramPath(), RealClangPath);
-- auto ParentPath = llvm::sys::path::parent_path(RealClangPath);
-- if (ParentPath != InstallDir)
-- ROCmSearchDirs.emplace_back(DeduceROCmPath(ParentPath));
--
-- // Device library may be installed in clang or resource directory.
-- auto ClangRoot = llvm::sys::path::parent_path(InstallDir);
-- auto RealClangRoot = llvm::sys::path::parent_path(ParentPath);
-- ROCmSearchDirs.emplace_back(ClangRoot.str(), /*StrictChecking=*/true);
-- if (RealClangRoot != ClangRoot)
-- ROCmSearchDirs.emplace_back(RealClangRoot.str(), /*StrictChecking=*/true);
-- ROCmSearchDirs.emplace_back(D.ResourceDir,
-- /*StrictChecking=*/true);
--
-- ROCmSearchDirs.emplace_back(D.SysRoot + "/opt/rocm",
-- /*StrictChecking=*/true);
--
-- // Find the latest /opt/rocm-{release} directory.
-- std::error_code EC;
-- std::string LatestROCm;
-- llvm::VersionTuple LatestVer;
-- // Get ROCm version from ROCm directory name.
-- auto GetROCmVersion = [](StringRef DirName) {
-- llvm::VersionTuple V;
-- std::string VerStr = DirName.drop_front(strlen("rocm-")).str();
-- // The ROCm directory name follows the format of
-- // rocm-{major}.{minor}.{subMinor}[-{build}]
-- std::replace(VerStr.begin(), VerStr.end(), '-', '.');
-- V.tryParse(VerStr);
-- return V;
-- };
-- for (llvm::vfs::directory_iterator
-- File = D.getVFS().dir_begin(D.SysRoot + "/opt", EC),
-- FileEnd;
-- File != FileEnd && !EC; File.increment(EC)) {
-- llvm::StringRef FileName = llvm::sys::path::filename(File->path());
-- if (!FileName.startswith("rocm-"))
-- continue;
-- if (LatestROCm.empty()) {
-- LatestROCm = FileName.str();
-- LatestVer = GetROCmVersion(LatestROCm);
-- continue;
-- }
-- auto Ver = GetROCmVersion(FileName);
-- if (LatestVer < Ver) {
-- LatestROCm = FileName.str();
-- LatestVer = Ver;
-- }
-- }
-- if (!LatestROCm.empty())
-- ROCmSearchDirs.emplace_back(D.SysRoot + "/opt/" + LatestROCm,
-- /*StrictChecking=*/true);
--
-- DoPrintROCmSearchDirs();
-- return ROCmSearchDirs;
-+ ROCmSearchDirs.emplace_back(D.SysRoot + "/usr", /*StrictChecking=*/true);
-+ return ROCmSearchDirs;
- }
-
- RocmInstallationDetector::RocmInstallationDetector(
-@@ -410,7 +279,7 @@ void RocmInstallationDetector::detectDev
- // - ${ROCM_ROOT}/lib/bitcode/*
- // so try to detect these layouts.
- static constexpr std::array SubDirsList[] = {
-- {"amdgcn", "bitcode"},
-+ {"lib/amdgcn", "bitcode"},
- {"lib", ""},
- {"lib", "bitcode"},
- };
-@@ -433,42 +302,7 @@ void RocmInstallationDetector::detectDev
- }
-
- void RocmInstallationDetector::detectHIPRuntime() {
-- SmallVector HIPSearchDirs;
-- if (!HIPPathArg.empty())
-- HIPSearchDirs.emplace_back(HIPPathArg.str(), /*StrictChecking=*/true);
-- else
-- HIPSearchDirs.append(getInstallationPathCandidates());
-- auto &FS = D.getVFS();
--
-- for (const auto &Candidate : HIPSearchDirs) {
-- InstallPath = Candidate.Path;
-- if (InstallPath.empty() || !FS.exists(InstallPath))
-- continue;
-- // HIP runtime built by SPACK is installed to
-- // /hip-- directory.
-- auto SPACKPath = findSPACKPackage(Candidate, "hip");
-- InstallPath = SPACKPath.empty() ? InstallPath : SPACKPath;
--
-- BinPath = InstallPath;
-- llvm::sys::path::append(BinPath, "bin");
-- IncludePath = InstallPath;
-- llvm::sys::path::append(IncludePath, "include");
-- LibPath = InstallPath;
-- llvm::sys::path::append(LibPath, "lib");
--
-- llvm::ErrorOr> VersionFile =
-- FS.getBufferForFile(BinPath + "/.hipVersion");
-- if (!VersionFile && Candidate.StrictChecking)
-- continue;
--
-- if (HIPVersionArg.empty() && VersionFile)
-- if (parseHIPVersionFile((*VersionFile)->getBuffer()))
-- continue;
--
-- HasHIPRuntime = true;
-- return;
-- }
-- HasHIPRuntime = false;
-+ HasHIPRuntime = true;
- }
-
- void RocmInstallationDetector::print(raw_ostream &OS) const {
diff --git a/sys-devel/llvm-roc/files/llvm-roc-5.0.0-linkdl.patch b/sys-devel/llvm-roc/files/llvm-roc-5.0.0-linkdl.patch
deleted file mode 100644
index 80598c6f990d..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-5.0.0-linkdl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-LLVMOffloadArch should link libdl to fix undefined symbol 'dlsym' when linking
---- llvm.orig/lib/OffloadArch/offload-arch/CMakeLists.txt
-+++ llvm/lib/OffloadArch/offload-arch/CMakeLists.txt
-@@ -3,6 +3,7 @@ add_llvm_tool(offload-arch
- ${CMAKE_CURRENT_SOURCE_DIR}/offload-arch.cpp
- DEPENDS generated-table LLVMOffloadArch
- )
-+target_link_libraries(LLVMOffloadArch PRIVATE ${CMAKE_DL_LIBS})
- target_link_libraries(offload-arch PRIVATE LLVMOffloadArch)
-
- if(CMAKE_HOST_UNIX)
diff --git a/sys-devel/llvm-roc/llvm-roc-5.0.2.ebuild b/sys-devel/llvm-roc/llvm-roc-5.0.2.ebuild
deleted file mode 100644
index 6dc4f6a23e2c..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-5.0.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug +runtime"
-
-RDEPEND="
- dev-libs/libxml2
- sys-libs/zlib
- sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.2.0-current_pos.patch"
- "${FILESDIR}/${PN}-5.0.0-linkdl.patch"
-)
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
- pushd "${WORKDIR}/llvm-project-rocm-${PV}" || die
- eapply "${FILESDIR}/${PN}-4.0.0-remove-isystem-usr-include.patch"
- eapply "${FILESDIR}/${PN}-5.0.0-hip-location.patch"
- eapply "${FILESDIR}/${PN}-5.0.0-add_GNU-stack.patch"
- popd || die
-
- if [[ -n ${EPREFIX} ]]; then
- pushd "${S}"/../clang >/dev/null || die
- sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" CMakeLists.txt || die
- eend $?
- ebegin "Use "${EPREFIX}" as default sysroot"
- cd lib/Driver/ToolChains >/dev/null || die
- ebegin "Use dynamic linker from ${EPREFIX}"
- sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" Linux.cpp || die
- eend $?
-
- ebegin "Remove --sysroot call on ld for native toolchain"
- sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp || die
- eend $?
- popd >/dev/null || die
- fi
-
- # handled by sysroot, don't prefixify here.
- sed -e 's:/opt/rocm:/usr/lib/hip:' \
- -i "${S}"/../clang/lib/Driver/ToolChains/AMDGPU.cpp || die
-
- eapply_user
- cmake_src_prepare
-}
-
-src_configure() {
- PROJECTS="clang;lld;llvm"
-
- if usex runtime; then
- PROJECTS+=";compiler-rt"
- fi
-
- local mycmakeargs=(
- -Wno-dev
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
- -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
- -DLLVM_ENABLE_PROJECTS="${PROJECTS}"
- -DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
- -DLLVM_BUILD_DOCS=NO
- -DLLVM_ENABLE_BINDINGS=OFF
- -DLLVM_ENABLE_OCAMLDOC=OFF
- -DLLVM_ENABLE_SPHINX=NO
- -DLLVM_ENABLE_DOXYGEN=OFF
- -DLLVM_BUILD_UTILS=ON
- -DLLVM_VERSION_SUFFIX=roc
- -DOCAMLFIND=NO
- )
-
- use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- cat > "99${PN}" <<-EOF
- LDPATH="${EPREFIX}/usr/lib/llvm/roc/lib"
- EOF
- doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/metadata.xml b/sys-devel/llvm-roc/metadata.xml
deleted file mode 100644
index e9e51b8f323e..000000000000
--- a/sys-devel/llvm-roc/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- candrews@gentoo.org
- Craig Andrews
-
-
- RadeonOpenCompute/llvm-project
-
-
-
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 54a74bc2f1be..c70f2d89ef6c 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -8,4 +8,5 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-devel/llvm/llvm-17.0.0_pre20230304.ebuild b/sys-devel/llvm/llvm-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..d05904f7192f
--- /dev/null
+++ b/sys-devel/llvm/llvm-17.0.0_pre20230304.ebuild
@@ -0,0 +1,518 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+ toolchain-funcs flag-o-matic
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS=""
+IUSE="
+ +binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
+ xml z3 zstd
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+ binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
+ exegesis? ( dev-libs/libpfm:= )
+ libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+ libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+ ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+ xar? ( app-arch/xar )
+ xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+ z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
+ zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+ ${RDEPEND}
+ binutils-plugin? ( sys-libs/binutils-libs )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-lang/perl
+ >=dev-util/cmake-3.16
+ sys-devel/gnuconfig
+ kernel_Darwin? (
+ =sys-devel/binutils-apple-5.1
+ )
+ doc? ( $(python_gen_any_dep '
+ dev-python/recommonmark[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ ') )
+ libffi? ( virtual/pkgconfig )
+"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="
+ ${RDEPEND}
+ !sys-devel/llvm:0
+"
+PDEPEND="
+ sys-devel/llvm-common
+ sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
+ binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} )
+"
+
+LLVM_COMPONENTS=( llvm cmake )
+LLVM_TEST_COMPONENTS=( third-party )
+LLVM_MANPAGES=1
+LLVM_USE_TARGETS=provide
+llvm.org_set_globals
+
+python_check_deps() {
+ use doc || return 0
+
+ python_has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
+ python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_uptodate() {
+ local prod_targets=(
+ $(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
+ | tail -n +2 | head -n -1)
+ )
+ local all_targets=(
+ lib/Target/*/
+ )
+ all_targets=( "${all_targets[@]#lib/Target/}" )
+ all_targets=( "${all_targets[@]%/}" )
+
+ local exp_targets=() i
+ for i in "${all_targets[@]}"; do
+ has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
+ done
+
+ if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
+ eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
+ eqawarn " Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
+ eqawarn "Expected: ${exp_targets[*]}"
+ eqawarn
+ fi
+
+ if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
+ eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
+ eqawarn " Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
+ eqawarn "Expected: ${prod_targets[*]}"
+ fi
+}
+
+check_distribution_components() {
+ if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+ local all_targets=() my_targets=() l
+ cd "${BUILD_DIR}" || die
+
+ while read -r l; do
+ if [[ ${l} == install-*-stripped:* ]]; then
+ l=${l#install-}
+ l=${l%%-stripped*}
+
+ case ${l} in
+ # shared libs
+ LLVM|LLVMgold)
+ ;;
+ # TableGen lib + deps
+ LLVMDemangle|LLVMSupport|LLVMTableGen)
+ ;;
+ # static libs
+ LLVM*)
+ continue
+ ;;
+ # meta-targets
+ distribution|llvm-libraries)
+ continue
+ ;;
+ # used only w/ USE=doc
+ docs-llvm-html)
+ use doc || continue
+ ;;
+ esac
+
+ all_targets+=( "${l}" )
+ fi
+ done < <(${NINJA} -t targets all)
+
+ while read -r l; do
+ my_targets+=( "${l}" )
+ done < <(get_distribution_components $"\n")
+
+ local add=() remove=()
+ for l in "${all_targets[@]}"; do
+ if ! has "${l}" "${my_targets[@]}"; then
+ add+=( "${l}" )
+ fi
+ done
+ for l in "${my_targets[@]}"; do
+ if ! has "${l}" "${all_targets[@]}"; then
+ remove+=( "${l}" )
+ fi
+ done
+
+ if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+ eqawarn "get_distribution_components() is outdated!"
+ eqawarn " Add: ${add[*]}"
+ eqawarn "Remove: ${remove[*]}"
+ fi
+ cd - >/dev/null || die
+ fi
+}
+
+src_prepare() {
+ # disable use of SDK on OSX, bug #568758
+ sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+ # Update config.guess to support more systems
+ cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
+
+ # Verify that the ebuild is up-to-date
+ check_uptodate
+
+ llvm.org_src_prepare
+}
+
+get_distribution_components() {
+ local sep=${1-;}
+
+ local out=(
+ # shared libs
+ LLVM
+ LTO
+ Remarks
+
+ # tools
+ llvm-config
+
+ # common stuff
+ cmake-exports
+ llvm-headers
+
+ # libraries needed for clang-tblgen
+ LLVMDemangle
+ LLVMSupport
+ LLVMTableGen
+ )
+
+ if multilib_is_native_abi; then
+ out+=(
+ # utilities
+ llvm-tblgen
+ FileCheck
+ llvm-PerfectShuffle
+ count
+ not
+ yaml-bench
+ UnicodeNameMappingGenerator
+
+ # tools
+ bugpoint
+ dsymutil
+ llc
+ lli
+ lli-child-target
+ llvm-addr2line
+ llvm-ar
+ llvm-as
+ llvm-bcanalyzer
+ llvm-bitcode-strip
+ llvm-c-test
+ llvm-cat
+ llvm-cfi-verify
+ llvm-config
+ llvm-cov
+ llvm-cvtres
+ llvm-cxxdump
+ llvm-cxxfilt
+ llvm-cxxmap
+ llvm-debuginfo-analyzer
+ llvm-debuginfod
+ llvm-debuginfod-find
+ llvm-diff
+ llvm-dis
+ llvm-dlltool
+ llvm-dwarfdump
+ llvm-dwarfutil
+ llvm-dwp
+ llvm-exegesis
+ llvm-extract
+ llvm-gsymutil
+ llvm-ifs
+ llvm-install-name-tool
+ llvm-jitlink
+ llvm-jitlink-executor
+ llvm-lib
+ llvm-libtool-darwin
+ llvm-link
+ llvm-lipo
+ llvm-lto
+ llvm-lto2
+ llvm-mc
+ llvm-mca
+ llvm-ml
+ llvm-modextract
+ llvm-mt
+ llvm-nm
+ llvm-objcopy
+ llvm-objdump
+ llvm-opt-report
+ llvm-otool
+ llvm-pdbutil
+ llvm-profdata
+ llvm-profgen
+ llvm-ranlib
+ llvm-rc
+ llvm-readelf
+ llvm-readobj
+ llvm-reduce
+ llvm-remark-size-diff
+ llvm-remarkutil
+ llvm-rtdyld
+ llvm-sim
+ llvm-size
+ llvm-split
+ llvm-stress
+ llvm-strings
+ llvm-strip
+ llvm-symbolizer
+ llvm-tapi-diff
+ llvm-tli-checker
+ llvm-undname
+ llvm-windres
+ llvm-xray
+ obj2yaml
+ opt
+ sancov
+ sanstats
+ split-file
+ verify-uselistorder
+ yaml2obj
+
+ # python modules
+ opt-viewer
+ )
+
+ if llvm_are_manpages_built; then
+ out+=(
+ # manpages
+ docs-dsymutil-man
+ docs-llvm-dwarfdump-man
+ docs-llvm-man
+ )
+ fi
+ use doc && out+=(
+ docs-llvm-html
+ )
+
+ use binutils-plugin && out+=(
+ LLVMgold
+ )
+ fi
+
+ printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+ tc-is-gcc && filter-lto # GCC miscompiles LLVM, bug #873670
+
+ local ffi_cflags ffi_ldflags
+ if use libffi; then
+ ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+ ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+ fi
+
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ # disable appending VCS revision to the version to improve
+ # direct cache hit ratio
+ -DLLVM_APPEND_VC_REV=OFF
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+ -DBUILD_SHARED_LIBS=OFF
+ -DLLVM_BUILD_LLVM_DYLIB=ON
+ -DLLVM_LINK_LLVM_DYLIB=ON
+ -DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+ # cheap hack: LLVM combines both anyway, and the only difference
+ # is that the former list is explicitly verified at cmake time
+ -DLLVM_TARGETS_TO_BUILD=""
+ -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+ -DLLVM_INCLUDE_BENCHMARKS=OFF
+ -DLLVM_INCLUDE_TESTS=$(usex test)
+ -DLLVM_BUILD_TESTS=$(usex test)
+
+ -DLLVM_ENABLE_FFI=$(usex libffi)
+ -DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+ -DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+ -DLLVM_ENABLE_LIBXML2=$(usex xml)
+ -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+ -DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+ -DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
+ -DLLVM_ENABLE_ZSTD=$(usex zstd)
+
+ -DLLVM_HOST_TRIPLE="${CHOST}"
+
+ -DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+ -DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+ # used only for llvm-objdump tool
+ -DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+ -DPython3_EXECUTABLE="${PYTHON}"
+
+ # disable OCaml bindings (now in dev-ml/llvm-ocaml)
+ -DOCAMLFIND=NO
+ )
+
+ local suffix=
+ if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
+ # the ABI of the main branch is not stable, so let's include
+ # the commit id in the SOVERSION to contain the breakage
+ suffix+="git${EGIT_VERSION::8}"
+ fi
+ if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
+ # Smart hack: alter version suffix -> SOVERSION when linking
+ # against libc++. This way we won't end up mixing LLVM libc++
+ # libraries with libstdc++ clang, and the other way around.
+ suffix+="+libcxx"
+ mycmakeargs+=(
+ -DLLVM_ENABLE_LIBCXX=ON
+ )
+ fi
+ mycmakeargs+=(
+ -DLLVM_VERSION_SUFFIX="${suffix}"
+ )
+
+ use test && mycmakeargs+=(
+ -DLLVM_LIT_ARGS="$(get_lit_flags)"
+ )
+
+ if multilib_is_native_abi; then
+ local build_docs=OFF
+ if llvm_are_manpages_built; then
+ build_docs=ON
+ mycmakeargs+=(
+ -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+ -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+ -DSPHINX_WARNINGS_AS_ERRORS=OFF
+ )
+ fi
+
+ mycmakeargs+=(
+ -DLLVM_BUILD_DOCS=${build_docs}
+ -DLLVM_ENABLE_OCAMLDOC=OFF
+ -DLLVM_ENABLE_SPHINX=${build_docs}
+ -DLLVM_ENABLE_DOXYGEN=OFF
+ -DLLVM_INSTALL_UTILS=ON
+ )
+ use binutils-plugin && mycmakeargs+=(
+ -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+ )
+ fi
+
+ # workaround BMI bug in gcc-7 (fixed in 7.4)
+ # https://bugs.gentoo.org/649880
+ # apply only to x86, https://bugs.gentoo.org/650506
+ if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+ [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+ then
+ local CFLAGS="${CFLAGS} -mno-bmi"
+ local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+ fi
+
+ # LLVM can have very high memory consumption while linking,
+ # exhausting the limit on 32-bit linker executable
+ use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+ cmake_src_configure
+
+ grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \
+ CMakeCache.txt ||
+ die "Incorrect version, did you update _LLVM_MASTER_MAJOR?"
+ multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+ tc-env_build cmake_build distribution
+
+ pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+ pax-mark m "${BUILD_DIR}"/bin/lli
+ pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+ if use test; then
+ pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+ pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+ pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+ fi
+}
+
+multilib_src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+ cmake_build check
+}
+
+src_install() {
+ local MULTILIB_CHOST_TOOLS=(
+ /usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config
+ )
+
+ local MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/llvm/Config/llvm-config.h
+ )
+
+ local LLVM_LDPATHS=()
+ multilib-minimal_src_install
+
+ # move wrapped headers back
+ mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
+}
+
+multilib_src_install() {
+ DESTDIR=${D} cmake_build install-distribution
+
+ # move headers to /usr/include for wrapping
+ rm -rf "${ED}"/usr/include || die
+ mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
+
+ LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+ local revord=$(( 9999 - ${LLVM_MAJOR} ))
+ newenvd - "60llvm-${revord}" <<-_EOF_
+ PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
+ # we need to duplicate it in ROOTPATH for Portage to respect...
+ ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
+ MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+ LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+ _EOF_
+
+ docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+ llvm_install_manpages
+}
+
+pkg_postinst() {
+ elog "You can find additional opt-viewer utility scripts in:"
+ elog " ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer"
+ elog "To use these scripts, you will need Python along with the following"
+ elog "packages:"
+ elog " dev-python/pygments (for opt-viewer)"
+ elog " dev-python/pyyaml (for all of them)"
+}
diff --git a/sys-devel/m4/m4-1.4.19-r1.ebuild b/sys-devel/m4/m4-1.4.19-r1.ebuild
index b87db9ecaaf3..1e21816bb42b 100644
--- a/sys-devel/m4/m4-1.4.19-r1.ebuild
+++ b/sys-devel/m4/m4-1.4.19-r1.ebuild
@@ -17,7 +17,7 @@ else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-test-198-sysval-r1.patch.gz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
- KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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"
fi
LICENSE="GPL-3"
diff --git a/sys-devel/mold/mold-1.10.1.ebuild b/sys-devel/mold/mold-1.10.1.ebuild
index ea88934048d6..a574dbeb3b3a 100644
--- a/sys-devel/mold/mold-1.10.1.ebuild
+++ b/sys-devel/mold/mold-1.10.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~ppc64 ~riscv ~x86"
fi
# mold (AGPL-3)
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 2d2d885f4c4d..70fc9edd23ee 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/vgabios/vgabios-0.8a.ebuild b/sys-firmware/vgabios/vgabios-0.8a.ebuild
index 6fb711e436e8..f29f45d6c17d 100644
--- a/sys-firmware/vgabios/vgabios-0.8a.ebuild
+++ b/sys-firmware/vgabios/vgabios-0.8a.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
IUSE="binary debug"
BDEPEND="!binary? ( sys-devel/dev86 )"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 8677ed8d6e4b..1967b14b25bc 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.1.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.1.2.ebuild
index 842180004a08..3e995e27b35a 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-6.1.2.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.1.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
fi
S="${WORKDIR}"/${PN}-${MY_PV}
diff --git a/sys-fs/libeatmydata/libeatmydata-131.ebuild b/sys-fs/libeatmydata/libeatmydata-131.ebuild
index 84b579718d1f..503a1de35721 100644
--- a/sys-fs/libeatmydata/libeatmydata-131.ebuild
+++ b/sys-fs/libeatmydata/libeatmydata-131.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/stewartsmith/${PN}/releases/download/v${PV}/${P}.tar
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/sys-fs/mdadm/mdadm-4.2-r1.ebuild b/sys-fs/mdadm/mdadm-4.2-r1.ebuild
index 26e0d88a0f6b..c73efa5d3292 100644
--- a/sys-fs/mdadm/mdadm-4.2-r1.ebuild
+++ b/sys-fs/mdadm/mdadm-4.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz
LICENSE="GPL-2"
SLOT="0"
[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc x86"
IUSE="static systemd +udev"
# Only sys-fs/eudev provides static-libs right now, so if you have systemd,
diff --git a/sys-fs/mergerfs/mergerfs-2.34.1.ebuild b/sys-fs/mergerfs/mergerfs-2.34.1.ebuild
index 768881f29bc8..a534d6068490 100644
--- a/sys-fs/mergerfs/mergerfs-2.34.1.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.34.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="A featureful union filesystem"
HOMEPAGE="https://github.com/trapexit/mergerfs"
SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
# Vendorized libfuse that's bundled is under LGPL-2.1.
LICENSE="ISC LGPL-2.1"
diff --git a/sys-fs/snapraid/metadata.xml b/sys-fs/snapraid/metadata.xml
index 6cb715dfdf3d..eb14d529cbe3 100644
--- a/sys-fs/snapraid/metadata.xml
+++ b/sys-fs/snapraid/metadata.xml
@@ -5,10 +5,6 @@
slashbeast@gentoo.org
Piotr Karbowski
-
- junghans@gentoo.org
- Christoph Junghans
-
snapraid
amadvance/snapraid
diff --git a/sys-fs/ubi_reader/Manifest b/sys-fs/ubi_reader/Manifest
index 31ade6122176..a0655a824d49 100644
--- a/sys-fs/ubi_reader/Manifest
+++ b/sys-fs/ubi_reader/Manifest
@@ -1,2 +1 @@
-DIST ubi_reader-0.8.0.tar.gz 42913 BLAKE2B e802833fcc633739da6cb3cfffb8f398ad27261df55301b6322ea7303aeccbc57f6a685cefa4005ecf80e2a968139d091a8b5c6a9783dd613a5016ba56d55425 SHA512 c22a0b056a2ce74c16683dafd8e2592ba3c73df32ca49cce19fe14f60d254249849769364993cabff5ce03c8049e1758f7bdb77583d745ed21efa0c62be20532
DIST ubi_reader-0.8.5.tar.gz 43237 BLAKE2B c55bc689af0a32a0e65aa6f860617131654d11ad5e6f7f1e37b4e048718c061f352965f9793595dc16162df0c08ce32d4db2d6bfaee9366110028f7fe61a5c98 SHA512 14e02c8b8c5fe0fe6316f0dabea21dbb6ef6a865ef2b176fc6e26f36bd54a981cb89fccee2ac476b042909cdd5946b1325f792ac159d7e6bd2c5a6f7f4b14062
diff --git a/sys-fs/ubi_reader/ubi_reader-0.8.0.ebuild b/sys-fs/ubi_reader/ubi_reader-0.8.0.ebuild
deleted file mode 100644
index 4c59ae5023d2..000000000000
--- a/sys-fs/ubi_reader/ubi_reader-0.8.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-MY_PN="${PN/_/-}"
-DESCRIPTION="Collection of Python scripts for extracting data from UBI and UBIFS images"
-HOMEPAGE="https://github.com/jrspruitt/ubi_reader"
-SRC_URI="https://github.com/jrspruitt/ubi_reader/archive/refs/tags/v${PV}-master.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}-master"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/python-lzo[${PYTHON_USEDEP}]"
diff --git a/sys-fs/ubi_reader/ubi_reader-0.8.5.ebuild b/sys-fs/ubi_reader/ubi_reader-0.8.5-r1.ebuild
similarity index 88%
rename from sys-fs/ubi_reader/ubi_reader-0.8.5.ebuild
rename to sys-fs/ubi_reader/ubi_reader-0.8.5-r1.ebuild
index 4c59ae5023d2..ea7eb78871bb 100644
--- a/sys-fs/ubi_reader/ubi_reader-0.8.5.ebuild
+++ b/sys-fs/ubi_reader/ubi_reader-0.8.5-r1.ebuild
@@ -3,8 +3,8 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
-
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1
MY_PN="${PN/_/-}"
diff --git a/sys-fs/xfsdump/xfsdump-3.1.12.ebuild b/sys-fs/xfsdump/xfsdump-3.1.12.ebuild
index d23c7df2938d..5e4ec29587b6 100644
--- a/sys-fs/xfsdump/xfsdump-3.1.12.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.1.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 -sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86"
IUSE="ncurses nls"
RDEPEND="
diff --git a/sys-fs/xfsprogs/xfsprogs-6.1.1.ebuild b/sys-fs/xfsprogs/xfsprogs-6.1.1.ebuild
index db6555bdf36d..c0458b718a19 100644
--- a/sys-fs/xfsprogs/xfsprogs-6.1.1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-6.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="icu libedit nls selinux"
RDEPEND="dev-libs/inih
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 05caa2685803..0b42d0434412 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/cryptodev/Manifest b/sys-kernel/cryptodev/Manifest
index 37705199474e..291074c9eb83 100644
--- a/sys-kernel/cryptodev/Manifest
+++ b/sys-kernel/cryptodev/Manifest
@@ -1,2 +1 @@
-DIST cryptodev-linux-1.11.tar.gz 56876 BLAKE2B 97cf09c515c586372b2c5bd450e445afd5f80ed8ab39002545dc550c63480469a5318214f467444618e4e1783b9ab999b550cfb16d8ded6de26671a0727d06c2 SHA512 f7b76e9a154945514e2238cd7106cb50cea8120febc79228d6a8ba2dfaf98d5f0756d970df76fd63bda4755d7e0d78331aea394c3c5c18794b7ef1a8738fddba
DIST cryptodev-linux-1.12.tar.gz 56922 BLAKE2B ec3d6585cbc15027468c0d009dfad1437286e71f90247b6b07067e1355483d9a3184cb0134ab4cfb406168b1b506fb08d4a0ab6476b71305267769a33e5ed2de SHA512 75f4f20ee7474375fd515cfd4f247f9a61739ac766525cd8fe007adfa44129d90077568d59409f577202a4d8883539b0d533dd5e060a1065b61106f68ea5e4b3
diff --git a/sys-kernel/cryptodev/cryptodev-1.11.ebuild b/sys-kernel/cryptodev/cryptodev-1.11.ebuild
deleted file mode 100644
index 89714e1aa6bd..000000000000
--- a/sys-kernel/cryptodev/cryptodev-1.11.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info linux-mod
-
-DESCRIPTION="device that allows access to Linux kernel cryptographic drivers"
-HOMEPAGE="http://cryptodev-linux.org/"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/cryptodev-linux/cryptodev-linux.git"
- S="${WORKDIR}/${PN}-${PV}"
-else
- SRC_URI="https://github.com/cryptodev-linux/cryptodev-linux/archive/${PN}-linux-${PV}.tar.gz"
- KEYWORDS="amd64 ~arm x86"
- S=${WORKDIR}/${PN}-linux-${PN}-linux-${PV}
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="examples"
-
-DEPEND="virtual/linux-sources"
-
-#test requires that the module is already loaded
-RESTRICT="test"
-
-MODULE_NAMES="cryptodev(extra:${S})"
-BUILD_PARAMS="KERNEL_DIR=\"\${KV_OUT_DIR}\""
-BUILD_TARGETS="build"
-
-pkg_pretend() {
- use kernel_linux || die "cryptodev ebuild only support linux"
-
- CONFIG_CHECK="~CRYPTO ~CRYPTO_AEAD"
- if kernel_is -lt 4 8 0; then
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_BLKCIPHER"
- else
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SKCIPHER"
- fi
- check_extra_config
-}
-
-src_install() {
- linux-mod_src_install
-
- insinto /usr/include/crypto
- doins crypto/cryptodev.h
-
- if use examples ; then
- docinto examples
- dodoc example/*
- fi
-}
diff --git a/sys-kernel/cryptodev/cryptodev-1.12.ebuild b/sys-kernel/cryptodev/cryptodev-1.12.ebuild
index 33410090c5ff..4660f202faa1 100644
--- a/sys-kernel/cryptodev/cryptodev-1.12.ebuild
+++ b/sys-kernel/cryptodev/cryptodev-1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,6 @@ HOMEPAGE="http://cryptodev-linux.org/"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/cryptodev-linux/cryptodev-linux.git"
- S="${WORKDIR}/${PN}-${PV}"
else
SRC_URI="https://github.com/cryptodev-linux/cryptodev-linux/archive/${PN}-linux-${PV}.tar.gz"
KEYWORDS="amd64 ~arm x86"
diff --git a/sys-kernel/cryptodev/cryptodev-9999.ebuild b/sys-kernel/cryptodev/cryptodev-9999.ebuild
index 08cf07fc623e..ac9bd1eeea15 100644
--- a/sys-kernel/cryptodev/cryptodev-9999.ebuild
+++ b/sys-kernel/cryptodev/cryptodev-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,6 @@ HOMEPAGE="http://cryptodev-linux.org/"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/cryptodev-linux/cryptodev-linux.git"
- S="${WORKDIR}/${PN}-${PV}"
else
SRC_URI="https://github.com/cryptodev-linux/cryptodev-linux/archive/${PN}-linux-${PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~x86"
diff --git a/sys-kernel/genkernel/genkernel-4.3.2.ebuild b/sys-kernel/genkernel/genkernel-4.3.2.ebuild
index 2c2314c58558..93c159ba3575 100644
--- a/sys-kernel/genkernel/genkernel-4.3.2.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.2.ebuild
@@ -92,7 +92,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.xz
${COMMON_URI}"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="Gentoo automatic kernel building scripts"
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 6dc9da28eeac..6400e2af91a7 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,9 +1,2 @@
-DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
-DIST patch-6.2-rc1.patch 61917436 BLAKE2B 038ccb5a750e55c926f223456acf32b06f38e01c1449fbd102d685202342ed774672927688cef83c19558bcb1b45919a85c34b3088ac81df6c81e569e4ed0ac2 SHA512 3a5fd0288c20bfb234e5f62102ebf9caa4addbe91e39c1a5882cbe68b32f2e6bfda1e91247526f5e0b3e18400906a44112c29f21777f838860a52b520eb7dc54
-DIST patch-6.2-rc2.patch 62009581 BLAKE2B b17cc02211a6c6c3f97eb8dd8896c572ea1dcef404c08c374aa21cb1d21d6c51bab37207454d2af63ae99e5c97fcd11e44ff243f82b57183a03a80131a838fc3 SHA512 047856bb07a371579a520a62d91f6fce78537da1826ea7ea3e39504470b47968c039037684e5b88918f48de1a22f1b6aa8ebbe7ab22f52ab4f0440255970c5a2
-DIST patch-6.2-rc3.patch 62224587 BLAKE2B e873338f80f379aceb3444e3e397014c1b91f1cb012e3080063e1d33c7339d84da25402fb40711f9c496becbedbd73935226f97061f8747e51022c3400f57c66 SHA512 a1a86364b57a03b3122dd54a012ad6de65696f21140d2958700668c9a63c3cc052ac2670177e188384961310568faabe87c351608efdf7dde69d4bdb6248c3f2
-DIST patch-6.2-rc4.patch 62686618 BLAKE2B 4f67e021c76b1d9f028813826c49f66795b46fcf558e906d3d2d03072522e21d99da96d92803f1252ac1a2f3b32946df90ae6fc4bef3c8ed6f0100e0fefd54eb SHA512 8e65854464e53b62452e5e80119e53fd61b3bdc2e5de262a44030208a07f811541f7d4e3af647afffbead7c96f0a6b9a81e6e17c95575d0cd6eaf6ea9f708fff
-DIST patch-6.2-rc5.patch 63046709 BLAKE2B 234ac71b0803b802c5fa54d1eef452ae1e76c9ed2b61638a357a4ccf851a38fb1ad1697a468059d5bd443c20d6cd799bf917aafd9801177b9ccd62f28255473f SHA512 bf7aeaca8fe6c4476f2b346b3f1bc88fba4e9da9cf12a2668baa2e73ba0a5a443fbde995909994db903b2ca64e58ed4aae1ff0cad539cee4d3712067f73e4220
-DIST patch-6.2-rc6.patch 63222751 BLAKE2B ca5572d4bd8fa547cac49210fd8204a65e0d1cc7d8c8bf386be88c7c4f7ad0c72048c8ceeea21574978947f75e8837b1b63a782ec3508641d1c5ba733bbea4a8 SHA512 7740742abfd6521f22d3281c0df882905c89af9ff673bf8da38d8503ef9f3853dbfc467f979e3057c7813f1fbf971a7369913a3f6b6ebe2fa87391bc30d606db
-DIST patch-6.2-rc7.patch 63465285 BLAKE2B 224e6484b6351590df8d12cd710b74b2118f4c5292ae2d10c61c3950c186d4491577fd9baba181665266ea5aaa8c30953d40ff89b7411668b3f47aa39777aaea SHA512 82be92a434a18a6e5e12324adf68869bef561ac4a8cfdd07fd725e6d05f6406c7b2057c3dd62759bbdc3d100e7392729f9ac2f4acdc5270e88278928a482d18e
-DIST patch-6.2-rc8.patch 63632969 BLAKE2B d4a386b0c7859013a40dec5b8a8fb7d4163432d5d383396f964cecb24e3461bc18e70287465d074a219eeaad3134af2bc5ccd488c815cd7cdd4f43e7f4165fef SHA512 2ed9d654862af81b66e9c4ba4a002ce1be57507a1feef28bc3e92fc0c66eba68c9f18c53709eedfd7c7363c270fe056abffd05deffb16b33894e11a4b52767f0
+DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
+DIST patch-6.3-rc1.patch 75751420 BLAKE2B 6e3cddb5397bea144a14b2b1efb1816841d81fa44030066a0196d97493121edfa451310dcb023d2feea45f17c43a8e3d1ecac63cf2a1b8c759c42bec5529d528 SHA512 f5f3240508ba1a0b5fef3a88ba781b7b76502eb242dbc670217f4c599d8394781d8fd8f05a24a831b25c18951e2a3278d1a89e99f2ef818d865c588371527e01
diff --git a/sys-kernel/git-sources/git-sources-6.2_rc1.ebuild b/sys-kernel/git-sources/git-sources-6.2_rc1.ebuild
deleted file mode 100644
index dfbf0ca4dd11..000000000000
--- a/sys-kernel/git-sources/git-sources-6.2_rc1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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="6.1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="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 ~loong ~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/git-sources/git-sources-6.2_rc2.ebuild b/sys-kernel/git-sources/git-sources-6.2_rc2.ebuild
deleted file mode 100644
index 3361401fba57..000000000000
--- a/sys-kernel/git-sources/git-sources-6.2_rc2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 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="6.1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="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 ~loong ~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/git-sources/git-sources-6.2_rc4.ebuild b/sys-kernel/git-sources/git-sources-6.2_rc4.ebuild
deleted file mode 100644
index 3361401fba57..000000000000
--- a/sys-kernel/git-sources/git-sources-6.2_rc4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 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="6.1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="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 ~loong ~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/git-sources/git-sources-6.2_rc5.ebuild b/sys-kernel/git-sources/git-sources-6.2_rc5.ebuild
deleted file mode 100644
index 3361401fba57..000000000000
--- a/sys-kernel/git-sources/git-sources-6.2_rc5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 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="6.1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="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 ~loong ~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/git-sources/git-sources-6.2_rc6.ebuild b/sys-kernel/git-sources/git-sources-6.2_rc6.ebuild
deleted file mode 100644
index 3361401fba57..000000000000
--- a/sys-kernel/git-sources/git-sources-6.2_rc6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 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="6.1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="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 ~loong ~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/git-sources/git-sources-6.2_rc7.ebuild b/sys-kernel/git-sources/git-sources-6.2_rc7.ebuild
deleted file mode 100644
index 3361401fba57..000000000000
--- a/sys-kernel/git-sources/git-sources-6.2_rc7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 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="6.1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="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 ~loong ~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/git-sources/git-sources-6.2_rc8.ebuild b/sys-kernel/git-sources/git-sources-6.2_rc8.ebuild
deleted file mode 100644
index 3361401fba57..000000000000
--- a/sys-kernel/git-sources/git-sources-6.2_rc8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 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="6.1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="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 ~loong ~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/git-sources/git-sources-6.2_rc3.ebuild b/sys-kernel/git-sources/git-sources-6.3_rc1.ebuild
similarity index 98%
rename from sys-kernel/git-sources/git-sources-6.2_rc3.ebuild
rename to sys-kernel/git-sources/git-sources-6.3_rc1.ebuild
index 3361401fba57..ae9a3401cdd2 100644
--- a/sys-kernel/git-sources/git-sources-6.2_rc3.ebuild
+++ b/sys-kernel/git-sources/git-sources-6.3_rc1.ebuild
@@ -7,7 +7,7 @@ K_NOUSENAME="yes"
K_NOSETEXTRAVERSION="yes"
K_NOUSEPR="yes"
K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="6.1"
+K_BASE_VER="6.2"
K_EXP_GENPATCHES_NOUSE="1"
K_FROM_GIT="yes"
K_NODRYRUN="yes"
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index a5b13becfae9..a7ab895614e1 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/blocksruntime/blocksruntime-0_pre20171027-r2.ebuild b/sys-libs/blocksruntime/blocksruntime-0_pre20171027-r2.ebuild
new file mode 100644
index 000000000000..1036aca20985
--- /dev/null
+++ b/sys-libs/blocksruntime/blocksruntime-0_pre20171027-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs vcs-snapshot
+
+COMMIT=9cc93ae2b58676c23fd02cf0c686fa15b7a3ff81 # 27 Oct 2017
+
+DESCRIPTION="BlocksRuntime library needed for clang's -fblocks support"
+HOMEPAGE="https://github.com/mackyle/blocksruntime"
+SRC_URI="https://github.com/mackyle/blocksruntime/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="!dev-libs/libdispatch"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0_pre20171027-ldflags-soname.patch
+)
+
+src_prepare() {
+ default
+
+ tc-export CC AR RANLIB
+}
+
+src_compile() {
+ ./buildlib -shared || die
+}
+
+src_install() {
+ prefix="${EPREFIX}/usr" \
+ includedir="${EPREFIX}/usr/include/blocksruntime" \
+ libdir="${EPREFIX}/usr/$(get_libdir)" \
+ DESTDIR="${D}" \
+ ./installlib $(use static-libs || echo -shared) || die
+}
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 73cabc1ed7a4..a5251923bec8 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -6,4 +6,5 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230304.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..cc599404c49c
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230304.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="${LLVM_MAJOR}"
+KEYWORDS=""
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
+# base targets
+IUSE+=" +libfuzzer +memprof +orc +profile +xray"
+# sanitizer targets, keep in sync with config-ix.cmake
+# NB: ubsan, scudo deliberately match two entries
+SANITIZER_FLAGS=(
+ asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
+ shadowcallstack gwp-asan
+)
+IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
+REQUIRED_USE="
+ || ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
+ test? (
+ cfi? ( ubsan )
+ gwp-asan? ( scudo )
+ )
+"
+RESTRICT="
+ !clang? ( test )
+ !test? ( test )
+"
+
+DEPEND="
+ sys-devel/llvm:${LLVM_MAJOR}
+ virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
+"
+BDEPEND="
+ >=dev-util/cmake-3.16
+ clang? ( sys-devel/clang )
+ elibc_glibc? ( net-libs/libtirpc )
+ test? (
+ $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+ =sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+ sys-libs/compiler-rt:${LLVM_MAJOR}
+ )
+ !test? (
+ ${PYTHON_DEPS}
+ )
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+python_check_deps() {
+ use test || return 0
+ python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+check_space() {
+ if use test; then
+ local CHECKREQS_DISK_BUILD=11G
+ check-reqs_pkg_pretend
+ fi
+}
+
+pkg_pretend() {
+ check_space
+}
+
+pkg_setup() {
+ check_space
+ LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+ local flag
+ for flag in "${SANITIZER_FLAGS[@]}"; do
+ if ! use "${flag}"; then
+ local cmake_flag=${flag/-/_}
+ sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
+ cmake/config-ix.cmake || die
+ fi
+ done
+
+ # TODO: fix these tests to be skipped upstream
+ if use asan && ! use profile; then
+ rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
+ fi
+ if use ubsan && ! use cfi; then
+ > test/cfi/CMakeLists.txt || die
+ fi
+
+ llvm.org_src_prepare
+}
+
+src_configure() {
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+ # pre-set since we need to pass it to cmake
+ BUILD_DIR=${WORKDIR}/compiler-rt_build
+
+ if use clang; then
+ local -x CC=${CHOST}-clang
+ local -x CXX=${CHOST}-clang++
+ strip-unsupported-flags
+ fi
+
+ local flag want_sanitizer=OFF
+ for flag in "${SANITIZER_FLAGS[@]}"; do
+ if use "${flag}"; then
+ want_sanitizer=ON
+ break
+ fi
+ done
+
+ local mycmakeargs=(
+ -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+ # use a build dir structure consistent with install
+ # this makes it possible to easily deploy test-friendly clang
+ -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
+
+ -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+ # builtins & crt installed by sys-libs/compiler-rt
+ -DCOMPILER_RT_BUILD_BUILTINS=OFF
+ -DCOMPILER_RT_BUILD_CRT=OFF
+ -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+ -DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
+ -DCOMPILER_RT_BUILD_ORC=$(usex orc)
+ -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+ -DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
+ -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
+
+ -DPython3_EXECUTABLE="${PYTHON}"
+ )
+
+ if use amd64; then
+ mycmakeargs+=(
+ -DCAN_TARGET_i386=$(usex abi_x86_32)
+ -DCAN_TARGET_x86_64=$(usex abi_x86_64)
+ )
+ fi
+
+ if use test; then
+ mycmakeargs+=(
+ -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+ -DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+ # they are created during src_test()
+ -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
+ -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
+ )
+
+ # same flags are passed for build & tests, so we need to strip
+ # them down to a subset supported by clang
+ CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
+ CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
+ strip-unsupported-flags
+ fi
+
+ if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+ mycmakeargs+=(
+ # setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+ # this allows adding arm64 support using SDK in EPREFIX
+ -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+ # Set version based on the SDK in EPREFIX
+ # This disables i386 for SDK >= 10.15
+ # Will error if has_use tsan and SDK < 10.12
+ -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+ # Use our libtool instead of looking it up with xcrun
+ -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+ )
+ fi
+
+ cmake_src_configure
+
+ if use test; then
+ local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
+ [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
+ [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
+
+ # copy clang over since resource_dir is located relatively to binary
+ # therefore, we can put our new libraries in it
+ mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
+ cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
+ "${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
+ cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
+ "${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
+ cp "${sys_dir}"/*builtins*.a \
+ "${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || die
+ # we also need LLVMgold.so for gold-based tests
+ if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
+ ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
+ "${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
+ fi
+ fi
+}
+
+src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+ # disable sandbox to have it stop clobbering LD_PRELOAD
+ local -x SANDBOX_ON=0
+ # wipe LD_PRELOAD to make ASAN happy
+ local -x LD_PRELOAD=
+
+ cmake_build check-all
+}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 03a17b99b940..a2bacff81331 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -6,4 +6,5 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230304.ebuild b/sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..2ed5fc860074
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230304.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="${LLVM_MAJOR}"
+KEYWORDS=""
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+DEPEND="
+ sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+ >=dev-util/cmake-3.16
+ clang? ( sys-devel/clang )
+ test? (
+ $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+ =sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+ )
+ !test? (
+ ${PYTHON_DEPS}
+ )
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+llvm.org_set_globals
+
+python_check_deps() {
+ use test || return 0
+ python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+ if ! use clang && ! tc-is-clang; then
+ ewarn "Building using a compiler other than clang may result in broken atomics"
+ ewarn "library. Enable USE=clang unless you have a very good reason not to."
+ fi
+}
+
+pkg_setup() {
+ # Darwin Prefix builds do not have llvm installed yet, so rely on
+ # bootstrap-prefix to set the appropriate path vars to LLVM instead
+ # of using llvm_pkg_setup.
+ if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+ LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+ fi
+ python-any-r1_pkg_setup
+}
+
+test_compiler() {
+ $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+ <<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+ # pre-set since we need to pass it to cmake
+ BUILD_DIR=${WORKDIR}/${P}_build
+
+ if use clang; then
+ # Only do this conditionally to allow overriding with
+ # e.g. CC=clang-13 in case of breakage
+ if ! tc-is-clang ; then
+ local -x CC=${CHOST}-clang
+ local -x CXX=${CHOST}-clang++
+ fi
+
+ strip-unsupported-flags
+ fi
+
+ if ! test_compiler; then
+ local nolib_flags=( -nodefaultlibs -lc )
+
+ if test_compiler "${nolib_flags[@]}"; then
+ local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+ ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+ elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
+ # Avoiding -nostartfiles earlier on for bug #862540,
+ # and set available entry symbol for bug #862798.
+ nolib_flags+=( -nostartfiles -emain )
+
+ local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+ ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+ fi
+ fi
+
+ local mycmakeargs=(
+ -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+
+ -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+ -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+ -DCOMPILER_RT_BUILD_MEMPROF=OFF
+ -DCOMPILER_RT_BUILD_ORC=OFF
+ -DCOMPILER_RT_BUILD_PROFILE=OFF
+ -DCOMPILER_RT_BUILD_SANITIZERS=OFF
+ -DCOMPILER_RT_BUILD_XRAY=OFF
+
+ -DPython3_EXECUTABLE="${PYTHON}"
+ )
+
+ if use amd64; then
+ mycmakeargs+=(
+ -DCAN_TARGET_i386=$(usex abi_x86_32)
+ -DCAN_TARGET_x86_64=$(usex abi_x86_64)
+ )
+ fi
+
+ if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+ mycmakeargs+=(
+ # setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+ # this allows adding arm64 support using SDK in EPREFIX
+ -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+ # Set version based on the SDK in EPREFIX.
+ # This disables i386 for SDK >= 10.15
+ -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+ # Use our libtool instead of looking it up with xcrun
+ -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+ )
+ fi
+
+ if use test; then
+ mycmakeargs+=(
+ -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+ -DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+ -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
+ -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
+ )
+ fi
+
+ cmake_src_configure
+}
+
+src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+
+ cmake_build check-builtins
+}
diff --git a/sys-libs/freeipmi/freeipmi-1.6.10-r1.ebuild b/sys-libs/freeipmi/freeipmi-1.6.10-r1.ebuild
index cc5e3e0cd78a..6f12a9a5d306 100644
--- a/sys-libs/freeipmi/freeipmi-1.6.10-r1.ebuild
+++ b/sys-libs/freeipmi/freeipmi-1.6.10-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 x86"
+KEYWORDS="amd64 hppa ~ppc64 x86"
IUSE="debug nagios without-root"
RDEPEND="dev-libs/libgcrypt:0="
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index c9896fc7486d..58266724eb65 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -6,4 +6,5 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-libs/libcxx/libcxx-17.0.0_pre20230304.ebuild b/sys-libs/libcxx/libcxx-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..4eeb65e55e83
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-17.0.0_pre20230304.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
+ toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="+clang +libcxxabi static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ libcxxabi? (
+ ~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+ )
+ !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+"
+DEPEND="
+ ${RDEPEND}
+ sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+ clang? (
+ sys-devel/clang:${LLVM_MAJOR}
+ )
+ !test? (
+ ${PYTHON_DEPS}
+ )
+ test? (
+ >=dev-util/cmake-3.16
+ sys-devel/gdb[python]
+ $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+ )
+"
+
+LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
+llvm.org_set_globals
+
+python_check_deps() {
+ use test || return 0
+ python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ # Darwin Prefix builds do not have llvm installed yet, so rely on
+ # bootstrap-prefix to set the appropriate path vars to LLVM instead
+ # of using llvm_pkg_setup.
+ if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+ LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+ fi
+ python-any-r1_pkg_setup
+
+ if ! use libcxxabi && ! tc-is-gcc ; then
+ eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
+ eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
+ eerror "and try again."
+ die
+ fi
+}
+
+test_compiler() {
+ $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+ <<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+ # note: we need to do this before multilib kicks in since it will
+ # alter the CHOST
+ local cxxabi cxxabi_incs
+ if use libcxxabi; then
+ cxxabi=system-libcxxabi
+ cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
+ else
+ local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+ cxxabi=libsupc++
+ cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ if use clang; then
+ local -x CC=${CHOST}-clang
+ local -x CXX=${CHOST}-clang++
+ strip-unsupported-flags
+ fi
+
+ # link to compiler-rt
+ local use_compiler_rt=OFF
+ [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+ # bootstrap: cmake is unhappy if compiler can't link to stdlib
+ local nolib_flags=( -nodefaultlibs -lc )
+ if ! test_compiler; then
+ if test_compiler "${nolib_flags[@]}"; then
+ local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+ ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+ fi
+ fi
+
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+ -DPython3_EXECUTABLE="${PYTHON}"
+ -DLLVM_ENABLE_RUNTIMES=libcxx
+ -DLLVM_INCLUDE_TESTS=OFF
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+ -DLIBCXX_ENABLE_SHARED=ON
+ -DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+ -DLIBCXX_CXX_ABI=${cxxabi}
+ -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+ # we're using our own mechanism for generating linker scripts
+ -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+ -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+ -DLIBCXX_INCLUDE_BENCHMARKS=OFF
+ -DLIBCXX_INCLUDE_TESTS=$(usex test)
+ -DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
+ )
+
+ if use test; then
+ mycmakeargs+=(
+ -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+ -DLLVM_LIT_ARGS="$(get_lit_flags)"
+ -DPython3_EXECUTABLE="${PYTHON}"
+ )
+ fi
+ cmake_src_configure
+}
+
+multilib_src_compile() {
+ cmake_src_compile
+ if [[ ${CHOST} != *-darwin* ]] ; then
+ gen_shared_ldscript
+ use static-libs && gen_static_ldscript
+ fi
+}
+
+multilib_src_test() {
+ local -x LIT_PRESERVES_TMP=1
+ cmake_build check-cxx
+}
+
+multilib_src_install() {
+ cmake_src_install
+ # since we've replaced libc++.{a,so} with ldscripts, now we have to
+ # install the extra symlinks
+ if [[ ${CHOST} != *-darwin* ]] ; then
+ dolib.so lib/libc++_shared.so
+ use static-libs && dolib.a lib/libc++_static.a
+ fi
+}
+
+# Usage: deps
+gen_ldscript() {
+ local output_format
+ output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+ [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+ cat <<-END_LDSCRIPT
+/* GNU ld script
+ Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+ # Move it first.
+ mv lib/libc++{,_static}.a || die
+ # Generate libc++.a ldscript for inclusion of its dependencies so that
+ # clang++ -stdlib=libc++ -static works out of the box.
+ local deps=(
+ libc++_static.a
+ $(usex libcxxabi libc++abi.a libsupc++.a)
+ )
+ # On Linux/glibc it does not link without libpthread or libdl. It is
+ # fine on FreeBSD.
+ use elibc_glibc && deps+=( libpthread.a libdl.a )
+
+ gen_ldscript "${deps[*]}" > lib/libc++.a || die
+}
+
+gen_shared_ldscript() {
+ # Move it first.
+ mv lib/libc++{,_shared}.so || die
+ local deps=(
+ libc++_shared.so
+ # libsupc++ doesn't have a shared version
+ $(usex libcxxabi libc++abi.so libsupc++.a)
+ )
+
+ gen_ldscript "${deps[*]}" > lib/libc++.so || die
+}
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index f60583ac2e4c..1edea9832f73 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -4,4 +4,5 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230304.ebuild b/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..e5f19fc61a28
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230304.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
+ toolchain-funcs
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="+clang static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
+RDEPEND+="
+ !/dev/null
+ int test[sizeof(void *) == 8 ? 1 : -1];
+ EOF
+ then
+ build_omptarget=ON
+ fi
+
+ local libdir="$(get_libdir)"
+ local mycmakeargs=(
+ -DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
+
+ -DLIBOMP_USE_HWLOC=$(usex hwloc)
+ -DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
+ -DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+
+ -DOPENMP_ENABLE_LIBOMPTARGET=${build_omptarget}
+
+ # do not install libgomp.so & libiomp5.so aliases
+ -DLIBOMP_INSTALL_ALIASES=OFF
+ # disable unnecessary hack copying stuff back to srcdir
+ -DLIBOMP_COPY_EXPORTS=OFF
+ )
+
+ if [[ ${build_omptarget} == ON ]]; then
+ if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
+ mycmakeargs+=(
+ -DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=$(usex llvm_targets_AMDGPU)
+ -DLIBOMPTARGET_BUILD_CUDA_PLUGIN=$(usex llvm_targets_NVPTX)
+ )
+ else
+ mycmakeargs+=(
+ -DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF
+ -DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF
+ )
+ fi
+ fi
+
+ use test && mycmakeargs+=(
+ # this project does not use standard LLVM cmake macros
+ -DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+ -DOPENMP_LIT_ARGS="$(get_lit_flags)"
+
+ -DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+ -DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+ )
+ addpredict /dev/nvidiactl
+ cmake_src_configure
+}
+
+multilib_src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+
+ cmake_build check-libomp
+}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index f60583ac2e4c..1edea9832f73 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -4,4 +4,5 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
+DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230304.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230304.ebuild
new file mode 100644
index 000000000000..6ffa6c4f81b8
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230304.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
+ toolchain-funcs
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="+clang debug static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ !sys-libs/libunwind
+"
+DEPEND="
+ sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+ clang? (
+ sys-devel/clang:${LLVM_MAJOR}
+ )
+ !test? (
+ ${PYTHON_DEPS}
+ )
+ test? (
+ $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+ )
+"
+
+LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
+LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
+llvm.org_set_globals
+
+python_check_deps() {
+ use test || return 0
+ python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+ local libdir=$(get_libdir)
+
+ # https://github.com/llvm/llvm-project/issues/56825
+ # also separately bug #863917
+ filter-lto
+
+ if use clang; then
+ local -x CC=${CHOST}-clang
+ local -x CXX=${CHOST}-clang++
+ strip-unsupported-flags
+ fi
+
+ # link to compiler-rt
+ # https://github.com/gentoo/gentoo/pull/21516
+ local use_compiler_rt=OFF
+ [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+ local mycmakeargs=(
+ -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+ -DPython3_EXECUTABLE="${PYTHON}"
+ -DLLVM_ENABLE_RUNTIMES="libunwind"
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+ -DLLVM_INCLUDE_TESTS=OFF
+ -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
+ -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+ -DLIBUNWIND_INCLUDE_TESTS=$(usex test)
+ -DLIBUNWIND_INSTALL_HEADERS=ON
+
+ # support non-native unwinding; given it's small enough,
+ # enable it unconditionally
+ -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
+
+ # avoid dependency on libgcc_s if compiler-rt is used
+ -DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
+ )
+ if use test; then
+ mycmakeargs+=(
+ -DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
+ -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+ -DLLVM_LIT_ARGS="$(get_lit_flags)"
+ -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
+
+ -DLIBCXXABI_LIBDIR_SUFFIX=
+ -DLIBCXXABI_ENABLE_SHARED=OFF
+ -DLIBCXXABI_ENABLE_STATIC=ON
+ -DLIBCXXABI_USE_LLVM_UNWINDER=ON
+ -DLIBCXXABI_INCLUDE_TESTS=OFF
+
+ -DLIBCXX_LIBDIR_SUFFIX=
+ -DLIBCXX_ENABLE_SHARED=OFF
+ -DLIBCXX_ENABLE_STATIC=ON
+ -DLIBCXX_CXX_ABI=libcxxabi
+ -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+ -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+ -DLIBCXX_HAS_GCC_S_LIB=OFF
+ -DLIBCXX_INCLUDE_TESTS=OFF
+ -DLIBCXX_INCLUDE_BENCHMARKS=OFF
+ )
+ fi
+
+ cmake_src_configure
+}
+
+multilib_src_test() {
+ local -x LIT_PRESERVES_TMP=1
+ cmake_build check-unwind
+}
+
+multilib_src_install() {
+ DESTDIR=${D} cmake_build install-unwind
+}
diff --git a/sys-libs/openipmi/openipmi-2.0.33.ebuild b/sys-libs/openipmi/openipmi-2.0.33.ebuild
index baa222d47db6..49b80b194dd9 100644
--- a/sys-libs/openipmi/openipmi-2.0.33.ebuild
+++ b/sys-libs/openipmi/openipmi-2.0.33.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-2.1 GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv x86"
IUSE="crypt snmp perl python static-libs tcl"
RDEPEND="
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 32021f258334..980df2078d87 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/atop/atop-2.8.1.ebuild b/sys-process/atop/atop-2.8.1.ebuild
index 744d07d3b7cc..0d634fd9bea4 100644
--- a/sys-process/atop/atop-2.8.1.ebuild
+++ b/sys-process/atop/atop-2.8.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI+=" modules? ( https://www.atoptool.nl/download/${NETATOP_P}.tar.gz )"
# Module is GPL-2 as well
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
RDEPEND="
sys-libs/ncurses:=
diff --git a/sys-process/bpytop/Manifest b/sys-process/bpytop/Manifest
index ab9ae84f6c50..213ab666b4d6 100644
--- a/sys-process/bpytop/Manifest
+++ b/sys-process/bpytop/Manifest
@@ -1 +1 @@
-DIST bpytop-1.0.68.tar.gz 632649 BLAKE2B a32a3b583b31c2c2013f4d2bb8834cf02a8702d37f723e304691eecdebcf32e21f639428abe7f5251c075aa73ed46f610e47c4241092455351001c31b2a051b5 SHA512 88a8be5cb5bbf5516dbafeb4d513d6a489ae9a8a84de316e2331a428cd4f338f8e01ed2eedd92c610b722c06dd968d85baf27692316f905855aca3d8a67a731d
+DIST bpytop-1.0.68.gh.tar.gz 632649 BLAKE2B a32a3b583b31c2c2013f4d2bb8834cf02a8702d37f723e304691eecdebcf32e21f639428abe7f5251c075aa73ed46f610e47c4241092455351001c31b2a051b5 SHA512 88a8be5cb5bbf5516dbafeb4d513d6a489ae9a8a84de316e2331a428cd4f338f8e01ed2eedd92c610b722c06dd968d85baf27692316f905855aca3d8a67a731d
diff --git a/sys-process/bpytop/bpytop-1.0.68-r1.ebuild b/sys-process/bpytop/bpytop-1.0.68-r1.ebuild
index 0b7da113d802..3656a5c1c26a 100644
--- a/sys-process/bpytop/bpytop-1.0.68-r1.ebuild
+++ b/sys-process/bpytop/bpytop-1.0.68-r1.ebuild
@@ -4,13 +4,19 @@
EAPI=8
DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1
DESCRIPTION="Linux/OSX/FreeBSD resource monitor"
-HOMEPAGE="https://github.com/aristocratos/bpytop"
-SRC_URI="https://github.com/aristocratos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+ https://github.com/aristocratos/bpytop/
+ https://pypi.org/project/bpytop/
+"
+SRC_URI="
+ https://github.com/aristocratos/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/sys-process/bpytop/metadata.xml b/sys-process/bpytop/metadata.xml
index bd6443d4a375..98655eaea7d0 100644
--- a/sys-process/bpytop/metadata.xml
+++ b/sys-process/bpytop/metadata.xml
@@ -5,4 +5,8 @@
chutzpah@gentoo.org
Patrick McLean
+
+ aristocratos/bpytop
+ bpytop
+
diff --git a/sys-process/numactl/numactl-2.0.16.ebuild b/sys-process/numactl/numactl-2.0.16.ebuild
index c1410190467a..110678fffc0c 100644
--- a/sys-process/numactl/numactl-2.0.16.ebuild
+++ b/sys-process/numactl/numactl-2.0.16.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://github.com/numactl/numactl.git"
else
SRC_URI="https://github.com/numactl/numactl/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux"
+ KEYWORDS="~alpha amd64 arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux"
fi
LICENSE="GPL-2"
diff --git a/sys-process/numad/numad-0.5_p20180531-r1.ebuild b/sys-process/numad/numad-0.5_p20180531-r1.ebuild
index 87bc6f0fdacb..229cae6f6556 100644
--- a/sys-process/numad/numad-0.5_p20180531-r1.ebuild
+++ b/sys-process/numad/numad-0.5_p20180531-r1.ebuild
@@ -14,7 +14,7 @@ else
# git archive --format=tar.gz --prefix="${P}/" -o ${P}.tar.gz ${EGIT_COMMIT}
EGIT_COMMIT="d696d6c413c5b47b4bbae79e29ea132e52095af3"
SRC_URI="https://dev.gentoo.org/~gyakovlev/distfiles/${P}.tar.gz"
- KEYWORDS="~amd64 -arm arm64 ~ppc64 ~s390 x86"
+ KEYWORDS="~amd64 -arm ~arm64 ~ppc64 ~s390 ~x86"
fi
DESCRIPTION="The NUMA daemon that manages application locality"
diff --git a/sys-process/psmisc/psmisc-23.6.ebuild b/sys-process/psmisc/psmisc-23.6.ebuild
index 6f0de1ae5c18..82c5fb80f3aa 100644
--- a/sys-process/psmisc/psmisc-23.6.ebuild
+++ b/sys-process/psmisc/psmisc-23.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="apparmor nls selinux test X"
RESTRICT="!test? ( test )"
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 89ebed4babd9..02cf73b570ec 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/ruby-ssl/ruby-ssl-13.ebuild b/virtual/ruby-ssl/ruby-ssl-13.ebuild
new file mode 100644
index 000000000000..0a2e7093c051
--- /dev/null
+++ b/virtual/ruby-ssl/ruby-ssl-13.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+inherit ruby-ng
+
+DESCRIPTION="Virtual ebuild for the Ruby OpenSSL bindings"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+ ruby_targets_ruby27? ( dev-lang/ruby:2.7[ssl] )
+ ruby_targets_ruby30? ( dev-lang/ruby:3.0[ssl] )
+ ruby_targets_ruby31? ( dev-lang/ruby:3.1[ssl] )
+ ruby_targets_ruby32? ( dev-lang/ruby:3.2[ssl] )
+"
+
+pkg_setup() { :; }
+src_unpack() { :; }
+src_prepare() { eapply_user; }
+src_compile() { :; }
+src_install() { :; }
+pkg_preinst() { :; }
+pkg_postinst() { :; }
diff --git a/virtual/rubygems/rubygems-18.ebuild b/virtual/rubygems/rubygems-18.ebuild
new file mode 100644
index 000000000000..9a4aade0e4d7
--- /dev/null
+++ b/virtual/rubygems/rubygems-18.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+inherit ruby-ng
+
+DESCRIPTION="Virtual ebuild for rubygems"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+ ruby_targets_ruby27? ( >=dev-ruby/rubygems-3.1.0[ruby_targets_ruby27] )
+ ruby_targets_ruby30? ( >=dev-ruby/rubygems-3.2.0[ruby_targets_ruby30] )
+ ruby_targets_ruby31? ( >=dev-ruby/rubygems-3.3.0[ruby_targets_ruby31] )
+ ruby_targets_ruby32? ( >=dev-ruby/rubygems-3.4.6[ruby_targets_ruby32] )
+"
+
+pkg_setup() { :; }
+src_unpack() { :; }
+src_prepare() { eapply_user; }
+src_compile() { :; }
+src_install() { :; }
+pkg_preinst() { :; }
+pkg_postinst() { :; }
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 2622a4587a8d..092539fcb423 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/selfoss/selfoss-2.19.ebuild b/www-apps/selfoss/selfoss-2.19.ebuild
index 2079fb7af1e8..42b67a167c1f 100644
--- a/www-apps/selfoss/selfoss-2.19.ebuild
+++ b/www-apps/selfoss/selfoss-2.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/SSilence/${PN}/releases/download/${PV}/${P}.zip"
S="${WORKDIR}"/${PN}
LICENSE="GPL-3"
-KEYWORDS="~amd64 arm arm64 ~x86"
+KEYWORDS="amd64 arm arm64 ~x86"
BDEPEND="app-arch/unzip"
RDEPEND="
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 97dfd4c02bd0..c0189a756034 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/qutebrowser/qutebrowser-2.5.3.ebuild b/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
index 7cb5d6ee3504..6260bb8c6fc8 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.3.ebuild
@@ -128,6 +128,9 @@ python_install_all() {
fperms -x /usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
python_fix_shebang "${ED}"/usr/share/${PN}
+ insinto /etc/apparmor.d
+ doins -r misc/apparmor/.
+
einstalldocs
}
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
index 0de37e2649d8..7a65a374061c 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
@@ -146,6 +146,9 @@ python_install_all() {
fperms -x /usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
python_fix_shebang "${ED}"/usr/share/${PN}
+ insinto /etc/apparmor.d
+ doins -r misc/apparmor/.
+
einstalldocs
}
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 7cb5d6ee3504..6260bb8c6fc8 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -128,6 +128,9 @@ python_install_all() {
fperms -x /usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
python_fix_shebang "${ED}"/usr/share/${PN}
+ insinto /etc/apparmor.d
+ doins -r misc/apparmor/.
+
einstalldocs
}
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 2798d099ea20..533b95de986a 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,6 +1,6 @@
-DIST vivaldi-snapshot_5.7.2921.41-1_amd64.deb 101576476 BLAKE2B 958e924f7882226d8a00f8e6a8a72b6b4eadf961841eed7548a7682638a538fdb259faea3bb5f3b2511a2fa2bad9eb77cc602b2a0a4b2c8f52f599a91f1b1f74 SHA512 a93638e9e41e27ad8fff9b396bd880d603598de52e4d8342e67dfa3bd6a67207b3220d0c5ed43785e3facbcc4f2870bbf4f4aab58535a3c0e394eb4747d9d3a2
-DIST vivaldi-snapshot_5.7.2921.41-1_arm64.deb 91105188 BLAKE2B 514f785e9e9b6d2f47c5424f7b43105e9adb77b4c793190cd3323927f896e7e09f7b9b49a9af9ab711a81b147613490433c772910db1d27f82a927728c5c9567 SHA512 0bd54f1c5fd6baeae551e3f24b9a4ed9522bc5342e2342ffe708becce406f3229c88e59a82e6a1026ac53375578093d3e0f4510cffa75267f875d575c6b046e9
-DIST vivaldi-snapshot_5.7.2921.41-1_armhf.deb 90776464 BLAKE2B e5675c7b4d51ad95f246f66e34f3b44b5de2e8463c9d388b5b459b3bcfb3bfff196b81688cb69e70839950b99948b366559756ac787a889e5862a5906c446a68 SHA512 69a5f1f23f400da823166f1e9bb1235b6445c704cb8e42fdb7a50d00abca48599d032b4fdcdad2fe10795741b8b769fe2e9503d237119dfbd87c1a96051b3ef0
DIST vivaldi-snapshot_5.8.2936.3-1_amd64.deb 101610392 BLAKE2B c15dd96f5042e2526af582a403a6cd0d2044bc98de189bff9dd68174eb59c15fe7a35956421207fe39e372337fb0706940c40b9ae1ab44574a7e01920e84b16c SHA512 5a6ce42a40a474b459edca64589433caeac4ef36bd13b7d95d3433de4fd8cd55e1c923d4913f5904d40f055d043ed2f9296eef6a4ec116936b9d2f13c951df20
DIST vivaldi-snapshot_5.8.2936.3-1_arm64.deb 91123504 BLAKE2B 1867304c33cf1617dd906c45d13df3c2e72f0b1d26e4af1e5e81574409f2033b16644e13d58dc58b1bde009fa5e12f95a028dc8a1c03a61aa560d214430c754c SHA512 2d320899b42bda7ba75a030f13200392c974bf87b4212305cbc91933185960a0c51658e80381756e84f92ed68e04988bf873b243bf5f5582089bb053768fd954
DIST vivaldi-snapshot_5.8.2936.3-1_armhf.deb 90795304 BLAKE2B 77db349d26f05c1834349202db5c26e0a69a1f91203913700838a947fa52ffd99f0e1cf33c67edd19fe78db1114826296767e062805582f693f7f6c9208b66dc SHA512 e7b12bdcb7b3185641cdc6a40c8df497e10082b28d45048f45b3f271b778384f024a8b114ddc71f38b7c5163f08880ae438f17aef01c13bcefbb377289225dd8
+DIST vivaldi-snapshot_5.8.2950.3-1_amd64.deb 101635184 BLAKE2B a8bfd884d8ffd797e83d9a30a1d274430e7ba87569013abf81d31e6e295d154d85ed4add8429c5b450c480998a0914781ba2c67c8817fe91cc71052bec975302 SHA512 459a8ecb12ea67e6e3dee8432329de633156be6a463b45828901e204d76511faaf2e6517ae51c5c7e15a7d08e8104ea8c2b38d604707711a6e2b9d1544c8a108
+DIST vivaldi-snapshot_5.8.2950.3-1_arm64.deb 91128240 BLAKE2B fe67411b689303d2d6990a2fb4e7555cd52d4c9452803caacc828459434b8ba5bdc9f564363c5cd4016c45868af0c6d51802cf375fae01218fd8b269c25865b1 SHA512 c212dabc72781f5b4a4b9fe7761ba4f00eeeded022d28af48f67598218270b4e839d98bd7914f1be88ec87ea2eb04345ef5c5bb46ab34767967dfd10040c6ab2
+DIST vivaldi-snapshot_5.8.2950.3-1_armhf.deb 90793860 BLAKE2B cfa0db482f430bf1c619b936b76d35cd89dd5c0224c35494afa2418c818727b60fdfa11b61093b0e02edeb524ad2649757c6d9f22235b9ecad4ca7caf7169210 SHA512 d1fd04f2a2563ad81fffd18402832b24e1de6c3bc59220071f505670f806155f33af3680ddebff405be642e34c61920c98604c9a02989bb6e13242a8ff33ff71
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.7.2921.41.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.8.2950.3.ebuild
similarity index 100%
rename from www-client/vivaldi-snapshot/vivaldi-snapshot-5.7.2921.41.ebuild
rename to www-client/vivaldi-snapshot/vivaldi-snapshot-5.8.2950.3.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index d8cda8725149..28a73b422314 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index c24aaabc7eea..75d12746d9be 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,3 +1,2 @@
-DIST lighttpd-1.4.67.tar.xz 1039872 BLAKE2B e8e32970fe8b6e36fbee0c5104c8f42f846531c75689ad8e561e8eef9e92c69989a094d18ad65e4c404ea69d67dd960c57ef91773f9b5599bfd6072e5d4588d9 SHA512 acfde71675d1c54b4e805998d1dabaa291437181bdbca0d6a3a069584c4576d7585d2401f57f8691f23aaf6283a95ac61156789a055a2a7236fd305c1f248627
DIST lighttpd-1.4.68.tar.xz 1030612 BLAKE2B 5682194a9e124598daf22bca56826535ac48f1c89087238f2a455cd4cb0f12287ce79ab5a7b6ca966003772335e6a14d484658300e401c098b4e87a7207198c4 SHA512 137cf62e3c7b07d1dc4af50318f1ec67bbf60058ad1a4fef0b1c94668916e23cfcdf85fe9cd728163e55c1b21f4831b9ab922fcf6b6ba8e2a03b2f73a9694189
DIST lighttpd-1.4.69.tar.xz 1045516 BLAKE2B 4b9c15bd69db5afcf40c3df41831d2fcecbb4149a8cfef582e7dfe80328d515a1021baa32c17e0f89d81c9726dbbe8480d9d319684d38a11961b28d2d0224e9c SHA512 9d174c8e0a192b4eb8218a9f76b0bd42f90030228600bb7bbe35ebb9e7bbaea36ee2732535c5cc6dab171294817837bfa26074ff84a37832dd89f57488b4071f
diff --git a/www-servers/lighttpd/lighttpd-1.4.67.ebuild b/www-servers/lighttpd/lighttpd-1.4.67.ebuild
deleted file mode 100644
index 461ca227d1b2..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.67.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit lua-single meson readme.gentoo-r1 systemd tmpfiles
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
-SRC_URI="https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls mmap mysql +nettle nss +pcre php postgres rrdtool sasl selinux ssl sqlite +system-xxhash test unwind webdav xattr +zlib zstd"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- lua? ( ${LUA_REQUIRED_USE} )
- mysql? ( dbi )
- postgres? ( dbi )
- sqlite? ( dbi )
- webdav? ( sqlite )
-"
-
-COMMON_DEPEND="
- acct-group/lighttpd
- acct-user/lighttpd
- virtual/libcrypt:=
- brotli? ( app-arch/brotli:= )
- dbi? (
- dev-db/libdbi
- mysql? ( dev-db/libdbi-drivers[mysql] )
- postgres? ( dev-db/libdbi-drivers[postgres] )
- sqlite? ( dev-db/libdbi-drivers[sqlite] )
- )
- gnutls? ( net-libs/gnutls )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-2.1.26:= )
- lua? ( ${LUA_DEPS} )
- maxminddb? ( dev-libs/libmaxminddb )
- mbedtls? ( net-libs/mbedtls )
- nettle? ( dev-libs/nettle:= )
- nss? ( dev-libs/nss )
- pcre? ( dev-libs/libpcre2 )
- php? ( dev-lang/php:*[cgi] )
- rrdtool? ( net-analyzer/rrdtool )
- sasl? ( dev-libs/cyrus-sasl )
- ssl? ( >=dev-libs/openssl-0.9.7:= )
- system-xxhash? ( dev-libs/xxhash )
- unwind? ( sys-libs/libunwind:= )
- webdav? (
- dev-libs/libxml2
- sys-fs/e2fsprogs
- )
- xattr? ( kernel_linux? ( sys-apps/attr ) )
- zlib? ( >=sys-libs/zlib-1.1 )
- zstd? ( app-arch/zstd:= )
-"
-DEPEND="
- ${COMMON_DEPEND}
- elibc_musl? ( sys-libs/queue-standalone )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- selinux? ( sec-policy/selinux-apache )
-"
-BDEPEND="
- virtual/pkgconfig
- test? ( virtual/perl-Test-Harness )
-"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
- local config="${ED}/etc/lighttpd/lighttpd.conf"
-
- # Enable php/mod_fastcgi settings
- if use php; then
- sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die
- fi
-
- # Automatically listen on IPv6 if built with USE=ipv6 (which we now always do)
- # bug #234987
- sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die
-}
-
-pkg_setup() {
- if use lua; then
- lua-single_pkg_setup
- fi
-
- if ! use pcre ; then
- ewarn "It is highly recommended that you build ${PN}"
- ewarn "with perl regular expressions support via USE=pcre."
- ewarn "Otherwise you lose support for some core options such"
- ewarn "as conditionals and modules such as mod_re{write,direct}."
- fi
-
- DOC_CONTENTS="IPv6 migration guide:\n
- http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
-}
-
-src_configure() {
- local emesonargs=(
- -Dmoduledir="$(get_libdir)"/${PN}
-
- $(meson_use brotli with_brotli)
-
- # TODO: revisit (was off in autotools ebuild)
- -Dwith_bzip=false
-
- $(meson_use dbi with_dbi)
-
- # Unpackaged in Gentoo
- -Dwith_libdeflate=false
- # Obsolete
- -Dwith_fam=false
-
- $(meson_use gnutls with_gnutls)
- $(meson_use kerberos with_krb5)
- $(meson_use ldap with_ldap)
-
- # TODO: revisit (was off in autotools ebuild)
- -Dwith_libev=false
-
- $(meson_use unwind with_libunwind)
-
- $(meson_use lua with_lua)
- -Dlua_version=${ELUA}
-
- $(meson_use maxminddb with_maxminddb)
- $(meson_use mbedtls with_mbedtls)
-
- # TODO: revisit (was off in autotools ebuild)
- -Dwith_mysql=false
-
- $(meson_use nettle with_nettle)
- $(meson_use nss with_nss)
-
- # Obsolete
- -Dwith_pcre=false
-
- $(meson_use pcre with_pcre2)
-
- # TODO: revisit (was off in autotools ebuild)
- -Dwith_pgsql=false
-
- $(meson_use sasl with_sasl)
- $(meson_use ssl with_openssl)
- $(meson_use system-xxhash with_xxhash)
- $(meson_use webdav with_webdav_props)
- $(meson_use webdav with_webdav_locks)
-
- # Unpackaged in Gentoo
- -Dwith_wolfssl=false
-
- $(meson_use xattr with_xattr)
- $(meson_use zlib with_zlib)
- $(meson_use zstd with_zstd)
- )
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- # Init script stuff
- newinitd "${FILESDIR}"/lighttpd.initd-r1 lighttpd
- newconfd "${FILESDIR}"/lighttpd.confd lighttpd
-
- # Configs
- insinto /etc/lighttpd
- newins "${FILESDIR}"/conf/lighttpd.conf-r1 lighttpd.conf
- doins "${FILESDIR}"/conf/mime-types.conf
- doins "${FILESDIR}"/conf/mod_cgi.conf
- doins "${FILESDIR}"/conf/mod_fastcgi.conf
-
- # Update lighttpd.conf directives based on conditionals
- update_config
-
- # Docs
- dodoc AUTHORS README NEWS doc/scripts/*.sh
- newdoc doc/config/lighttpd.conf lighttpd.conf.distrib
- readme.gentoo_create_doc
-
- docinto txt
- dodoc doc/outdated/*.txt
-
- doman doc/*.8
-
- # Logrotate
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
-
- keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
- fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
- fperms 0750 /var/l{ib,og}/lighttpd
-
- systemd_dounit "${FILESDIR}"/${PN}.service
- newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf
-}
-
-pkg_postinst() {
- tmpfiles_process ${PN}.conf
-
- readme.gentoo_print_elog
-
- if [[ -f ${EROOT}/etc/lighttpd.conf ]] ; then
- elog
- elog "Gentoo has a customized configuration,"
- elog "which is now located in ${EROOT}/etc/lighttpd. Please migrate your"
- elog "existing configuration."
- fi
-
- if use brotli || use zstd || use zlib ; then
- elog
- elog "Remember to clean your cache directory when using"
- elog "output compression!"
- elog "https://wiki.lighttpd.net/Docs_ModDeflate"
- fi
-
- if use mysql ; then
- elog
- elog "Note that upstream has moved away from using mysql directly"
- elog "via mod_mysql and is now accessing it through mod_dbi. You"
- elog "may need to update your configuration"
- fi
-
- elog
- elog "Upstream has deprecated a number of features. They are not missing"
- elog "but have been migrated to other mechanisms. Please see upstream"
- elog "changelog for details."
- elog "https://www.lighttpd.net/2022/1/19/1.4.64/"
-}
diff --git a/www-servers/lighttpd/metadata.xml b/www-servers/lighttpd/metadata.xml
index 2696a20794df..1daaefb10da5 100644
--- a/www-servers/lighttpd/metadata.xml
+++ b/www-servers/lighttpd/metadata.xml
@@ -1,7 +1,10 @@
-
+
+ sam@gentoo.org
+ Sam James
+
lighttpd (pronounced /lighty/) is a secure, fast, compliant, and very
flexible web server that has been optimized for high-performance
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 921b1de30026..5e3a9b45c64a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,11 +1,11 @@
DIST apache-tomcat-10.1.5-src.tar.gz 6066163 BLAKE2B 96c03f053b8585cfc466e7bf870a85d82e5637169028d0bca43508480f14834ebccf2ddf68744b29510fa93cc8fd0994c72a61d0949da0d4e6b095da87704d0d SHA512 d52cf7fd4c4982b7934cd14000e540998cf2599a730083c7647d57939993f3522b6d208a82cdfcb0f7ffc084d9d2ea2b27104203398a61bb765667d97fc13c02
DIST apache-tomcat-10.1.5-src.tar.gz.asc 849 BLAKE2B 6b733488772bea88ea6a6710651bf60a83c78187463850f0216ca5152f0698648ab8ba37f86480916caa816792095a1f434bc84d5706ae9e6f6ed882b8b29d4b SHA512 600580fb89620937c103fa5581669b9ab7cb359db32b0d1d2cd81e9dc41cec6e3df7e852baa3564ed94e4af30d506453e6761fa20ff8fd37d7c4dafa33aac712
-DIST apache-tomcat-10.1.6-src.tar.gz 6073924 BLAKE2B debc363395becd96a856a03ffd5846e786c27781318b9c08c428498a010dc77e334e6fd15ffea1545dc15b1c226fdd73f24d15f70361b39d37316c48a0c5e66e SHA512 54df5784fbbe9c29b5569783c836e1490a6c08610ffe3c98123cc8bee8b483fcb73f46a15487dc5a6c9c7926ba63bab79e1794b07c00c22798ea0984e56f12f5
-DIST apache-tomcat-10.1.6-src.tar.gz.asc 849 BLAKE2B 71f512c0def69b9c23d4440a988f1f889c57c55e731fc00080a6c919c13360ad2b8a7bbdc65b0e632b5e4b66eb96e58301d720fb433b3b3b50e107de17fd6fe6 SHA512 51d560236ebdc9f9c6e77e6ac98306ec8e9e3079efda7f0a2b6cb0cc3256571881acd891668d606d873d0b5a1be3ba3cd5a095d44cba6e852f1cd5fd8e1e9d41
+DIST apache-tomcat-10.1.7-src.tar.gz 6075723 BLAKE2B ef00c3c43a6cd6c68b09930fd7dc8f822b49f5cec3a0c2b3dad1cb20e5f37ff17f35dfd48c5a8537dedbb9c3887620b6e0ec29272a002df46aa8fa0e5ccbaaa7 SHA512 3daeb5cb3650382224ba4b5cf830c7288531b7f565fdde4a8acca1ee66bebbbfafb4790a6ce50b965e176e9669203e90342e61d42d1656fd12f656d9394c3283
+DIST apache-tomcat-10.1.7-src.tar.gz.asc 849 BLAKE2B 79d5d6885dd3304999a3ec1e16ffeca95df0b0b135ad6733b932b745e248bfd84be06f7eb70588167e7a8b74c4fa1db93cfba99dee10b8ebc00b7ce46226e128 SHA512 ae5c9238ea33743ed40dc74e47e6441f52437322376df94b770dd00e354dc67851cedeb2b4b1148262bdb12b15f7ded49d0f5ee050d451006fa81c5c86b20768
DIST apache-tomcat-8.5.85-src.tar.gz 6035271 BLAKE2B 06180fe34c3bd70678dd82d44e2cfc7cf4ed367523b35f3cdaab6c15a5a586522584c8338a990543b5452073ae3ed8a60fad9a159ddfd63adcbaaac35a5a4528 SHA512 1500c87a4f3f5302ff28f7592c1bdd66190095b04a1fac349bf421d117c0ace7b109bfb7943795375bcdf76c810df8f588150ccfb5843ccdf10c394b11754736
DIST apache-tomcat-8.5.85-src.tar.gz.asc 849 BLAKE2B ead4de7a2fe01f67b2c3fd61d4c85d87e5142f2bd0ba933d70d8e5a8935e6bd97fff14bd4d4ddeee27edd7683971d241e6d14126fee01e789914a394ee0faf47 SHA512 e7c3cb19cff697154d159986748680d66bae22a12bc272a09d64b39ed681d60ce9d7ff9ba9c2f45744b6ac81b675a87af6c7df3eecd7079b98749063fbe579a5
-DIST apache-tomcat-8.5.86-src.tar.gz 6038952 BLAKE2B b57a203fb2e215f0a07485d5ae70398e0e2d56b37cd7172f33680c8b57faa97929904349ee93b3d975cb24ac2c9e2d15240d59d4a3295d0a7deb96b8069269ef SHA512 fbc57d314fb8885e9986a26515b6536f2bffdb3476af71417eb9dab1623f36ea80da431bc1dc8874aa99dd6575919a0d3a828d84a87404a73ed22de601097e12
-DIST apache-tomcat-8.5.86-src.tar.gz.asc 849 BLAKE2B ff388f97a189c9b45eaac42a1e670c8cddf52903421f053ec1df0518937f3c8b0bc650009cc93bb0a7440aa0607f955bbc219d80a34ab050851554b5736f3235 SHA512 85e961b6569e6c8421b83246653c86a53843232dc7a3eb5d466e6f11fb4b4f1a5dcee43403a43c8950774395acf7f576f7184c7dfa84084f08ff9a203b6104fd
+DIST apache-tomcat-8.5.87-src.tar.gz 6041463 BLAKE2B 2b41e324be028b9bf4db3fcd32a45ad6a84644535c20c5a46c7850c8b0ee054130a7fa5091009928b71c8ece2f24f49530845727cc3f1b6d5907de07d7ad3703 SHA512 cd15fc27c781a0835ec5c35726832f51abfc8bba9b647e690b3dadb7141b5c96b5014f0d6ebf46277d43cf10e2839ef0229dccf87c0449f2004ae90041ef10b6
+DIST apache-tomcat-8.5.87-src.tar.gz.asc 849 BLAKE2B 05a5911b344b5ffdcb392189b64dc4c4d31d000a8b653338780e74ab569a3b024a13b491ba4946bbf68b5955af65df05bfe7b4795a120977f1b26a2bcff0c96d SHA512 fb56af00d3f9302251e65a08d852992192137eeed0eecf100bcfafb778e01dfb92fc024f47ef41ca71f01eebb3622fcaa53fcb776403939313502039080a2b4c
DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743 SHA512 398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
DIST apache-tomcat-9.0.73-src.tar.gz 6229040 BLAKE2B 97b1348e532eea75c4d0723c314cc24a9c13bd4a948a8eea4d1ee1c5121472f2fedec7d30c240b2617a51ef57898fbd96c254f9d84c9e943ebe808f1dba4cf16 SHA512 1691a0087ceaf2100ce17fe9b9a973d079c39b20effbe0c0d68f92d2684a681e001b0c2b8bde40c289754ac02ba02f9eb4dfac617fccb8f451c96dfdd4741237
diff --git a/www-servers/tomcat/tomcat-10.1.6.ebuild b/www-servers/tomcat/tomcat-10.1.7.ebuild
similarity index 99%
rename from www-servers/tomcat/tomcat-10.1.6.ebuild
rename to www-servers/tomcat/tomcat-10.1.7.ebuild
index 17af3cdb9074..a2d0614c3733 100644
--- a/www-servers/tomcat/tomcat-10.1.6.ebuild
+++ b/www-servers/tomcat/tomcat-10.1.7.ebuild
@@ -51,6 +51,8 @@ DEPEND="${COMMON_DEP}
BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+PATCHES=( "${FILESDIR}/${PN}-10.1.6-build.xml.patch" )
+
S=${WORKDIR}/${MY_P}
BND_HOME="${S}/tomcat-build-libs/bnd"
@@ -75,8 +77,6 @@ src_prepare() {
find -name '*.jar' -type f -delete -print || die
- eapply "${FILESDIR}/${PN}-10.1.6-build.xml.patch"
-
local vm_version="$(java-config -g PROVIDES_VERSION)"
# For use of catalina.sh in netbeans
diff --git a/www-servers/tomcat/tomcat-8.5.86.ebuild b/www-servers/tomcat/tomcat-8.5.87.ebuild
similarity index 98%
rename from www-servers/tomcat/tomcat-8.5.86.ebuild
rename to www-servers/tomcat/tomcat-8.5.87.ebuild
index e1506972d167..6f5f1a7f9687 100644
--- a/www-servers/tomcat/tomcat-8.5.86.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.87.ebuild
@@ -47,6 +47,8 @@ DEPEND="${COMMON_DEP}
BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+PATCHES=( "${FILESDIR}/${PN}-8.5.86-build.xml.patch" )
+
S=${WORKDIR}/${MY_P}
src_prepare() {
@@ -54,8 +56,6 @@ src_prepare() {
find -name '*.jar' -type f -delete -print || die
- eapply "${FILESDIR}/${PN}-8.5.86-build.xml.patch"
-
# For use of catalina.sh in netbeans
sed -i -e "/^# ----- Execute The Requested Command/ a\
CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
diff --git a/www-servers/tomcat/tomcat-9.0.73.ebuild b/www-servers/tomcat/tomcat-9.0.73.ebuild
index 106615a65169..3a87d1e05600 100644
--- a/www-servers/tomcat/tomcat-9.0.73.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.73.ebuild
@@ -57,6 +57,7 @@ S=${WORKDIR}/${MY_P}
PATCHES=(
"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
+ "${FILESDIR}/${PN}-9.0.72-build.xml.patch"
)
BND_HOME="${S}/tomcat-build-libs/bnd"
@@ -81,8 +82,6 @@ src_prepare() {
find -name '*.jar' -type f -delete -print || die
- eapply "${FILESDIR}/${PN}-9.0.72-build.xml.patch"
-
# For use of catalina.sh in netbeans
sed -i -e "/^# ----- Execute The Requested Command/ a\
CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 2a69ed19ff42..940e3e99cc10 100644
Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ
diff --git a/x11-apps/beforelight/beforelight-1.0.6.ebuild b/x11-apps/beforelight/beforelight-1.0.6.ebuild
index aa47d6e393ae..5815ee4a9044 100644
--- a/x11-apps/beforelight/beforelight-1.0.6.ebuild
+++ b/x11-apps/beforelight/beforelight-1.0.6.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
inherit xorg-3
DESCRIPTION="Sample implementation of screen saver"
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
RDEPEND="
x11-libs/libX11
diff --git a/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
index fd625c5baf89..b889538a2fc2 100644
--- a/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
@@ -1,4 +1,4 @@
-From f687e1297c9a26b219fc8b5a1faa6c1e3d1d6d16 Mon Sep 17 00:00:00 2001
+From 04603e5b169edbbe9a6d7dc6a00906c1382b141a Mon Sep 17 00:00:00 2001
From: Matt Turner
Date: Fri, 27 Jan 2023 06:40:05 -0800
Subject: [PATCH] Disable things we don't want
@@ -16,7 +16,7 @@ v3: Enable most of libutil to fix undefined references in es2gears
7 files changed, 4 insertions(+), 94 deletions(-)
diff --git a/meson.build b/meson.build
-index 6ad6ea7a..1c46da4f 100644
+index 29e5b41e..93a56b5f 100644
--- a/meson.build
+++ b/meson.build
@@ -87,16 +87,7 @@ endif
@@ -35,9 +35,9 @@ index 6ad6ea7a..1c46da4f 100644
-endif
+dep_glu = disabler()
- # GBM is needed for EGL on KMS
- dep_gbm = dependency('gbm', required : false, disabler : true)
-@@ -135,6 +126,8 @@ else
+ dep_glx = dependency('glx', required: false, disabler : true)
+ if not dep_glx.found() and host_machine.system() == 'darwin'
+@@ -144,6 +135,8 @@ else
dep_glut = dependency('', required : false)
endif
@@ -47,7 +47,7 @@ index 6ad6ea7a..1c46da4f 100644
dependencies: [dep_glut],
prefix : '#include ')
diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build
-index 434adf21..e4b0c83a 100644
+index a613eb43..1c91ae1b 100644
--- a/src/egl/opengl/meson.build
+++ b/src/egl/opengl/meson.build
@@ -25,38 +25,12 @@ executable(
@@ -90,7 +90,7 @@ index 434adf21..e4b0c83a 100644
executable(
'eglinfo', 'eglinfo.c',
@@ -64,10 +38,3 @@ executable(
- include_directories: [inc_glad, '../../xdemos'],
+ include_directories: [inc_glad],
install: true
)
-
@@ -142,13 +142,13 @@ index b2ff9c8f..f482df5e 100644
#ifndef GLAPIENTRY
diff --git a/src/util/meson.build b/src/util/meson.build
-index ddcd4834..72e9480d 100644
+index b4fe614f..e56b456e 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
-@@ -21,17 +21,12 @@
- inc_util = include_directories('.')
+@@ -22,17 +22,12 @@ inc_util = include_directories('.')
files_libutil = files(
+ 'glinfo_common.c',
- 'readtex.c',
'showbuffer.c',
'trackball.c',
@@ -165,11 +165,11 @@ index ddcd4834..72e9480d 100644
_libutil = static_library(
'util',
diff --git a/src/xdemos/meson.build b/src/xdemos/meson.build
-index d6d5d5d5..ce26699f 100644
+index a569fde5..40007616 100644
--- a/src/xdemos/meson.build
+++ b/src/xdemos/meson.build
@@ -21,25 +21,7 @@
- glx_deps = [dep_gl, dep_x11, dep_m]
+ glx_deps = [dep_gl, dep_glx, dep_x11, dep_m]
progs = [
- 'glsync',
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.7.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.7.ebuild
index 42354f7d0c52..ad7db01d0ef0 100644
--- a/x11-apps/xdriinfo/xdriinfo-1.0.7.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.7.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
inherit xorg-3
DESCRIPTION="query configuration information of DRI drivers"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
RDEPEND="
x11-libs/libX11
diff --git a/x11-apps/xvidtune/xvidtune-1.0.4.ebuild b/x11-apps/xvidtune/xvidtune-1.0.4.ebuild
index a25169ba359e..a0be43b09355 100644
--- a/x11-apps/xvidtune/xvidtune-1.0.4.ebuild
+++ b/x11-apps/xvidtune/xvidtune-1.0.4.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
inherit xorg-3
DESCRIPTION="video mode tuner for Xorg"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
RDEPEND="
x11-libs/libXaw
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index a0ad9373bd6c..b7d38d10ad13 100644
Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ
diff --git a/x11-base/xorg-apps/xorg-apps-1.ebuild b/x11-base/xorg-apps/xorg-apps-2.ebuild
similarity index 97%
rename from x11-base/xorg-apps/xorg-apps-1.ebuild
rename to x11-base/xorg-apps/xorg-apps-2.ebuild
index 32c0da10b43c..c39251620ce3 100644
--- a/x11-base/xorg-apps/xorg-apps-1.ebuild
+++ b/x11-base/xorg-apps/xorg-apps-2.ebuild
@@ -44,7 +44,6 @@ RDEPEND="
x11-apps/xcmsdb
x11-apps/xconsole
x11-apps/xcursorgen
- x11-apps/xdbedizzy
x11-apps/xditview
x11-apps/xdm
x11-apps/xdpyinfo
@@ -52,7 +51,6 @@ RDEPEND="
x11-apps/xedit
x11-apps/xev
x11-apps/xeyes
- x11-apps/xf86dga
x11-apps/xfd
x11-apps/xfontsel
x11-apps/xgamma
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index fabcb53ff8a1..92fe6f490408 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-23.0.0.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-23.0.0.ebuild
index b7b71ddc8524..2c3c8374a7f2 100644
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-23.0.0.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-23.0.0.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
if [[ ${PV} == 9999* ]]; then
SRC_URI=""
else
- KEYWORDS="~amd64 ~loong ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
fi
DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
index b7b71ddc8524..be87b71005b9 100644
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
if [[ ${PV} == 9999* ]]; then
SRC_URI=""
else
- KEYWORDS="~amd64 ~loong ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
fi
DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild
index 6927f556abf2..07a7e42694b1 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ inherit linux-info xorg-3
if [[ ${PV} == 9999* ]]; then
SRC_URI=""
else
- KEYWORDS="~alpha amd64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
+ KEYWORDS="~alpha amd64 arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
fi
DESCRIPTION="ATI video driver"
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
index 159d57fa1154..22590fa5482b 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ inherit linux-info xorg-3
if [[ ${PV} == 9999* ]]; then
SRC_URI=""
else
- KEYWORDS="~alpha ~amd64 ~ia64 ~loong ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~sparc ~x86"
fi
DESCRIPTION="ATI video driver"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index f4ec58d77359..ddf6659de4b2 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/cairo/cairo-1.17.6-r1.ebuild b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
index 3b2e47825c19..b5f91f28230d 100644
--- a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/cmrt/cmrt-1.0.6-r2.ebuild b/x11-libs/cmrt/cmrt-1.0.6-r3.ebuild
similarity index 87%
rename from x11-libs/cmrt/cmrt-1.0.6-r2.ebuild
rename to x11-libs/cmrt/cmrt-1.0.6-r3.ebuild
index 335b0341d47e..6ccae4fc9c5d 100644
--- a/x11-libs/cmrt/cmrt-1.0.6-r2.ebuild
+++ b/x11-libs/cmrt/cmrt-1.0.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -20,6 +20,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${P}-musl-fix.patch"
+)
+
src_prepare() {
default
eautoreconf
diff --git a/x11-libs/cmrt/files/cmrt-1.0.6-musl-fix.patch b/x11-libs/cmrt/files/cmrt-1.0.6-musl-fix.patch
new file mode 100644
index 000000000000..91bae74ed8a1
--- /dev/null
+++ b/x11-libs/cmrt/files/cmrt-1.0.6-musl-fix.patch
@@ -0,0 +1,15 @@
+diff --git a/src/os_defs.h b/src/os_defs.h
+index 82794f5..13539ee 100644
+--- a/src/os_defs.h
++++ b/src/os_defs.h
+@@ -109,6 +109,10 @@ typedef struct tagRECT {
+
+ #define CONST const
+
++#ifndef __CONCAT
++ #define __CONCAT( a1, a2 ) a1 ## a2
++#endif
++
+ #define __UNIQUENAME( a1, a2 ) __CONCAT( a1, a2 )
+ #define UNIQUENAME( __text ) __UNIQUENAME( __text, __COUNTER__ )
+ #define STATIC_ASSERT(e) typedef char UNIQUENAME(STATIC_ASSERT_)[(e)?1:-1]
diff --git a/x11-libs/libX11/libX11-1.8.4.ebuild b/x11-libs/libX11/libX11-1.8.4.ebuild
index 6000cbf08f70..ed0fedb4f2b2 100644
--- a/x11-libs/libX11/libX11-1.8.4.ebuild
+++ b/x11-libs/libX11/libX11-1.8.4.ebuild
@@ -11,7 +11,7 @@ inherit toolchain-funcs xorg-3
# Note: please bump this with x11-misc/compose-tables
DESCRIPTION="X.Org X11 library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/libdrm/libdrm-2.4.115.ebuild b/x11-libs/libdrm/libdrm-2.4.115.ebuild
index 326182ae7388..7473e6ec5cdc 100644
--- a/x11-libs/libdrm/libdrm-2.4.115.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.115.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
fi
VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.5.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.5.0.ebuild
index 6c92e0eb15c8..ee16ebb31428 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-1.5.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.5.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
else
SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
fi
PYTHON_COMPAT=( python3_{9..11} )
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 93bc82851fdd..8ae5f45d5137 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/compose-tables/compose-tables-1.8.4.ebuild b/x11-misc/compose-tables/compose-tables-1.8.4.ebuild
index 2ddfe90f3568..478b326cd7c4 100644
--- a/x11-misc/compose-tables/compose-tables-1.8.4.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.8.4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="X.Org Compose Key tables from libX11"
SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
S="${WORKDIR}/libX11-${PV}/"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
# Only needed by configure
DEPEND="
diff --git a/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild b/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild
index 065d94897723..d9ae207590c5 100644
--- a/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild
+++ b/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild
@@ -16,10 +16,10 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
else
if [[ ${PV} == *_p20230109 ]] ; then
- H=7bdba66574244061c6e1934c4f204d02d570f182
- SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/${H}/${PN}-${H}.tar.bz2
+ COMMIT=7bdba66574244061c6e1934c4f204d02d570f182
+ SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.bz2
-> ${P}.tar.bz2"
- S="${WORKDIR}"/${PN}-${H}
+ S="${WORKDIR}"/${PN}-${COMMIT}
else
SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
-> ${P}.tar.bz2"
diff --git a/x11-misc/sunflower/sunflower-0.5-r2.ebuild b/x11-misc/sunflower/sunflower-0.5-r2.ebuild
new file mode 100644
index 000000000000..7f4468cab6df
--- /dev/null
+++ b/x11-misc/sunflower/sunflower-0.5-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_PEP517="setuptools"
+inherit distutils-r1 xdg
+
+MY_PN="Sunflower"
+MY_PV="${PV}-63"
+
+DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support"
+HOMEPAGE="https://github.com/MeanEYE/Sunflower
+ https://sunflower-fm.org/"
+SRC_URI="https://github.com/MeanEYE/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+
+DEPEND="
+ ${PYTHON_DEPS}
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/chardet[${PYTHON_USEDEP}]
+"
+
+RDEPEND="${DEPEND}
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ x11-libs/vte
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+src_prepare() {
+ default
+
+ # Upstream's get_version requires a lot of BDEPENDS we do not want.
+ sed 's%version=get_version()%version="0.5"%g' -i setup.py
+}
diff --git a/x11-misc/trayer/trayer-1.0-r5.ebuild b/x11-misc/trayer/trayer-1.0-r5.ebuild
index 051d15d92456..0eb7ae28ba83 100644
--- a/x11-misc/trayer/trayer-1.0-r5.ebuild
+++ b/x11-misc/trayer/trayer-1.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.ta
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
RDEPEND="dev-libs/glib:2
x11-libs/gdk-pixbuf:2
diff --git a/x11-misc/util-macros/util-macros-1.20.0.ebuild b/x11-misc/util-macros/util-macros-1.20.0.ebuild
index 8637acc63649..f27b305bc224 100644
--- a/x11-misc/util-macros/util-macros-1.20.0.ebuild
+++ b/x11-misc/util-macros/util-macros-1.20.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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 ~loong ~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"
# there is nothing to compile for this package, all its contents are produced by
# configure. the only make job that matters is make install
diff --git a/x11-misc/xdaliclock/xdaliclock-2.47.ebuild b/x11-misc/xdaliclock/xdaliclock-2.47.ebuild
index 52fc4e245729..e7424ed71cb4 100644
--- a/x11-misc/xdaliclock/xdaliclock-2.47.ebuild
+++ b/x11-misc/xdaliclock/xdaliclock-2.47.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}/X11
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 x86"
+KEYWORDS="~amd64 ppc ppc64 x86"
RDEPEND="
dev-libs/glib:2
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 96691fcda6e1..1c68008cf204 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/fluent-icon-theme/fluent-icon-theme-2023.02.01.ebuild b/x11-themes/fluent-icon-theme/fluent-icon-theme-2023.02.01.ebuild
index 82a474b46799..fe300c325a84 100644
--- a/x11-themes/fluent-icon-theme/fluent-icon-theme-2023.02.01.ebuild
+++ b/x11-themes/fluent-icon-theme/fluent-icon-theme-2023.02.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://github.com/vinceliuice/${MY_PN}.git"
else
SRC_URI="https://github.com/vinceliuice/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
S="${WORKDIR}/${MY_PN}-${MY_PV}"
fi
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 4d0dad82c84f..add7e109901a 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/page/page-1.9.10-r1.ebuild b/x11-wm/page/page-1.9.10-r1.ebuild
new file mode 100644
index 000000000000..9dcfac0380fd
--- /dev/null
+++ b/x11-wm/page/page-1.9.10-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A mouse friendly tiling window manager"
+HOMEPAGE="https://github.com/gschwind/page"
+SRC_URI="https://github.com/gschwind/page/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+ >=x11-libs/libxcb-1.11
+ >=x11-libs/xcb-util-0.4.0
+ >=x11-libs/libXfixes-5.0.3
+ >=x11-libs/libXdamage-1.1.4-r1
+ >=x11-libs/libXrandr-1.5.1
+ >=x11-libs/libXcomposite-0.4.4-r1
+ >=x11-libs/libXrender-0.9.10
+ >=x11-libs/libXext-1.3.3
+ >=x11-libs/cairo-1.14.6[X]
+ >=x11-libs/pango-1.40.5
+ >=dev-libs/glib-2.50.3-r1:2"
+DEPEND="${RDEPEND}
+ >=x11-base/xcb-proto-1.12-r2
+ x11-base/xorg-proto"
+
+src_install() {
+ default
+
+ # Solves file collision with dev-tcltk/tcllib, bug #574074
+ ebegin "Changing references from 'page' to 'pagewm'"
+ mv "${ED}"/usr/bin/page "${ED}"/usr/bin/pagewm || die "Could not rename binary!"
+ sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${ED}"/usr/share/applications/page.desktop || die "Could not change .desktop file!"
+ eend $?
+}
+
+pkg_postinst() {
+ elog "page can now be launched using \"pagewm\". To find out more about this functionality,"
+ elog "see the following bug report: https://bugs.gentoo.org/574074."
+}