diff --git a/Manifest.files.gz b/Manifest.files.gz
index a1cc8eeb4365..a7549d92d4d0 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 094077d92f34..ade214f502e8 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/longrun/metadata.xml b/app-admin/longrun/metadata.xml
index 571b8a2a562f..5e882ed16b13 100644
--- a/app-admin/longrun/metadata.xml
+++ b/app-admin/longrun/metadata.xml
@@ -7,7 +7,4 @@
thermal and power save functionalities found in the processors made
by Transmeta.
-
- longrun
-
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index b80b5ead5fff..ada78c7bb559 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -1,2 +1 @@
-DIST mcelog-180.tar.gz 314605 BLAKE2B 0cf4f25dc26901bee56ddd437ad3d56874ba70f2323d9d6821432bf744b78392e871c9632e44a7bef7a1954eb6605cf72f6d9268397741cecd5066b6bcafe54a SHA512 89b2b1c2f7ab03bb358926f10fa2c3e8f048bb5cf2d6f4453de63ecfd44daebe771087522c69ade5638248ab79c80122448efef798e4ea8d1a5f88308e8bfd32
DIST mcelog-181.tar.gz 314690 BLAKE2B 4e182c84ae15abf3673e0210940830c66377b275e05c0bf88ff2199ef1b87bf1e9bcff12ebd9c07e5af00d763369c96aae37c274174563fb3ae0db7bbd7306de SHA512 70f0a923bfc0a941b2a70501dd89b8634be52f51c98ab482b212e337684620165f71420205bd779039fe7704e230eb35e47c77802109242dc401803613393bb9
diff --git a/app-admin/mcelog/mcelog-180-r1.ebuild b/app-admin/mcelog/mcelog-180-r1.ebuild
deleted file mode 100644
index 1b3a0ee7345e..000000000000
--- a/app-admin/mcelog/mcelog-180-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit linux-info python-any-r1 systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-DEPEND="${PYTHON_DEPS}"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != buildonly ]]; then
- local CONFIG_CHECK="~X86_MCE"
- kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
- check_extra_config
- fi
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
- "${FILESDIR}"/${PN}-129-debugflags.patch
- eapply_user
- tc-export CC
- python_fix_shebang genconfig.py
-}
-
-src_install() {
- default
-
- insinto /etc/logrotate.d/
- newins ${PN}.logrotate ${PN}
-
- newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
- systemd_dounit ${PN}.service
-
- dodoc *.pdf
-}
diff --git a/app-admin/mcelog/mcelog-181.ebuild b/app-admin/mcelog/mcelog-181.ebuild
index b95ec9cf6b31..1b3a0ee7345e 100644
--- a/app-admin/mcelog/mcelog-181.ebuild
+++ b/app-admin/mcelog/mcelog-181.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="selinux"
RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
diff --git a/app-admin/watchfolder/metadata.xml b/app-admin/watchfolder/metadata.xml
index 5110520fa1d3..115e9d64a669 100644
--- a/app-admin/watchfolder/metadata.xml
+++ b/app-admin/watchfolder/metadata.xml
@@ -2,7 +2,4 @@
-
- watchd
-
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index f5bf63a82ced..d81994bcaf1a 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/afio/metadata.xml b/app-arch/afio/metadata.xml
index e87efba35be1..b18457cad81f 100644
--- a/app-arch/afio/metadata.xml
+++ b/app-arch/afio/metadata.xml
@@ -9,7 +9,4 @@
tar or cpio archives. Afio is best used as an 'archive engine' in a backup
script.
-
- afio
-
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index a4b762c411c2..fff6913072bd 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/dvorakng/metadata.xml b/app-misc/dvorakng/metadata.xml
index fa2cd7596c28..115e9d64a669 100644
--- a/app-misc/dvorakng/metadata.xml
+++ b/app-misc/dvorakng/metadata.xml
@@ -2,7 +2,4 @@
-
- dvorakng
-
diff --git a/app-misc/esekeyd/metadata.xml b/app-misc/esekeyd/metadata.xml
index 399723ab2679..115e9d64a669 100644
--- a/app-misc/esekeyd/metadata.xml
+++ b/app-misc/esekeyd/metadata.xml
@@ -2,7 +2,4 @@
-
- esekeyd
-
diff --git a/app-misc/jot/metadata.xml b/app-misc/jot/metadata.xml
index d319ae32fa44..6258504e5133 100644
--- a/app-misc/jot/metadata.xml
+++ b/app-misc/jot/metadata.xml
@@ -5,7 +5,4 @@
shell-tools@gentoo.org
Gentoo Shell Tools Project
-
- bsd-jot
-
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 76e92b7643ce..0eb2a947e15f 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/rrs/metadata.xml b/app-shells/rrs/metadata.xml
index 0f7a21678173..a3862b8ec2fc 100644
--- a/app-shells/rrs/metadata.xml
+++ b/app-shells/rrs/metadata.xml
@@ -5,7 +5,4 @@
pinkbyte@gentoo.org
Sergey Popov
-
- rrs
-
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a63eba628650..7bd9a3b657c4 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index 03742b741c98..4364ae48615f 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,2 +1 @@
-DIST grip-4.6.0.tar.gz 147222 BLAKE2B ee5c10ca47ca0e9089d2618dc765a4ca01f4927da8c4256a251a9cf90ee15d63eb6136848cef0005d5f3af1f12b603f6f0fd55b65840bf542dcb9cd29ff35518 SHA512 483170996e593593781b684986dcb8eec20afb02dca84a9f5baeb3917220706332037f7b18f504aba8aa7d1d1c3587a1af18d6d5628f1e96517511c0be40a6ac
DIST grip-4.6.1.tar.gz 147894 BLAKE2B e4f6b5c72e98b5d8ec443c794e95ff0a4250526dd7381f5a28da7d1119b607970593c4b3c22a49ec7da7d772e984abb2a0984ed7290b007e48cddf49bfc290ae SHA512 73eb80995457faa10ba5f174c8151c821f4bd9cda066099ba249cc5aad668e6adef267410ddd24fefa1d1e444c276a10a0881ec5e528bc616d3c4d98a8427b3d
diff --git a/app-text/grip/grip-4.6.0.ebuild b/app-text/grip/grip-4.6.0.ebuild
deleted file mode 100644
index 224d3078f628..000000000000
--- a/app-text/grip/grip-4.6.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
-HOMEPAGE="https://github.com/joeyespo/grip"
-LICENSE="MIT"
-
-SLOT="0"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
- !media-sound/grip
- >=dev-python/docopt-0.4.0[${PYTHON_USEDEP}]
- >=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
- >=dev-python/markdown-2.5.1[${PYTHON_USEDEP}]
- >=dev-python/path-and-address-2.0.1[${PYTHON_USEDEP}]
- >=dev-python/pygments-1.6[${PYTHON_USEDEP}]
- >=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
-"
diff --git a/app-text/grip/grip-4.6.1.ebuild b/app-text/grip/grip-4.6.1.ebuild
index 1dc8182a71d1..224d3078f628 100644
--- a/app-text/grip/grip-4.6.1.ebuild
+++ b/app-text/grip/grip-4.6.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="MIT"
SLOT="0"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 60c524c4ba5a..4ab142241132 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/janino/Manifest b/dev-java/janino/Manifest
index b25cc96111ea..413a68fd99f3 100644
--- a/dev-java/janino/Manifest
+++ b/dev-java/janino/Manifest
@@ -1 +1,2 @@
DIST janino-3.1.6.tar.gz 1730264 BLAKE2B a4e15b7b9a9d17b8762f5964171a01da3ce6f1045b8830c9a6e9a0d35c5096376fd667103360791f6848c762177f48f858e4e6233205fb6ff8258e6582211b89 SHA512 6e729733f74e0cc24db56c4030de8751c131c94b3abf0519288cc7539b5dda45de8c33e8dd37d8e70565ad0c3a3122cac7c73d77bc5f92a16db0b0f7ea7436d3
+DIST janino-3.1.7.tar.gz 1747439 BLAKE2B 6e42a9d5cc079c2cf17b76c1d76420ff3fa0027b54736f23e0aa2c5062f4dad19c1ac7efa678fa06cee369a01125a64a4ee32e4120e60ecd8a56d47aa4f69503 SHA512 541925fc10f5fbefde45e60cec1925e3d6f5b7244a6b9de251b5483224bee05c16182e2bf137a00349cbdb6c209ce18b2203ca066e5a7a1f146efa255f5f7799
diff --git a/dev-java/janino/janino-3.1.7.ebuild b/dev-java/janino/janino-3.1.7.ebuild
new file mode 100644
index 000000000000..a1ab15ac5d16
--- /dev/null
+++ b/dev-java/janino/janino-3.1.7.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom janino/pom.xml --download-uri https://github.com/janino-compiler/janino/archive/refs/tags/v3.1.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild janino-3.1.7.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.codehaus.janino:janino:3.1.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An embedded compiler for run-time compilation purposes"
+HOMEPAGE="https://janino-compiler.github.io/janino/"
+SRC_URI="https://github.com/janino-compiler/janino/archive/v3.1.7.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: ${PN}/pom.xml
+# org.codehaus.janino:commons-compiler:3.1.7 -> !!!artifactId-not-found!!!
+
+CDEPEND="
+ !!!artifactId-not-found!!!
+"
+
+# Compile dependencies
+# POM: ${PN}/pom.xml
+# org.apache.ant:ant:1.10.11 -> !!!suitable-mavenVersion-not-found!!!
+# POM: ${PN}/pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ dev-java/ant-core:0
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${P}/janino"
+
+src_prepare() {
+ default
+ java-pkg_clean
+}
+
+src_compile() {
+ JAVA_SRC_DIR="../commons-compiler/src/main/java"
+ JAVA_JAR_FILENAME="commons-compiler.jar"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":commons-compiler.jar"
+ rm -r target || die
+
+ JAVA_CLASSPATH_EXTRA="ant-core"
+ JAVA_SRC_DIR="src/main/java"
+ JAVA_RESOURCE_DIRS="src/main/resources"
+ JAVA_JAR_FILENAME="janino.jar"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":janino.jar"
+ rm -r target || die
+
+ if use doc; then
+ JAVA_SRC_DIR=(
+ "../commons-compiler/src/main/java"
+ "src/main/java"
+ )
+ JAVA_JAR_FILENAME="ignoreme.jar"
+ java-pkg-simple_src_compile
+ fi
+}
+
+src_test() {
+ JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+ JAVA_TEST_SRC_DIR="../commons-compiler/src/test/java"
+ JAVA_TEST_RESOURCE_DIRS="../commons-compiler/src/test/resources"
+ java-pkg-simple_src_test
+
+ JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+ JAVA_TEST_SRC_DIR="src/test/java"
+ JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ default
+
+ java-pkg_dojar "commons-compiler.jar"
+ java-pkg_dojar "janino.jar"
+
+ if use doc; then
+ java-pkg_dojavadoc target/api
+ fi
+
+ if use source; then
+ java-pkg_dosrc "../commons-compiler/src/main/java/*"
+ java-pkg_dosrc "src/main/java/*"
+ fi
+}
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild
index 7e413eeba216..1bb314be9d5d 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild
@@ -41,7 +41,7 @@ SRC_URI="
DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
HOMEPAGE="https://adoptium.net"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
IUSE="alsa cups headless-awt selinux source"
RDEPEND="
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
index b00e90353bad..f5637ac0f050 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
@@ -42,7 +42,7 @@ SRC_URI="
DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
HOMEPAGE="https://adoptium.net"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
IUSE="alsa cups +gentoo-vm headless-awt selinux source"
RDEPEND="
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild
index 3887cf82d548..aad1888ca56b 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild
@@ -34,7 +34,7 @@ SRC_URI="
"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
IUSE="alsa cups examples headless-awt selinux source"
diff --git a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild
index 7134546ff10a..c9dc36e2d7bd 100644
--- a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild
@@ -43,7 +43,7 @@ SRC_URI="
"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
diff --git a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild
index 1d2d646294ee..b860f01cb145 100644
--- a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild
@@ -44,7 +44,7 @@ SRC_URI="
"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
IUSE="alsa big-endian cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
diff --git a/dev-java/openjdk/openjdk-8.332_p09.ebuild b/dev-java/openjdk/openjdk-8.332_p09.ebuild
index 943af1f42587..5af7952e09b3 100644
--- a/dev-java/openjdk/openjdk-8.332_p09.ebuild
+++ b/dev-java/openjdk/openjdk-8.332_p09.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://openjdk.java.net"
SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source"
COMMON_DEPEND="
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 3ec6429ab4d2..c11f8c093d87 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/spidermonkey/spidermonkey-91.9.1.ebuild b/dev-lang/spidermonkey/spidermonkey-91.9.1.ebuild
index e04a46ab49ff..4f0988ba35ec 100644
--- a/dev-lang/spidermonkey/spidermonkey-91.9.1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-91.9.1.ebuild
@@ -61,7 +61,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
HOMEPAGE="https://spidermonkey.dev https://firefox-source-docs.mozilla.org/js/index.html "
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ppc64 ~riscv x86"
SLOT="91"
LICENSE="MPL-2.0"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d4a40bb07b47..7f11d609682c 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/gost-engine/Manifest b/dev-libs/gost-engine/Manifest
index 2ffd9edb4a36..2dfaa392a43e 100644
--- a/dev-libs/gost-engine/Manifest
+++ b/dev-libs/gost-engine/Manifest
@@ -1,2 +1,3 @@
DIST gost-engine-1.1.0.3_p20181031.tar.gz 473151 BLAKE2B fb8dc737c3bda181de168d918744d6e036886753e70cfcd0516499dd5d9a1ba3af0d44d26fc50570318375a142adfec532327dc57fac5996266b12551631b5fd SHA512 9f0df3c48191aea75d3fee5b5886ba32451889bdbb97c5e540f14a57d8d41606d858769a70b51c0c2c958565b347c5a613004e7c3f81658281d6a3eecd030707
DIST gost-engine-3.0.0.tar.gz 1634392 BLAKE2B a97150e8d3d30df487d63e0b1016e21b719f951c37646239492a89462169f8712bc5ffb335653b26778104644bb1175f5e17afffd8ba0422d8ec748ea59e3f0d SHA512 180cfbd013bf9959659744c49c886afa67911e1722db1dc3189f94f5320a51fc3b48ed937e57cdfe33f0e63cbf3597a41483fbda534fb8932997f21bebb1bb73
+DIST gost-engine-3.0.1.tar.gz 1645245 BLAKE2B 713a7343f9c11feec361dd2828b00dd7d47518f5a1b047a6e11f8d8eea206ce9058ace1bd70e12b4cb2200789eb8209de671cb5e2692e95391b4e7a82d0badc2 SHA512 eb9fb126393cfe23bcef0f45c05b38d39aadd8909419ebcf6dab4800bd7372b63891e9061f8e70686f8ba5cd58669681895b36320ed6a8cc0ca1ff037aa73b85
diff --git a/dev-libs/gost-engine/gost-engine-3.0.1.ebuild b/dev-libs/gost-engine/gost-engine-3.0.1.ebuild
new file mode 100644
index 000000000000..b9fc8e721abe
--- /dev/null
+++ b/dev-libs/gost-engine/gost-engine-3.0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A reference implementation of the Russian GOST crypto algorithms for OpenSSL"
+HOMEPAGE="https://github.com/gost-engine/engine"
+IUSE="test"
+RESTRICT="!test? ( test )"
+SLOT="0/${PV}"
+
+COMMON_DEPEND=">=dev-libs/openssl-3.0.0:0="
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+ test? (
+ dev-lang/perl
+ )"
+RDEPEND="${COMMON_DEPEND}"
+
+LICENSE="openssl"
+
+DOCS=( INSTALL.md README.gost README.md )
+
+if [[ ${PV} == "9999" ]] ; then
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/gost-engine/engine.git"
+ inherit git-r3
+else
+ KEYWORDS="~amd64 ~hppa"
+ SRC_URI="https://github.com/gost-engine/engine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/engine-${PV}"
+fi
+
+src_prepare() {
+ cmake_src_prepare
+ sed 's:Werror:Wno-error:g' -i "${S}/CMakeLists.txt" || die
+}
diff --git a/dev-libs/gost-engine/gost-engine-9999.ebuild b/dev-libs/gost-engine/gost-engine-9999.ebuild
index fd08e96d4a63..b9fc8e721abe 100644
--- a/dev-libs/gost-engine/gost-engine-9999.ebuild
+++ b/dev-libs/gost-engine/gost-engine-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
@@ -11,7 +11,7 @@ IUSE="test"
RESTRICT="!test? ( test )"
SLOT="0/${PV}"
-COMMON_DEPEND=">=dev-libs/openssl-1.1.1:0="
+COMMON_DEPEND=">=dev-libs/openssl-3.0.0:0="
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
test? (
diff --git a/dev-libs/vc/Manifest b/dev-libs/vc/Manifest
index bc28ee059331..f14c03c4bddd 100644
--- a/dev-libs/vc/Manifest
+++ b/dev-libs/vc/Manifest
@@ -1,2 +1,3 @@
DIST vc-1.4.1.tar.gz 638797 BLAKE2B 38feab898a4ce2b15c4db508369426a6b470f24b81e6676ad0e667cc08efaf30e96ed1455c667372104192fe6eb2340fdbd367298fa68e3168350c2e134cc0b8 SHA512 dd17e214099796c41d70416d365ea038c00c5fda285b05e48d7ee4fe03f4db2671d2be006ca7b98b0d4133bfcb57faf04cecfe35c29c3b006cd91c9a185cc04a
DIST vc-1.4.2.tar.gz 639711 BLAKE2B e8ef5c1249f1d5bff26997dd2b9e7e5923682a5251119b23fe4e7d4f9a166b4f9bfa0f5599d1fc4fd6ca390515e51039051c2afb17aece4c2c40a3cbd6ab630e SHA512 9a929cd48bdf6b8e94765bd649e7ec42b10dea28e36eff288223d72cffa5f4fc8693e942aa3f780b42d8a0c1824fcabff22ec0622aa8ea5232c9123858b8bbbf
+DIST vc-1.4.3.tar.gz 640398 BLAKE2B 18a5bf346b433c08b565fe4e39395f2126fff47561651d5adba677de40c50e1f1d26cef2ae6ee7f9e18f4334116aa1ad3c0bff923c61494a4ccac4d7ac2d1991 SHA512 7c0c4ccf8c7c4585334482135f2daf1a5bc088114b880093893583bdcea1fbfcec02485da6059304c510c8b1bb1b768ef04fd7ac8ccb21b9ebbad5d0d5babaef
diff --git a/dev-libs/vc/vc-1.4.3.ebuild b/dev-libs/vc/vc-1.4.3.ebuild
new file mode 100644
index 000000000000..8a6631c0494f
--- /dev/null
+++ b/dev-libs/vc/vc-1.4.3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="SIMD Vector Class Library for C++"
+HOMEPAGE="https://github.com/VcDevel/Vc"
+SRC_URI="https://github.com/VcDevel/Vc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/Vc-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c31520919743..b4134f7e4ce8 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 5b453f7bdf33..084843824ab3 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,2 +1 @@
-DIST flake8-3.9.2.tar.gz 164777 BLAKE2B 1c991296a3e47e4c41f1196fcaf1e7ea059226dfb41657a52fc4f5a9023b54dba21dd99635398e12f37f52f6e498a0a1fb7d87aba0fe7098ebbdfb54dc5598b0 SHA512 618fe1b35070b24395e5d4da9fa1b1f6308abf6f85d8de71b8b553f84d70d9cd7d2a6f616fa1418db9a8b5ad3efab038f4e2d7c6020c0c1bdeb8157e666911fd
DIST flake8-4.0.1.tar.gz 154905 BLAKE2B b93fea36236881da595ae924b056686e0cd35d2466c1858e3ee83262922df8bc38cf5cd40a910980d287d048572dc94eb8d7c8ee4b11ebd1b4a474dfca02490c SHA512 0bdbf0218ce893df1c3e61f51cd3f371a5c72bb49ef78fec39548b1684e49b024e91cf4e3dcea60ba1efc08727985ef485814c372461e062ff4f810da99a1796
diff --git a/dev-python/flake8/flake8-3.9.2-r1.ebuild b/dev-python/flake8/flake8-3.9.2-r1.ebuild
deleted file mode 100644
index ba315d7ed262..000000000000
--- a/dev-python/flake8/flake8-3.9.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
- >=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
- =dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
- = (3,):
-+ if PYPY:
- column = 7
-+ elif sys.version_info >= (3, 9):
-+ column = 21
- elif sys.version_info >= (3, 8):
- column = 9
- else:
-@@ -543,8 +543,10 @@ foo(bar=baz, bax)
- """
- with self.makeTempFile(source) as sourcePath:
- if ERROR_HAS_LAST_LINE:
-- if PYPY and sys.version_info >= (3,):
-+ if PYPY:
- column = 12
-+ elif sys.version_info >= (3, 9):
-+ column = 17
- elif sys.version_info >= (3, 8):
- column = 14
- else:
-@@ -578,7 +580,9 @@ foo(bar=baz, bax)
- else:
- position_end = 1
- if PYPY:
-- column = 6
-+ column = 5
-+ elif ver >= (3, 9):
-+ column = 13
- else:
- column = 7
- # Column has been "fixed" since 3.2.4 and 3.3.1
-@@ -717,13 +721,6 @@ class IntegrationTests(TestCase):
- """
- Tests of the pyflakes script that actually spawn the script.
- """
--
-- # https://bitbucket.org/pypy/pypy/issues/3069/pypy36-on-windows-incorrect-line-separator
-- if PYPY and sys.version_info >= (3,) and WIN:
-- LINESEP = '\n'
-- else:
-- LINESEP = os.linesep
--
- def setUp(self):
- self.tempdir = tempfile.mkdtemp()
- self.tempfilepath = os.path.join(self.tempdir, 'temp')
-@@ -784,7 +781,7 @@ class IntegrationTests(TestCase):
- fd.write("import contraband\n".encode('ascii'))
- d = self.runPyflakes([self.tempfilepath])
- expected = UnusedImport(self.tempfilepath, Node(1), 'contraband')
-- self.assertEqual(d, ("%s%s" % (expected, self.LINESEP), '', 1))
-+ self.assertEqual(d, ("%s%s" % (expected, os.linesep), '', 1))
-
- def test_errors_io(self):
- """
-@@ -794,7 +791,7 @@ class IntegrationTests(TestCase):
- """
- d = self.runPyflakes([self.tempfilepath])
- error_msg = '%s: No such file or directory%s' % (self.tempfilepath,
-- self.LINESEP)
-+ os.linesep)
- self.assertEqual(d, ('', error_msg, 1))
-
- def test_errors_syntax(self):
-@@ -807,7 +804,7 @@ class IntegrationTests(TestCase):
- fd.write("import".encode('ascii'))
- d = self.runPyflakes([self.tempfilepath])
- error_msg = '{0}:1:{2}: invalid syntax{1}import{1} {3}^{1}'.format(
-- self.tempfilepath, self.LINESEP, 6 if PYPY else 7, '' if PYPY else ' ')
-+ self.tempfilepath, os.linesep, 6 if PYPY else 7, '' if PYPY else ' ')
- self.assertEqual(d, ('', error_msg, 1))
-
- def test_readFromStdin(self):
-@@ -816,15 +813,13 @@ class IntegrationTests(TestCase):
- """
- d = self.runPyflakes([], stdin='import contraband')
- expected = UnusedImport('', Node(1), 'contraband')
-- self.assertEqual(d, ("%s%s" % (expected, self.LINESEP), '', 1))
-+ self.assertEqual(d, ("%s%s" % (expected, os.linesep), '', 1))
-
-
- class TestMain(IntegrationTests):
- """
- Tests of the pyflakes main function.
- """
-- LINESEP = os.linesep
--
- def runPyflakes(self, paths, stdin=None):
- try:
- with SysStreamCapturing(stdin) as capture:
diff --git a/dev-python/pyflakes/files/pyflakes-2.3.1-fix-py3.10-tests.patch b/dev-python/pyflakes/files/pyflakes-2.3.1-fix-py3.10-tests.patch
deleted file mode 100644
index c96585d20c73..000000000000
--- a/dev-python/pyflakes/files/pyflakes-2.3.1-fix-py3.10-tests.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From f3b1b44bf3d2d5927004fa1c2fcf1ab2def816b9 Mon Sep 17 00:00:00 2001
-From: Anthony Sottile
-Date: Thu, 20 May 2021 07:23:19 -0700
-Subject: [PATCH] fix syntax error offsets for python 3.10 (#635)
-
----
- .github/workflows/test.yml | 2 +-
- pyflakes/test/test_api.py | 43 +++++++++++++++++++++++++-------------
- tox.ini | 2 +-
- 3 files changed, 30 insertions(+), 17 deletions(-)
-
-diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py
-index d379b3b7..2c1cf19d 100644
---- a/pyflakes/test/test_api.py
-+++ b/pyflakes/test/test_api.py
-@@ -441,7 +441,7 @@ def evaluate(source):
- evaluate(source)
- except SyntaxError:
- e = sys.exc_info()[1]
-- if not PYPY:
-+ if not PYPY and sys.version_info < (3, 10):
- self.assertTrue(e.text.count('\n') > 1)
- else:
- self.fail()
-@@ -449,10 +449,17 @@ def evaluate(source):
- with self.makeTempFile(source) as sourcePath:
- if PYPY:
- message = 'end of file (EOF) while scanning triple-quoted string literal'
-+ elif sys.version_info >= (3, 10):
-+ message = 'unterminated triple-quoted string literal (detected at line 8)' # noqa: E501
- else:
- message = 'invalid syntax'
-
-- column = 8 if sys.version_info >= (3, 8) else 11
-+ if sys.version_info >= (3, 10):
-+ column = 12
-+ elif sys.version_info >= (3, 8):
-+ column = 8
-+ else:
-+ column = 11
- self.assertHasErrors(
- sourcePath,
- ["""\
-@@ -468,21 +475,25 @@ def test_eofSyntaxError(self):
- """
- with self.makeTempFile("def foo(") as sourcePath:
- if PYPY:
-- result = """\
--%s:1:7: parenthesis is never closed
--def foo(
-- ^
--""" % (sourcePath,)
-+ msg = 'parenthesis is never closed'
-+ elif sys.version_info >= (3, 10):
-+ msg = "'(' was never closed"
- else:
-- result = """\
--%s:1:9: unexpected EOF while parsing
--def foo(
-- ^
--""" % (sourcePath,)
-+ msg = 'unexpected EOF while parsing'
-
-- self.assertHasErrors(
-- sourcePath,
-- [result])
-+ if PYPY:
-+ column = 7
-+ elif sys.version_info >= (3, 10):
-+ column = 8
-+ else:
-+ column = 9
-+
-+ spaces = ' ' * (column - 1)
-+ expected = '{}:1:{}: {}\ndef foo(\n{}^\n'.format(
-+ sourcePath, column, msg, spaces
-+ )
-+
-+ self.assertHasErrors(sourcePath, [expected])
-
- def test_eofSyntaxErrorWithTab(self):
- """
-@@ -515,6 +526,8 @@ def foo(bar=baz, bax):
- if ERROR_HAS_LAST_LINE:
- if PYPY:
- column = 7
-+ elif sys.version_info >= (3, 10):
-+ column = 18
- elif sys.version_info >= (3, 9):
- column = 21
- elif sys.version_info >= (3, 8):
diff --git a/dev-python/pyflakes/pyflakes-2.2.0.ebuild b/dev-python/pyflakes/pyflakes-2.2.0.ebuild
deleted file mode 100644
index 879458907120..000000000000
--- a/dev-python/pyflakes/pyflakes-2.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-# Uses pkg_resources
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Should be included in the next release
-PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyflakes/pyflakes-2.3.1.ebuild b/dev-python/pyflakes/pyflakes-2.3.1.ebuild
deleted file mode 100644
index 1c9e50892545..000000000000
--- a/dev-python/pyflakes/pyflakes-2.3.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-py3.10-tests.patch"
-)
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyflakes/pyflakes-2.4.0-r1.ebuild b/dev-python/pyflakes/pyflakes-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..c9e280ec853e
--- /dev/null
+++ b/dev-python/pyflakes/pyflakes-2.4.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Passive checker for Python programs"
+HOMEPAGE="
+ https://github.com/PyCQA/pyflakes/
+ https://pypi.org/project/pyflakes/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_tests unittest
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 2c21c260abaf..c3ae20e49789 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,2 +1,2 @@
-DIST spyder-5.3.0.tar.gz 24404638 BLAKE2B 558c0d1ce8cda61786a772bf7ea471eab69755e3852f5701363b3c52cf1cac388a3800d2e59f266ca9e99007c7096582fbd341956752385b23c3af12ef097204 SHA512 c556deb8bed91ad6c59761e70e1e69f2402a216d8c87a57b3fc55f3624418d95114b015f5fc5baf0cb7e405955cd2ae82372105830b405ea52c50d7329ba7f42
-DIST spyder-docs-f99196cc267b07fa7ad56f0134744b545fa21fcd.tar.gz 90037460 BLAKE2B 8d279e2c2e397a63919c4ba8723ce674d2c5660793330dc578b9a6e05034af016085faedd73894f16241c0ffe1f734217d9e237f7589e59fe2186511552cefe1 SHA512 6c7d35274fd2f627b3b9371c7a2a9f0446c8aee3754b7c7dda6c5a2b9fd4ab04e73637648a188960c71d43f348c6f9ef1911979fec4c281515937e1069e68500
+DIST spyder-5.3.1.tar.gz 24415110 BLAKE2B 368179c6ba6d355ca56fe3eb3ed8b24be3e986f1f2d0284f0f5739bdecb21225bce10802883b54dd888da54515bd8477adf6c0d3e38a3c549bb10407534254b0 SHA512 2501ddc45df11671b1a318eb33b50788b334ab10fbafb97a9491775a0efcc6a57814672068ab84314f9cb43961d6fabd9b906fb164cd58c77b6d6ecf0d6621e6
+DIST spyder-docs-d43d6cd46b6eb7675ec690b0dff573ca03f2e301.tar.gz 90037375 BLAKE2B 2faf8d2d07b10aec750534c73ebcfc9146533db4223908ecabafb214d7e0a85416aaaf4359f95768572bbd8806f13bd707124f9585299527af5bd5bc735293d4 SHA512 00f12af5298f5b90eaf9a4ea8706b5bb29445ca344b5117801dbac54508eefa29c807e0d4f36524fb5d8b6208204533dc657da63849cadaf13f4aa3652612cb1
diff --git a/dev-python/spyder/spyder-5.3.0-r1.ebuild b/dev-python/spyder/spyder-5.3.1.ebuild
similarity index 92%
rename from dev-python/spyder/spyder-5.3.0-r1.ebuild
rename to dev-python/spyder/spyder-5.3.1.ebuild
index 868ae5625d61..8d4d998cb68a 100644
--- a/dev-python/spyder/spyder-5.3.0-r1.ebuild
+++ b/dev-python/spyder/spyder-5.3.1.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_USE_PEP517=setuptools
inherit optfeature xdg distutils-r1
# Commit of documentation to fetch
-DOCS_PV="f99196cc267b07fa7ad56f0134744b545fa21fcd"
+DOCS_PV="d43d6cd46b6eb7675ec690b0dff573ca03f2e301"
DESCRIPTION="The Scientific Python Development Environment"
HOMEPAGE="
@@ -26,11 +26,9 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-# The test suite often hangs or does not work. Technically spyder requires
-# pyqt5<13, which we do not have in ::gentoo any more. Likely this is the reason
-# many of the tests fail or hang. RESTRICTing because IMO it is not worth the
-# several hours I spend every single version bump checking which tests do and
-# do not work. Spyder itself works fine with pyqt5>13.
+# The test suite often hangs or does not work. RESTRICTing because IMO it is
+# not worth the several hours I would have to spend every single version bump
+# checking which tests do and do not work.
RESTRICT="test"
RDEPEND="
@@ -51,17 +49,17 @@ RDEPEND="
>=dev-python/python-lsp-black-1.2.0[${PYTHON_USEDEP}]
>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
- >=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+ >=dev-python/pyzmq-22.1.0[${PYTHON_USEDEP}]
>=dev-python/qdarkstyle-3.0.2[${PYTHON_USEDEP}]
=dev-python/qstylizer-0.1.10[${PYTHON_USEDEP}]
>=dev-python/qtawesome-1.0.2[${PYTHON_USEDEP}]
>=dev-python/qtconsole-5.3.0[${PYTHON_USEDEP}]
=dev-python/QtPy-2.0.1[${PYTHON_USEDEP},svg,webengine]
+ >=dev-python/QtPy-2.1.0[${PYTHON_USEDEP},svg,webengine]
>=sci-libs/rtree-0.9.7[${PYTHON_USEDEP}]
>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
- >=dev-python/spyder-kernels-2.3.0[${PYTHON_USEDEP}]
+ >=dev-python/spyder-kernels-2.3.1[${PYTHON_USEDEP}]
=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/tenacity/tenacity-8.0.1-r1.ebuild b/dev-python/tenacity/tenacity-8.0.1-r1.ebuild
new file mode 100644
index 000000000000..f26d4e37358c
--- /dev/null
+++ b/dev-python/tenacity/tenacity-8.0.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="General-purpose retrying library"
+HOMEPAGE="
+ https://github.com/jd/tenacity/
+ https://pypi.org/project/tenacity/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ www-servers/tornado[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+ local EPYTEST_DESELECT=()
+
+ if ! has_version "dev-python/typeguard[${PYTHON_USEDEP}]"; then
+ EPYTEST_DESELECT+=(
+ tests/test_tenacity.py::TestRetryTyping::test_retry_type_annotations
+ )
+ fi
+
+ epytest
+}
diff --git a/dev-python/typeguard/Manifest b/dev-python/typeguard/Manifest
index bd919f1a8b8f..1f9c43e6470b 100644
--- a/dev-python/typeguard/Manifest
+++ b/dev-python/typeguard/Manifest
@@ -1,3 +1 @@
-DIST typeguard-2.13.0.gh.tar.gz 36849 BLAKE2B ef9b724bdd5ef127b6ede4ff4cb1d4f4794b0e921512d2cbf474145bf64de0cae85b7f5283dfc7f0b750e79e1c44c03ce6b4c0f24a33ae961c428aa57f3b6ae5 SHA512 48df7a9d6ee2cc11b5118432afcda5e0939712ff66d67f3945e26047c0880a05c133b505869ebcef59ce438260b9f6d1806121d0d4828853bc3b9c3468769f39
-DIST typeguard-2.13.2.gh.tar.gz 37142 BLAKE2B 0aa3f53bc0d1aa485d071cd52d2458ab83c4d5eba88708240c100a3205a2714f39465cb48d82118eb6bcf1e30579e50bb5dffb31b3f2b673573481772d650a23 SHA512 a11c1b9ee417a99a8bd09f4b5b05c7cdf319748b8221a49d1ff76854e2f432768224437f82a41c0166e5b148a550b58afbabfa1935cdc2a049cda3010edd052a
DIST typeguard-2.13.3.gh.tar.gz 37436 BLAKE2B a3cb616692119c64a9dc0d0bae25cc661b7974a0b6cf6632fa403f7c5430873570b1aaa310bc03843deee6f77a831c303ea9d9091db596eb565fce43980bbb13 SHA512 26c31ee9670650d1969320187a924d29d986894a38f1026af58f705b132b64be3b6e2ac34729f966f5d302d486334b5a5d9e65fb206245b82b0ff0852020b609
diff --git a/dev-python/typeguard/files/typeguard-2.13.3-test.patch b/dev-python/typeguard/files/typeguard-2.13.3-test.patch
new file mode 100644
index 000000000000..3c01c018ea86
--- /dev/null
+++ b/dev-python/typeguard/files/typeguard-2.13.3-test.patch
@@ -0,0 +1,44 @@
+diff --git a/src/typeguard/__init__.py b/src/typeguard/__init__.py
+index 5684d63..27fa30b 100644
+--- a/src/typeguard/__init__.py
++++ b/src/typeguard/__init__.py
+@@ -61,22 +61,25 @@ except ImportError:
+ from typing import _ForwardRef as ForwardRef
+ evaluate_forwardref = ForwardRef._eval_type
+
+-if sys.version_info >= (3, 10):
+- from typing import is_typeddict
+-else:
+- _typed_dict_meta_types = ()
+- if sys.version_info >= (3, 8):
+- from typing import _TypedDictMeta
+- _typed_dict_meta_types += (_TypedDictMeta,)
++try:
++ from typing_extensions import is_typeddict
++except ImportError:
++ if sys.version_info >= (3, 10):
++ from typing import is_typeddict
++ else:
++ _typed_dict_meta_types = ()
++ if sys.version_info >= (3, 8):
++ from typing import _TypedDictMeta
++ _typed_dict_meta_types += (_TypedDictMeta,)
+
+- try:
+- from typing_extensions import _TypedDictMeta
+- _typed_dict_meta_types += (_TypedDictMeta,)
+- except ImportError:
+- pass
++ try:
++ from typing_extensions import _TypedDictMeta
++ _typed_dict_meta_types += (_TypedDictMeta,)
++ except ImportError:
++ pass
+
+- def is_typeddict(tp) -> bool:
+- return isinstance(tp, _typed_dict_meta_types)
++ def is_typeddict(tp) -> bool:
++ return isinstance(tp, _typed_dict_meta_types)
+
+
+ if TYPE_CHECKING:
diff --git a/dev-python/typeguard/typeguard-2.13.0.ebuild b/dev-python/typeguard/typeguard-2.13.0.ebuild
deleted file mode 100644
index 9ea46fa44506..000000000000
--- a/dev-python/typeguard/typeguard-2.13.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Run-time type checker for Python"
-HOMEPAGE="
- https://pypi.org/project/typeguard/
- https://github.com/agronholm/typeguard/"
-SRC_URI="
- https://github.com/agronholm/typeguard/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
- local EPYTEST_IGNORE=(
- # mypy changes results from version to version
- tests/mypy
- )
-
- local -x PYTHONDONTWRITEBYTECODE=
- epytest
-}
diff --git a/dev-python/typeguard/typeguard-2.13.2.ebuild b/dev-python/typeguard/typeguard-2.13.3-r1.ebuild
similarity index 63%
rename from dev-python/typeguard/typeguard-2.13.2.ebuild
rename to dev-python/typeguard/typeguard-2.13.3-r1.ebuild
index 9ea46fa44506..05158a8faa03 100644
--- a/dev-python/typeguard/typeguard-2.13.2.ebuild
+++ b/dev-python/typeguard/typeguard-2.13.3-r1.ebuild
@@ -1,33 +1,43 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
inherit distutils-r1
DESCRIPTION="Run-time type checker for Python"
HOMEPAGE="
https://pypi.org/project/typeguard/
- https://github.com/agronholm/typeguard/"
+ https://github.com/agronholm/typeguard/
+"
SRC_URI="
https://github.com/agronholm/typeguard/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz"
+ -> ${P}.gh.tar.gz
+"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
BDEPEND="
dev-python/setuptools_scm[${PYTHON_USEDEP}]
test? (
dev-python/typing-extensions[${PYTHON_USEDEP}]
- )"
+ )
+"
distutils_enable_tests pytest
export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+PATCHES=(
+ # backport from https://github.com/agronholm/typeguard/pull/243
+ "${FILESDIR}"/${P}-test.patch
+)
+
python_test() {
local EPYTEST_IGNORE=(
# mypy changes results from version to version
diff --git a/dev-python/whisper/whisper-1.1.10.ebuild b/dev-python/whisper/whisper-1.1.10.ebuild
index d587c6d47c45..7c5e02c4610f 100644
--- a/dev-python/whisper/whisper-1.1.10.ebuild
+++ b/dev-python/whisper/whisper-1.1.10.ebuild
@@ -28,8 +28,7 @@ RDEPEND="
distutils_enable_tests pytest
-EPYTEST_DESELECT=(
- # not a regression (fails the same with the previous version)
- # https://github.com/graphite-project/whisper/issues/321
- test_whisper.py::TestWhisper::test_resize_with_aggregate
-)
+python_test() {
+ local -x TZ=UTC
+ epytest
+}
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 7848f70852de..260bffc2100f 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/chicken/chicken-5.3.0.ebuild b/dev-scheme/chicken/chicken-5.3.0.ebuild
index 2b0584234cea..daf9c3453782 100644
--- a/dev-scheme/chicken/chicken-5.3.0.ebuild
+++ b/dev-scheme/chicken/chicken-5.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://code.call-cc.org/releases/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~mips ppc ppc64 ~riscv x86"
IUSE="doc"
RDEPEND=""
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c63f247c2c4d..e7166f578a4d 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/drone/files/drone-agent.confd b/dev-util/drone/files/drone-agent.confd
deleted file mode 100644
index bfe82b16c756..000000000000
--- a/dev-util/drone/files/drone-agent.confd
+++ /dev/null
@@ -1,19 +0,0 @@
-# arguments for drone-agent
-# See also http://readme.drone.io/admin/installation-reference/
-#DRONE_SERVER=
-#DRONE_SECRET=
-#DRONE_DEBUG=false
-#DRONE_BACKOFF=15s
-#DRONE_TIMEOUT=15m
-#DRONE_MAX_LOGS=5
-#DRONE_PLUGIN_PULL=true
-#DRONE_PLUGIN_PRIVILEGED
-#DOCKER_HOST
-#DOCKER_TLS_VERIFY
-#DOCKER_CERT_PATH
-#DOCKER_MAX_PROCS=2
-#DOCKER_OS=linux
-#DOCKER_ARCH=amd64
-#HTTP_PROXY=
-#HTTPS_PROXY=
-#NO_PROXY=
diff --git a/dev-util/drone/files/drone-agent.initd b/dev-util/drone/files/drone-agent.initd
deleted file mode 100644
index d14b11f80d33..000000000000
--- a/dev-util/drone/files/drone-agent.initd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Drone CI Agent"
-pidfile=${pidfile:-"/run/drone/${SVCNAME}.pid"}
-user=${user:-drone}
-group=${group:-drone}
-
-command="/usr/bin/drone-agent"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
- --stdout /var/log/drone/${SVCNAME}.log \
- --stderr /var/log/drone/${SVCNAME}.log"
diff --git a/dev-util/ebuildtester/Manifest b/dev-util/ebuildtester/Manifest
index f326e9a4cb62..49e9b2d3077b 100644
--- a/dev-util/ebuildtester/Manifest
+++ b/dev-util/ebuildtester/Manifest
@@ -2,3 +2,4 @@ DIST ebuildtester-0.1.27.tar.gz 17347 BLAKE2B 4b4b97235b073bfa1fc78dd3e4f5d03a2e
DIST ebuildtester-0.1.29.tar.gz 17446 BLAKE2B d0dccc4e290e9907b90d93ecd87cb263e842ee60944ea9e8a0cb3864029595a5979c16e3c13d59dfd6d5bdc989a6211bf56262b88bbf2f28a86b236f1c305fd9 SHA512 4093df87f85fc581dc1b286b7377929f111d0f1efc960d7623ff3cbd833ef997174b0508422567de819490c30a8246a431d6a29bf71f1e828064b3987bd129a4
DIST ebuildtester-0.1.30.tar.gz 17436 BLAKE2B 264a10b1f61fcb9ef0ef232118ab1f830da4754ddf724d9797beaabbbd03b6d8a6c790150847dde2f8a0436a71ea0351b547ea3996709da41abcaad02cdfcac8 SHA512 0138b220bfc109ea05a8052150150ca38e6612e7089926d88f5a8dc99f7c27b16adce10cce1779f981eb8bb4ee05a2aac381d5a875ef38ffa83243a2945d3666
DIST ebuildtester-0.1.35.tar.gz 19842 BLAKE2B 3d562718680914a47bb078f38f4351e5b4575ef6d11fa39247d7f06b81868cca0a30ec29ba0e7b14330ef45a117330ad2351f5eea2b75f23cbaba9e37d0441d4 SHA512 c268c621c3b22aefb6945da7169a4049c7bd3f9cc198d43eb733bc144bf1ac46e251235af669d2af5231f5517ef997ffcd28f4bcbb1c945237f6dd2dca502c46
+DIST ebuildtester-0.1.37.tar.gz 20919 BLAKE2B a97ea0de557601aae3faee8c959453179d402450f722872a7de6f544abdc2facaa71558d8b2088fbadf37b829a2991ca717ff5e1790c1e7c48ccfcd619e1737e SHA512 dfa157bb5745854cfd2a7580e5c8650712b796e01831137b90dbea7097f926e7b1eb6718bef8ab70a8e703a65049274cfe52eda9c3635df6b5697ff3403f5ee0
diff --git a/dev-util/ebuildtester/ebuildtester-0.1.37.ebuild b/dev-util/ebuildtester/ebuildtester-0.1.37.ebuild
new file mode 100644
index 000000000000..bb15017e24ac
--- /dev/null
+++ b/dev-util/ebuildtester/ebuildtester-0.1.37.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
+HOMEPAGE="https://ebuildtester.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-containers/docker
+ sys-fs/fuse
+"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+src_install() {
+ distutils-r1_src_install
+ newbashcomp "${PN}.bash-completion" "${PN}"
+}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 9ace92f65995..87441f010c2a 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,4 +1,5 @@
DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
+DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
DIST patch-5.17.1.xz 15244 BLAKE2B f340b8a103754122153dd381fe210b18ba37b7262dae4fc7a1f99c5a62868c9bdb178e83865b35f00b82bd2d67ae127c440515d1740093825f7ec7fa4c4a490d SHA512 fb9a28ce7c68daeca82586e7631dc0be00a1a8393b4cef4c659fc1f9dac6e1f941bd60671c0350d1dea9cb035f56d627f64a394a9acb00b2b5dea8a1d44c065f
diff --git a/dev-util/perf/files/perf-5.18-clang.patch b/dev-util/perf/files/perf-5.18-clang.patch
new file mode 100644
index 000000000000..d1c9a48e6848
--- /dev/null
+++ b/dev-util/perf/files/perf-5.18-clang.patch
@@ -0,0 +1,45 @@
+
+Fix building against LLVM/Clang with monolithic libraries.
+
+--- a/tools/build/feature/Makefile
++++ b/tools/build/feature/Makefile
+@@ -299,7 +299,7 @@ $(OUTPUT)test-llvm.bin:
+ $(BUILDXX) -std=gnu++14 \
+ -I$(shell $(LLVM_CONFIG) --includedir) \
+ -L$(shell $(LLVM_CONFIG) --libdir) \
+- $(shell $(LLVM_CONFIG) --libs Core BPF) \
++ $(shell $(LLVM_CONFIG) --libs) \
+ $(shell $(LLVM_CONFIG) --system-libs) \
+ > $(@:.bin=.make.output) 2>&1
+
+@@ -312,10 +312,7 @@ $(OUTPUT)test-clang.bin:
+ $(BUILDXX) -std=gnu++14 \
+ -I$(shell $(LLVM_CONFIG) --includedir) \
+ -L$(shell $(LLVM_CONFIG) --libdir) \
+- -Wl,--start-group -lclangBasic -lclangDriver \
+- -lclangFrontend -lclangEdit -lclangLex \
+- -lclangAST -Wl,--end-group \
+- $(shell $(LLVM_CONFIG) --libs Core option) \
++ -lclang-cpp $(shell $(LLVM_CONFIG) --libs) \
+ $(shell $(LLVM_CONFIG) --system-libs) \
+ > $(@:.bin=.make.output) 2>&1
+
+--- a/tools/perf/Makefile.perf
++++ b/tools/perf/Makefile.perf
+@@ -417,14 +417,11 @@ EXTLIBS := $(call filter-out,$(EXCLUDE_EXTLIBS),$(EXTLIBS))
+ LIBS = -Wl,--whole-archive $(PERFLIBS) $(EXTRA_PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group
+
+ ifeq ($(USE_CLANG), 1)
+- CLANGLIBS_LIST = AST Basic CodeGen Driver Frontend Lex Tooling Edit Sema Analysis Parse Serialization
+- CLANGLIBS_NOEXT_LIST = $(foreach l,$(CLANGLIBS_LIST),$(shell $(LLVM_CONFIG) --libdir)/libclang$(l))
+- LIBCLANG = $(foreach l,$(CLANGLIBS_NOEXT_LIST),$(wildcard $(l).a $(l).so))
+- LIBS += -Wl,--start-group $(LIBCLANG) -Wl,--end-group
++ LIBS += -lclang-cpp
+ endif
+
+ ifeq ($(USE_LLVM), 1)
+- LIBLLVM = $(shell $(LLVM_CONFIG) --libs all) $(shell $(LLVM_CONFIG) --system-libs)
++ LIBLLVM = $(shell $(LLVM_CONFIG) --libs) $(shell $(LLVM_CONFIG) --system-libs)
+ LIBS += -L$(shell $(LLVM_CONFIG) --libdir) $(LIBLLVM)
+ endif
+
diff --git a/dev-util/perf/perf-5.18.ebuild b/dev-util/perf/perf-5.18.ebuild
new file mode 100644
index 000000000000..a2e565d93fcb
--- /dev/null
+++ b/dev-util/perf/perf-5.18.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+ LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+ PATCH_VERSION=$(ver_cut 1-3)
+ LINUX_PATCH=patch-${PV//_/-}.xz
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+ # stable-release series
+ 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}"
+else
+ LINUX_VER=${PV}
+ SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+ ${LINUX_PATCH+dev-util/patchutils}
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ doc? (
+ app-text/asciidoc
+ app-text/sgml-common
+ app-text/xmlto
+ sys-process/time
+ )
+ ${PYTHON_DEPS}
+"
+
+RDEPEND="audit? ( sys-process/audit )
+ babeltrace? ( dev-util/babeltrace )
+ crypt? ( virtual/libcrypt:= )
+ clang? (
+ sys-devel/clang:=
+ sys-devel/llvm:=
+ )
+ gtk? ( x11-libs/gtk+:2 )
+ java? ( virtual/jre:* )
+ libpfm? ( dev-libs/libpfm )
+ lzma? ( app-arch/xz-utils )
+ numa? ( sys-process/numactl )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ slang? ( sys-libs/slang )
+ systemtap? ( dev-util/systemtap )
+ unwind? ( sys-libs/libunwind )
+ zlib? ( sys-libs/zlib )
+ zstd? ( app-arch/zstd )
+ dev-libs/elfutils
+ sys-libs/binutils-libs:="
+
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-5.10
+ java? ( virtual/jdk )
+"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+QA_FLAGS_IGNORED=(
+ 'usr/bin/perf-read-vdso32' # not linked with anything except for libc
+ 'usr/libexec/perf-core/dlfilters/.*' # plugins
+)
+
+pkg_pretend() {
+ if ! use doc ; then
+ ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+ ewarn "And without man pages, you won't get any --help output for perf and its"
+ ewarn "sub-tools."
+ fi
+}
+
+pkg_setup() {
+ use clang && llvm_pkg_setup
+ # We enable python unconditionally as libbpf always generates
+ # API headers using python script
+ python_setup
+}
+
+# src_unpack and src_prepare are copied to dev-util/bpftool since
+# it's building from the same tarball, please keep it in sync with bpftool
+src_unpack() {
+ local paths=(
+ tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+ scripts include lib "arch/*/lib"
+ )
+
+ # We expect the tar implementation to support the -j option (both
+ # GNU tar and libarchive's tar support that).
+ echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+ tar --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
+ eapply "${FILESDIR}"/${P}-clang.patch
+ popd || die
+
+ # Drop some upstream too-developer-oriented flags and fix the
+ # Makefile in general
+ sed -i \
+ -e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
+ "${S}"/Makefile.perf || die
+ # A few places still use -Werror w/out $(WERROR) protection.
+ sed -i -e 's:-Werror::' \
+ "${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
+
+ # Avoid the call to make kernelversion
+ sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die
+ echo "#define PERF_VERSION \"${PV}\"" > PERF-VERSION-FILE
+
+ # The code likes to compile local assembly files which lack ELF markings.
+ find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+ # The arch parsing is a bit funky. The perf tools package is integrated
+ # into the kernel, so it wants an ARCH that looks like the kernel arch,
+ # but it also wants to know about the split value -- i386/x86_64 vs just
+ # x86. We can get that by telling the func to use an older linux version.
+ # It's kind of a hack, but not that bad ...
+
+ # LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+ local arch=$(tc-arch-kernel)
+ local java_dir
+ use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
+ # FIXME: NO_CORESIGHT
+ emake V=1 VF=1 \
+ HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ prefix="${EPREFIX}/usr" bindir_relative="bin" \
+ tipdir="share/doc/${PF}" \
+ EXTRA_CFLAGS="${CFLAGS}" \
+ EXTRA_LDFLAGS="${LDFLAGS}" \
+ ARCH="${arch}" \
+ JDIR="${java_dir}" \
+ LIBCLANGLLVM=$(usex clang 1 "") \
+ LIBPFM4=$(usex libpfm 1 "") \
+ NO_AUXTRACE="" \
+ NO_BACKTRACE="" \
+ NO_CORESIGHT=1 \
+ NO_DEMANGLE= \
+ GTK2=$(usex gtk 1 "") \
+ feature-gtk2-infobar=$(usex gtk 1 "") \
+ NO_JVMTI=$(puse java) \
+ NO_LIBAUDIT=$(puse audit) \
+ NO_LIBBABELTRACE=$(puse babeltrace) \
+ NO_LIBBIONIC=1 \
+ NO_LIBBPF= \
+ NO_LIBCRYPTO=$(puse crypt) \
+ NO_LIBDW_DWARF_UNWIND= \
+ NO_LIBELF= \
+ NO_LIBNUMA=$(puse numa) \
+ NO_LIBPERL=$(puse perl) \
+ NO_LIBPYTHON=$(puse python) \
+ NO_LIBUNWIND=$(puse unwind) \
+ NO_LIBZSTD=$(puse zstd) \
+ NO_SDT=$(puse systemtap) \
+ NO_SLANG=$(puse slang) \
+ NO_LZMA=$(puse lzma) \
+ NO_ZLIB=$(puse zlib) \
+ WERROR=0 \
+ LIBDIR="/usr/libexec/perf-core" \
+ libdir="${EPREFIX}/usr/$(get_libdir)" \
+ plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \
+ "$@"
+}
+
+src_compile() {
+ # test-clang.bin not build with g++
+ if use clang; then
+ make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+ fi
+ perf_make -f Makefile.perf
+ use doc && perf_make -C Documentation man
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ _install_python_ext() {
+ perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+ }
+
+ perf_make -f Makefile.perf install DESTDIR="${D}"
+
+ if use python; then
+ python_foreach_impl _install_python_ext
+ fi
+
+ if use gtk; then
+ local libdir
+ libdir="$(get_libdir)"
+ # on some arches it ends up in lib even on 64bit, ppc64 for instance.
+ [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+ mv "${ED}"/usr/${libdir}/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
+ fi
+
+ dodoc CREDITS
+
+ dodoc *txt Documentation/*.txt
+
+ # perf needs this decompressed to print out tips for users
+ docompress -x /usr/share/doc/${PF}/tips.txt
+
+ if use doc ; then
+ doman Documentation/*.1
+ fi
+}
diff --git a/dev-util/rebar/rebar-3.18.0.ebuild b/dev-util/rebar/rebar-3.18.0.ebuild
index 4f02c6cc4e21..7aef643d13c2 100644
--- a/dev-util/rebar/rebar-3.18.0.ebuild
+++ b/dev-util/rebar/rebar-3.18.0.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}"/${MY_PN}-${PV}
LICENSE="Apache-2.0 MIT BSD"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index fba87adf4fd4..41d33e9b621e 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/cvs-fast-export/metadata.xml b/dev-vcs/cvs-fast-export/metadata.xml
index b82d1c9c6b9a..10e4ea021b98 100644
--- a/dev-vcs/cvs-fast-export/metadata.xml
+++ b/dev-vcs/cvs-fast-export/metadata.xml
@@ -4,7 +4,4 @@
ulm@gentoo.org
-
- cvs-fast-export
-
diff --git a/dev-vcs/cvsps/metadata.xml b/dev-vcs/cvsps/metadata.xml
index 0ac4a88f8792..115e9d64a669 100644
--- a/dev-vcs/cvsps/metadata.xml
+++ b/dev-vcs/cvsps/metadata.xml
@@ -2,7 +2,4 @@
-
- cvsps
-
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index c729e0979ac8..1f93f48d3895 100644
Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ
diff --git a/games-action/luola/metadata.xml b/games-action/luola/metadata.xml
index b2c2edf3b20c..7c730d47817a 100644
--- a/games-action/luola/metadata.xml
+++ b/games-action/luola/metadata.xml
@@ -5,7 +5,4 @@
games@gentoo.org
Gentoo Games Project
-
- luola
-
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index 8d911f723887..ac7ab8450067 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1,2 +1 @@
-DIST polymc-1.2.1.tar.gz 5157547 BLAKE2B 92a65cd1303b4f2dce299d2a40824de54babd47bd21a894827e7a0e94276551fc747873ba44e63ac13b3ca46649c3d5280ec9eecd92eb63678f8cbc3c27e4f69 SHA512 193415b552dbc3f540f481c22e36c2b9d0604757cb12283ec0fc2979246757937648b76821818f0742b3f5201ed7af8e535dff9ef3d5efcb22f7a1ddf9ee67d2
-DIST polymc-1.2.2.tar.gz 5167667 BLAKE2B 5cc26d1650f9cf851ad01d3bc75a0ec3f19b3aa50031a91a3c9c16e9bc73dabfc495e408b8c83559026f3af03b86fdd5c83815f04c62121b71c144d1548d764c SHA512 d81d1aaba5361c8ad664bbecffd9869dda637002a5c1288142f40d21abca974d6cc03a50685be5f70a01d5b1ae8bcff4e48c5b849f6c3dcd959e5977582ada58
+DIST polymc-1.3.0.tar.gz 5115480 BLAKE2B ac818b899d25f1545ceafd109a8eb48acd6a2d4b09b8d7f5365de0fc1b6ce0171ed053bc19785192ab781a2d7f506167599e3f3747e94fe1cf62b9989208e685 SHA512 b33660dfc7026f1153aaffd4429b9047bffa9cc80a3231bb19c0f3a7d4046654c49f278d9c07ae3ac631172ed147fa06065c2713fb59221ff9131406d8c6df46
diff --git a/games-action/polymc/files/polymc-iconfix.patch b/games-action/polymc/files/polymc-iconfix.patch
deleted file mode 100644
index 01477e559ff6..000000000000
--- a/games-action/polymc/files/polymc-iconfix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8f494636afb9a9b9c0619b256252d3a9dcdbab72 Mon Sep 17 00:00:00 2001
-From: flow
-Date: Thu, 21 Apr 2022 06:38:18 -0300
-Subject: [PATCH] fix: Build iconfix as static library
-
-Otherwise the launcher is unable to find the iconfix .so, and so the
-launcher doesn't run.
-
-Signed-off-by: Thiago Donato Ferreira
----
- libraries/iconfix/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libraries/iconfix/CMakeLists.txt b/libraries/iconfix/CMakeLists.txt
-index 08441203..97a59129 100644
---- a/libraries/iconfix/CMakeLists.txt
-+++ b/libraries/iconfix/CMakeLists.txt
-@@ -12,7 +12,7 @@ internal/qiconloader.cpp
- internal/qiconloader_p.h
- )
-
--add_library(Launcher_iconfix ${ICONFIX_SOURCES})
-+add_library(Launcher_iconfix STATIC ${ICONFIX_SOURCES})
- target_include_directories(Launcher_iconfix PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}" )
-
- target_link_libraries(Launcher_iconfix Qt5::Core Qt5::Widgets)
---
-2.35.1
-
diff --git a/games-action/polymc/polymc-1.2.2.ebuild b/games-action/polymc/polymc-1.2.2.ebuild
deleted file mode 100644
index 00e26da2635e..000000000000
--- a/games-action/polymc/polymc-1.2.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake java-pkg-2 optfeature xdg
-
-HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
-DESCRIPTION="A custom, open source Minecraft launcher"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="
- https://github.com/PolyMC/PolyMC
- https://github.com/PolyMC/libnbtplusplus
- "
-
- EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
-else
- MY_PN="PolyMC"
-
- # Let's use the vendored tarball to avoid dealing with the submodules directly
- SRC_URI="
- https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
- "
-
- # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
- S="${WORKDIR}/${MY_PN}-${PV}"
-
- KEYWORDS="~amd64"
-fi
-
-# Apache-2.0 for MultiMC (PolyMC is forked from it)
-# GPL-3 for PolyMC
-# LGPL-3 for libnbtplusplus
-# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
-
-SLOT="0"
-
-IUSE="debug lto"
-REQUIRED_USE="
- lto? ( !debug )
-"
-
-MIN_QT="5.6.0"
-
-QT_DEPS="
- >=dev-qt/qtconcurrent-${MIN_QT}:5
- >=dev-qt/qtcore-${MIN_QT}:5
- >=dev-qt/qtgui-${MIN_QT}:5
- >=dev-qt/qtnetwork-${MIN_QT}:5
- >=dev-qt/qttest-${MIN_QT}:5
- >=dev-qt/qtwidgets-${MIN_QT}:5
- >=dev-qt/qtxml-${MIN_QT}:5
-"
-
-# Required at both build-time and run-time
-COMMON_DEPENDS="
- ${QT_DEPS}
- >=dev-libs/quazip-1.3:=
- sys-libs/zlib
-"
-
-DEPEND="
- ${COMMON_DEPENDS}
- media-libs/libglvnd
- >=virtual/jdk-1.8.0:*
-"
-
-# At run-time we don't depend on JDK, only JRE
-# And we need more than just the GL headers
-RDEPEND="
- ${COMMON_DEPENDS}
- >=virtual/jre-1.8.0:*
- virtual/opengl
-"
-
-if [[ ${PV} != 9999 ]]; then
- PATCHES=( "${FILESDIR}/${PN}-iconfix.patch" )
-fi
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure(){
- local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="/usr"
- # Resulting binary is named polymc
- -DLauncher_APP_BINARY_NAME="${PN}"
-
- -DENABLE_LTO=$(usex lto)
- )
-
- if use debug; then
- CMAKE_BUILD_TYPE=Debug
- else
- CMAKE_BUILD_TYPE=Release
- fi
-
- cmake_src_configure
-}
-
-src_compile(){
- cmake_src_compile
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- # https://github.com/PolyMC/PolyMC/issues/227
- optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
-}
diff --git a/games-action/polymc/polymc-1.2.1.ebuild b/games-action/polymc/polymc-1.3.0.ebuild
similarity index 95%
rename from games-action/polymc/polymc-1.2.1.ebuild
rename to games-action/polymc/polymc-1.3.0.ebuild
index 00e26da2635e..abe73ed34f30 100644
--- a/games-action/polymc/polymc-1.2.1.ebuild
+++ b/games-action/polymc/polymc-1.3.0.ebuild
@@ -44,7 +44,7 @@ REQUIRED_USE="
lto? ( !debug )
"
-MIN_QT="5.6.0"
+MIN_QT="5.12.0"
QT_DEPS="
>=dev-qt/qtconcurrent-${MIN_QT}:5
@@ -77,10 +77,6 @@ RDEPEND="
virtual/opengl
"
-if [[ ${PV} != 9999 ]]; then
- PATCHES=( "${FILESDIR}/${PN}-iconfix.patch" )
-fi
-
src_prepare() {
cmake_src_prepare
}
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index 00e26da2635e..abe73ed34f30 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -44,7 +44,7 @@ REQUIRED_USE="
lto? ( !debug )
"
-MIN_QT="5.6.0"
+MIN_QT="5.12.0"
QT_DEPS="
>=dev-qt/qtconcurrent-${MIN_QT}:5
@@ -77,10 +77,6 @@ RDEPEND="
virtual/opengl
"
-if [[ ${PV} != 9999 ]]; then
- PATCHES=( "${FILESDIR}/${PN}-iconfix.patch" )
-fi
-
src_prepare() {
cmake_src_prepare
}
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index e1909b4deb08..95984b2ebe69 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/pengupop/metadata.xml b/games-arcade/pengupop/metadata.xml
index c0074924de44..7c730d47817a 100644
--- a/games-arcade/pengupop/metadata.xml
+++ b/games-arcade/pengupop/metadata.xml
@@ -5,7 +5,4 @@
games@gentoo.org
Gentoo Games Project
-
- pengupop
-
diff --git a/games-arcade/spout/metadata.xml b/games-arcade/spout/metadata.xml
index 91325b3c4eff..7c730d47817a 100644
--- a/games-arcade/spout/metadata.xml
+++ b/games-arcade/spout/metadata.xml
@@ -5,7 +5,4 @@
games@gentoo.org
Gentoo Games Project
-
- spout
-
diff --git a/games-arcade/yarsrevenge/metadata.xml b/games-arcade/yarsrevenge/metadata.xml
index c6adac0a3600..40ca8a9757f8 100644
--- a/games-arcade/yarsrevenge/metadata.xml
+++ b/games-arcade/yarsrevenge/metadata.xml
@@ -9,7 +9,4 @@
A rather weird shoot-em-up game that originated on the Atari 2600. It's more
fun than it looks. Just released so might be tweaked.
-
- yarsrevenge
-
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index dd0ae5ef556c..b8a13f293d3e 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/xscrabble/metadata.xml b/games-board/xscrabble/metadata.xml
index df2786e820bf..7c730d47817a 100644
--- a/games-board/xscrabble/metadata.xml
+++ b/games-board/xscrabble/metadata.xml
@@ -5,7 +5,4 @@
games@gentoo.org
Gentoo Games Project
-
- xscrabble
-
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index bf07e09caf62..f080b0b19f4b 100644
Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ
diff --git a/games-puzzle/einstein/metadata.xml b/games-puzzle/einstein/metadata.xml
index ee427295410e..7c730d47817a 100644
--- a/games-puzzle/einstein/metadata.xml
+++ b/games-puzzle/einstein/metadata.xml
@@ -5,7 +5,4 @@
games@gentoo.org
Gentoo Games Project
-
- einsteinpuzzle
-
diff --git a/games-puzzle/wmpuzzle/metadata.xml b/games-puzzle/wmpuzzle/metadata.xml
index 652bdb753ecc..bad30ff48c80 100644
--- a/games-puzzle/wmpuzzle/metadata.xml
+++ b/games-puzzle/wmpuzzle/metadata.xml
@@ -9,7 +9,4 @@
games@gentoo.org
Gentoo Games Project
-
- wmpuzzle
-
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index daee0a2bce19..3e4cf46d46ce 100644
Binary files a/games-roguelike/Manifest.gz and b/games-roguelike/Manifest.gz differ
diff --git a/games-roguelike/wrogue/metadata.xml b/games-roguelike/wrogue/metadata.xml
index a97d8139b7db..968ca19a0d39 100644
--- a/games-roguelike/wrogue/metadata.xml
+++ b/games-roguelike/wrogue/metadata.xml
@@ -9,7 +9,4 @@
Warp Rogue is a gothic science fantasy roguelike game. It features RPG-like game
mechanics, recruitable NPCs, and a consistent theme.
-
- wrogue
-
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index f034d1466cb9..90e64934be3c 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch b/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch
deleted file mode 100644
index 4a7c8cf41e72..000000000000
--- a/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Leave default AR as is, https://bugs.gentoo.org/732096
-
-diff -r 419bf3de54e5 CMakeLists.txt
---- a/CMakeLists.txt Sat Oct 24 19:50:25 2020 +0000
-+++ b/CMakeLists.txt Sat Oct 24 19:50:53 2020 +0000
-@@ -390,8 +390,6 @@
- MESSAGE("Using ar, ranlib, and default linker")
- find_program(NON_LTO_AR NAMES ar)
- find_program(NON_LTO_RANLIB NAMES ranlib)
-- set(CMAKE_AR "${NON_LTO_AR}" CACHE STRING "Does not support LTO" FORCE)
-- set(CMAKE_RANLIB "${NON_LTO_RANLIB}" CACHE STRING "Does not support LTO" FORCE)
- endif()
- MARK_AS_ADVANCED(LTO_AR LTO_RANLIB NON_LTO_AR NON_LTO_RANLIB)
-
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 024df8ea0eaa..112cbb5056f5 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-commander/metadata.xml b/gnome-extra/gnome-commander/metadata.xml
index f0e845edde9b..2ba2944b6f0d 100644
--- a/gnome-extra/gnome-commander/metadata.xml
+++ b/gnome-extra/gnome-commander/metadata.xml
@@ -16,7 +16,6 @@
https://gitlab.gnome.org/GNOME/gnome-commander/-/blob/master/NEWS
https://gitlab.gnome.org/GNOME/gnome-commander/issues
- gnome-commander
FFTW/fftw3
- fftw
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 5ef70655a01d..6b493a56bd9c 100644
Binary files a/sci-physics/Manifest.gz and b/sci-physics/Manifest.gz differ
diff --git a/sci-physics/geant/geant-4.10.7.3.ebuild b/sci-physics/geant/geant-4.10.7.3.ebuild
index b25e1a0f55d8..fe10d40f4664 100644
--- a/sci-physics/geant/geant-4.10.7.3.ebuild
+++ b/sci-physics/geant/geant-4.10.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -67,7 +67,7 @@ S="${WORKDIR}/${MY_P}"
src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
- -DGEANT4_BUILD_CXXSTD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+ -DGEANT4_BUILD_CXXSTD=$( (usev c++11 || usev c++14 || usev c++17) | cut -c4-)
-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
-DGEANT4_BUILD_STORE_TRAJECTORY=OFF
-DGEANT4_BUILD_TLS_MODEL=$(usex threads global-dynamic initial-exec)
diff --git a/sci-physics/geant/geant-4.11.0.0.ebuild b/sci-physics/geant/geant-4.11.0.0.ebuild
index 589a2cd089b5..e0a6cc6d6c5d 100644
--- a/sci-physics/geant/geant-4.11.0.0.ebuild
+++ b/sci-physics/geant/geant-4.11.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -80,7 +80,7 @@ S="${WORKDIR}/${MY_P}"
src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
- -DCMAKE_CXX_STANDARD=$((usev c++17 || usev c++20) | cut -c4-)
+ -DCMAKE_CXX_STANDARD=$( (usev c++17 || usev c++20) | cut -c4-)
-DGEANT4_BUILD_BUILTIN_BACKTRACE=$(usex debug)
-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
-DGEANT4_BUILD_STORE_TRAJECTORY=OFF
diff --git a/sci-physics/geant/geant-4.11.0.1.ebuild b/sci-physics/geant/geant-4.11.0.1.ebuild
index 1ea83a6f144f..9112a2515352 100644
--- a/sci-physics/geant/geant-4.11.0.1.ebuild
+++ b/sci-physics/geant/geant-4.11.0.1.ebuild
@@ -78,7 +78,7 @@ S="${WORKDIR}/${MY_P}"
src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_DATADIR="${EPREFIX}/usr/share/geant4"
- -DCMAKE_CXX_STANDARD=$((usev c++17 || usev c++20) | cut -c4-)
+ -DCMAKE_CXX_STANDARD=$( (usev c++17 || usev c++20) | cut -c4-)
-DGEANT4_BUILD_BUILTIN_BACKTRACE=$(usex debug)
-DGEANT4_BUILD_MULTITHREADED=$(usex threads)
-DGEANT4_BUILD_STORE_TRAJECTORY=OFF
diff --git a/sci-physics/root/root-6.24.06-r2.ebuild b/sci-physics/root/root-6.24.06-r2.ebuild
index 8da6d265fdfe..521449068ccb 100644
--- a/sci-physics/root/root-6.24.06-r2.ebuild
+++ b/sci-physics/root/root-6.24.06-r2.ebuild
@@ -157,7 +157,7 @@ src_configure() {
-DCMAKE_CUDA_HOST_COMPILER="$(tc-getCXX)"
-DCMAKE_C_FLAGS="${CFLAGS}"
-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
- -DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+ -DCMAKE_CXX_STANDARD=$( (usev c++11 || usev c++14 || usev c++17) | cut -c4-)
-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)"
-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
diff --git a/sci-physics/root/root-6.26.02.ebuild b/sci-physics/root/root-6.26.02.ebuild
index fc9568849f88..304b7de69514 100644
--- a/sci-physics/root/root-6.26.02.ebuild
+++ b/sci-physics/root/root-6.26.02.ebuild
@@ -157,7 +157,7 @@ src_configure() {
-DCMAKE_CUDA_HOST_COMPILER="$(tc-getCXX)"
-DCMAKE_C_FLAGS="${CFLAGS}"
-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
- -DCMAKE_CXX_STANDARD=$((usev c++14 || usev c++17) | cut -c4-)
+ -DCMAKE_CXX_STANDARD=$( (usev c++14 || usev c++17) | cut -c4-)
-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)"
-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
diff --git a/sci-physics/root/root-6.26.9999.ebuild b/sci-physics/root/root-6.26.9999.ebuild
index 9089f78b2f9a..246be36df972 100644
--- a/sci-physics/root/root-6.26.9999.ebuild
+++ b/sci-physics/root/root-6.26.9999.ebuild
@@ -168,7 +168,7 @@ src_configure() {
-DCMAKE_CUDA_HOST_COMPILER="$(tc-getCXX)"
-DCMAKE_C_FLAGS="${CFLAGS}"
-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
- -DCMAKE_CXX_STANDARD=$((usev c++14 || usev c++17) | cut -c4-)
+ -DCMAKE_CXX_STANDARD=$( (usev c++14 || usev c++17) | cut -c4-)
-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)"
-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 2459437b34a4..295ee5f051f2 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -168,7 +168,7 @@ src_configure() {
-DCMAKE_CUDA_HOST_COMPILER="$(tc-getCXX)"
-DCMAKE_C_FLAGS="${CFLAGS}"
-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
- -DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+ -DCMAKE_CXX_STANDARD=$( (usev c++11 || usev c++14 || usev c++17) | cut -c4-)
-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)"
-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 3c30b446f63c..74ef41096964 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/bleachbit/bleachbit-4.4.2.ebuild b/sys-apps/bleachbit/bleachbit-4.4.2.ebuild
index 72fbae3d20f0..3e64868c96db 100644
--- a/sys-apps/bleachbit/bleachbit-4.4.2.ebuild
+++ b/sys-apps/bleachbit/bleachbit-4.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://download.bleachbit.org/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
RDEPEND="
$(python_gen_cond_dep '
diff --git a/sys-apps/systemd/files/251-format-string.patch b/sys-apps/systemd/files/251-format-string.patch
new file mode 100644
index 000000000000..f36cc5d657f3
--- /dev/null
+++ b/sys-apps/systemd/files/251-format-string.patch
@@ -0,0 +1,25 @@
+From 08e86b15fc22a8e9f1ee0a791dfd35b2fc25e4c4 Mon Sep 17 00:00:00 2001
+From: Daan De Meyer
+Date: Sun, 22 May 2022 14:36:07 +0200
+Subject: [PATCH] coredump: Fix format string type mismatch
+
+Fixes #23471
+---
+ src/coredump/coredump.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
+index c9747416ad3c..994d968d871b 100644
+--- a/src/coredump/coredump.c
++++ b/src/coredump/coredump.c
+@@ -512,8 +512,8 @@ static int save_external_coredump(
+
+ if (truncated)
+ log_struct(LOG_INFO,
+- LOG_MESSAGE("Core file was truncated to %zu bytes.", max_size),
+- "SIZE_LIMIT=%zu", max_size,
++ LOG_MESSAGE("Core file was truncated to %"PRIu64" bytes.", max_size),
++ "SIZE_LIMIT=%"PRIu64, max_size,
+ "MESSAGE_ID=" SD_MESSAGE_TRUNCATED_CORE_STR);
+
+ r = fix_permissions(fd, tmp, fn, context, uid);
diff --git a/sys-apps/systemd/systemd-251.ebuild b/sys-apps/systemd/systemd-251.ebuild
index 8d12de0b47a7..697214806c4b 100644
--- a/sys-apps/systemd/systemd-251.ebuild
+++ b/sys-apps/systemd/systemd-251.ebuild
@@ -235,6 +235,7 @@ src_prepare() {
# Add local patches here
PATCHES+=(
+ "${FILESDIR}/251-format-string.patch"
)
if ! use vanilla; then
diff --git a/sys-auth/AusweisApp2/AusweisApp2-1.22.6.ebuild b/sys-auth/AusweisApp2/AusweisApp2-1.22.7.ebuild
similarity index 100%
rename from sys-auth/AusweisApp2/AusweisApp2-1.22.6.ebuild
rename to sys-auth/AusweisApp2/AusweisApp2-1.22.7.ebuild
diff --git a/sys-auth/AusweisApp2/Manifest b/sys-auth/AusweisApp2/Manifest
index d6abf04ec673..93469d003a77 100644
--- a/sys-auth/AusweisApp2/Manifest
+++ b/sys-auth/AusweisApp2/Manifest
@@ -1,2 +1,2 @@
DIST AusweisApp2-1.22.5.tar.gz 11251263 BLAKE2B 8f62864d4e4139b06715765666fb7cc040d7cfc0c3cfb8082399ca24b2edbca754f511a4e7ab1eee6dd4fa3e8ea6cd38d048446877a6cff6ce37d7bddc56e01a SHA512 79cdd749d656aa9b082a80b9db9863bc11f4c5b8e06efefa2eb215724a45894137c5b6b8884d622e4a8203346e1b4d91b292013395a978e06a0201e40693a17d
-DIST AusweisApp2-1.22.6.tar.gz 11405656 BLAKE2B 27b9bcee74b134ec899543bfca46269a5dde66b1cafefa3bca58aac5182d6f8864d80a3f61202c5e9690914f28c2d80ee2091055afeb89e6c473662c8b7c4d06 SHA512 747ebdea12a26efd6d50413d6722c770301966e20a866a9fd189a4dacaa15ef03a3e4ca34ce84df3b775c10b8c8406e3786bdb4ffaffd13b35cf35f43c773d47
+DIST AusweisApp2-1.22.7.tar.gz 11406133 BLAKE2B 17bc9824035007bf62037562ebd38c2b3558660060c0eba302ac04e8e9d0eabc7c8cb69d064a1a02be213f91f823030e5afdab74d5614db2c1bc8318ca1f9f22 SHA512 4ea1d2c02e076121b340da6d16973de6dafe513d2e9c96b535063466c06137d8e2a325661478d0cfbd96f506a875dca8d4df6a53af657a8d2eb59e7ad7d1a472
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index ab4e5bdcd02f..47345fb86311 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/pam_skey/metadata.xml b/sys-auth/pam_skey/metadata.xml
index f24f61630158..f520e8983b28 100644
--- a/sys-auth/pam_skey/metadata.xml
+++ b/sys-auth/pam_skey/metadata.xml
@@ -4,7 +4,4 @@
ulm@gentoo.org
-
- pam_skey
-
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 3f8553ae022e..790313fb36d2 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/refind/files/makefile.patch b/sys-boot/refind/files/makefile.patch
deleted file mode 100644
index 5db6f75b1919..000000000000
--- a/sys-boot/refind/files/makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/Makefile b/Makefile
---- a/Makefile
-+++ b/Makefile
-@@ -161,8 +161,9 @@ fs_edk2: build_edk2
- done
-
- build_edk2: $(EDK2BASE)/RefindPkg
-- cd $(EDK2BASE) && \
-- . ./edksetup.sh BaseTools && \
-+ +cd $(EDK2BASE) && \
-+ . udk-workspace && \
-+ build -a $(UC_ARCH) -p MdePkg/MdePkg.dsc && \
- build -a $(UC_ARCH) -p RefindPkg/RefindPkg.dsc
- mkdir -p ./drivers_$(FILENAME_CODE)
-
-diff --git a/filesystems/Makefile b/filesystems/Makefile
-index 99452ed..9bc984d 100644
---- a/filesystems/Makefile
-+++ b/filesystems/Makefile
-@@ -5,6 +5,7 @@
- # name of the driver to be built. This is done because of a dependency
- # in the fsw_efi.c file on the filesystem type; this file must be
- # recompiled for each new filesystem built.
-+.NOTPARALLEL:
-
- # This program is licensed under the terms of the GNU GPL, version 3,
- # or (at your option) any later version.
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 7462b1af8656..763a34091e91 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild
index 7a1897471468..7abf8519df2c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild
@@ -7,7 +7,7 @@ MODULES_OPTIONAL_USE="driver"
inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
systemd toolchain-funcs udev unpacker user-info
-NV_KERNEL_MAX="5.17"
+NV_KERNEL_MAX="5.18"
NV_URI="https://download.nvidia.com/XFree86/"
DESCRIPTION="NVIDIA Accelerated Graphics Driver"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-510.68.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-510.68.02.ebuild
index e888f6de08a4..f480d0fd7789 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.68.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.68.02.ebuild
@@ -7,7 +7,7 @@ MODULES_OPTIONAL_USE="driver"
inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
systemd toolchain-funcs unpacker user-info
-NV_KERNEL_MAX="5.17"
+NV_KERNEL_MAX="5.18"
DESCRIPTION="NVIDIA Accelerated Graphics Driver"
HOMEPAGE="https://www.nvidia.com/download/index.aspx"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05.ebuild
index 60d3a7e68313..b9f23f3149ff 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05.ebuild
@@ -7,7 +7,7 @@ MODULES_OPTIONAL_USE="driver"
inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
systemd toolchain-funcs udev unpacker user-info
-NV_KERNEL_MAX="5.17"
+NV_KERNEL_MAX="5.18"
NV_URI="https://download.nvidia.com/XFree86/"
DESCRIPTION="NVIDIA Accelerated Graphics Driver"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.43.04.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.43.04.ebuild
index d9a29874e5ad..fb4a71fa0b6a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.43.04.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.43.04.ebuild
@@ -7,7 +7,7 @@ MODULES_OPTIONAL_USE="driver"
inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
systemd toolchain-funcs udev unpacker user-info
-NV_KERNEL_MAX="5.17"
+NV_KERNEL_MAX="5.18"
NV_URI="https://download.nvidia.com/XFree86/"
DESCRIPTION="NVIDIA Accelerated Graphics Driver"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 69b52498d45a..eaf40ba9b38e 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/cmrt/Manifest b/x11-libs/cmrt/Manifest
new file mode 100644
index 000000000000..848ba8490df6
--- /dev/null
+++ b/x11-libs/cmrt/Manifest
@@ -0,0 +1 @@
+DIST cmrt-1.0.6.tar.gz 3717552 BLAKE2B 0bfb121f37b9b2e9e672d6129a6b7207ccfc3455ea613c8ae000965ee49260e56a154fba8595d8f3b022d153c9d84c7ded7b9f0914f7387eeca826acca9acfa0 SHA512 de115e86e4dc65e617e5e39dd1a14a4baa301480915d1ef31245b759acebbd2c85647e3affb9ccda3b55f7f9008b03d561689d2b63a61a70feba72c9a62b6505
diff --git a/x11-libs/cmrt/cmrt-1.0.6-r1.ebuild b/x11-libs/cmrt/cmrt-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..ea02e47a44ae
--- /dev/null
+++ b/x11-libs/cmrt/cmrt-1.0.6-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Intel C for Media RunTime GPU kernel manager"
+HOMEPAGE="https://github.com/intel/cmrt"
+SRC_URI="https://github.com/intel/cmrt/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+ >=x11-libs/libdrm-2.4.23
+ >=x11-libs/libva-2.0.0
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_install() {
+ default
+ find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/x11-libs/cmrt/metadata.xml b/x11-libs/cmrt/metadata.xml
new file mode 100644
index 000000000000..debd0b7111b7
--- /dev/null
+++ b/x11-libs/cmrt/metadata.xml
@@ -0,0 +1,18 @@
+
+
+
+
+ media-video@gentoo.org
+
+
+ kaichun.ning@gmail.com
+ Kai-Chun Ning
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ intel/cmrt
+
+
diff --git a/x11-libs/intel-hybrid-codec-driver/Manifest b/x11-libs/intel-hybrid-codec-driver/Manifest
new file mode 100644
index 000000000000..fdb2e271ea38
--- /dev/null
+++ b/x11-libs/intel-hybrid-codec-driver/Manifest
@@ -0,0 +1 @@
+DIST intel-hybrid-codec-driver-2.0.0.tar.gz 1332637 BLAKE2B c02a54a12ad3b9d35bd4e15f9ffaecc8cd33750ab2eea73c8e4140ada1c666cd9a2b43725b44a22050f8140ffe2810ca87802854afb4c251cb879f219da8db6b SHA512 1d4e2c41d30892e07a3d2c83977725fca6fc20d887bead41109a0936fa9b4848131e4460cca8efe792f2815fcc9622d38d0a5e117a54403708e1132f1112d37a
diff --git a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-gcc10-fix.patch b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-gcc10-fix.patch
new file mode 100644
index 000000000000..0c170579857f
--- /dev/null
+++ b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-gcc10-fix.patch
@@ -0,0 +1,11 @@
+--- intel-hybrid-driver/src/media_drv_common.h 2020-05-26 23:18:02.279795861 +0100
++++ intel-hybrid-driver-new/src/media_drv_common.h 2020-05-26 23:19:11.316101524 +0100
+@@ -39,6 +39,6 @@
+ #define BRC_INIT_IGNORE_PICTURE_HEADER_SIZE 0x2000
+ #define BRC_INIT_DISABLE_MBBRC 0x8000
+
+-UINT SEARCH_PATH_TABLE[2][8][16];
+-UINT ME_CURBE_INIT_DATA[30];
++extern UINT SEARCH_PATH_TABLE[2][8][16];
++extern UINT ME_CURBE_INIT_DATA[30];
+ #endif
diff --git a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-invalid-read-fix.patch b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-invalid-read-fix.patch
new file mode 100644
index 000000000000..e410a8cc89c5
--- /dev/null
+++ b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-invalid-read-fix.patch
@@ -0,0 +1,39 @@
+diff --git a/src/media_drv_gen75_render.c b/src/media_drv_gen75_render.c
+index a3d60ff..51b1442 100644
+--- a/src/media_drv_gen75_render.c
++++ b/src/media_drv_gen75_render.c
+@@ -1453,7 +1453,7 @@ media_drv_gen75_render_init(VADriverContextP ctx)
+
+ if (IS_HASWELL (drv_ctx->drv_data.device_id)) {
+ memcpy(render_state->render_kernels, render_kernels_gen7_haswell,
+- sizeof(render_state->render_kernels));
++ sizeof(render_kernels_gen7_haswell));
+ render_state->render_put_surface = gen7_render_put_surface;
+ render_state->render_put_subpicture = gen7_render_put_subpicture;
+ } else {
+diff --git a/src/media_drv_gen8_render.c b/src/media_drv_gen8_render.c
+index 42005ea..da349cc 100644
+--- a/src/media_drv_gen8_render.c
++++ b/src/media_drv_gen8_render.c
+@@ -1741,7 +1741,7 @@ media_drv_gen8_render_init(VADriverContextP ctx)
+ render_state->max_wm_threads = 64;
+
+ memcpy(render_state->render_kernels, render_kernels_gen8,
+- sizeof(render_state->render_kernels));
++ sizeof(render_kernels_gen8));
+
+ kernel_size = 4096;
+
+diff --git a/src/media_drv_hw_g75.c b/src/media_drv_hw_g75.c
+index 57eddbd..080cd86 100644
+--- a/src/media_drv_hw_g75.c
++++ b/src/media_drv_hw_g75.c
+@@ -3325,7 +3325,7 @@ media_set_curbe_vp8_me (VP8_ME_CURBE_PARAMS * params)
+ MEDIA_CURBE_DATA_ME *cmd = (MEDIA_CURBE_DATA_ME *) params->curbe_cmd_buff;
+
+ media_drv_memcpy (cmd, sizeof (MEDIA_CURBE_DATA_ME), ME_CURBE_INIT_DATA,
+- sizeof (MEDIA_CURBE_DATA_ME));
++ sizeof (ME_CURBE_INIT_DATA));
+ me_mode =
+ params->
+ me_16x_enabled ? (params->me_16x ? ME16x_BEFORE_ME4x : ME4x_AFTER_ME16x) :
diff --git a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-nullptr-fix.patch b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-nullptr-fix.patch
new file mode 100644
index 000000000000..84562584b6a2
--- /dev/null
+++ b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-nullptr-fix.patch
@@ -0,0 +1,21 @@
+diff --git a/src/vp9hdec/decode_hybrid_vp9.cpp b/src/vp9hdec/decode_hybrid_vp9.cpp
+index 1baf339..7a086e2 100644
+--- a/src/vp9hdec/decode_hybrid_vp9.cpp
++++ b/src/vp9hdec/decode_hybrid_vp9.cpp
+@@ -3289,9 +3289,16 @@ VAStatus Intel_HybridVp9Decode_HostVldRenderCb (
+
+ // Reset padding flag of current frame and update surface dimension
+ surface = SURFACE(pMdfDecodeFrame->ucCurrIndex);
++ if ((surface == NULL) || (surface->private_data == NULL))
++ return VA_STATUS_ERROR_INVALID_PARAMETER;
++
+ pFrameSource = (INTEL_DECODE_HYBRID_VP9_MDF_FRAME_SOURCE *)(surface->private_data);
+ pCurrFrame = &(pFrameSource->Frame);
+ pFrameSource->bHasPadding = false;
++
++ if (pCurrFrame->pMdfSurface == NULL)
++ return VA_STATUS_ERROR_INVALID_PARAMETER;
++
+ pCurrFrame->pMdfSurface->SetSurfaceStateDimensions(
+ pMdfDecodeFrame->dwWidth,
+ pMdfDecodeFrame->dwHeight);
diff --git a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-vadriverinit-fix.patch b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-vadriverinit-fix.patch
new file mode 100644
index 000000000000..5177e1448539
--- /dev/null
+++ b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-vadriverinit-fix.patch
@@ -0,0 +1,13 @@
+--- intel-hybrid-driver/src/media_drv_init.c
++++ intel-hybrid-driver-new/src/media_drv_init.c
+@@ -2764,9 +2764,9 @@ va_driver_init (VADriverContextP ctx)
+ return ret;
+ }
+
+-VAStatus DLL_EXPORT __vaDriverInit_0_34 (VADriverContextP ctx);
++VAStatus DLL_EXPORT VA_DRIVER_INIT_FUNC (VADriverContextP ctx);
+ VAStatus
+-__vaDriverInit_0_34 (VADriverContextP ctx)
++VA_DRIVER_INIT_FUNC (VADriverContextP ctx)
+ {
+ VAStatus ret = VA_STATUS_ERROR_UNKNOWN;
diff --git a/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-x11-fix.patch b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-x11-fix.patch
new file mode 100644
index 000000000000..2422e4d1721b
--- /dev/null
+++ b/x11-libs/intel-hybrid-codec-driver/files/intel-hybrid-codec-driver-2.0.0-x11-fix.patch
@@ -0,0 +1,54 @@
+From b3b4d9a3a08d48bf6022723908a22255cc271ab7 Mon Sep 17 00:00:00 2001
+From: Daniel Charles
+Date: Fri, 4 May 2018 09:56:10 -0700
+Subject: [PATCH] driver_init: load libva-x11.so for any ABI version
+
+with libva > 2.0.0 hybrid driver can operate with it as well
+so make this load generic to libva installed version
+
+Signed-off-by: Daniel Charles
+---
+ src/media_drv_output_dri.c | 10 ++++++++++
+ src/media_drv_output_dri.h | 2 +-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/media_drv_output_dri.c b/src/media_drv_output_dri.c
+index 42299b8..bbd9713 100644
+--- a/src/media_drv_output_dri.c
++++ b/src/media_drv_output_dri.c
+@@ -105,6 +105,15 @@ media_output_dri_init (VADriverContextP ctx)
+ struct dri_vtable *dri_vtable;
+
+ static const struct dso_symbol symbols[] = {
++#if VA_CHECK_VERSION(1,0,0)
++ {"va_dri_get_drawable",
++ offsetof (struct dri_vtable, get_drawable)},
++ {"va_dri_get_rendering_buffer",
++ offsetof (struct dri_vtable, get_rendering_buffer)},
++ {"va_dri_swap_buffer",
++ offsetof (struct dri_vtable, swap_buffer)},
++ {NULL,}
++#else
+ {"dri_get_drawable",
+ offsetof (struct dri_vtable, get_drawable)},
+ {"dri_get_rendering_buffer",
+@@ -112,6 +121,7 @@ media_output_dri_init (VADriverContextP ctx)
+ {"dri_swap_buffer",
+ offsetof (struct dri_vtable, swap_buffer)},
+ {NULL,}
++#endif
+ };
+
+ drv_ctx->dri_output =
+diff --git a/src/media_drv_output_dri.h b/src/media_drv_output_dri.h
+index 0d6ccf0..889861c 100644
+--- a/src/media_drv_output_dri.h
++++ b/src/media_drv_output_dri.h
+@@ -30,7 +30,7 @@
+ #define _MEDIA__DRIVER_OUT_DRI_H
+ #include
+ #include "media_drv_defines.h"
+-#define LIBVA_X11_NAME "libva-x11.so.1"
++#define LIBVA_X11_NAME "libva-x11.so.2"
+ VOID media_output_dri_terminate (VADriverContextP ctx);
+ BOOL media_output_dri_init (VADriverContextP ctx);
diff --git a/x11-libs/intel-hybrid-codec-driver/intel-hybrid-codec-driver-2.0.0.ebuild b/x11-libs/intel-hybrid-codec-driver/intel-hybrid-codec-driver-2.0.0.ebuild
new file mode 100644
index 000000000000..860feeb69f61
--- /dev/null
+++ b/x11-libs/intel-hybrid-codec-driver/intel-hybrid-codec-driver-2.0.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_64 )
+EGIT_COMMIT="edead0c17e2818bc0fee0ea644f85ab81bbe6f7a"
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Libva support for partially hardware accelerated encode and decode on Haswell and newer"
+HOMEPAGE="https://github.com/intel/intel-hybrid-driver"
+SRC_URI="https://github.com/intel/intel-hybrid-driver/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/intel-hybrid-driver-${EGIT_COMMIT}"
+
+KEYWORDS="~amd64 ~amd64-linux"
+LICENSE="MIT"
+SLOT="0"
+IUSE="wayland X"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ >=x11-libs/cmrt-1.0.6
+ >=x11-libs/libdrm-2.4.45
+ >=x11-libs/libva-1.0.16[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-gcc10-fix.patch"
+ "${FILESDIR}/${P}-vadriverinit-fix.patch"
+ "${FILESDIR}/${P}-x11-fix.patch"
+ "${FILESDIR}/${P}-nullptr-fix.patch"
+ "${FILESDIR}/${P}-invalid-read-fix.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myconf=(
+ $(use_enable wayland)
+ $(use_enable X x11)
+ )
+ ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+ default
+ find "${D}" -name "*.la" -delete || die
+}
diff --git a/x11-libs/intel-hybrid-codec-driver/metadata.xml b/x11-libs/intel-hybrid-codec-driver/metadata.xml
new file mode 100644
index 000000000000..b93334ee2543
--- /dev/null
+++ b/x11-libs/intel-hybrid-codec-driver/metadata.xml
@@ -0,0 +1,18 @@
+
+
+
+
+ media-video@gentoo.org
+
+
+ kaichun.ning@gmail.com
+ Kai-Chun Ning
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ intel/intel-hybrid-driver
+
+
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r2.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r2.ebuild
new file mode 100644
index 000000000000..2adee1dcc69b
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="intel-vaapi-driver"
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver"
+fi
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
+if [[ ${PV} != *9999* ]] ; then
+ SRC_URI="https://github.com/intel/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.tar.bz2"
+ S="${WORKDIR}/${MY_PN}-${PV}"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="hybrid wayland X"
+RESTRICT="test" # No tests
+
+RDEPEND="
+ >=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
+ >=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
+
+ hybrid? (
+ >=x11-libs/intel-hybrid-codec-driver-2.0.0[X?,wayland?]
+ )
+
+ wayland? (
+ >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+ >=media-libs/mesa-9.1.6[egl(+),${MULTILIB_USEDEP}]
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ eapply_user
+ sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myconf=(
+ $(use_enable hybrid hybrid-codec)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ )
+ ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+ find "${D}" -name "*.la" -delete || die
+}
diff --git a/x11-libs/libva-intel-driver/metadata.xml b/x11-libs/libva-intel-driver/metadata.xml
index da593f3141e2..fed131d8322d 100644
--- a/x11-libs/libva-intel-driver/metadata.xml
+++ b/x11-libs/libva-intel-driver/metadata.xml
@@ -5,6 +5,9 @@
aballier@gentoo.org
Alexis Ballier
+
intel/intel-vaapi-driver
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index a33aab00cdf9..7cf674b403ea 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/peksystray/metadata.xml b/x11-misc/peksystray/metadata.xml
index 20fad93206f2..786486b128da 100644
--- a/x11-misc/peksystray/metadata.xml
+++ b/x11-misc/peksystray/metadata.xml
@@ -4,6 +4,5 @@
peksystray
- peksystray
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 9b48c0a3cfec..69e540efb911 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/gkrellm-countdown/metadata.xml b/x11-plugins/gkrellm-countdown/metadata.xml
index f4b972370205..115e9d64a669 100644
--- a/x11-plugins/gkrellm-countdown/metadata.xml
+++ b/x11-plugins/gkrellm-countdown/metadata.xml
@@ -2,7 +2,4 @@
-
- gkrellm-countdown
-
diff --git a/x11-plugins/wmblob/metadata.xml b/x11-plugins/wmblob/metadata.xml
index 0ff962f909a3..8a473e90e026 100644
--- a/x11-plugins/wmblob/metadata.xml
+++ b/x11-plugins/wmblob/metadata.xml
@@ -5,7 +5,4 @@
voyageur@gentoo.org
Bernard Cafarelli
-
- wmblob
-
diff --git a/x11-plugins/wmnetload/metadata.xml b/x11-plugins/wmnetload/metadata.xml
index b86cbf3cb450..cd9959ef1348 100644
--- a/x11-plugins/wmnetload/metadata.xml
+++ b/x11-plugins/wmnetload/metadata.xml
@@ -13,7 +13,4 @@ throughput, along with an auto-scaling graph of recent network activity (the
graph separates upstream and downstream traffic load cleanly without resorting
to colors).
-
- wmnetload
-
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index bf9fbb413e14..e4eea06a06f1 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/experience/metadata.xml b/x11-themes/experience/metadata.xml
index 623c0d240073..f453528b934f 100644
--- a/x11-themes/experience/metadata.xml
+++ b/x11-themes/experience/metadata.xml
@@ -5,7 +5,4 @@
gnome@gentoo.org
Gentoo GNOME Desktop
-
- experience
-