diff --git a/Manifest.files.gz b/Manifest.files.gz
index 42aae7c91340..6765b9a3742e 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 26245841413b..d033ef1ea8fd 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/defang/Manifest b/acct-group/defang/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/defang/defang-0.ebuild b/acct-group/defang/defang-0.ebuild
new file mode 100644
index 000000000000..aab0765fabfa
--- /dev/null
+++ b/acct-group/defang/defang-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for mail-filter/mimedefang"
+
+ACCT_GROUP_ID="181"
diff --git a/acct-group/defang/metadata.xml b/acct-group/defang/metadata.xml
new file mode 100644
index 000000000000..e30c4083017e
--- /dev/null
+++ b/acct-group/defang/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ rentorbuy@yahoo.com
+ Vieri Di Paola
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-group/ftpproxy/Manifest b/acct-group/ftpproxy/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/ftpproxy/ftpproxy-0.ebuild b/acct-group/ftpproxy/ftpproxy-0.ebuild
new file mode 100644
index 000000000000..66b993575afe
--- /dev/null
+++ b/acct-group/ftpproxy/ftpproxy-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-ftp/frox"
+
+ACCT_GROUP_ID="182"
diff --git a/acct-group/ftpproxy/metadata.xml b/acct-group/ftpproxy/metadata.xml
new file mode 100644
index 000000000000..d4b5eca0ef68
--- /dev/null
+++ b/acct-group/ftpproxy/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ kabel@blackhole.sk
+ Marek Behun
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-group/ngrep/Manifest b/acct-group/ngrep/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/ngrep/metadata.xml b/acct-group/ngrep/metadata.xml
new file mode 100644
index 000000000000..074612e6f7d5
--- /dev/null
+++ b/acct-group/ngrep/metadata.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ jpr5+gentoo@darkridge.com
+ Jordan Ritter
+ Program author who would like to be notified of bugs
+
+
+ netmon@gentoo.org
+ Gentoo network monitoring and analysis project
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-group/ngrep/ngrep-0-r1.ebuild b/acct-group/ngrep/ngrep-0-r1.ebuild
new file mode 100644
index 000000000000..c01e5f34d05e
--- /dev/null
+++ b/acct-group/ngrep/ngrep-0-r1.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-analyzer/ngrep"
+
+ACCT_GROUP_ID="185"
diff --git a/acct-group/postfwd/Manifest b/acct-group/postfwd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/postfwd/metadata.xml b/acct-group/postfwd/metadata.xml
new file mode 100644
index 000000000000..758292245aa4
--- /dev/null
+++ b/acct-group/postfwd/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ c@roessner.co
+ Christian Roessner
+
+
+ mschiff@gentoo.org
+ Marc Schiffbauer
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-group/postfwd/postfwd-0.ebuild b/acct-group/postfwd/postfwd-0.ebuild
new file mode 100644
index 000000000000..a912e8aeb7fb
--- /dev/null
+++ b/acct-group/postfwd/postfwd-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for mail-filter/postfwd"
+
+ACCT_GROUP_ID="189"
diff --git a/acct-group/rslsync/Manifest b/acct-group/rslsync/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/rslsync/metadata.xml b/acct-group/rslsync/metadata.xml
new file mode 100644
index 000000000000..0002e1a56764
--- /dev/null
+++ b/acct-group/rslsync/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ spiderx@spiderx.dp.ua
+ Vladimir Pavljuchenkov
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-group/rslsync/rslsync-0.ebuild b/acct-group/rslsync/rslsync-0.ebuild
new file mode 100644
index 000000000000..c4e17e79078d
--- /dev/null
+++ b/acct-group/rslsync/rslsync-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-p2p/resilio-sync"
+
+ACCT_GROUP_ID="175"
diff --git a/acct-group/samplicator/Manifest b/acct-group/samplicator/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/samplicator/metadata.xml b/acct-group/samplicator/metadata.xml
new file mode 100644
index 000000000000..0002e1a56764
--- /dev/null
+++ b/acct-group/samplicator/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ spiderx@spiderx.dp.ua
+ Vladimir Pavljuchenkov
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-group/samplicator/samplicator-0.ebuild b/acct-group/samplicator/samplicator-0.ebuild
new file mode 100644
index 000000000000..7e5219d58e15
--- /dev/null
+++ b/acct-group/samplicator/samplicator-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/samplicator"
+
+ACCT_GROUP_ID="179"
diff --git a/acct-group/stg/Manifest b/acct-group/stg/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/stg/metadata.xml b/acct-group/stg/metadata.xml
new file mode 100644
index 000000000000..0002e1a56764
--- /dev/null
+++ b/acct-group/stg/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ spiderx@spiderx.dp.ua
+ Vladimir Pavljuchenkov
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-group/stg/stg-0.ebuild b/acct-group/stg/stg-0.ebuild
new file mode 100644
index 000000000000..cd405cbaf857
--- /dev/null
+++ b/acct-group/stg/stg-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for net-misc/stargazer"
+
+ACCT_GROUP_ID="176"
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 577df703d44e..f68ae2aa39c3 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/defang/Manifest b/acct-user/defang/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/defang/defang-0.ebuild b/acct-user/defang/defang-0.ebuild
new file mode 100644
index 000000000000..295e77995907
--- /dev/null
+++ b/acct-user/defang/defang-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for mail-filter/mimedefang"
+
+ACCT_USER_GROUPS=( "defang" )
+ACCT_USER_ID="181"
+
+acct-user_add_deps
diff --git a/acct-user/defang/metadata.xml b/acct-user/defang/metadata.xml
new file mode 100644
index 000000000000..e30c4083017e
--- /dev/null
+++ b/acct-user/defang/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ rentorbuy@yahoo.com
+ Vieri Di Paola
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-user/ftpproxy/Manifest b/acct-user/ftpproxy/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/ftpproxy/ftpproxy-0.ebuild b/acct-user/ftpproxy/ftpproxy-0.ebuild
new file mode 100644
index 000000000000..0a05768729d5
--- /dev/null
+++ b/acct-user/ftpproxy/ftpproxy-0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-ftp/frox"
+
+ACCT_USER_GROUPS=( "ftpproxy" )
+ACCT_USER_HOME="/var/spool/frox"
+ACCT_USER_HOME_PERMS="700"
+ACCT_USER_ID="182"
+
+acct-user_add_deps
diff --git a/acct-user/ftpproxy/metadata.xml b/acct-user/ftpproxy/metadata.xml
new file mode 100644
index 000000000000..d4b5eca0ef68
--- /dev/null
+++ b/acct-user/ftpproxy/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ kabel@blackhole.sk
+ Marek Behun
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-user/ngrep/Manifest b/acct-user/ngrep/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/ngrep/metadata.xml b/acct-user/ngrep/metadata.xml
new file mode 100644
index 000000000000..074612e6f7d5
--- /dev/null
+++ b/acct-user/ngrep/metadata.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ jpr5+gentoo@darkridge.com
+ Jordan Ritter
+ Program author who would like to be notified of bugs
+
+
+ netmon@gentoo.org
+ Gentoo network monitoring and analysis project
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-user/ngrep/ngrep-0-r1.ebuild b/acct-user/ngrep/ngrep-0-r1.ebuild
new file mode 100644
index 000000000000..4851b7fcb10f
--- /dev/null
+++ b/acct-user/ngrep/ngrep-0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-analyzer/ngrep"
+
+ACCT_USER_GROUPS=( "ngrep" )
+ACCT_USER_ID="185"
+
+acct-user_add_deps
diff --git a/acct-user/postfwd/Manifest b/acct-user/postfwd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/postfwd/metadata.xml b/acct-user/postfwd/metadata.xml
new file mode 100644
index 000000000000..758292245aa4
--- /dev/null
+++ b/acct-user/postfwd/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ c@roessner.co
+ Christian Roessner
+
+
+ mschiff@gentoo.org
+ Marc Schiffbauer
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-user/postfwd/postfwd-0.ebuild b/acct-user/postfwd/postfwd-0.ebuild
new file mode 100644
index 000000000000..ba5ad6136dfa
--- /dev/null
+++ b/acct-user/postfwd/postfwd-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for mail-filter/postfwd"
+
+ACCT_USER_GROUPS=( "postfwd" )
+ACCT_USER_ID="189"
+
+acct-user_add_deps
diff --git a/acct-user/rslsync/Manifest b/acct-user/rslsync/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/rslsync/metadata.xml b/acct-user/rslsync/metadata.xml
new file mode 100644
index 000000000000..0002e1a56764
--- /dev/null
+++ b/acct-user/rslsync/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ spiderx@spiderx.dp.ua
+ Vladimir Pavljuchenkov
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-user/rslsync/rslsync-0.ebuild b/acct-user/rslsync/rslsync-0.ebuild
new file mode 100644
index 000000000000..c0b018b0637e
--- /dev/null
+++ b/acct-user/rslsync/rslsync-0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-p2p/resilio-sync"
+
+ACCT_USER_GROUPS=( "rslsync" )
+ACCT_USER_HOME="/var/lib/resilio-sync"
+ACCT_USER_HOME_PERMS="0700"
+ACCT_USER_ID="175"
+
+acct-user_add_deps
diff --git a/acct-user/samplicator/Manifest b/acct-user/samplicator/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/samplicator/metadata.xml b/acct-user/samplicator/metadata.xml
new file mode 100644
index 000000000000..0002e1a56764
--- /dev/null
+++ b/acct-user/samplicator/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ spiderx@spiderx.dp.ua
+ Vladimir Pavljuchenkov
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-user/samplicator/samplicator-0.ebuild b/acct-user/samplicator/samplicator-0.ebuild
new file mode 100644
index 000000000000..cbdb6485cf39
--- /dev/null
+++ b/acct-user/samplicator/samplicator-0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/samplicator"
+
+ACCT_USER_GROUPS=( "samplicator" )
+ACCT_USER_HOME="/etc/samplicator"
+ACCT_USER_ID="179"
+
+acct-user_add_deps
diff --git a/acct-user/stg/Manifest b/acct-user/stg/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/stg/metadata.xml b/acct-user/stg/metadata.xml
new file mode 100644
index 000000000000..0002e1a56764
--- /dev/null
+++ b/acct-user/stg/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ spiderx@spiderx.dp.ua
+ Vladimir Pavljuchenkov
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-user/stg/stg-0.ebuild b/acct-user/stg/stg-0.ebuild
new file mode 100644
index 000000000000..db254cc77e7e
--- /dev/null
+++ b/acct-user/stg/stg-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for net-misc/stargazer"
+
+ACCT_USER_GROUPS=( "stg" )
+ACCT_USER_ID="176"
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index c289f602a8b0..92d60e823067 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 8cf631a27fda..7ebe5534910f 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,2 +1,3 @@
DIST at-spi2-core-2.40.1.tar.xz 197064 BLAKE2B dfa19413e6688678fcc0c0ed76d0fca0d5de5039c9b1e42dc10c9c387c0cbffb3c6a38570f9e74c343fa86310f2c3f6fcf0e311c57d11b5adeac5faf7bdf9630 SHA512 fcb73e78a85db9b982ae10d8c968c7732079832877fa0214c30a04b9e27910448c3f5456b8628ed4a3d4dbd59037c8c206916ad1462ca5c7a44409a702096b14
DIST at-spi2-core-2.40.2.tar.xz 197476 BLAKE2B a3b6f1edb7beace2a54cc651f8bf5d002009a3d2791306f2b0a33c351c68d04e0a1003ab11f215333d498c50d17139b978e7f232df802f6c620bbe31997a8e1c SHA512 854fbba39064ba4b1d9728fc4943e811f0a9557f1096f32d7a6486bcb6c73379ab84c5fb8ce5288bf4dab1d1cd3e0664c492977450d4da503ce4b08abfc75fd9
+DIST at-spi2-core-2.40.3.tar.xz 197528 BLAKE2B bc248d57d51cea6ae6dd6c737d85f10599a9c177a3a59f95ffc8f96f74b7da057f75e2b961c281650795ba8d5387a9439b00a0f277731af3d490cc8f34c3ab1a SHA512 85adf3da0a369d7f3481646a495a9c4c3337da3ae6a20ce8c924f8621d3d6ed1d9461bfac0e821dfe86e4ad6b930e4fd65d24c26401cbea644ef4951e5dda5ce
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.40.2.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.40.2.ebuild
index afdd68b2a4b3..b72d7d90b637 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.40.2.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.40.2.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
SLOT="2"
IUSE="X gtk-doc +introspection"
REQUIRED_USE="gtk-doc? ( X )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
RDEPEND="
>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.40.3.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.40.3.ebuild
new file mode 100644
index 000000000000..015d93ad1499
--- /dev/null
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.40.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson-multilib systemd virtualx xdg
+
+DESCRIPTION="D-Bus accessibility specifications and registration daemon"
+HOMEPAGE="https://wiki.gnome.org/Accessibility https://gitlab.gnome.org/GNOME/at-spi2-core"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="X gtk-doc +introspection"
+REQUIRED_USE="gtk-doc? ( X )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+ >=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.62:2[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
+ X? (
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXtst[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.25
+ app-text/docbook-xml-dtd:4.3
+ )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ # disable teamspaces test since that requires Novell.ICEDesktop.Daemon
+ "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
+)
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dsystemd_user_dir="$(systemd_get_userunitdir)"
+ $(meson_native_use_bool gtk-doc docs)
+ -Dintrospection=$(multilib_native_usex introspection)
+ -Dx11=$(usex X)
+ )
+ meson_src_configure
+}
+
+multilib_src_test() {
+ virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f459396daa9f..458f75426f88 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index c2796b099a3d..142b495626a4 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1 +1 @@
-DIST exo-1.33.0.tar.gz 5227893 BLAKE2B 17272d6a614aa7b4441d3de73ffebda3244c0ce98e3d74e85c013c3410cf0d414cfcac958ba67eadebfbc84d6c3969bb8563f62a8a9531e6cdd09ac3dfa2526f SHA512 4c17cd8752862de70885a65d43d2ee69a6bed6e96d858423e308188a868b1732137c4bf811b1baae0e9b8a8425f8755d57a3711b333c50dd291fe1e22c19d91c
+DIST exo-1.36.0.tar.gz 5233021 BLAKE2B b1d2fc014773c0a4939e114ea611e067ae9e646126f5ca4c37c78fb06e84df8c3c535570994808fb5aab2545ff3a40a2bbba12642bb5dc02abf6e6f88ba388af SHA512 9d5cb8bef91d78223b625a6b81721d172a9e613199c3f7a0bb225302a498b9625f6dc029b03ca6bbdae0afc59317f2f00637206507724c3852fe09b4095eb807
diff --git a/app-admin/exo/exo-1.33.0.ebuild b/app-admin/exo/exo-1.36.0.ebuild
similarity index 100%
rename from app-admin/exo/exo-1.33.0.ebuild
rename to app-admin/exo/exo-1.36.0.ebuild
diff --git a/app-admin/fam/fam-2.7.0_p17_p3.ebuild b/app-admin/fam/fam-2.7.0_p17_p3.ebuild
index 801f387b200c..9e7ecb066422 100644
--- a/app-admin/fam/fam-2.7.0_p17_p3.ebuild
+++ b/app-admin/fam/fam-2.7.0_p17_p3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${PN}-${FAM_PV}
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="static-libs"
DEPEND="
diff --git a/app-admin/fluentd/files/fluentd-1.2.6.initd b/app-admin/fluentd/files/fluentd-1.2.6.initd
deleted file mode 100644
index f2019e3e116a..000000000000
--- a/app-admin/fluentd/files/fluentd-1.2.6.initd
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2018 Sony Interactive Entertainment
-# Distributed under the terms of the GNU General Public License v2
-
-command=/usr/bin/fluentd
-logfile=/var/log/fluentd/fluent.log
-pidfile=/var/run/fluentd.pid
-command_args="--daemon ${pidfile} --no-supervisor -o ${logfile} ${fluentd_opts}"
-command_background=yes
-command_user=fluentd:fluentd
-retry="TERM/10/KILL/30"
-
-start_pre() {
- fluentd -q --dry-run
-}
diff --git a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
index 9e0e8c5ef8f2..18a07d6a7eb0 100644
--- a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
+++ b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-solaris"
IUSE="debug kernel_linux"
RDEPEND=">=dev-libs/glib-2:2
diff --git a/app-admin/gamin/gamin-0.1.10-r1.ebuild b/app-admin/gamin/gamin-0.1.10-r1.ebuild
index c9c84e7ac3c8..a19d50b7724b 100644
--- a/app-admin/gamin/gamin-0.1.10-r1.ebuild
+++ b/app-admin/gamin/gamin-0.1.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI=""
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="!app-admin/fam
diff --git a/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch b/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch
deleted file mode 100644
index daa065dabb5c..000000000000
--- a/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- spec/unit/network/http/api/indirected_routes_spec.rb 2018-09-17 19:36:56.000000000 -0500
-+++ spec/unit/network/http/api/indirected_routes_spec.rb 2018-09-19 10:52:35.841614932 -0500
-@@ -158,16 +158,6 @@
- handler.uri2indirection("GET", uri_escaped, params)
- end
-
-- it "when the environment is unknown should remove :environment from params passed to check_authorization and therefore fail" do
-- expect(handler).to receive(:check_authorization).with(anything,
-- anything,
-- excluding(:environment))
-- expect { handler.uri2indirection("GET",
-- "#{master_url_prefix}/node/bar",
-- {:environment => 'bogus'})
-- }.to raise_error(not_found_error)
-- end
--
- it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
- expect(handler).to receive(:check_authorization).with(anything, anything, hash_including(environment: be_a(Puppet::Node::Environment).and(have_attributes(name: :env))))
-
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 425c449e8f86..67fe9d6f641e 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.3.3.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.3.3.ebuild
index 23e930668ace..407c5ae032fb 100644
--- a/app-arch/gnome-autoar/gnome-autoar-0.3.3.ebuild
+++ b/app-arch/gnome-autoar/gnome-autoar-0.3.3.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
IUSE="gtk +introspection vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
RDEPEND="
>=app-arch/libarchive-3.4.0
diff --git a/app-arch/lxqt-archiver/lxqt-archiver-0.4.0.ebuild b/app-arch/lxqt-archiver/lxqt-archiver-0.4.0.ebuild
index 6d90fded3a27..d4ebbcdbf5c7 100644
--- a/app-arch/lxqt-archiver/lxqt-archiver-0.4.0.ebuild
+++ b/app-arch/lxqt-archiver/lxqt-archiver-0.4.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
else
SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="GPL-2 GPL-2+"
diff --git a/app-arch/makeself/Manifest b/app-arch/makeself/Manifest
index 159a45ffdd5c..429c5b8c3991 100644
--- a/app-arch/makeself/Manifest
+++ b/app-arch/makeself/Manifest
@@ -1,3 +1,2 @@
DIST makeself-2.4.3.tar.gz 32613 BLAKE2B 2295b6d47a8105f2b495260abb0c9ae85875c821d0291a19b5af894c1cef669f338c4e10de8128fe38008e7e08079d1f29949884f202cab680c7fd62e2f00dd9 SHA512 d404c7920c7f69ae29c7168bcf76806b6e2aae2e8916bb7feed998d031ce8b2cd205b83ad960a90b01189c97f9242eb3ef574194ba3ee51c605fe99dafbd6c13
-DIST makeself-2.4.4.tar.gz 38889 BLAKE2B eac74fa28ac39cbc6b18d11671bfa32d6c0b04b55b3603c6c928483dd64af38d416936ef242f55aa4840affd4bf7fb91c2987f87afab093816331e50f16379ab SHA512 3d4d03458f7f11a8df46340d1b489ca60d413d5ed857cc67bb8ef15335ce2848e4675e080791c26fdf29423f813d468b4b797438fe0876dad54e85c6346b9b8b
-DIST release-2.2.0.tar.gz 21640 BLAKE2B 32b06157829864918d225a136043a5c9b7c6c543351e981c0e3cdce84cbbe4c52f00870bb04d29bfd79e715c1c708b51cc9958d495a9633afb9a8d342601c20d SHA512 11cd536baed2d56405103f18a8318a202092755a74baf10730aa58dc57032e327697b1c7f76bf9bf438927093ba9ac467ffa0c4564c7f6b1d3b2b3936f34fa73
+DIST makeself-2.4.5.tar.gz 39012 BLAKE2B f79cf1c087e89c4fd09f328fb795a3f8a78ee38060dbbd1590e3dcdf22a346b0c12bf6837d1636efadb2a66f6a762308de7ee9dd2fc62a7c88d417d257c5f0f6 SHA512 1dae74586f6bd5afb526801b7ffa7fc7962ff74b0f190cdd51da93c21421864b72f5fe18090cb2ff6ad27f0907fbf3aeb5545f3f70e33dbc9e505a78505f5f90
diff --git a/app-arch/makeself/files/makeself-2.2.0-help-header.patch b/app-arch/makeself/files/makeself-2.2.0-help-header.patch
deleted file mode 100644
index 5726bf55f7da..000000000000
--- a/app-arch/makeself/files/makeself-2.2.0-help-header.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From c9f605cb4a3903985f2c6f816c30c1edf728c1b5 Mon Sep 17 00:00:00 2001
-From: Jon Salz
-Date: Mon, 27 Jan 2014 16:04:33 +0800
-Subject: [PATCH] Add --help-header option to prepend a string to the archive's
- --help.
-
----
- makeself-header.sh | 3 ++-
- makeself.sh | 71 ++++++++++++++++++++++++++++++------------------------
- 2 files changed, 41 insertions(+), 33 deletions(-)
-
-diff --git a/makeself-header.sh b/makeself-header.sh
-index e3f6c11..f97758c 100755
---- a/makeself-header.sh
-+++ b/makeself-header.sh
-@@ -13,6 +13,7 @@ label="$LABEL"
- script="$SCRIPT"
- scriptargs="$SCRIPTARGS"
- licensetxt="$LICENSE"
-+helpheader='$HELPHEADER'
- targetdir="$archdirname"
- filesizes="$filesizes"
- keep="$KEEP"
-@@ -119,7 +120,7 @@ MS_dd_Progress()
- MS_Help()
- {
- cat << EOH >&2
--Makeself version $MS_VERSION
-+\${helpheader}Makeself version $MS_VERSION
- 1) Getting help or info about \$0 :
- \$0 --help Print this message
- \$0 --info Print embedded info : title, default target directory, embedded script ...
-diff --git a/makeself.sh b/makeself.sh
-index 361d710..cb2d6f2 100755
---- a/makeself.sh
-+++ b/makeself.sh
-@@ -88,38 +88,39 @@ MS_Usage()
- {
- echo "Usage: $0 [params] archive_dir file_name label startup_script [args]"
- echo "params can be one or more of the following :"
-- echo " --version | -v : Print out Makeself version number and exit"
-- echo " --help | -h : Print out this help message"
-- echo " --quiet | -q : Do not print any messages other than errors."
-- echo " --gzip : Compress using gzip (default if detected)"
-- echo " --bzip2 : Compress using bzip2 instead of gzip"
-- echo " --pbzip2 : Compress using pbzip2 instead of gzip"
-- echo " --xz : Compress using xz instead of gzip"
-- echo " --compress : Compress using the UNIX 'compress' command"
-- echo " --complevel lvl : Compression level for gzip xz bzip2 and pbzip2 (default 9)"
-- echo " --base64 : Instead of compressing, encode the data using base64"
-- echo " --nocomp : Do not compress the data"
-- echo " --notemp : The archive will create archive_dir in the"
-- echo " current directory and uncompress in ./archive_dir"
-- echo " --copy : Upon extraction, the archive will first copy itself to"
-- echo " a temporary directory"
-- echo " --append : Append more files to an existing Makeself archive"
-- echo " The label and startup scripts will then be ignored"
-- echo " --target dir : Extract directly to a target directory"
-- echo " directory path can be either absolute or relative"
-- echo " --current : Files will be extracted to the current directory"
-- echo " Both --current and --target imply --notemp"
-- echo " --tar-extra opt : Append more options to the tar command line"
-- echo " --nomd5 : Don't calculate an MD5 for archive"
-- echo " --nocrc : Don't calculate a CRC for archive"
-- echo " --header file : Specify location of the header script"
-- echo " --follow : Follow the symlinks in the archive"
-- echo " --noprogress : Do not show the progress during the decompression"
-- echo " --nox11 : Disable automatic spawn of a xterm"
-- echo " --nowait : Do not wait for user input after executing embedded"
-- echo " program from an xterm"
-- echo " --lsm file : LSM file describing the package"
-- echo " --license file : Append a license file"
-+ echo " --version | -v : Print out Makeself version number and exit"
-+ echo " --help | -h : Print out this help message"
-+ echo " --quiet | -q : Do not print any messages other than errors."
-+ echo " --gzip : Compress using gzip (default if detected)"
-+ echo " --bzip2 : Compress using bzip2 instead of gzip"
-+ echo " --pbzip2 : Compress using pbzip2 instead of gzip"
-+ echo " --xz : Compress using xz instead of gzip"
-+ echo " --compress : Compress using the UNIX 'compress' command"
-+ echo " --complevel lvl : Compression level for gzip xz bzip2 and pbzip2 (default 9)"
-+ echo " --base64 : Instead of compressing, encode the data using base64"
-+ echo " --nocomp : Do not compress the data"
-+ echo " --notemp : The archive will create archive_dir in the"
-+ echo " current directory and uncompress in ./archive_dir"
-+ echo " --copy : Upon extraction, the archive will first copy itself to"
-+ echo " a temporary directory"
-+ echo " --append : Append more files to an existing Makeself archive"
-+ echo " The label and startup scripts will then be ignored"
-+ echo " --target dir : Extract directly to a target directory"
-+ echo " directory path can be either absolute or relative"
-+ echo " --current : Files will be extracted to the current directory"
-+ echo " Both --current and --target imply --notemp"
-+ echo " --tar-extra opt : Append more options to the tar command line"
-+ echo " --nomd5 : Don't calculate an MD5 for archive"
-+ echo " --nocrc : Don't calculate a CRC for archive"
-+ echo " --header file : Specify location of the header script"
-+ echo " --follow : Follow the symlinks in the archive"
-+ echo " --noprogress : Do not show the progress during the decompression"
-+ echo " --nox11 : Disable automatic spawn of a xterm"
-+ echo " --nowait : Do not wait for user input after executing embedded"
-+ echo " program from an xterm"
-+ echo " --lsm file : LSM file describing the package"
-+ echo " --license file : Append a license file"
-+ echo " --help-header file : Add a header to the archive's --help output"
- echo
- echo "Do not forget to give a fully qualified startup script name"
- echo "(i.e. with a ./ prefix if inside the archive)."
-@@ -254,6 +255,12 @@ do
- LSM_CMD="cat \"$2\" >> \"\$archname\""
- if ! shift 2; then MS_Help; exit 1; fi
- ;;
-+ --help-header)
-+ HELPHEADER=`sed -e "s/'/'\\\\\''/g" $2`
-+ if ! shift 2; then MS_Help; exit 1; fi
-+ [ -n "$HELPHEADER" ] && HELPHEADER="$HELPHEADER
-+"
-+ ;;
- -q | --quiet)
- QUIET=y
- shift
---
-1.8.5.5
-
diff --git a/app-arch/makeself/files/makeself-unpack b/app-arch/makeself/files/makeself-unpack
deleted file mode 100644
index 90b98312c8b9..000000000000
--- a/app-arch/makeself/files/makeself-unpack
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/bash
-
-# Glue to keep unpack_makeself() unchanged
-source /lib/gentoo/functions.sh
-find_unpackable_file() { echo "$@"; }
-debug-print() { :; }
-emktemp() { mktemp "$@"; }
-die() { eerror "$*"; exit 1; }
-assert() { _pipestatus="${PIPESTATUS[*]}"; [[ "${_pipestatus// /}" -eq 0 ]] || die; }
-
-# Straight copied from unpacker.eclass ... should be kept in sync
-
-unpack_banner() {
- echo ">>> Unpacking ${1##*/} to ${PWD}"
-}
-
-unpack_makeself() {
- local src_input=${1:-${A}}
- local src=$(find_unpackable_file "${src_input}")
- local skip=$2
- local exe=$3
-
- [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
-
- unpack_banner "${src}"
-
- if [[ -z ${skip} ]] ; then
- local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
- local skip=0
- exe=tail
- case ${ver} in
- 1.5.*|1.6.0-nv*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
- skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
- ;;
- 2.0|2.0.1)
- skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
- ;;
- 2.1.1)
- skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
- (( skip++ ))
- ;;
- 2.1.2)
- skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
- (( skip++ ))
- ;;
- 2.1.3)
- skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
- (( skip++ ))
- ;;
- 2.1.4|2.1.5|2.1.6|2.2.0)
- skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
- skip=$(head -n ${skip} "${src}" | wc -c)
- exe="dd"
- ;;
- *)
- eerror "I'm sorry, but I was unable to support the Makeself file."
- eerror "The version I detected was '${ver}'."
- eerror "Please file a bug about the file ${src##*/} at"
- eerror "http://bugs.gentoo.org/ so that support can be added."
- die "makeself version '${ver}' not supported"
- ;;
- esac
- debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
- fi
- case ${exe} in
- tail) exe="tail -n +${skip} '${src}'";;
- dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
- *) die "makeself cant handle exe '${exe}'"
- esac
-
- # lets grab the first few bytes of the file to figure out what kind of archive it is
- local filetype tmpfile=$(emktemp)
- eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
- filetype=$(file -b "${tmpfile}") || die
- case ${filetype} in
- *tar\ archive*)
- eval ${exe} | tar --no-same-owner -xf -
- ;;
- bzip2*)
- eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
- ;;
- gzip*)
- eval ${exe} | tar --no-same-owner -xzf -
- ;;
- compress*)
- eval ${exe} | gunzip | tar --no-same-owner -xf -
- ;;
- XZ*)
- eval ${exe} | unxz | tar --no-same-owner -xf -
- ;;
- *)
- eerror "Unknown filetype \"${filetype}\" ?"
- false
- ;;
- esac
- assert "failure unpacking (${filetype}) makeself ${src##*/} ('${ver}' +${skip})"
- rm "${tmpfile}"
-}
-
-for x; do unpack_makeself "$x" ; done
diff --git a/app-arch/makeself/makeself-2.2.0-r2.ebuild b/app-arch/makeself/makeself-2.2.0-r2.ebuild
deleted file mode 100644
index 04f9402991c5..000000000000
--- a/app-arch/makeself/makeself-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker
-
-DESCRIPTION="Shell script that generates a self-extractible tar.gz"
-HOMEPAGE="http://www.megastep.org/makeself/"
-SRC_URI="https://github.com/megastep/makeself/archive/release-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-release-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="sys-apps/gentoo-functions"
-
-PATCHES=( "${FILESDIR}/${P}-help-header.patch" )
-
-src_install() {
- dobin makeself-header.sh makeself.sh "${FILESDIR}"/makeself-unpack
- dosym makeself.sh /usr/bin/makeself
- doman makeself.1
- dodoc README.md makeself.lsm
-}
diff --git a/app-arch/makeself/makeself-2.4.3.ebuild b/app-arch/makeself/makeself-2.4.3.ebuild
index 2cd2a9fa8709..32df98cc0e0c 100644
--- a/app-arch/makeself/makeself-2.4.3.ebuild
+++ b/app-arch/makeself/makeself-2.4.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit optfeature
DESCRIPTION="Shell script that generates a self-extractible tar.gz"
-HOMEPAGE="http://www.megastep.org/makeself/"
+HOMEPAGE="https://makeself.io/"
SRC_URI="https://github.com/megastep/makeself/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-release-${PV}"
diff --git a/app-arch/makeself/makeself-2.4.4.ebuild b/app-arch/makeself/makeself-2.4.5.ebuild
similarity index 96%
rename from app-arch/makeself/makeself-2.4.4.ebuild
rename to app-arch/makeself/makeself-2.4.5.ebuild
index 17f5cf26fdd7..6e66645515bd 100644
--- a/app-arch/makeself/makeself-2.4.4.ebuild
+++ b/app-arch/makeself/makeself-2.4.5.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
inherit optfeature
DESCRIPTION="Shell script that generates a self-extractible tar.gz"
-HOMEPAGE="http://www.megastep.org/makeself/"
+HOMEPAGE="https://makeself.io/"
SRC_URI="https://github.com/megastep/makeself/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild
index 3e6a36bfe072..cdb8d7392a5a 100644
--- a/app-arch/rpm/rpm-4.16.0.ebuild
+++ b/app-arch/rpm/rpm-4.16.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-LUA_COMPAT=( lua5-2 )
+LUA_COMPAT=( lua5-{2..4} )
PYTHON_COMPAT=( python3_{7,8,9} )
inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs
diff --git a/app-arch/rpm/rpm-4.16.1.3.ebuild b/app-arch/rpm/rpm-4.16.1.3.ebuild
index 1302a5a779e0..ee7d55a49e08 100644
--- a/app-arch/rpm/rpm-4.16.1.3.ebuild
+++ b/app-arch/rpm/rpm-4.16.1.3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-LUA_COMPAT=( lua5-2 )
+LUA_COMPAT=( lua5-{2..4} )
PYTHON_COMPAT=( python3_{7,8,9} )
inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs
diff --git a/app-arch/snappy/snappy-1.1.9.ebuild b/app-arch/snappy/snappy-1.1.9.ebuild
index ad43d4fa986c..1d6d63ebf93a 100644
--- a/app-arch/snappy/snappy-1.1.9.ebuild
+++ b/app-arch/snappy/snappy-1.1.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-arch/unrar/unrar-6.0.7.ebuild b/app-arch/unrar/unrar-6.0.7.ebuild
index 4402858b2088..e7805e6a50aa 100644
--- a/app-arch/unrar/unrar-6.0.7.ebuild
+++ b/app-arch/unrar/unrar-6.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="unRAR"
# subslot = soname version
SLOT="0/6"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/wimlib/wimlib-1.13.3.ebuild b/app-arch/wimlib/wimlib-1.13.3.ebuild
index a6115205d0c9..5c3f76379b53 100644
--- a/app-arch/wimlib/wimlib-1.13.3.ebuild
+++ b/app-arch/wimlib/wimlib-1.13.3.ebuild
@@ -11,7 +11,7 @@ else
MY_PV="${PV/_/-}"
MY_PV="${MY_PV^^}"
SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="The open source Windows Imaging (WIM) library"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 89eb29ac46aa..15e50c0e2de4 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/deja-dup/deja-dup-42.7.ebuild b/app-backup/deja-dup/deja-dup-42.7.ebuild
index 379d6a0cd948..8c5db5079185 100644
--- a/app-backup/deja-dup/deja-dup-42.7.ebuild
+++ b/app-backup/deja-dup/deja-dup-42.7.ebuild
@@ -30,7 +30,7 @@ DEPEND="
>=dev-libs/glib-2.64:2[dbus]
>=dev-libs/json-glib-1.2
dev-libs/libgpg-error
- >=gui-libs/libhandy-1.0
+ >=gui-libs/libhandy-1.0:1
>=net-libs/libsoup-2.48
>=x11-libs/gtk+-3.22:3
>=x11-libs/libnotify-0.7
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 92b044bb269f..5a11171381c4 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index c931e0f70fe1..75ec98d13ed0 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1 +1,2 @@
DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
+DIST certbot-1.17.0.tar.gz 1386471 BLAKE2B 26cf23c481cc67e1fa0f698dee83dd42b1d382814f10bdb4d2a459f1274f3d661d2a58815c30110701d46362c3fbaee9f57089a7eda1221c9b9dadb2c48dc79d SHA512 104deb8e6e804a3a3f50c730f00307aa39d9d42756f24be009fedc27c889c1575b456455ee11441e341025db6f528359e927a347554ebd57b64c39e789576eda
diff --git a/app-crypt/acme/acme-1.17.0.ebuild b/app-crypt/acme/acme-1.17.0.ebuild
new file mode 100644
index 000000000000..6e86a07321fd
--- /dev/null
+++ b/app-crypt/acme/acme-1.17.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
+ >=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+ dev-python/pyrfc3339[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.10[${PYTHON_USEDEP}]
+ >=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+src_compile() {
+ python_foreach_impl run_in_build_dir default
+ distutils-r1_src_compile
+ if use doc ; then
+ cd docs || die
+ sphinx-build -b html -d _build/doctrees . _build/html
+ fi
+}
+
+python_test() {
+ nosetests -w ${PN} || die
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index c931e0f70fe1..75ec98d13ed0 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1 +1,2 @@
DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
+DIST certbot-1.17.0.tar.gz 1386471 BLAKE2B 26cf23c481cc67e1fa0f698dee83dd42b1d382814f10bdb4d2a459f1274f3d661d2a58815c30110701d46362c3fbaee9f57089a7eda1221c9b9dadb2c48dc79d SHA512 104deb8e6e804a3a3f50c730f00307aa39d9d42756f24be009fedc27c889c1575b456455ee11441e341025db6f528359e927a347554ebd57b64c39e789576eda
diff --git a/app-crypt/certbot-apache/certbot-apache-1.17.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.17.0.ebuild
new file mode 100644
index 000000000000..7f0e325d33df
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-1.17.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+ >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+ dev-python/python-augeas[${PYTHON_USEDEP}]
+ dev-python/zope-component[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index c931e0f70fe1..75ec98d13ed0 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1 +1,2 @@
DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
+DIST certbot-1.17.0.tar.gz 1386471 BLAKE2B 26cf23c481cc67e1fa0f698dee83dd42b1d382814f10bdb4d2a459f1274f3d661d2a58815c30110701d46362c3fbaee9f57089a7eda1221c9b9dadb2c48dc79d SHA512 104deb8e6e804a3a3f50c730f00307aa39d9d42756f24be009fedc27c889c1575b456455ee11441e341025db6f528359e927a347554ebd57b64c39e789576eda
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.17.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.17.0.ebuild
new file mode 100644
index 000000000000..b4f61386b477
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.17.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ >=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+ >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index c931e0f70fe1..75ec98d13ed0 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1 +1,2 @@
DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
+DIST certbot-1.17.0.tar.gz 1386471 BLAKE2B 26cf23c481cc67e1fa0f698dee83dd42b1d382814f10bdb4d2a459f1274f3d661d2a58815c30110701d46362c3fbaee9f57089a7eda1221c9b9dadb2c48dc79d SHA512 104deb8e6e804a3a3f50c730f00307aa39d9d42756f24be009fedc27c889c1575b456455ee11441e341025db6f528359e927a347554ebd57b64c39e789576eda
diff --git a/app-crypt/certbot/certbot-1.17.0.ebuild b/app-crypt/certbot/certbot-1.17.0.ebuild
new file mode 100644
index 000000000000..bf9117a89b96
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.17.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+S=${WORKDIR}/${P}/${PN}
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+ >=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+ >=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+ >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
+ dev-python/pyrfc3339[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/zope-component[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 9846b113d371..264c0b91fc4a 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/myspell-en/myspell-en-20210601-r1.ebuild b/app-dicts/myspell-en/myspell-en-20210601-r2.ebuild
similarity index 97%
rename from app-dicts/myspell-en/myspell-en-20210601-r1.ebuild
rename to app-dicts/myspell-en/myspell-en-20210601-r2.ebuild
index fca6fa3ff16d..f4ccd7d28f0b 100644
--- a/app-dicts/myspell-en/myspell-en-20210601-r1.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20210601-r2.ebuild
@@ -26,6 +26,7 @@ src_prepare() {
"th_en_US_v2.dat"
"th_en_US_v2.idx"
)
+ MYSPELL_HYPH+=( "hyph_en_US.dic" )
fi
MYSPELL_DICT=( )
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 5c51ef3daa25..7f13b133c67e 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index 903984a6ce36..6de450c68818 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1,2 +1,2 @@
-DIST eclass-manpages-20200913.tar.xz 411832 BLAKE2B b33b126ae2fb18755f193ccfbbe354c2015a5a0e16b7899ea2e8d547333bace6f0f70f6cf3f2793efdf53625f8ee6e5868fb60d56b57b82c61c26be6a1d8790a SHA512 8acd35b08ce6835de2c1bb79c4ae0746e9d9057f9ef897e5bfc885be1e55e7885c1e4172d0673bf10e0ac24dc705c7926a78bb2237319f059d65622dce4c08ec
DIST eclass-manpages-20210104.tar.xz 413740 BLAKE2B af65e53d54af6036a1feb4eda09a2b06e4f94221b98dd333008a74059781381ecd0d66fb71ca6583278684c8faa9efb330ed939c9f49d8052de15194fa321dae SHA512 cf19f521484474c7c7660f2f056d24d5e6c0e29ccf177cd7e1aaa4e1b55a14c8eabd8ec14cc3c6957706370f5f046ffe9aad59e3b9309da51e17c200d724d539
+DIST eclass-manpages-20210712.tar.xz 410588 BLAKE2B 776da6b26db95791401d562d3d550e1ab71dc19f54124fa37e78ab2595835fb05e7382b98007e58131698710b978dd87cbc10df1ea98c6ef01ec866418d6f9a6 SHA512 fb2bdc790d96f0662d84eddd01f291b4a3cac638c1e3df8975755e81d2d64dda14b0f60a77387da8544672080711d5047dda777d27a8cf2ded2634c47ecfee4b
diff --git a/app-doc/eclass-manpages/eclass-manpages-20200913.ebuild b/app-doc/eclass-manpages/eclass-manpages-20210712.ebuild
similarity index 98%
rename from app-doc/eclass-manpages/eclass-manpages-20200913.ebuild
rename to app-doc/eclass-manpages/eclass-manpages-20210712.ebuild
index 68c4e97e55e4..d28b3ad5325c 100644
--- a/app-doc/eclass-manpages/eclass-manpages-20200913.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-20210712.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=8
DESCRIPTION="Collection of Gentoo eclass manpages"
HOMEPAGE="https://github.com/mgorny/eclass-to-manpage"
diff --git a/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
index 7b5da48dfdf2..20bbf855699a 100644
--- a/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-99999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=8
inherit git-r3
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 660484519306..74031838ba88 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/emacs/emacs-27.2-r3.ebuild b/app-editors/emacs/emacs-27.2-r3.ebuild
new file mode 100644
index 000000000000..0245ab3cc2db
--- /dev/null
+++ b/app-editors/emacs/emacs-27.2-r3.ebuild
@@ -0,0 +1,447 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+ EGIT_BRANCH="emacs-27"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+ S="${EGIT_CHECKOUT_DIR}"
+ SLOT="${PV%%.*}-vcs"
+else
+ # FULL_VERSION keeps the full version number, which is needed in
+ # order to determine some path information correctly for copy/move
+ # operations later on
+ FULL_VERSION="${PV%%_*}"
+ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+ S="${WORKDIR}/emacs-${FULL_VERSION}"
+ # PV can be in any of the following formats:
+ # 27.1 released version (slot 27)
+ # 27.1_rc1 upstream release candidate (27)
+ # 27.0.9999 live ebuild (slot 27-vcs)
+ # 27.0.90 upstream prerelease snapshot (27-vcs)
+ # 27.0.50_pre20191223 snapshot by Gentoo developer (27-vcs)
+ if [[ ${PV} == *_pre* ]]; then
+ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+ S="${WORKDIR}/emacs"
+ elif [[ ${PV//[0-9]} != "." ]]; then
+ SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+ fi
+ # Patchset from proj/emacs-patches.git
+ SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz"
+ PATCHES=("${WORKDIR}/patch")
+ SLOT="${PV%%.*}"
+ [[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+RESTRICT="test"
+
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
+ sys-libs/ncurses:0=
+ acl? ( virtual/acl )
+ alsa? ( media-libs/alsa-lib )
+ dbus? ( sys-apps/dbus )
+ games? ( acct-group/gamestat )
+ gmp? ( dev-libs/gmp:0= )
+ gpm? ( sys-libs/gpm )
+ !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+ json? ( dev-libs/jansson )
+ kerberos? ( virtual/krb5 )
+ lcms? ( media-libs/lcms:2 )
+ libxml2? ( >=dev-libs/libxml2-2.2.0 )
+ mailutils? ( net-mail/mailutils[clients] )
+ !mailutils? ( acct-group/mail net-libs/liblockfile )
+ selinux? ( sys-libs/libselinux )
+ ssl? ( net-libs/gnutls:0= )
+ systemd? ( sys-apps/systemd )
+ zlib? ( sys-libs/zlib )
+ gui? ( !aqua? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libxcb
+ x11-misc/xbitmaps
+ gconf? ( >=gnome-base/gconf-2.26.2 )
+ gsettings? ( >=dev-libs/glib-2.28.6 )
+ gif? ( media-libs/giflib:0= )
+ jpeg? ( virtual/jpeg:0= )
+ png? ( >=media-libs/libpng-1.4:0= )
+ svg? ( >=gnome-base/librsvg-2.0 )
+ tiff? ( media-libs/tiff:0 )
+ xpm? ( x11-libs/libXpm )
+ imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+ xft? (
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libXft
+ x11-libs/libXrender
+ cairo? ( >=x11-libs/cairo-1.12.18 )
+ harfbuzz? ( media-libs/harfbuzz:0= )
+ m17n-lib? (
+ >=dev-libs/libotf-0.9.4
+ >=dev-libs/m17n-lib-1.5.1
+ )
+ )
+ gtk? (
+ x11-libs/gtk+:3
+ xwidgets? (
+ net-libs/webkit-gtk:4=
+ x11-libs/libXcomposite
+ )
+ )
+ !gtk? (
+ motif? (
+ >=x11-libs/motif-2.3:0
+ x11-libs/libXpm
+ x11-libs/libXmu
+ x11-libs/libXt
+ )
+ !motif? (
+ Xaw3d? (
+ x11-libs/libXaw3d
+ x11-libs/libXmu
+ x11-libs/libXt
+ )
+ !Xaw3d? ( athena? (
+ x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libXt
+ ) )
+ )
+ )
+ ) )"
+
+DEPEND="${RDEPEND}
+ gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="sys-apps/texinfo
+ virtual/pkgconfig
+ gzip-el? ( app-arch/gzip )"
+
+RDEPEND="${RDEPEND}
+ !app-editors/emacs-vcs:27
+ app-eselect/eselect-emacs"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+src_prepare() {
+ if [[ ${PV##*.} = 9999 ]]; then
+ FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+ configure.ac)
+ [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+ einfo "Emacs branch: ${EGIT_BRANCH}"
+ einfo "Commit: ${EGIT_VERSION}"
+ einfo "Emacs version number: ${FULL_VERSION}"
+ [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+ || die "Upstream version number changed to ${FULL_VERSION}"
+ fi
+
+ default
+
+ # Fix filename reference in redirected man page
+ sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+ #AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+ strip-flags
+ filter-flags -pie #526948
+
+ if use ia64; then
+ replace-flags "-O[2-9]" -O1 #325373
+ else
+ replace-flags "-O[3-9]" -O2
+ fi
+
+ local myconf
+
+ if use alsa; then
+ use sound || ewarn \
+ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+ myconf+=" --with-sound=alsa"
+ else
+ myconf+=" --with-sound=$(usex sound oss)"
+ fi
+
+ if ! use gui; then
+ einfo "Configuring to build without window system support"
+ myconf+=" --without-x --without-ns"
+ elif use aqua; then
+ einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+ myconf+=" --with-ns --disable-ns-self-contained"
+ myconf+=" --without-x"
+ else
+ myconf+=" --with-x --without-ns"
+ myconf+=" $(use_with gconf)"
+ myconf+=" $(use_with gsettings)"
+ myconf+=" $(use_with toolkit-scroll-bars)"
+ myconf+=" $(use_with gif)"
+ myconf+=" $(use_with jpeg)"
+ myconf+=" $(use_with png)"
+ myconf+=" $(use_with svg rsvg)"
+ myconf+=" $(use_with tiff)"
+ myconf+=" $(use_with xpm)"
+ myconf+=" $(use_with imagemagick)"
+
+ if use xft; then
+ myconf+=" --with-xft"
+ myconf+=" $(use_with cairo)"
+ myconf+=" $(use_with harfbuzz)"
+ myconf+=" $(use_with m17n-lib libotf)"
+ myconf+=" $(use_with m17n-lib m17n-flt)"
+ else
+ myconf+=" --without-xft"
+ myconf+=" --without-cairo"
+ myconf+=" --without-libotf --without-m17n-flt"
+ use cairo && ewarn \
+ "USE flag \"cairo\" has no effect if \"xft\" is not set."
+ use m17n-lib && ewarn \
+ "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+ fi
+
+ local f line
+ if use gtk; then
+ einfo "Configuring to build with GIMP Toolkit (GTK+)"
+ while read line; do ewarn "${line}"; done <<-EOF
+ Your version of GTK+ will have problems with closing open
+ displays. This is no problem if you just use one display, but
+ if you use more than one and close one of them Emacs may crash.
+ See and
+ .
+ If you intend to use more than one display, then it is strongly
+ recommended that you compile Emacs with the Athena/Lucid or the
+ Motif toolkit instead.
+ EOF
+ myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+ for f in motif Xaw3d athena; do
+ use ${f} && ewarn \
+ "USE flag \"${f}\" has no effect if \"gtk\" is set."
+ done
+ elif use motif; then
+ einfo "Configuring to build with Motif toolkit"
+ myconf+=" --with-x-toolkit=motif"
+ for f in Xaw3d athena; do
+ use ${f} && ewarn \
+ "USE flag \"${f}\" has no effect if \"motif\" is set."
+ done
+ elif use athena || use Xaw3d; then
+ einfo "Configuring to build with Athena/Lucid toolkit"
+ myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+ else
+ einfo "Configuring to build with no toolkit"
+ myconf+=" --with-x-toolkit=no"
+ fi
+ ! use gtk && use xwidgets && ewarn \
+ "USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+ fi
+
+ if tc-is-cross-compiler; then
+ # Configure a CBUILD directory when cross-compiling to make tools
+ mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
+ ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+ popd >/dev/null || die
+ # Don't try to execute the binary for dumping during the build
+ myconf+=" --with-dumping=none"
+ else
+ myconf+=" --with-dumping=pdumper"
+ fi
+
+ econf \
+ --program-suffix="-${EMACS_SUFFIX}" \
+ --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+ --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+ --localstatedir="${EPREFIX}"/var \
+ --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+ --without-compress-install \
+ --without-hesiod \
+ --without-pop \
+ --with-file-notification=$(usev inotify || usev gfile || echo no) \
+ --with-pdumper \
+ $(use_enable acl) \
+ $(use_with dbus) \
+ $(use_with dynamic-loading modules) \
+ $(use_with games gameuser ":gamestat") \
+ $(use_with gmp libgmp) \
+ $(use_with gpm) \
+ $(use_with json) \
+ $(use_with kerberos) $(use_with kerberos kerberos5) \
+ $(use_with lcms lcms2) \
+ $(use_with libxml2 xml2) \
+ $(use_with mailutils) \
+ $(use_with selinux) \
+ $(use_with ssl gnutls) \
+ $(use_with systemd libsystemd) \
+ $(use_with threads) \
+ $(use_with wide-int) \
+ $(use_with zlib) \
+ ${myconf}
+}
+
+src_compile() {
+ if tc-is-cross-compiler; then
+ # Build native tools for compiling lisp etc.
+ emake -C "${S}-build" src
+ emake lib # Cross-compile dependencies first for timestamps
+ # Save native build tools in the cross-directory
+ cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+ # Specify the native Emacs to compile lisp
+ emake -C lisp all EMACS="${S}-build/src/emacs"
+ fi
+
+ emake
+}
+
+src_install() {
+ emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+ mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+ mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+ mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
+
+ # move info dir to avoid collisions with the dir file generated by portage
+ mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+ touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+ docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+ # movemail must be setgid mail
+ if ! use mailutils; then
+ fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+ fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+ fi
+
+ # avoid collision between slots, see bug #169033 e.g.
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+ rm -rf "${ED}"/usr/share/{applications,icons} || die
+ rm -rf "${ED}/usr/$(get_libdir)" || die
+ rm -rf "${ED}"/var || die
+
+ # remove unused /site-lisp dir
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+ # remove COPYING file (except for etc/COPYING used by describe-copying)
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+ if use systemd; then
+ insinto /usr/lib/systemd/user
+ sed -e "/^##/d" \
+ -e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+ -e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+ etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+ assert
+ fi
+
+ if use gzip-el; then
+ # compress .el files when a corresponding .elc exists
+ find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+ -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+ assert "gzip .el failed"
+ fi
+
+ local cdir
+ if use source; then
+ cdir="/usr/share/emacs/${FULL_VERSION}/src"
+ insinto "${cdir}"
+ # This is not meant to install all the source -- just the
+ # C source you might find via find-function
+ doins src/*.{c,h,m}
+ elif has installsources ${FEATURES}; then
+ cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+ fi
+
+ sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+ X
+ ;;; ${EMACS_SUFFIX} site-lisp configuration
+ X
+ (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+ Y (setq find-function-C-source-directory
+ Y "${EPREFIX}${cdir}")
+ X (let ((path (getenv "INFOPATH"))
+ X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+ X (re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+ X (and path
+ X ;; move Emacs Info dir before anything else in /usr/share
+ X (let* ((p (cons nil (split-string path ":" t))) (q p))
+ X (while (and (cdr q) (not (string-match re (cadr q))))
+ X (setq q (cdr q)))
+ X (setcdr q (cons dir (delete dir (cdr q))))
+ X (setq Info-directory-list (prune-directory-list (cdr p)))))))
+ EOF
+ elisp-site-file-install "${T}/${SITEFILE}" || die
+
+ dodoc README BUGS CONTRIBUTE
+
+ if use gui && use aqua; then
+ dodir /Applications/Gentoo
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+ mv nextstep/Emacs.app \
+ "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+ fi
+
+ local DOC_CONTENTS="You can set the version to be started by
+ /usr/bin/emacs through the Emacs eselect module, which also
+ redirects man and info pages. Therefore, several Emacs versions can
+ be installed at the same time. \"man emacs.eselect\" for details.
+ \\n\\nIf you upgrade from a previous major version of Emacs, then
+ it is strongly recommended that you use app-admin/emacs-updater
+ to rebuild all byte-compiled elisp files of the installed Emacs
+ packages."
+ if use gui; then
+ DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+ Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+ machine would satisfy basic Emacs requirements under X11.
+ See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+ for how to enable anti-aliased fonts."
+ use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+ \"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+ symlink it into /Applications by yourself."
+ fi
+ tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+ a portable dump file due to being cross-compiled.
+ To create this file at run time, execute the following command:
+ \\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+ \"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+ readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+ # move Info dir file to correct name
+ if [[ -d ${ED}/usr/share/info ]]; then
+ mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+ fi
+}
+
+pkg_postinst() {
+ elisp-site-regen
+ readme.gentoo_print_elog
+
+ if use livecd; then
+ # force an update of the emacs symlink for the livecd/dvd,
+ # because some microemacs packages set it with USE=livecd
+ eselect emacs update
+ else
+ eselect emacs update ifunset
+ fi
+}
+
+pkg_postrm() {
+ elisp-site-regen
+ eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild
index 7089e4a9a735..6e936382b210 100644
--- a/app-editors/emacs/emacs-27.2.9999.ebuild
+++ b/app-editors/emacs/emacs-27.2.9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
@@ -125,8 +125,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
DEPEND="${RDEPEND}
gui? ( !aqua? ( x11-base/xorg-proto ) )"
-BDEPEND="app-eselect/eselect-emacs
- sys-apps/texinfo
+BDEPEND="sys-apps/texinfo
virtual/pkgconfig
gzip-el? ( app-arch/gzip )"
@@ -134,6 +133,8 @@ RDEPEND="${RDEPEND}
!app-editors/emacs-vcs:27
app-eselect/eselect-emacs"
+IDEPEND="app-eselect/eselect-emacs"
+
EMACS_SUFFIX="emacs-${SLOT}"
SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index aeefea10ed81..f5a41b7f06e7 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
@@ -118,14 +118,15 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
DEPEND="${RDEPEND}
gui? ( !aqua? ( x11-base/xorg-proto ) )"
-BDEPEND="app-eselect/eselect-emacs
- sys-apps/texinfo
+BDEPEND="sys-apps/texinfo
virtual/pkgconfig
gzip-el? ( app-arch/gzip )"
RDEPEND="${RDEPEND}
app-eselect/eselect-emacs"
+IDEPEND="app-eselect/eselect-emacs"
+
EMACS_SUFFIX="emacs-${SLOT}"
SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
@@ -141,9 +142,17 @@ src_prepare() {
|| die "Upstream version number changed to ${FULL_VERSION}"
fi
- # These files ignore LDFLAGS. We assign the variable here, because
- # for live ebuilds FULL_VERSION doesn't exist in global scope
- use jit && QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+ if use jit; then
+ # These files ignore LDFLAGS. We assign the variable here, because
+ # for live ebuilds FULL_VERSION doesn't exist in global scope
+ QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+
+ # gccjit doesn't play well with ccache #801580
+ # For now, work around the problem with an explicit LIBRARY_PATH
+ has ccache ${FEATURES} && tc-is-gcc \
+ && export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
+ | sed -n '/^libraries:/{s:^[^/]*::;p}')
+ fi
default
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 8fe53755ba31..e37fe0b339e7 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/cloud-init/files/cloud-init-20.1-gentoo-support-upstream-templates.patch b/app-emulation/cloud-init/files/cloud-init-20.1-gentoo-support-upstream-templates.patch
deleted file mode 100644
index c840f4fde3eb..000000000000
--- a/app-emulation/cloud-init/files/cloud-init-20.1-gentoo-support-upstream-templates.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 823454f1ea140ec47f5f9c5c3c5ad62eb458eb8a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue
-Date: Wed, 24 Oct 2018 10:52:46 +0200
-Subject: [PATCH 2/5] Add support for gentoo in cloud.cfg and templates
-
----
- config/cloud.cfg.tmpl | 8 ++++++--
- templates/hosts.gentoo.tmpl | 24 ++++++++++++++++++++++++
- tools/render-cloudcfg | 2 +-
- 3 files changed, 31 insertions(+), 3 deletions(-)
- create mode 100644 templates/hosts.gentoo.tmpl
-
-diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
-index 1fef133a..3f5a41a2 100644
---- a/config/cloud.cfg.tmpl
-+++ b/config/cloud.cfg.tmpl
-@@ -134,7 +134,7 @@ cloud_final_modules:
- # (not accessible to handlers/transforms)
- system_info:
- # This will affect which distro class gets used
--{% if variant in ["amazon", "arch", "centos", "debian", "fedora", "freebsd", "rhel", "suse", "ubuntu"] %}
-+{% if variant in ["amazon", "arch", "centos", "debian", "fedora", "freebsd", "gentoo", "rhel", "suse", "ubuntu"] %}
- distro: {{ variant }}
- {% else %}
- # Unknown/fallback distro.
-@@ -172,7 +172,7 @@ system_info:
- primary: http://ports.ubuntu.com/ubuntu-ports
- security: http://ports.ubuntu.com/ubuntu-ports
- ssh_svcname: ssh
--{% elif variant in ["amazon", "arch", "centos", "fedora", "rhel", "suse"] %}
-+{% elif variant in ["amazon", "arch", "centos", "fedora", "gentoo", "rhel", "suse"] %}
- # Default user name + that default users groups (if added/used)
- default_user:
- name: {{ variant }}
-@@ -180,6 +180,10 @@ system_info:
- {% endif %}
- {% if variant == "suse" %}
- groups: [cdrom, users]
-+{% elif variant == "gentoo" %}
-+ groups: [users, wheel]
-+ primary_group: users
-+ no_user_group: true
- {% elif variant == "arch" %}
- groups: [wheel, users]
- {% else %}
-diff --git a/templates/hosts.gentoo.tmpl b/templates/hosts.gentoo.tmpl
-new file mode 100644
-index 00000000..cd045fa6
---- /dev/null
-+++ b/templates/hosts.gentoo.tmpl
-@@ -0,0 +1,24 @@
-+## template:jinja
-+{#
-+This file /etc/cloud/templates/hosts.gentoo.tmpl is only utilized
-+if enabled in cloud-config. Specifically, in order to enable it
-+you need to add the following to config:
-+ manage_etc_hosts: True
-+-#}
-+# Your system has configured 'manage_etc_hosts' as True.
-+# As a result, if you wish for changes to this file to persist
-+# then you will need to either
-+# a.) make changes to the master file in /etc/cloud/templates/hosts.gentoo.tmpl
-+# b.) change or remove the value of 'manage_etc_hosts' in
-+# /etc/cloud/cloud.cfg or cloud-config from user-data
-+#
-+# The following lines are desirable for IPv4 capable hosts
-+127.0.0.1 {{fqdn}} {{hostname}}
-+127.0.0.1 localhost.localdomain localhost
-+127.0.0.1 localhost4.localdomain4 localhost4
-+
-+# The following lines are desirable for IPv6 capable hosts
-+::1 {{fqdn}} {{hostname}}
-+::1 localhost.localdomain localhost
-+::1 localhost6.localdomain6 localhost6
-+
-diff --git a/tools/render-cloudcfg b/tools/render-cloudcfg
-index 8b7cb875..d109044e 100755
---- a/tools/render-cloudcfg
-+++ b/tools/render-cloudcfg
-@@ -4,7 +4,7 @@ import argparse
- import os
- import sys
-
--VARIANTS = ["amazon", "arch", "centos", "debian", "fedora", "freebsd", "rhel",
-- "suse", "ubuntu", "unknown"]
-+VARIANTS = ["amazon", "arch", "centos", "debian", "fedora", "freebsd",
-+ "gentoo", "rhel", "suse", "ubuntu", "unknown"]
-
- if "avoid-pep8-E402-import-not-top-of-file":
- _tdir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
---
-2.19.1
-
diff --git a/app-emulation/containerd/containerd-1.4.6.ebuild b/app-emulation/containerd/containerd-1.4.6.ebuild
index f0cb4195bf52..8e9b81b35d7d 100644
--- a/app-emulation/containerd/containerd-1.4.6.ebuild
+++ b/app-emulation/containerd/containerd-1.4.6.ebuild
@@ -21,6 +21,7 @@ DEPEND="
seccomp? ( sys-libs/libseccomp )
"
+# recommended version of runc is found in script/setup/runc-version
RDEPEND="
${DEPEND}
~app-emulation/runc-1.0.0_rc95
diff --git a/app-emulation/containerd/containerd-1.5.2.ebuild b/app-emulation/containerd/containerd-1.5.2.ebuild
index 7f7c816464f6..7ebc5b203744 100644
--- a/app-emulation/containerd/containerd-1.5.2.ebuild
+++ b/app-emulation/containerd/containerd-1.5.2.ebuild
@@ -19,6 +19,7 @@ DEPEND="
seccomp? ( sys-libs/libseccomp )
"
+# recommended version of runc is found in script/setup/runc-version
RDEPEND="
${DEPEND}
~app-emulation/runc-1.0.0_rc95
diff --git a/app-emulation/uade/metadata.xml b/app-emulation/uade/metadata.xml
index 78274e0fa550..c4c4b8d8413a 100644
--- a/app-emulation/uade/metadata.xml
+++ b/app-emulation/uade/metadata.xml
@@ -1,8 +1,14 @@
-
- games@gentoo.org
- Gentoo Games Project
-
+
+ games@gentoo.org
+ Gentoo Games Project
+
+
+
+ uade-music-player/uade
+
diff --git a/app-emulation/uade/uade-2.13-r1.ebuild b/app-emulation/uade/uade-2.13-r1.ebuild
deleted file mode 100644
index 28ceda581e45..000000000000
--- a/app-emulation/uade/uade-2.13-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Unix Amiga Delitracker Emulator - plays old Amiga tunes through UAE emulation"
-HOMEPAGE="https://zakalwe.fi/uade"
-SRC_URI="https://zakalwe.fi/uade/uade2/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="media-libs/libao"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog doc/BUGS doc/PLANS )
-
-PATCHES=( "${FILESDIR}"/${P}-configure.patch )
-
-src_configure() {
- tc-export CC
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --package-prefix="${D}" \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --with-text-scope \
- --without-xmms \
- --without-audacious || die
-}
-
-src_install() {
- default
- doman doc/uade123.1
-}
diff --git a/app-emulation/uade/uade-2.13-r2.ebuild b/app-emulation/uade/uade-2.13-r2.ebuild
new file mode 100644
index 000000000000..262a54d90331
--- /dev/null
+++ b/app-emulation/uade/uade-2.13-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Unix Amiga Delitracker Emulator - plays old Amiga tunes through UAE emulation"
+HOMEPAGE="https://zakalwe.fi/uade"
+SRC_URI="https://zakalwe.fi/uade/uade2/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="fuse"
+
+RDEPEND="
+ media-libs/libao
+ fuse? ( sys-fs/fuse:0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-configure.patch
+)
+
+DOCS=( AUTHORS ChangeLog doc/BUGS doc/PLANS )
+
+src_prepare() {
+ default
+
+ # needed to avoid ${D} VariableScope undefined behavior in src_configure
+ find . -name Makefile.in -exec sed -i 's|{PACKAGEPREFIX}|$(DESTDIR)|' {} + || die
+}
+
+src_configure() {
+ tc-export CC
+
+ # not autotools generated
+ local configure=(
+ ./configure
+ --prefix="${EPREFIX}"/usr
+ --libdir="${EPREFIX}"/usr/$(get_libdir)
+ --with-text-scope
+ --without-audacious
+ --without-xmms
+ $(use_with fuse uadefs)
+ ${EXTRA_ECONF}
+ )
+ echo ${configure[*]}
+ "${configure[@]}" || die
+}
diff --git a/app-emulation/wine-staging/wine-staging-6.12.ebuild b/app-emulation/wine-staging/wine-staging-6.12.ebuild
index 9f66da3e67f9..77c35e15d933 100644
--- a/app-emulation/wine-staging/wine-staging-6.12.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.12.ebuild
@@ -528,10 +528,9 @@ multilib_src_configure() {
$(use_with vaapi va)
)
- local PKG_CONFIG AR RANLIB
+ local PKG_CONFIG
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
- # set AR and RANLIB to make QA scripts happy; #483342
- tc-export PKG_CONFIG AR RANLIB
+ tc-export PKG_CONFIG
if use amd64; then
if [[ ${ABI} == amd64 ]]; then
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 5fa927046960..97f1f4176260 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -528,10 +528,9 @@ multilib_src_configure() {
$(use_with vaapi va)
)
- local PKG_CONFIG AR RANLIB
+ local PKG_CONFIG
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
- # set AR and RANLIB to make QA scripts happy; #483342
- tc-export PKG_CONFIG AR RANLIB
+ tc-export PKG_CONFIG
if use amd64; then
if [[ ${ABI} == amd64 ]]; then
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 31d23198f518..008c6a752abf 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
index c83bf61b511c..8437ec99e247 100644
--- a/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
LICENSE="GPL-2"
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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="app-admin/eselect"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index b6e6cc84abb1..2083a5ffa15b 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/tmux/files/tmux-fix-bindings.patch b/app-misc/tmux/files/tmux-fix-bindings.patch
deleted file mode 100644
index 6436302f0557..000000000000
--- a/app-misc/tmux/files/tmux-fix-bindings.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f2951bd4a560692048e68bf29a5b0a288346a7d4 Mon Sep 17 00:00:00 2001
-From: Nicholas Marriott
-Date: Wed, 5 May 2021 07:23:23 +0100
-Subject: [PATCH] Remove old shift function keys which interfere with xterm
- keys now. GitHub issue 2696.
-
----
- input-keys.c | 24 ------------------------
- 1 file changed, 24 deletions(-)
-
-diff --git a/input-keys.c b/input-keys.c
-index ffd2201c0..be83600e5 100644
---- a/input-keys.c
-+++ b/input-keys.c
-@@ -94,30 +94,6 @@ static struct input_key_entry input_key_defaults[] = {
- { .key = KEYC_F12,
- .data = "\033[24~"
- },
-- { .key = KEYC_F1|KEYC_SHIFT,
-- .data = "\033[25~"
-- },
-- { .key = KEYC_F2|KEYC_SHIFT,
-- .data = "\033[26~"
-- },
-- { .key = KEYC_F3|KEYC_SHIFT,
-- .data = "\033[28~"
-- },
-- { .key = KEYC_F4|KEYC_SHIFT,
-- .data = "\033[29~"
-- },
-- { .key = KEYC_F5|KEYC_SHIFT,
-- .data = "\033[31~"
-- },
-- { .key = KEYC_F6|KEYC_SHIFT,
-- .data = "\033[32~"
-- },
-- { .key = KEYC_F7|KEYC_SHIFT,
-- .data = "\033[33~"
-- },
-- { .key = KEYC_F8|KEYC_SHIFT,
-- .data = "\033[34~"
-- },
- { .key = KEYC_IC,
- .data = "\033[2~"
- },
diff --git a/app-misc/tracker-miners/tracker-miners-3.1.2.ebuild b/app-misc/tracker-miners/tracker-miners-3.1.2.ebuild
index 0f530dad0852..c11b348c2830 100644
--- a/app-misc/tracker-miners/tracker-miners-3.1.2.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-3.1.2.ebuild
@@ -16,7 +16,7 @@ IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +pl
REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
RDEPEND="
diff --git a/app-misc/tracker/tracker-3.1.2.ebuild b/app-misc/tracker/tracker-3.1.2.ebuild
index 9ee32b0f1e2d..8b0fe7d06283 100644
--- a/app-misc/tracker/tracker-3.1.2.ebuild
+++ b/app-misc/tracker/tracker-3.1.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="3/0" # libtracker-sparql-3.0 soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="gtk-doc +miners stemmer test"
RESTRICT="!test? ( test )"
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index a0f55c56ccec..eab4552c2e19 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/pkg-testing-tools/Manifest b/app-portage/pkg-testing-tools/Manifest
new file mode 100644
index 000000000000..936e7ff08c1e
--- /dev/null
+++ b/app-portage/pkg-testing-tools/Manifest
@@ -0,0 +1 @@
+DIST pkg-testing-tools-0.1.0.tar.gz 6131 BLAKE2B 6d8dddb81e57159df9f2e1897718433d29f330286afb868a1111db4e0bb7a53823df57a5d7084a24fd5807787f169fff137f5c6c0bdcddeec2c59090d9b90775 SHA512 05165d3790b4d38c939226d1149c0c44cd62fe222a199bce8f1e108d12475710f8482f82e2e2e45223ba24fd1b50451dea8b3761c8f474a59e660b9a67bf8ab4
diff --git a/app-portage/pkg-testing-tools/metadata.xml b/app-portage/pkg-testing-tools/metadata.xml
new file mode 100644
index 000000000000..4a891574f8ce
--- /dev/null
+++ b/app-portage/pkg-testing-tools/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ slashbeast@gentoo.org
+ Piotr Karbowski
+
+
+ slashbeast/pkg-testing-tools
+
+
diff --git a/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.0.ebuild b/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.0.ebuild
new file mode 100644
index 000000000000..a6616c032088
--- /dev/null
+++ b/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Packages testing tools for Gentoo"
+HOMEPAGE="https://github.com/slashbeast/pkg-testing-tools"
+SRC_URI="https://github.com/slashbeast/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ sys-apps/portage[${PYTHON_USEDEP}]
+"
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 4eff728e3654..491a9adde2d3 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash/files/bash-5.0_p11-disable_priv_mode.patch b/app-shells/bash/files/bash-5.0_p11-disable_priv_mode.patch
deleted file mode 100644
index 9a05c8b8613f..000000000000
--- a/app-shells/bash/files/bash-5.0_p11-disable_priv_mode.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -urP ../bash-5.0.orig/config.h.in config.h.in
---- ../bash-5.0.orig/config.h.in 2018-12-04 09:54:17.000000000 -0700
-+++ config.h.in 2019-12-10 11:34:42.157926317 -0700
-@@ -1,6 +1,6 @@
- /* config.h -- Configuration file for bash. */
-
--/* Copyright (C) 1987-2009,2011-2012 Free Software Foundation, Inc.
-+/* Copyright (C) 1987-2009,2011-2012,2013-2019 Free Software Foundation, Inc.
-
- This file is part of GNU Bash, the Bourne Again SHell.
-
-@@ -807,6 +807,14 @@
- #undef HAVE_SETREGID
- #undef HAVE_DECL_SETREGID
-
-+/* Define if you have the setregid function. */
-+#undef HAVE_SETRESGID
-+#undef HAVE_DECL_SETRESGID
-+
-+/* Define if you have the setresuid function. */
-+#undef HAVE_SETRESUID
-+#undef HAVE_DECL_SETRESUID
-+
- /* Define if you have the setvbuf function. */
- #undef HAVE_SETVBUF
-
-diff -urP ../bash-5.0.orig/configure configure
---- ../bash-5.0.orig/configure 2019-01-02 07:43:31.000000000 -0700
-+++ configure 2019-12-10 11:34:42.166926317 -0700
-@@ -10281,6 +10281,17 @@
- #define HAVE_DECL_SETREGID $ac_have_decl
- _ACEOF
-
-+ac_fn_c_check_decl "$LINENO" "" "ac_cv_have_decl_" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_" = xyes; then :
-+ ac_have_decl=1
-+else
-+ ac_have_decl=0
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_ $ac_have_decl
-+_ACEOF
-+(setresuid, setresgid)
- ac_fn_c_check_decl "$LINENO" "strcpy" "ac_cv_have_decl_strcpy" "$ac_includes_default"
- if test "x$ac_cv_have_decl_strcpy" = xyes; then :
- ac_have_decl=1
-diff -urP ../bash-5.0.orig/configure.ac configure.ac
---- ../bash-5.0.orig/configure.ac 2019-01-02 07:39:11.000000000 -0700
-+++ configure.ac 2019-12-10 11:34:42.168926317 -0700
-@@ -810,6 +810,7 @@
- AC_CHECK_DECLS([printf])
- AC_CHECK_DECLS([sbrk])
- AC_CHECK_DECLS([setregid])
-+AC_CHECK_DECLS[(setresuid, setresgid])
- AC_CHECK_DECLS([strcpy])
- AC_CHECK_DECLS([strsignal])
-
-diff -urP ../bash-5.0.orig/shell.c shell.c
---- ../bash-5.0.orig/shell.c 2018-12-06 09:28:21.000000000 -0700
-+++ shell.c 2019-12-10 11:34:42.170926317 -0700
-@@ -1293,7 +1293,11 @@
- {
- int e;
-
-+#if HAVE_DECL_SETRESUID
-+ if (setresuid (current_user.uid, current_user.uid, current_user.uid) < 0)
-+#else
- if (setuid (current_user.uid) < 0)
-+#endif
- {
- e = errno;
- sys_error (_("cannot set uid to %d: effective uid %d"), current_user.uid, current_user.euid);
-@@ -1302,7 +1306,11 @@
- exit (e);
- #endif
- }
-+#if HAVE_DECL_SETRESGID
-+ if (setresgid (current_user.gid, current_user.gid, current_user.gid) < 0)
-+#else
- if (setgid (current_user.gid) < 0)
-+#endif
- sys_error (_("cannot set gid to %d: effective gid %d"), current_user.gid, current_user.egid);
-
- current_user.euid = current_user.uid;
diff --git a/app-shells/bash/files/bash-5.1-parallel_make.patch b/app-shells/bash/files/bash-5.1-parallel_make.patch
deleted file mode 100644
index b341a8a06e28..000000000000
--- a/app-shells/bash/files/bash-5.1-parallel_make.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-bashline.c:65:10: fatal error: builtins/builtext.h: No such file or directory
- 65 | #include "builtins/builtext.h" /* for read_builtin */
- | ^~~~~~~~~~~~~~~~~~~~~
-
---- bash-5.1/Makefile.in
-+++ bash-5.1/Makefile.in
-@@ -584,6 +584,8 @@
- ls -l $(Program)
- -$(SIZE) $(Program)
-
-+$(CSOURCES): $(DEFDIR)/builtext.h
-+
- .build: $(SOURCES) config.h Makefile version.h $(VERSPROG)
- @echo
- @echo " ***********************************************************"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 34a9b9a0cf9f..7b063a077c60 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/enchant/enchant-2.3.0.ebuild b/app-text/enchant/enchant-2.3.0.ebuild
index 80348cd95b81..2942529407cc 100644
--- a/app-text/enchant/enchant-2.3.0.ebuild
+++ b/app-text/enchant/enchant-2.3.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
LICENSE="LGPL-2.1+"
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="aspell +hunspell test voikko"
REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 00a100ed1d0c..e354eb5010fc 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/gnat-suite-bin/Manifest b/dev-ada/gnat-suite-bin/Manifest
index 057b95bd783f..7072fc6f7eff 100644
--- a/dev-ada/gnat-suite-bin/Manifest
+++ b/dev-ada/gnat-suite-bin/Manifest
@@ -1,3 +1,2 @@
-DIST gnat-gpl-2016-x86_64-linux-bin.tar.gz 372813330 BLAKE2B a0374ad730ae275aaedcf5663c30f8e0221af32f14391fe87a3ce0630d4498a1e90671c02830d62f78857571a5a521af91f6db409a7b3c367c7b0f059571eefd SHA512 5115ac3be0badc5125ee048a98230f18363d72107da3325ce602c0e618cee2e3646a0decc00a2388f14bc61bfed51dd0622f365f5f7ee8b0cec2187ebcf8e075
DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f
DIST gnat-suite-bin-2018.txz 337235688 BLAKE2B cf1b8f0253907b8fc97b9c7218b23dcda8f1557be5e12293eab59e09427418a8814c1bafbcb3f89c1e5dd755a161c5dfa8a852631d137f17acb3167bf51dadbb SHA512 9b57709c05a121b0a0adabe3232128e3f27659d1928857fbd6883b73a7487c3d457317e8f236df3d16ced635514af8afbafc584cc74d865e11288820ac9c4f77
diff --git a/dev-ada/gnat-suite-bin/gnat-suite-bin-2016-r1.ebuild b/dev-ada/gnat-suite-bin/gnat-suite-bin-2016-r1.ebuild
deleted file mode 100644
index 7e44aa89cf35..000000000000
--- a/dev-ada/gnat-suite-bin/gnat-suite-bin-2016-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MYP=gnat-gpl-${PV}
-DESCRIPTION="GNAT Ada suite"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5739cefdc7a447658e0b016b
- -> ${MYP}-x86_64-linux-bin.tar.gz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="${PV}"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
- sys-devel/binutils
- sys-devel/gdb
- sys-libs/gdbm
- sys-libs/ncurses-compat
-"
-
-S="${WORKDIR}"/${MYP}-x86_64-linux-bin
-
-PREFIX=/opt/${P}
-
-src_prepare() {
- default
- rm Makefile
- cd share/examples/gnat
- cat header.xml \
- full_project/full.xml \
- options/options.xml \
- other_languages/cpp_main/cpp_main.xml \
- other_languages/cpp_pragmas/cpp_pragmas.xml \
- other_languages/import_from_c/import_from_c.xml \
- plugins/plugins.xml \
- stream_io/stream_io.xml \
- simple_project/simple.xml \
- starter/starter.xml \
- xml_stream/xml_stream.xml \
- containers/anagram/anagram.xml \
- containers/genealogy/genealogy.xml \
- containers/hash/hash.xml \
- containers/library/library.xml \
- containers/shapes/shapes.xml \
- containers/spellcheck/spellcheck.xml \
- containers/wordcount/wordcount.xml \
- containers/wordfreq/wordfreq.xml \
- oo_interfaces/oo_interfaces.xml \
- oo_airline/oo_airline.xml \
- altivec/altivec.xml \
- footer.xml \
- > gnat-examples.xml \
- || die
- sed -i \
- -e "s:PREFIX:${PREFIX}:" \
- gnat-examples.xml || die
- cd ../../..
-
- # Remove objects from binutils
- cd bin
- rm addr2line ar c++filt gprof nm objdump ranlib || die
- cd ..
- rm share/doc/gnat/info/{as,bfd,binutils,ld}.info || die
-
- # Remove objects from gdb
- cd bin
- rm gdb gdbserver gcore || die
- cd ..
- rm -r include/gdb || die
- rm lib*/libinproctrace.so || die
- rm -r share/gdb-* || die
- rm share/doc/gnat/info/gdb.info || die
-
- basever=4.9.4
- machine=x86_64-pc-linux-gnu
- rm libexec//gcc/${machine}/${basever}/ld || die
-}
-
-src_install() {
- into ${PREFIX}
- dobin bin/*
- insinto ${PREFIX}
- doins -r etc include lib* share
- insinto ${PREFIX}/share/gps/plug-ins
- doins share/examples/gnat/gnat-examples.xml
- fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1
- fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus
- fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2
- fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1
- fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0
- fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1
- fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper
- fperms 755 ${PREFIX}/libexec/gprbuild/gprbind
- fperms 755 ${PREFIX}/libexec/gprbuild/gprlib
-}
-
-pkg_postinst() {
- einfo "GNAT GPL is now installed. To launch it, you must put"
- einfo " ${PREFIX}/bin"
- einfo "in front of your PATH environment variable. The following"
- einfo "commands enable you to do this:"
- einfo " PATH=${PREFIX}/bin:\$PATH; export PATH (Bourne shell)"
- einfo " setenv PATH ${PREFIX}/bin:\$PATH (C shell)"
- einfo " Thank you for installing GNAT GPL Edition"
-}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 47c95f168860..4de79dec386a 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
index b7b6b0554b9b..17ede9b10e24 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
DEPEND=""
diff --git a/dev-db/postgresql/postgresql-13.3.ebuild b/dev-db/postgresql/postgresql-13.3.ebuild
index d71750a1cb74..85d7618669ca 100644
--- a/dev-db/postgresql/postgresql-13.3.ebuild
+++ b/dev-db/postgresql/postgresql-13.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8,9,10} )
inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles
-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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
@@ -134,14 +134,13 @@ src_configure() {
[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
fi
- econf \
+ local myconf="\
--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
--datadir="${PO}/usr/share/postgresql-${SLOT}" \
--includedir="${PO}/usr/include/postgresql-${SLOT}" \
--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
--with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !alpha spinlocks) \
$(use_enable debug) \
$(use_enable threads thread-safety) \
$(use_with icu) \
@@ -159,7 +158,14 @@ src_configure() {
$(use_with xml libxml) \
$(use_with xml libxslt) \
$(use_with zlib) \
- $(use_enable nls)
+ $(use_enable nls)"
+ if use alpha || use riscv; then
+ myconf+=" --disable-spinlocks"
+ else
+ # Should be the default but just in case
+ myconf+=" --enable-spinlocks"
+ fi
+ econf ${myconf}
}
src_compile() {
diff --git a/dev-db/postgresql/postgresql-14_beta2.ebuild b/dev-db/postgresql/postgresql-14_beta2.ebuild
index a9630c760e88..e6463312ebcb 100644
--- a/dev-db/postgresql/postgresql-14_beta2.ebuild
+++ b/dev-db/postgresql/postgresql-14_beta2.ebuild
@@ -135,14 +135,13 @@ src_configure() {
[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
fi
- econf \
+ local myconf="\
--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
--datadir="${PO}/usr/share/postgresql-${SLOT}" \
--includedir="${PO}/usr/include/postgresql-${SLOT}" \
--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
--with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !alpha spinlocks) \
$(use_enable debug) \
$(use_enable threads thread-safety) \
$(use_with icu) \
@@ -161,7 +160,14 @@ src_configure() {
$(use_with xml libxml) \
$(use_with xml libxslt) \
$(use_with zlib) \
- $(use_enable nls)
+ $(use_enable nls)"
+ if use alpha || use riscv; then
+ myconf+=" --disable-spinlocks"
+ else
+ # Should be the default but just in case
+ myconf+=" --enable-spinlocks"
+ fi
+ econf ${myconf}
}
src_compile() {
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index 106cb9fb88fe..8bdc4467a149 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -151,14 +151,13 @@ src_configure() {
[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
fi
- econf \
+ local myconf="\
--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
--datadir="${PO}/usr/share/postgresql-${SLOT}" \
--includedir="${PO}/usr/include/postgresql-${SLOT}" \
--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
--with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !alpha spinlocks) \
$(use_enable debug) \
$(use_enable nls) \
$(use_enable threads thread-safety) \
@@ -177,7 +176,14 @@ src_configure() {
$(use_with xml libxslt) \
$(use_with zlib) \
$(use_with systemd) \
- ${uuid_config}
+ ${uuid_config}"
+ if use alpha || use riscv; then
+ myconf+=" --disable-spinlocks"
+ else
+ # Should be the default but just in case
+ myconf+=" --enable-spinlocks"
+ fi
+ econf ${myconf}
}
src_compile() {
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 4266d804d25b..57da1d936079 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/unixutils/Manifest b/dev-haskell/unixutils/Manifest
index 4153f8472577..c03e42305fef 100644
--- a/dev-haskell/unixutils/Manifest
+++ b/dev-haskell/unixutils/Manifest
@@ -1 +1 @@
-DIST Unixutils-1.54.1.tar.gz 12177 BLAKE2B d330150c36ac3cdfb3b9eea4a26109cb76a96207c5db40d306479696082fe2017e1ae3892fa06571af96ae5cd4c3204e56860ab204ad9192fc5160d18f663bc3 SHA512 b8395cf6778c18a2f36a45a927d24042fd144ab70c6c092e1be36b22c59bbd1f0151cbe703d9db98dc769eba41ca9eb89cf60e87f5a6bbb32d6b64ef97c45665
+DIST Unixutils-1.54.2.tar.gz 12299 BLAKE2B a31f3cc3657ef3a5fc02dec19720e876ac3df0a7fb4f559cce849099ff887bb8b5dd7df35cf7077d42d1ba1c18448945ccc343cfd89e12dddcc110c9ccc8aedb SHA512 7d8e652ed6d7a19082ae5fb4ca4e05f808fc7d6599b7a41652743dfbd53f0ebd3333168ea76e480127b554bbaab7466ed8ac6c066edd6651fe9f54e69ea4f5df
diff --git a/dev-haskell/unixutils/unixutils-1.54.1.ebuild b/dev-haskell/unixutils/unixutils-1.54.2-r1.ebuild
similarity index 81%
rename from dev-haskell/unixutils/unixutils-1.54.1.ebuild
rename to dev-haskell/unixutils/unixutils-1.54.2-r1.ebuild
index 118d852db460..648a5f9271ec 100644
--- a/dev-haskell/unixutils/unixutils-1.54.1.ebuild
+++ b/dev-haskell/unixutils/unixutils-1.54.2-r1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.6.9999
+# ebuild generated by hackport 0.7
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
MY_PN="Unixutils"
MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
DESCRIPTION="A crude interface between Haskell and Unix-like operating systems"
HOMEPAGE="https://github.com/seereason/haskell-unixutils.git"
@@ -18,7 +19,6 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
-IUSE=""
RDEPEND="dev-haskell/exceptions:=[profile?]
dev-haskell/mtl:=[profile?]
@@ -26,11 +26,9 @@ RDEPEND="dev-haskell/exceptions:=[profile?]
dev-haskell/puremd5:=[profile?]
dev-haskell/regex-tdfa:=[profile?]
dev-haskell/zlib:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- virtual/libc
+ >=dev-lang/ghc-8.4.3:=
+ virtual/libcrypt:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2
+ >=dev-haskell/cabal-2.2.0.1
"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 028aa0554539..6005f82eca6f 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
index dda39756714c..55b5518402a6 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="sun-bcla-jai"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
DEPEND=""
RDEPEND="virtual/jre:1.8"
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 8bd79bcf4355..13cd29d9fa1a 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,2 +1 @@
-DIST tomcat-native-1.2.28-src.tar.gz 423848 BLAKE2B f0528817e1ea7e90ce67d8e181c0f620211d36529809a4c89ae687f4cefe4b0f977eb53b87e70bd0132ef1a5a000df82fc8c70e08f9bb568644b47cbf8817470 SHA512 16b8659dcd228ea153d05c9ae19e3d97add944315f3b8b42905162d0e4e8a28fd51a172d59d7da8508271ecad0b8ac025a386895565acaf8e2ba11fba77492bb
DIST tomcat-native-1.2.30-src.tar.gz 425741 BLAKE2B d39c7762db0f8c6b3422d1a4811d65793e2315e0d34fae8a37f250ff41a2c11a0c89ccaf8a361cda7cb16434dcd9678289ecec60cc5322a5fae2d6963c76f36c SHA512 51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.28.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.28.ebuild
deleted file mode 100644
index fd32b6403ca4..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.28.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/apr:1=
- dev-libs/openssl:0=
- >=virtual/jre-1.8:*"
-
-DEPEND=">=virtual/jdk-1.8:*
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_configure() {
- local myeconfargs=(
- --with-apr="${EPREFIX}"/usr/bin/apr-1-config
- --with-ssl="${EPREFIX}"/usr
- )
-
- cd native || die
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- eant jar
-
- cd native || die
- default
-}
-
-src_install() {
- java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
- cd native || die
- default
-
- ! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-pkg_postinst() {
- elog "For more information, please visit"
- elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.30.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.30.ebuild
index 76a4520b2d1f..fd32b6403ca4 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.30.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.30.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Allows Tomcat to use certain native resources for better performanc
HOMEPAGE="https://tomcat.apache.org/"
SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="static-libs test"
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
deleted file mode 100644
index a52b851aeb9e..000000000000
--- a/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An implementation of XMLPULL V1 API"
-HOMEPAGE="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html"
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
- >=virtual/jre-1.6"
-
-DEPEND="
- >=virtual/jdk-1.6
- source? ( app-arch/zip )"
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r5.ebuild
similarity index 75%
rename from dev-java/xpp3/xpp3-1.1.4c-r4.ebuild
rename to dev-java/xpp3/xpp3-1.1.4c-r5.ebuild
index 6dc6ad5bd4e6..3f30d6b9c176 100644
--- a/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-r5.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
JAVA_PKG_IUSE="doc source"
MAVEN_ID="xpp3:xpp3:1.1.4c"
@@ -17,5 +17,13 @@ SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+ default
+ mkdir "resources" || die
+ cp -r "META-INF" "resources" || die
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 69b3f0f3ffc9..733755de3cd8 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 72da37844ea3..e217fbc0125b 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,3 +1,4 @@
DIST R-4.0.4.tar.gz 33687611 BLAKE2B 40cdfd98fe6c9193deb729d151631c2b0f935accf5ea6251704b633d2688278af1a5a67317152be023fb4a10315c64e473f58276bb0c3fadb1141c35391ad22e SHA512 811c4407a083eb776f92c3cbacb1dc7eada8890a8c27678c6c82bef9db52b1afaefeb408fbe11e46922740adee498f32e7ddf7451b3ab89cf60773737e47f8be
DIST R-4.0.5.tar.gz 32466444 BLAKE2B 5dbbd289f4fd6347b4109eecaf65b50b5793a83edddd2cb391c20473607f136d91a8e9f4ab9e453f6927d2ca9145762920424e3a1dcea89309afde56efd5d32c SHA512 6ff5b0f9cb6b17f66cde1f5585d1b33659dbae8919d34c2e593f68a0bff4d0425aa9704d99284d103702a9cd42f613311f3a87af6b939b1af65dcec80bf2ca8c
+DIST R-4.1.0.tar.gz 33714683 BLAKE2B 22ba966b5a29f153f3ce6cbc467e815c397e7c6aade0db62c7d2ae044056d9227da4dcb8fbf33e661548f4f434c328415e297c6b07b3932ef3f47358c2543f42 SHA512 41519bf06a1ebc2bb582e9a7c35d0e82e213312dec8147861a7f9b28ee750cd40dfbf02737602d05698641fcea6182b0da8131e83edacc358e98eca0a393b729
DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06
diff --git a/dev-lang/R/R-4.1.0-r1.ebuild b/dev-lang/R/R-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..3972132499a3
--- /dev/null
+++ b/dev-lang/R/R-4.1.0-r1.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 autotools flag-o-matic fortran-2 toolchain-funcs
+
+# latest git commit for R bash completion: https://github.com/deepayan/rcompletion
+BCPV=78d6830e28ea90a046da79a9b4f70c39594bb6d6
+
+DESCRIPTION="Language and environment for statistical computing and graphics"
+HOMEPAGE="https://www.r-project.org/"
+SRC_URI="
+ mirror://cran/src/base/R-4/${P}.tar.gz
+ https://raw.githubusercontent.com/deepayan/rcompletion/${BCPV}/bash_completion/R -> ${PN}-${BCPV}.bash_completion"
+
+LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline static-libs test tiff tk X"
+
+REQUIRED_USE="png? ( || ( cairo X ) )
+ jpeg? ( || ( cairo X ) )
+ tiff? ( || ( cairo X ) )
+"
+
+# At least one package installation in the test suite requires TeX,
+# and will fail without it (bug #718056).
+BDEPEND="virtual/pkgconfig
+ doc? (
+ virtual/latex-base
+ dev-texlive/texlive-fontsrecommended
+ )
+ test? ( virtual/latex-base )"
+DEPEND="
+ app-arch/bzip2:0=
+ app-arch/xz-utils:0=
+ app-text/ghostscript-gpl
+ dev-libs/libpcre2:=
+ net-libs/libtirpc
+ net-misc/curl
+ virtual/blas:0
+ || ( sys-apps/coreutils app-misc/realpath )
+ cairo? ( x11-libs/cairo:0=[X=] x11-libs/pango:0= )
+ icu? ( dev-libs/icu:= )
+ jpeg? ( virtual/jpeg:0 )
+ lapack? ( virtual/lapack:0 )
+ perl? ( dev-lang/perl )
+ png? ( media-libs/libpng:0= )
+ readline? ( sys-libs/readline:0= )
+ tiff? ( media-libs/tiff:0= )
+ tk? ( dev-lang/tk:0= )
+ X? ( x11-libs/libXmu:0= x11-libs/libXt x11-misc/xdg-utils )"
+
+RDEPEND="${DEPEND}
+ sys-libs/zlib:0[minizip]
+ java? ( >=virtual/jre-1.8:* )"
+
+RESTRICT="minimal? ( test )
+ !test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.4.1-parallel.patch
+ "${FILESDIR}"/${PN}-3.4.1-rmath-shared.patch
+ "${FILESDIR}"/${PN}-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch
+ "${FILESDIR}"/${PN}-3.6.2-no-gzip-doc.patch
+)
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+ FORTRAN_NEED_OPENMP=1
+ fi
+ fortran-2_pkg_setup
+ filter-ldflags -Wl,-Bdirect -Bdirect
+ # avoid using existing R installation
+ unset R_HOME
+}
+
+src_prepare() {
+ default
+
+ # fix packages.html for doc (gentoo bug #205103)
+ sed -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
+ -i src/library/tools/R/Rd.R || die
+
+ # fix Rscript path when installed (gentoo bug #221061)
+ sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT}/usr/$(get_libdir)/${PN}\"':" \
+ -i src/unix/Makefile.in || die "sed unix Makefile failed"
+
+ # fix HTML links to manual (gentoo bug #273957)
+ sed -e 's:\.\./manual/:manual/:g' \
+ -i $(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
+
+ use lapack && \
+ export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
+
+ if use X; then
+ export R_BROWSER="$(type -p xdg-open)"
+ export R_PDFVIEWER="$(type -p xdg-open)"
+ fi
+ use perl && \
+ export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
+
+ # don't search /usr/local
+ sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
+ # Fix for Darwin (OS X)
+ if use prefix; then
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
+ -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
+ -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
+ -e "/SHLIB_EXT/s/\.so/.dylib/" \
+ -i configure.ac || die
+ # sort of "undo" 2.14.1-rmath-shared.patch
+ sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT}/usr/$(get_libdir)/libRmath.dylib:" \
+ -i src/nmath/standalone/Makefile.in || die
+ else
+ append-ldflags -Wl,-rpath="${EROOT}/usr/$(get_libdir)/R/lib"
+ fi
+ fi
+ AT_M4DIR=m4
+ eautoreconf
+}
+
+src_configure() {
+ # --with-system-tre \
+ # tre is patched from upstream
+ econf \
+ --enable-byte-compiled-packages \
+ --enable-R-shlib \
+ --disable-R-framework \
+ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+ rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
+ $(use_enable java) \
+ $(use_enable lto lto R)
+ $(use_enable nls) \
+ $(use_enable openmp) \
+ $(use_enable profile R-profiling) \
+ $(use_enable profile memory-profiling) \
+ $(use_enable static-libs static) \
+ $(use_enable static-libs R-static-lib) \
+ $(use_with cairo) \
+ $(use_with icu ICU) \
+ $(use_with jpeg jpeglib) \
+ $(use_with lapack) \
+ $(use_with !minimal recommended-packages) \
+ $(use_with png libpng) \
+ $(use_with readline) \
+ $(use_with tiff libtiff) \
+ $(use_with tk tcltk) \
+ $(use_with tk tk-config "${EPREFIX}"/usr/$(get_libdir)/tkConfig.sh) \
+ $(use_with tk tcl-config "${EPREFIX}"/usr/$(get_libdir)/tclConfig.sh) \
+ $(use_with X x)
+}
+
+src_compile() {
+ export VARTEXFONTS="${T}/fonts"
+ emake AR="$(tc-getAR)"
+ emake -C src/nmath/standalone \
+ shared $(use static-libs && echo static) AR="$(tc-getAR)"
+ use doc && emake info pdf
+}
+
+src_install() {
+ default
+ emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
+
+ if use doc; then
+ emake DESTDIR="${D}" install-info install-pdf
+ dosym ../manual /usr/share/doc/${PF}/html/manual
+ fi
+
+ cat > 99R <<-EOF
+ LDPATH=${EROOT}/usr/$(get_libdir)/${PN}/lib
+ R_HOME=${EROOT}/usr/$(get_libdir)/${PN}
+ EOF
+ doenvd 99R
+ newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}
+ # The buildsystem has a different understanding of install_names than
+ # we require. Since it builds modules like shared objects (wrong), many
+ # objects (all modules) get an incorrect install_name. Fixing the build
+ # system here is not really trivial.
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ local mod
+ pushd "${ED}"/usr/$(get_libdir)/R > /dev/null
+ for mod in $(find . -name "*.dylib") ; do
+ mod=${mod#./}
+ install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/R/${mod}" \
+ "${mod}"
+ done
+ popd > /dev/null
+ fi
+
+ # Users are encouraged to access some of the the R documentation
+ # interactively, through functions like "contributors()" that
+ # tries to open the "AUTHORS" file. Other files can be accessed
+ # by name with RShowDoc(), and the documentation for e.g. license()
+ # and RShowDoc() suggests a few of these names. Here we try to
+ # collect as many names as possible that a user might actually
+ # try to view through R, because if we don't decompress them,
+ # then R doesn't know what to do with 'em. Bug #556706.
+ INTERACTIVE_DOCS=(
+ AUTHORS
+ COPYING
+ FAQ
+ NEWS
+ THANKS
+ )
+
+ # Other data sources that are shipped as "documentation," but which
+ # need to be accessible via their original unmolested filenames.
+ INTERACTIVE_DATA=(
+ BioC_mirrors.csv
+ CRAN_mirrors.csv
+ KEYWORDS.db
+ NEWS.rds
+ )
+
+ NOCOMPRESS_DOCS=( "${INTERACTIVE_DOCS[@]}" "${INTERACTIVE_DATA[@]}" )
+
+ for f in "${NOCOMPRESS_DOCS[@]}"; do
+ docompress -x "/usr/share/doc/${PF}/${f}"
+ done
+}
+
+pkg_postinst() {
+ if use java; then
+ einfo "Re-initializing java paths for ${P}"
+ R CMD javareconf
+ fi
+}
diff --git a/dev-lang/R/metadata.xml b/dev-lang/R/metadata.xml
index 8972d9ed88ca..e9bebc0e016a 100644
--- a/dev-lang/R/metadata.xml
+++ b/dev-lang/R/metadata.xml
@@ -5,6 +5,11 @@
sci-mathematics@gentoo.org
Gentoo Mathematics Project
+
R is GNU S, a system for statistical computation and graphics. It
consists of a language plus a run-time environment with graphics, a
diff --git a/dev-lang/elixir/elixir-1.12.1.ebuild b/dev-lang/elixir/elixir-1.12.1.ebuild
index 1579eb228442..984a5d1789a1 100644
--- a/dev-lang/elixir/elixir-1.12.1.ebuild
+++ b/dev-lang/elixir/elixir-1.12.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="Apache-2.0 ErlPL-1.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/erlang/erlang-24.0.2.ebuild b/dev-lang/erlang/erlang-24.0.2.ebuild
index 9a518bfccce6..a953a96263c7 100644
--- a/dev-lang/erlang/erlang-24.0.2.ebuild
+++ b/dev-lang/erlang/erlang-24.0.2.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
# same build of ERTS that was used when compiling the code. See
# http://erlang.org/doc/system_principles/misc.html for more information.
SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
RDEPEND="
diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index e221b8dc8f6c..e569b85df24d 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -1,12 +1,6 @@
DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
DIST gcc-10-2021-20210519-19A74-src.tar.gz 109157702 BLAKE2B 8ec307e4fde35c8726bc7b9702717329695bad928d5222a7bb691cce47500de31a60bcfcbb925129a57cb81d3d7ea92e60599aa7383d5358e63cc087b0482550 SHA512 2e2cc0ec9a3a82816a5d399d2db261c356e106b82a44efd54a1ac882b96549ab8de79c69858127c4397de6e9e9463ce6fb9994fc2e426e7d3d2f98d5efa2edb6
DIST gcc-10.3.0-patches-1.tar.bz2 15282 BLAKE2B ef283e8b108af9bfd3324fabb95c835374113c6ff2cf1430a5568b3d1b27183e6de6751367c1e5720c85ac4c45132848888d5510c63f95e88a1f623b6bcf4000 SHA512 6dc435c8619a1532000fae843b9964d0d1e28d3cc9cc1962ab7391570a0cf1135424ea5c0b0d3d5ec5ea863f02e963be2ec4c94822f217fc692a1d808325404e
-DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
-DIST gcc-4.9-gpl-2016-src.tar.gz 76361760 BLAKE2B 681aac3dd2e04110f58637cc9fe1eb663ce55af16a929a446eb59ce338bec9357e65517890f7fa01d61eec9c5041336722b2b94a5fea27a55ade686fe1fe9fbc SHA512 da1e26b4dbbe0ec634eab4e64d1cdb2632300c24f0885bc72fb57edba6ce29ab92b04eaedd8f8077ea623f1ef1428f53616e8c8d6630328d9790d968b60c67cf
-DIST gcc-4.9.4-patches-1.4.tar.bz2 27240 BLAKE2B 26b7d08bad4b617ede2564f77ded67cc87ec6b9f6b4d4ff78b5b75c1d5739fc4049480c716075d74c9b8e23a4a3c1889796cacb3456a3982ab04a0781fe3cd04 SHA512 efa60a7f86e684710848182c7d040565c9cec7666e897adc02e5dea9d4c76117deece7b1f7e1f8772cdec9697bb92b762f93408824e47b3f63b4f35029f50a4b
-DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285
-DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db
-DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af2cfe3291281d9354c58a270d2eba73a0f301d90840dfabf423c82b368e113df7a2cb6cc28b2a703b0b6eb585 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe
DIST gcc-6-gpl-2017-src.tar.gz 88045488 BLAKE2B 5df712eadef723df9057653e49d215cef6b59032e4b4a62c8622a7b735c660f42ec4135dba628a2080a7540d407186a4e4b1eb373e937374bc4e407dc9afe97d SHA512 bf8f786b5ad28a6b7d184fb5263424b7ed62154e308e259b61c24a577efdae56939fbaabc1fc53a0f467702c1e6d8598dc6e489ce074724799130a793cfb146e
DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 BLAKE2B e3c298bd80b83e72d6ea9b4ec777d4f28153bf959da1e54307909383efecd2bf0e7e0cc9d9b27529e5f00b2e27132bf5ff6afd2129d061d3b111f9cfe732a874 SHA512 8fc96086bd3da3726687ee9d180d3b5d0a7d5814141d44eac8eb01566a783ec780c8fb8f55f75d6e9c9006b2e407e20cdb5835d541b0b66a47dd60642861734c
DIST gcc-7-gpl-2018-src.tar.gz 90302033 BLAKE2B 2f79137e176bff04c4fb17ab863302943588226d5b599dfa1acf0e495111be1c581f4e130f911c312916669c4f2707eec5218601db090d5060248b2fe481d710 SHA512 79f06deca5753251de82a703f4a9698c117706290df779291a5405edb06f1c225d1d2416bda0e67dcd87cc308bf79504e89d4bd8e22aa0eedfbf06d88bc37f33
@@ -16,7 +10,6 @@ DIST gcc-8.3.0-patches-4.tar.bz2 17095 BLAKE2B 449d83371bf5a70020f4caad38d7b8f79
DIST gcc-9-2020-20200429-19AA7-src.tar.gz 101030094 BLAKE2B 843d7a92f206a08aa6c0fb41b8b93db494eee26c15872b8d8547685c1013559856cd83c5a4139d8ba68aa6737c0270502fd5547664b458cb8fd023f5ce9601e8 SHA512 2eaf999f4ef7f0216b7bab9963ce1cb9dd4be4d4645415183a0e0706ce0f0f119a5437c482d60db16ea152ebcb36186fc7900ec196fc7b8022d4d9cea2e5a631
DIST gcc-9.3.0-patches-4.tar.bz2 15474 BLAKE2B b06fdfce4402850bb1c6c211ace4c3a07ad2114ffa48eac58d1624124d5d1bddd6d2b4faa18be3291a340272c022bea26dfcaf17929828ceb6474a5211401389 SHA512 54904a4a1c4a784f1a707cbdd9f6f498457e4aa550dc6f3d6eff71ed05a75685e23e6b71c2a614b1dea7e506b9f42fb0109ecfde00ef00373275bbc0409cb7e0
DIST gcc-interface-10-2021-20210519-19A75-src.tar.gz 359085 BLAKE2B 75f941a7635f2880cc0192acb49d8e7f567baca7530fb981be14dc6cb1bf46fda0e3c043c8703cdbeeb242b548894e0bc6787adfff0f27198354d150e6e36386 SHA512 0251a93d20c59cc4705963438880fe265e2e0bb94a35b7ddaaf03e9efae60e044e585a2204d0773a46f17b3b774e4d0c73adf852f5d06ba17373d26ed580ca8d
-DIST gcc-interface-4.9-gpl-2016-src.tar.gz 339037 BLAKE2B 8218ea3a3e3ddb11febb5f2fbcfad69ec25251d3ed6bf4f9c70dc9b3720cc2fb3310d704db40bd0c749be89b17a2b3766ddae3d6158313480073856057ad4bcf SHA512 507df314d1890c228c19f458bd51197377deaaa2d6082fe1e71b62b683252ee5fba4adfe2386246e14618b1c77288e0dcb5bf501e2daaca249b6299462c2f6bd
DIST gcc-interface-6-gpl-2017-src.tar.gz 347016 BLAKE2B 934c6dac491abece9a6868d28fe9d2a6a1109238fe25c9b94abe83dfc22a1085489f0e0384626da0a3abeebe7537c5715df49a7e2d40577c96eb7ac897b84fd8 SHA512 5833303fce5bf812ccbc71f3d3726c0cb877937d75327edb15097c0b7dba58024a52688392906695ab92fb4e5d7a6623671eac9a05d17937dc0270bafcde920a
DIST gcc-interface-7-gpl-2018-src.tar.gz 339461 BLAKE2B e6009c0b287b1cd8f055226e6919c12f2ba08f8ef24101608691b05b70a7fb0ca708e2ecd126499fb84a126436d3841f1a13be0b6d3442ef3bd3871391f8e1d5 SHA512 9dc942a39dd983778756be2951b4c66ac3835bf456dc389f80ffbafdacde4ebcb80720ac9eca8fef8734d6d052c061db37c88dba642d85add10940164d120381
DIST gcc-interface-8-2019-20190510-18F59-src.tar.gz 352408 BLAKE2B d08867737fd5a2e8aa87e61efff47757b587baff67810eb9193fe72b68578bcb130f0c1491599588d130663d908b9c6c9a604b1352aeccb79e9dd3bfef4b9f61 SHA512 c4a048725517e674cc43b7b72e3b1bdb4f1cf9d81fe3b84dd177a2fda8c7af11c3135e883072b640c8aa351625f49573727c859064683e8b5f096fdbd3990c38
@@ -26,6 +19,5 @@ DIST gnat-2020-20200429-19B04-src.tar.gz 8485156 BLAKE2B 79683138873b236d8329396
DIST gnat-2021-20210519-19A70-src.tar.gz 8765762 BLAKE2B ef48f54c6109566e37bfa5dee9262305d0529b3dfd333ee28bc4e66f4709a0673f673d742bc04deb15dc145404f7618d350dbdf3f2a7ab37c861e57d011946fa SHA512 3cb79be024fdd9b738d99ffc8e224d32bb382b5da2d02b97b2061a5ea58456f33d4564c92e224af2713ce15fd5481edd715e5b9a52abc74fdc142f27e103c201
DIST gnat-gpl-2014-x86-linux-bin.tar.gz 233049287 BLAKE2B 2e8bab113f6a319533ec12fdf71c481f72aee227c22bd0cc42a53bd727b323caba1e7b6298053db8b4d3016236b31649b0b255f4ebcbb81a08a69f29f78f13fc SHA512 ac7f53fb4bd71b0e8fbd62abc45de76f7f8f2f405b80e9b60b4b65a6cef6ee98e3b06848e4b752af3c8268237e5a0529cf6145ebc5b33cd6e5cf4928d85f5be2
DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688b8e323d5a02e2e9707ba1f02835ea551038d0a09aafede93a224091e5186f2f2a9d0f96144027af2184ee05ca1c19cc997a6cf3902df7 SHA512 5e40a251baac3d0ace78352956ca21a7d294d902d344a9ed7a8d376e900468c283721ebfb773adfedbf4d623ace02536505c0147815a0c1908933ad611ea085e
-DIST gnat-gpl-2016-src.tar.gz 8857249 BLAKE2B 3ff0fe247990e2a612ac989aa389e9ccae2e29c16177975c327b53ae1471030d0a70e5a2e3af219ad9a3288c241f2d18da349d0650f7fde01d439f4e4720de88 SHA512 4a5cb58ede5b4ae2887e64f0f2e12e0e06470d320796f06d02f7ddd932ff0d3b40e6d3e98a81138fff6906548a55153c2a186ff4a6e3d23b9dbe01ca582da1f8
DIST gnat-gpl-2017-src.tar.gz 8783473 BLAKE2B b0415b42f4d3a5e8675591a5602ff0a96945670104064671a232c0c12271ee141a3a5d148b8507bdab83cb8a0677c57b78e690060088308c51732bad3715964f SHA512 ae7314a2241107ed4d962dce08306eeb34c5f11e26183935bbb1ccf3a5eb011d6457c1b6fcded93dd0ee9ba31d791971ebe2a5a5a0ae04ff80d87a670325a098
DIST gnat-gpl-2018-src.tar.gz 8706578 BLAKE2B ba245fd91cc5263d5b8c159d9e75caf6bed21dcaa5fa43734af8775a4008ce5f96bfb84a8b5e6e734ff883314ab3219dacec3fe95a5baa33fb712bfb5ff8bce8 SHA512 0ff7e848ef77f7e772e2a1b01905307a91c332f32329456f5238c4b7eb46cc118709e8682a5fc826d98a7d99fd15a92c194f4a278f04bc465165cfa616cc3c2e
diff --git a/dev-lang/gnat-gpl/files/gcc-spec-env-r1.patch b/dev-lang/gnat-gpl/files/gcc-spec-env-r1.patch
deleted file mode 100644
index a58926836e4e..000000000000
--- a/dev-lang/gnat-gpl/files/gcc-spec-env-r1.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-2013-08-22 Magnus Granberg
-
- * gcc/gcc.c (main): Add support for external spec file via the GCC_SPECS env var
- and move the process of the user specifed specs.
-
- This allows us to easily control pie/ssp defaults with gcc-config profiles.
- Original patch by Rob Holland
- Extended to support multiple entries separated by ':' by Kevin F. Quinn
- Modified to use getenv instead of poisoned GET_ENVIRONMENT by Ryan Hill
- Modified to process the GCC_SPECS env var befor DRIVER_SELF_SPECS by Magnus Granberg
-
---- gcc-4.8-20130210/gcc/gcc.c 2013-02-05 16:55:31.000000000 +0100
-+++ gcc-4.8-20130210-work/gcc/gcc.c 2013-07-26 02:32:14.625089864 +0200
-@@ -6427,6 +6428,48 @@ main (int argc, char **argv)
- do_option_spec (option_default_specs[i].name,
- option_default_specs[i].spec);
-
-+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined (WIN32))
-+ /* Add specs listed in GCC_SPECS. Note; in the process of separating
-+ * each spec listed, the string is overwritten at token boundaries
-+ * (':') with '\0', an effect of strtok_r().
-+ */
-+ specs_file = getenv ("GCC_SPECS");
-+ if (specs_file && (strlen(specs_file) > 0))
-+ {
-+ char *spec, *saveptr;
-+ for (spec=strtok_r(specs_file,":",&saveptr);
-+ spec!=NULL;
-+ spec=strtok_r(NULL,":",&saveptr))
-+ {
-+ struct user_specs *user = (struct user_specs *)
-+ xmalloc (sizeof (struct user_specs));
-+ user->next = (struct user_specs *) 0;
-+ user->filename = spec;
-+ if (user_specs_tail)
-+ user_specs_tail->next = user;
-+ else
-+ user_specs_head = user;
-+ user_specs_tail = user;
-+ }
-+ }
-+#endif
-+ /* Process any user specified specs in the order given on the command
-+ * line. */
-+ for (uptr = user_specs_head; uptr; uptr = uptr->next)
-+ {
-+ char *filename = find_a_file (&startfile_prefixes, uptr->filename,
-+ R_OK, true);
-+ read_specs (filename ? filename : uptr->filename, false, true);
-+ }
-+ /* Process any user self specs. */
-+ {
-+ struct spec_list *sl;
-+ for (sl = specs; sl; sl = sl->next)
-+ if (sl->name_len == sizeof "self_spec" - 1
-+ && !strcmp (sl->name, "self_spec"))
-+ do_self_spec (*sl->ptr_spec);
-+ }
-+
- /* Process DRIVER_SELF_SPECS, adding any new options to the end
- of the command line. */
-
-@@ -6535,24 +6578,6 @@ main (int argc, char **argv)
- PREFIX_PRIORITY_LAST, 0, 1);
- }
-
-- /* Process any user specified specs in the order given on the command
-- line. */
-- for (uptr = user_specs_head; uptr; uptr = uptr->next)
-- {
-- char *filename = find_a_file (&startfile_prefixes, uptr->filename,
-- R_OK, true);
-- read_specs (filename ? filename : uptr->filename, false, true);
-- }
--
-- /* Process any user self specs. */
-- {
-- struct spec_list *sl;
-- for (sl = specs; sl; sl = sl->next)
-- if (sl->name_len == sizeof "self_spec" - 1
-- && !strcmp (sl->name, "self_spec"))
-- do_self_spec (*sl->ptr_spec);
-- }
--
- if (compare_debug)
- {
- enum save_temps save;
diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2016-bootstrap.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2016-bootstrap.patch
deleted file mode 100644
index aed1ad0e90be..000000000000
--- a/dev-lang/gnat-gpl/files/gnat-gpl-2016-bootstrap.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 41a4aa66eac45c8862a79351647ec06dd03bd1f5 Mon Sep 17 00:00:00 2001
-From: jakub
-Date: Sat, 13 Dec 2014 11:24:37 +0000
-Subject: [PATCH] PR bootstrap/64023 * Makefile.tpl
- (EXTRA_TARGET_FLAGS): Set STAGE1_LDFLAGS to POSTSTAGE1_LDFLAGS and
- STAGE1_LIBS to POSTSTAGE1_LIBS. Add -B to libstdc++-v3/src/.libs and
- libstdc++-v3/libsupc++/.libs to CXX. * Makefile.in: Regenerated.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218705 138bc75d-0d04-0410-961f-82ee72b054a4
----
- ChangeLog | 9 +++++++++
- Makefile.in | 6 +++++-
- Makefile.tpl | 6 +++++-
- 3 files changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index ba5ae4c2ecb..8ffc313f157 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -835,7 +835,9 @@ EXTRA_TARGET_FLAGS = \
- 'AS=$(COMPILER_AS_FOR_TARGET)' \
- 'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
- 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
-- 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
-+ 'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
-+ -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
-+ $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
- 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
- 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
- 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
-@@ -853,6 +855,8 @@ EXTRA_TARGET_FLAGS = \
- 'WINDRES=$$(WINDRES_FOR_TARGET)' \
- 'WINDMC=$$(WINDMC_FOR_TARGET)' \
- 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
-+ 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
-+ 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
- "TFLAGS=$$TFLAGS"
-
- TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
-diff --git a/Makefile.tpl b/Makefile.tpl
-index dcbc6b1b143..bb8227eaafa 100644
---- a/Makefile.tpl
-+++ b/Makefile.tpl
-@@ -641,7 +641,9 @@ EXTRA_TARGET_FLAGS = \
- 'AS=$(COMPILER_AS_FOR_TARGET)' \
- 'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
- 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
-- 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
-+ 'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
-+ -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
-+ $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
- 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
- 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
- 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
-@@ -659,6 +661,8 @@ EXTRA_TARGET_FLAGS = \
- 'WINDRES=$$(WINDRES_FOR_TARGET)' \
- 'WINDMC=$$(WINDMC_FOR_TARGET)' \
- 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
-+ 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
-+ 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
- "TFLAGS=$$TFLAGS"
-
- TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
---
-2.15.0
-
diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2016-finalization.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2016-finalization.patch
deleted file mode 100644
index 44503ae6b72e..000000000000
--- a/dev-lang/gnat-gpl/files/gnat-gpl-2016-finalization.patch
+++ /dev/null
@@ -1,220 +0,0 @@
---- a/gcc/ada/exp_attr.adb 2018-11-16 20:23:21.775906196 +0100
-+++ b/gcc/ada/exp_attr.adb 2018-11-16 20:25:57.418211404 +0100
-@@ -3121,6 +3121,121 @@
- Analyze_And_Resolve (N, Standard_String);
- end External_Tag;
-
-+ -----------------------
-+ -- Finalization_Size --
-+ -----------------------
-+
-+ when Attribute_Finalization_Size => Finalization_Size : declare
-+ function Calculate_Header_Size return Node_Id;
-+ -- Generate a runtime call to calculate the size of the hidden header
-+ -- along with any added padding which would precede a heap-allocated
-+ -- object of the prefix type.
-+
-+ ---------------------------
-+ -- Calculate_Header_Size --
-+ ---------------------------
-+
-+ function Calculate_Header_Size return Node_Id is
-+ begin
-+ -- Generate:
-+ -- Universal_Integer
-+ -- (Header_Size_With_Padding (Pref'Alignment))
-+
-+ return
-+ Convert_To (Universal_Integer,
-+ Make_Function_Call (Loc,
-+ Name =>
-+ New_Occurrence_Of (RTE (RE_Header_Size_With_Padding), Loc),
-+
-+ Parameter_Associations => New_List (
-+ Make_Attribute_Reference (Loc,
-+ Prefix => New_Copy_Tree (Pref),
-+ Attribute_Name => Name_Alignment))));
-+ end Calculate_Header_Size;
-+
-+ -- Local variables
-+
-+ Size : Entity_Id;
-+
-+ -- Start of Finalization_Size
-+
-+ begin
-+ -- An object of a class-wide type first requires a runtime check to
-+ -- determine whether it is actually controlled or not. Depending on
-+ -- the outcome of this check, the Finalization_Size of the object
-+ -- may be zero or some positive value.
-+ --
-+ -- In this scenario, Pref'Finalization_Size is expanded into
-+ --
-+ -- Size : Integer := 0;
-+ --
-+ -- if Needs_Finalization (Pref'Tag) then
-+ -- Size :=
-+ -- Universal_Integer
-+ -- (Header_Size_With_Padding (Pref'Alignment));
-+ -- end if;
-+ --
-+ -- and the attribute reference is replaced with a reference to Size.
-+
-+ if Is_Class_Wide_Type (Ptyp) then
-+ Size := Make_Temporary (Loc, 'S');
-+
-+ Insert_Actions (N, New_List (
-+
-+ -- Generate:
-+ -- Size : Integer := 0;
-+
-+ Make_Object_Declaration (Loc,
-+ Defining_Identifier => Size,
-+ Object_Definition =>
-+ New_Occurrence_Of (Standard_Integer, Loc),
-+ Expression => Make_Integer_Literal (Loc, 0)),
-+
-+ -- Generate:
-+ -- if Needs_Finalization (Pref'Tag) then
-+ -- Size :=
-+ -- Universal_Integer
-+ -- (Header_Size_With_Padding (Pref'Alignment));
-+ -- end if;
-+
-+ Make_If_Statement (Loc,
-+ Condition =>
-+ Make_Function_Call (Loc,
-+ Name =>
-+ New_Occurrence_Of (RTE (RE_Needs_Finalization), Loc),
-+
-+ Parameter_Associations => New_List (
-+ Make_Attribute_Reference (Loc,
-+ Prefix => New_Copy_Tree (Pref),
-+ Attribute_Name => Name_Tag))),
-+
-+ Then_Statements => New_List (
-+ Make_Assignment_Statement (Loc,
-+ Name => New_Occurrence_Of (Size, Loc),
-+ Expression => Calculate_Header_Size)))));
-+
-+ Rewrite (N, New_Occurrence_Of (Size, Loc));
-+
-+ -- The prefix is known to be controlled at compile time. Calculate
-+ -- Finalization_Size by calling function Header_Size_With_Padding.
-+
-+ elsif Needs_Finalization (Ptyp) then
-+ Rewrite (N, Calculate_Header_Size);
-+
-+ -- The prefix is not an object with controlled parts, so its
-+ -- Finalization_Size is zero.
-+
-+ else
-+ Rewrite (N, Make_Integer_Literal (Loc, 0));
-+ end if;
-+
-+ -- Due to cases where the entity type of the attribute is already
-+ -- resolved the rewritten N must get re-resolved to its appropriate
-+ -- type.
-+
-+ Analyze_And_Resolve (N, Typ);
-+ end Finalization_Size;
-+
- -----------
- -- First --
- -----------
---- a/gcc/ada/snames.ads-tmpl 2016-05-16 11:29:28.000000000 +0200
---- b/gcc/ada/snames.ads-tmpl 2016-05-16 11:29:28.000000000 +0200
-@@ -884,6 +884,7 @@
- Name_Exponent : constant Name_Id := N + $;
- Name_External_Tag : constant Name_Id := N + $;
- Name_Fast_Math : constant Name_Id := N + $; -- GNAT
-+ Name_Finalization_Size : constant Name_Id := N + $; -- GNAT
- Name_First : constant Name_Id := N + $;
- Name_First_Bit : constant Name_Id := N + $;
- Name_First_Valid : constant Name_Id := N + $; -- Ada 12
-@@ -1523,6 +1524,7 @@
- Attribute_Exponent,
- Attribute_External_Tag,
- Attribute_Fast_Math,
-+ Attribute_Finalization_Size,
- Attribute_First,
- Attribute_First_Bit,
- Attribute_First_Valid,
---- a/gcc/ada/sem_attr.ads 2018-11-16 21:35:46.821279875 +0100
-+++ b/gcc/ada/sem_attr.ads 2018-11-16 21:36:00.028057464 +0100
-@@ -242,6 +242,16 @@
- -- enumeration value. Constraint_Error is raised if no value of the
- -- enumeration type corresponds to the given integer value.
-
-+ -----------------------
-+ -- Finalization_Size --
-+ -----------------------
-+
-+ Attribute_Finalization_Size => True,
-+ -- For every object or non-class-wide-type, Finalization_Size returns
-+ -- the size of the hidden header used for finalization purposes as if
-+ -- the object or type was allocated on the heap. The size of the header
-+ -- does take into account any extra padding due to alignment issues.
-+
- -----------------
- -- Fixed_Value --
- -----------------
---- a/gcc/ada/sem_attr.adb 2018-11-16 21:35:49.698231429 +0100
-+++ b/gcc/ada/sem_attr.adb 2018-11-16 21:36:00.028057464 +0100
-@@ -3828,6 +3828,42 @@
- Check_Standard_Prefix;
- Rewrite (N, New_Occurrence_Of (Boolean_Literals (Fast_Math), Loc));
-
-+ -----------------------
-+ -- Finalization_Size --
-+ -----------------------
-+
-+ when Attribute_Finalization_Size =>
-+ Check_E0;
-+
-+ -- The prefix denotes an object
-+
-+ if Is_Object_Reference (P) then
-+ Check_Object_Reference (P);
-+
-+ -- The prefix denotes a type
-+
-+ elsif Is_Entity_Name (P) and then Is_Type (Entity (P)) then
-+ Check_Type;
-+ Check_Not_Incomplete_Type;
-+
-+ -- Attribute 'Finalization_Size is not defined for class-wide
-+ -- types because it is not possible to know statically whether
-+ -- a definite type will have controlled components or not.
-+
-+ if Is_Class_Wide_Type (Etype (P)) then
-+ Error_Attr_P
-+ ("prefix of % attribute cannot denote a class-wide type");
-+ end if;
-+
-+ -- The prefix denotes an illegal construct
-+
-+ else
-+ Error_Attr_P
-+ ("prefix of % attribute must be a definite type or an object");
-+ end if;
-+
-+ Set_Etype (N, Universal_Integer);
-+
- -----------
- -- First --
- -----------
-@@ -8264,6 +8300,13 @@
- Fold_Uint (N,
- Eval_Fat.Exponent (P_Base_Type, Expr_Value_R (E1)), Static);
-
-+ -----------------------
-+ -- Finalization_Size --
-+ -----------------------
-+
-+ when Attribute_Finalization_Size =>
-+ null;
-+
- -----------
- -- First --
- -----------
diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2016-gentoo.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2016-gentoo.patch
deleted file mode 100644
index 959ed5183124..000000000000
--- a/dev-lang/gnat-gpl/files/gnat-gpl-2016-gentoo.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/patch/09_all_default-ssp.patch 2017-01-08 16:14:09.377755019 +0100
-+++ b/patch/09_all_default-ssp.patch 2017-01-08 16:15:48.792764201 +0100
-@@ -78,14 +78,14 @@
- optimizing. The default value is 32.
- --- a/gcc/cp/lang-specs.h
- +++ b/gcc/cp/lang-specs.h
--@@ -46,7 +46,7 @@ along with GCC; see the file COPYING3. If not see
-+@@ -46,7 +46,7 @@
- %(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}\
- cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}\
- %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
- - %(cc1_options) %2\
- + %(cc1_options) %(ssp_default) %2\
-- %{!fsyntax-only:%{!fdump-ada-spec*:-o %g.s %{!o*:--output-pch=%i.gch}\
-- %W{o*:--output-pch=%*}}%V}}}}",
-+ %{!fsyntax-only:-o %g.s %{!fdump-ada-spec*:%{!fdump-xref*:%{!o*:--output-pch=%i.gch}\
-+ %W{o*:--output-pch=%*}}}%V}}}}",
- CPLUSPLUS_CPP_SPEC, 0, 0},
- @@ -57,11 +57,11 @@ along with GCC; see the file COPYING3. If not see
- %(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}\
-@@ -151,14 +151,14 @@
- /* This contains cpp options which are not passed when the preprocessor
- output will be used by another program. */
- @@ -1015,9 +1024,9 @@ static const struct compiler default_compilers[] =
-- %{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
-+ %{save-temps*|fdump-scos|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
- %(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i} \n\
- cc1 -fpreprocessed %{save-temps*:%b.i} %{!save-temps*:%g.i} \
- - %(cc1_options)}\
- + %(cc1_options) %(ssp_default)}\
-- %{!save-temps*:%{!traditional-cpp:%{!no-integrated-cpp:\
--- cc1 %(cpp_unique_options) %(cc1_options)}}}\
--+ cc1 %(cpp_unique_options) %(cc1_options) %(ssp_default)}}}\
-+ %{!save-temps*:%{!fdump-scos:%{!traditional-cpp:%{!no-integrated-cpp:\
-+- cc1 %(cpp_unique_options) %(cc1_options)}}}}\
-++ cc1 %(cpp_unique_options) %(cc1_options) %(ssp_default)}}}}\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 1},
- {"-",
- "%{!E:%e-E or -x required when input is from standard input}\
---- a/gcc-4.9-gpl-2016-src/gcc/ada/osint.adb 2017-03-10 21:58:02.600710156 +0100
-+++ b/gcc-4.9-gpl-2016-src/gcc/ada/osint.adb 2017-03-10 21:59:38.033983293 +0100
-@@ -2229,14 +2229,11 @@
- for J in Start_Of_Prefix .. Name_Len - Prog'Length + 1 loop
- if Name_Buffer (J .. J + Prog'Length - 1) = Prog then
- End_Of_Prefix := J - 1;
-+ Start_Of_Suffix := J + Prog'Length;
- exit;
- end if;
- end loop;
-
-- if End_Of_Prefix > 1 then
-- Start_Of_Suffix := End_Of_Prefix + Prog'Length + 1;
-- end if;
--
- -- Create the new program name
-
- return new String'
diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2016-profile.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2016-profile.patch
deleted file mode 100644
index 561c012a23e6..000000000000
--- a/dev-lang/gnat-gpl/files/gnat-gpl-2016-profile.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- a/gcc/ada/s-rident.ads 2018-11-18 18:47:39.042412895 +0100
-+++ b/gcc/ada/s-rident.ads 2018-11-18 19:02:31.736559044 +0100
-@@ -378,15 +378,17 @@
- type Profile_Name is
- (No_Profile,
- No_Implementation_Extensions,
-+ Restricted_Tasking,
-+ Restricted,
- Ravenscar,
- GNAT_Extended_Ravenscar,
-- Restricted);
-+ GNAT_Ravenscar_EDF);
- -- Names of recognized profiles. No_Profile is used to indicate that a
- -- restriction came from pragma Restrictions[_Warning], as opposed to
- -- pragma Profile[_Warning].
-
- subtype Profile_Name_Actual is Profile_Name
-- range No_Implementation_Extensions .. Restricted;
-+ range No_Implementation_Extensions .. Profile_Name'Last;
- -- Actual used profile names
-
- type Profile_Data is record
-@@ -456,6 +458,40 @@
- Max_Task_Entries => 0,
- others => 0)),
-
-+ -- Restricted_Tasking Profile
-+
-+ Restricted_Tasking =>
-+
-+ -- Restrictions for Restricted_Tasking profile
-+
-+ (Set =>
-+ (No_Abort_Statements => True,
-+ No_Asynchronous_Control => True,
-+ No_Dynamic_Attachment => True,
-+ No_Dynamic_Priorities => True,
-+ No_Entry_Queue => True,
-+ No_Local_Protected_Objects => True,
-+ No_Protected_Type_Allocators => True,
-+ No_Requeue_Statements => True,
-+ No_Task_Allocators => True,
-+ No_Task_Attributes_Package => True,
-+ No_Task_Hierarchy => True,
-+ No_Terminate_Alternatives => True,
-+ Max_Asynchronous_Select_Nesting => True,
-+ Max_Protected_Entries => True,
-+ Max_Select_Alternatives => True,
-+ Max_Task_Entries => True,
-+ others => False),
-+
-+ -- Value settings for Restricted profile
-+
-+ Value =>
-+ (Max_Asynchronous_Select_Nesting => 0,
-+ Max_Protected_Entries => 1,
-+ Max_Select_Alternatives => 0,
-+ Max_Task_Entries => 0,
-+ others => 0)),
-+
- -- Ravenscar Profile
-
- -- Note: the table entries here only represent the
-@@ -509,6 +545,49 @@
- Max_Task_Entries => 0,
- others => 0)),
-
-+ GNAT_Ravenscar_EDF =>
-+
-+ -- Restrictions for Ravenscar = Restricted profile ..
-+
-+ (Set =>
-+ (No_Abort_Statements => True,
-+ No_Asynchronous_Control => True,
-+ No_Dynamic_Attachment => True,
-+ No_Dynamic_Priorities => True,
-+ No_Entry_Queue => True,
-+ No_Local_Protected_Objects => True,
-+ No_Protected_Type_Allocators => True,
-+ No_Requeue_Statements => True,
-+ No_Task_Allocators => True,
-+ No_Task_Attributes_Package => True,
-+ No_Task_Hierarchy => True,
-+ No_Terminate_Alternatives => True,
-+ Max_Asynchronous_Select_Nesting => True,
-+ Max_Protected_Entries => True,
-+ Max_Select_Alternatives => True,
-+ Max_Task_Entries => True,
-+
-+ -- plus these additional restrictions:
-+
-+ No_Calendar => True,
-+ No_Implicit_Heap_Allocations => True,
-+ No_Local_Timing_Events => True,
-+ No_Relative_Delay => True,
-+ No_Select_Statements => True,
-+ No_Specific_Termination_Handlers => True,
-+ No_Task_Termination => True,
-+ Simple_Barriers => True,
-+ others => False),
-+
-+ -- Value settings for Ravenscar (same as Restricted)
-+
-+ Value =>
-+ (Max_Asynchronous_Select_Nesting => 0,
-+ Max_Protected_Entries => 1,
-+ Max_Select_Alternatives => 0,
-+ Max_Task_Entries => 0,
-+ others => 0)),
-+
- GNAT_Extended_Ravenscar =>
-
- -- Restrictions for GNAT_Extended_Ravenscar =
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
deleted file mode 100644
index d9b01134a7c3..000000000000
--- a/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PATCH_GCC_VER=4.9.4
-PATCH_VER="1.4"
-UCLIBC_VER="1.0"
-
-# Hardened gcc 4 stuff
-PIE_VER="0.6.4"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
-SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
-# uclibc need tls and nptl support for SSP support
-# uclibc need to be >= 0.9.33
-SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
-#end Hardened stuff
-
-TOOLCHAIN_GCC_PV=4.9.4
-
-REL=4.9
-MYP=gcc-${REL}-gpl-${PV}-src
-BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
-BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
-
-inherit toolchain-funcs toolchain
-
-DESCRIPTION="GNAT Ada Compiler - GPL version"
-HOMEPAGE="http://libre.adacore.com/"
-# we provide own tarball below
-SRC_URI+="
- http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f
- -> ${P}-src.tar.gz
- http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db
- -> ${MYP}.tar.gz
- http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d
- -> gcc-interface-${REL}-gpl-${PV}-src.tar.gz
- bootstrap? (
- amd64? (
- http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
- ${BTSTRP_AMD64}.tar.gz
- )
- x86? (
- http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 ->
- ${BTSTRP_X86}.tar.gz
- )
- )"
-
-LICENSE+=" GPL-2 GPL-3"
-SLOT="${TOOLCHAIN_GCC_PV}"
-KEYWORDS="amd64 x86"
-IUSE="+ada +bootstrap"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
-DEPEND="${RDEPEND}
- elibc_glibc? ( >=sys-libs/glibc-2.8 )
- >=sys-devel/binutils-2.20"
-
-PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-
-S="${WORKDIR}"/${MYP}
-
-FSFGCC=gcc-${TOOLCHAIN_GCC_PV}
-
-src_unpack() {
- if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
- eerror "You need a gcc compiler that provides the Ada Compiler:"
- eerror "1) use gcc-config to select the right compiler or"
- eerror "2) set the bootstrap use flag"
- die "ada compiler not available"
- fi
-
- toolchain_src_unpack
-}
-
-src_prepare() {
- if use amd64; then
- BTSTRP=${BTSTRP_AMD64}
- else
- BTSTRP=${BTSTRP_X86}
- fi
- if use bootstrap; then
- GCC="${WORKDIR}"/${BTSTRP}/bin/gcc
- else
- GCC=${ADA:-$(tc-getCC)}
- fi
- CC=${GCC}
- local base=$(basename ${GCC})
- CXX="${base/gcc/g++}"
- GNATMAKE="${base/gcc/gnatmake}"
- GNATBIND="${base/gcc/gnatbind}"
- if [[ ${base} != ${GCC} ]] ; then
- local path=$(dirname ${GCC})
- GNATMAKE="${path}/${GNATMAKE}"
- GNATBIND="${path}/${GNATBIND}"
- CXX="${path}/${CXX}"
- fi
- if use bootstrap; then
- rm ../${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
- fi
-
- cd ..
-
- sed -i \
- -e "s:gnatmake:${GNATMAKE}:g" \
- ${P}-src/src/ada/Make-generated.in || die "sed failed"
- sed -i \
- -e "/xoscons/s:gnatmake:${GNATMAKE}:g" \
- gcc-interface-${REL}-gpl-${PV}-src/Makefile.in || die "sed failed"
-
- mv ${P}-src/src/ada ${MYP}/gcc/ || die
- mv gcc-interface-${REL}-gpl-${PV}-src ${MYP}/gcc/ada/gcc-interface || die
- mv ${FSFGCC}/gcc/doc/gcc.info ${MYP}/gcc/doc/ || die
- mv ${FSFGCC}/libjava ${MYP} || die
- rm -r ${FSFGCC} || die
- eapply "${FILESDIR}"/${P}-gentoo.patch
- cd -
-
- # Bug 638056
- eapply "${FILESDIR}/${P}-bootstrap.patch"
- # add Finalization_Size Attribute
- eapply "${FILESDIR}/${P}-finalization.patch"
- # add profile for gnat_util compatibility
- eapply "${FILESDIR}/${P}-profile.patch"
-
- EPATCH_EXCLUDE+=" 34_all_gcc48_config_i386.patch"
- EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-
- toolchain_src_prepare
-
- use vanilla && return 0
- # Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
- [[ ${CHOST} == ${CTARGET} ]] && eapply "${FILESDIR}"/gcc-spec-env-r1.patch
-}
-
-src_configure() {
- downgrade_arch_flags "$(gcc-version)"
- toolchain_src_configure \
- CC=${GCC} \
- GNATBIND=${GNATBIND} \
- GNATMAKE=yes
-}
-
-pkg_postinst() {
- toolchain_pkg_postinst
- einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
- einfo "The compiler binary is gcc-${TOOLCHAIN_GCC_PV}"
- einfo "Even if the c/c++ compilers are using almost the same patched"
- einfo "source as the sys-devel/gcc package its use is not extensively"
- einfo "tested, and not supported for updating your system, except for ada"
- einfo "related packages"
-}
diff --git a/dev-lang/gnat-gpl/metadata.xml b/dev-lang/gnat-gpl/metadata.xml
index d22ee4a1f672..3a9e3dea8305 100644
--- a/dev-lang/gnat-gpl/metadata.xml
+++ b/dev-lang/gnat-gpl/metadata.xml
@@ -23,8 +23,6 @@
than use the code in the C library (DO NOT ENABLE THIS IF YOU DON'T
KNOW WHAT IT DOES)
Build using Link Time Optimizations (LTO)
- Disable PIE support (NOT FOR GENERAL USE)
- Disable SSP support (NOT FOR GENERAL USE)
Enable support for Native POSIX Threads Library, the new threading module (requires linux-2.6 or better usually)
Build support for the Objective C code language
diff --git a/dev-lang/python/python-3.10.0_beta2.ebuild b/dev-lang/python/python-3.10.0_beta2.ebuild
index 818aa5957c75..3018395550f3 100644
--- a/dev-lang/python/python-3.10.0_beta2.ebuild
+++ b/dev-lang/python/python-3.10.0_beta2.ebuild
@@ -43,7 +43,7 @@ RDEPEND="app-arch/bzip2:=
ncurses? ( >=sys-libs/ncurses-5.2:= )
readline? ( >=sys-libs/readline-4.1:= )
sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? ( dev-libs/openssl:= )
+ ssl? ( >=dev-libs/openssl-1.1.1:= )
tk? (
>=dev-lang/tcl-8.0:=
>=dev-lang/tk-8.0:=
diff --git a/dev-lang/python/python-3.10.0_beta3.ebuild b/dev-lang/python/python-3.10.0_beta3.ebuild
index e7e3f59b1da7..64b7a0044422 100644
--- a/dev-lang/python/python-3.10.0_beta3.ebuild
+++ b/dev-lang/python/python-3.10.0_beta3.ebuild
@@ -43,7 +43,7 @@ RDEPEND="app-arch/bzip2:=
ncurses? ( >=sys-libs/ncurses-5.2:= )
readline? ( >=sys-libs/readline-4.1:= )
sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? ( dev-libs/openssl:= )
+ ssl? ( >=dev-libs/openssl-1.1.1:= )
tk? (
>=dev-lang/tcl-8.0:=
>=dev-lang/tk-8.0:=
diff --git a/dev-lang/python/python-3.10.0_beta4.ebuild b/dev-lang/python/python-3.10.0_beta4.ebuild
index e7e3f59b1da7..64b7a0044422 100644
--- a/dev-lang/python/python-3.10.0_beta4.ebuild
+++ b/dev-lang/python/python-3.10.0_beta4.ebuild
@@ -43,7 +43,7 @@ RDEPEND="app-arch/bzip2:=
ncurses? ( >=sys-libs/ncurses-5.2:= )
readline? ( >=sys-libs/readline-4.1:= )
sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? ( dev-libs/openssl:= )
+ ssl? ( >=dev-libs/openssl-1.1.1:= )
tk? (
>=dev-lang/tcl-8.0:=
>=dev-lang/tk-8.0:=
diff --git a/dev-lang/python/python-3.7.10_p6.ebuild b/dev-lang/python/python-3.7.10_p6.ebuild
index fc1984de3bc1..e3bd9bd6bc81 100644
--- a/dev-lang/python/python-3.7.10_p6.ebuild
+++ b/dev-lang/python/python-3.7.10_p6.ebuild
@@ -42,7 +42,7 @@ RDEPEND="app-arch/bzip2:=
ncurses? ( >=sys-libs/ncurses-5.2:= )
readline? ( >=sys-libs/readline-4.1:= )
sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? ( dev-libs/openssl:= )
+ ssl? ( >=dev-libs/openssl-1.1.1:= )
tk? (
>=dev-lang/tcl-8.0:=
>=dev-lang/tk-8.0:=
diff --git a/dev-lang/python/python-3.7.11.ebuild b/dev-lang/python/python-3.7.11.ebuild
index 2a194aeea941..4f48850a2fdb 100644
--- a/dev-lang/python/python-3.7.11.ebuild
+++ b/dev-lang/python/python-3.7.11.ebuild
@@ -42,7 +42,7 @@ RDEPEND="app-arch/bzip2:=
ncurses? ( >=sys-libs/ncurses-5.2:= )
readline? ( >=sys-libs/readline-4.1:= )
sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? ( dev-libs/openssl:= )
+ ssl? ( >=dev-libs/openssl-1.1.1:= )
tk? (
>=dev-lang/tcl-8.0:=
>=dev-lang/tk-8.0:=
diff --git a/dev-lang/python/python-3.8.10_p2.ebuild b/dev-lang/python/python-3.8.10_p2.ebuild
index 3e7b9da36c3b..409300beb1d3 100644
--- a/dev-lang/python/python-3.8.10_p2.ebuild
+++ b/dev-lang/python/python-3.8.10_p2.ebuild
@@ -43,7 +43,7 @@ RDEPEND="app-arch/bzip2:=
ncurses? ( >=sys-libs/ncurses-5.2:= )
readline? ( >=sys-libs/readline-4.1:= )
sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? ( dev-libs/openssl:= )
+ ssl? ( >=dev-libs/openssl-1.1.1:= )
tk? (
>=dev-lang/tcl-8.0:=
>=dev-lang/tk-8.0:=
diff --git a/dev-lang/python/python-3.8.11.ebuild b/dev-lang/python/python-3.8.11.ebuild
index c6243a8ecd7a..3ac0540738bf 100644
--- a/dev-lang/python/python-3.8.11.ebuild
+++ b/dev-lang/python/python-3.8.11.ebuild
@@ -43,7 +43,7 @@ RDEPEND="app-arch/bzip2:=
ncurses? ( >=sys-libs/ncurses-5.2:= )
readline? ( >=sys-libs/readline-4.1:= )
sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? ( dev-libs/openssl:= )
+ ssl? ( >=dev-libs/openssl-1.1.1:= )
tk? (
>=dev-lang/tcl-8.0:=
>=dev-lang/tk-8.0:=
diff --git a/dev-lang/python/python-3.9.5_p2.ebuild b/dev-lang/python/python-3.9.5_p2.ebuild
index 687ad6e769ed..b16fafd716fa 100644
--- a/dev-lang/python/python-3.9.5_p2.ebuild
+++ b/dev-lang/python/python-3.9.5_p2.ebuild
@@ -43,7 +43,7 @@ RDEPEND="app-arch/bzip2:=
ncurses? ( >=sys-libs/ncurses-5.2:= )
readline? ( >=sys-libs/readline-4.1:= )
sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? ( dev-libs/openssl:= )
+ ssl? ( >=dev-libs/openssl-1.1.1:= )
tk? (
>=dev-lang/tcl-8.0:=
>=dev-lang/tk-8.0:=
diff --git a/dev-lang/python/python-3.9.6.ebuild b/dev-lang/python/python-3.9.6.ebuild
index f035379167b1..e24479c5cb4a 100644
--- a/dev-lang/python/python-3.9.6.ebuild
+++ b/dev-lang/python/python-3.9.6.ebuild
@@ -43,7 +43,7 @@ RDEPEND="app-arch/bzip2:=
ncurses? ( >=sys-libs/ncurses-5.2:= )
readline? ( >=sys-libs/readline-4.1:= )
sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? ( dev-libs/openssl:= )
+ ssl? ( >=dev-libs/openssl-1.1.1:= )
tk? (
>=dev-lang/tcl-8.0:=
>=dev-lang/tk-8.0:=
diff --git a/dev-lang/ruby/ruby-2.6.8.ebuild b/dev-lang/ruby/ruby-2.6.8.ebuild
index 0d71d00b2715..407cab269e1c 100644
--- a/dev-lang/ruby/ruby-2.6.8.ebuild
+++ b/dev-lang/ruby/ruby-2.6.8.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
RDEPEND="
diff --git a/dev-lang/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
index 3d736c369682..23816a53fc3a 100644
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@@ -1,2 +1 @@
-DIST scala-2.13.1.tgz 19685743 BLAKE2B aaff6db71023f539d08da521ab1ff505a626605d9c298472d0c2e98a9a13d6b8440e89cf5ff4a53b7b9bcc48cbc1e3b55cc253563f54f18c369e13fc8c00a6c2 SHA512 028aa237c471cada1501cd5764b3c384c3f50e9fc327cddd3fa7c79e9cc909d86bf84d5fc28103054600f879a60c546fc45a837cdca54964eb57ec77f9c1613e
DIST scala-2.13.6.tgz 23407489 BLAKE2B b65db49968dcbce2f5586aafaa4cd437156050050f209cce4a7d5edc18dfca3ebb60d2a726b4a26902723f993b78a673909c1139eb67e8eea4f35a4842b33c70 SHA512 445267cd7c1ddb8ef94d2edeb36567318c66429c88fcb183840998dc204a10253df09c33eb4de2f87b68b1a8cd4f557910fa3f061d4316314653eb64e91c0188
diff --git a/dev-lang/scala-bin/scala-bin-2.13.1-r1.ebuild b/dev-lang/scala-bin/scala-bin-2.13.1-r1.ebuild
deleted file mode 100644
index 9469077928d2..000000000000
--- a/dev-lang/scala-bin/scala-bin-2.13.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2
-
-MY_PN="${PN%-*}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://scala.epfl.ch/"
-SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
- >=virtual/jre-1.6
- !dev-lang/scala"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- ebegin 'Cleaning .bat files'
- rm -f bin/*.bat || die
- eend $?
-
- ebegin 'Patching SCALA_HOME variable in bin/ directory'
- local f
- for f in bin/*; do
- sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' "$f" || die
- done
- eend $?
-}
-
-src_compile() {
- :;
-}
-
-src_install() {
- ebegin 'Installing bin scripts'
- dobin bin/*
- eend $?
-
- ebegin 'Installing jar files'
-
- cd lib/ || die
-
- # Unversion those libs.
- java-pkg_newjar jline-*.jar jline.jar
- java-pkg_newjar scalap-*.jar scalap.jar
-
- # Install these the usual way.
- java-pkg_dojar scala-compiler.jar
- java-pkg_dojar scala-library.jar
- java-pkg_dojar scala-reflect.jar
-
- eend $?
-
- cd ../ || die
-
- ebegin 'Installing man pages'
- doman man/man1/*.1
- eend $?
-
- if use doc; then
- ebegin 'Installing documentation'
- java-pkg_dohtml -r doc/tools
- eend $?
- fi
-}
diff --git a/dev-lang/scala-bin/scala-bin-2.13.6.ebuild b/dev-lang/scala-bin/scala-bin-2.13.6.ebuild
index cdb8e4a5f113..951d45582b4f 100644
--- a/dev-lang/scala-bin/scala-bin-2.13.6.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.13.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc"
RDEPEND="
diff --git a/dev-lang/vala/vala-0.52.4.ebuild b/dev-lang/vala/vala-0.52.4.ebuild
index 03db361f3c83..2d8bdd459604 100644
--- a/dev-lang/vala/vala-0.52.4.ebuild
+++ b/dev-lang/vala/vala-0.52.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1+"
SLOT="0.52"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="test valadoc"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index df473f605c7d..712e14fa6970 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/elfutils/elfutils-0.185.ebuild b/dev-libs/elfutils/elfutils-0.185.ebuild
index f8471f70f442..c02044855553 100644
--- a/dev-libs/elfutils/elfutils-0.185.ebuild
+++ b/dev-libs/elfutils/elfutils-0.185.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/glib/glib-2.68.3-r1.ebuild b/dev-libs/glib/glib-2.68.3-r1.ebuild
index 4fb34812b583..6f3ad8f65d70 100644
--- a/dev-libs/glib/glib-2.68.3-r1.ebuild
+++ b/dev-libs/glib/glib-2.68.3-r1.ebuild
@@ -15,7 +15,7 @@ IUSE="dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-
RESTRICT="!test? ( test )"
REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
# * elfutils (via libelf) does not build on Windows. gresources are not embedded
# within ELF binaries on that platform anyway and inspecting ELF binaries from
diff --git a/dev-libs/judy/judy-1.0.5-r3.ebuild b/dev-libs/judy/judy-1.0.5-r3.ebuild
index 30329c63a52c..b730c174159e 100644
--- a/dev-libs/judy/judy-1.0.5-r3.ebuild
+++ b/dev-libs/judy/judy-1.0.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/judy/Judy-${PV}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="static-libs"
DOCS=( AUTHORS ChangeLog README )
diff --git a/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild b/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
index 96cb17f5396c..77712202c0be 100644
--- a/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
+++ b/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://ubuntu/pool/main/liba/${PN}/${PN}_${MY_PV}+20.10.${PATCH_VERSI
LICENSE="LGPL-2.1 LGPL-3"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
IUSE="+introspection test"
RDEPEND="
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
index 786de79b0ac7..b861b0d7a072 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="debug kernel_linux static-libs"
RESTRICT="test" # needs gam-server
diff --git a/dev-libs/libjcat/libjcat-0.1.8.ebuild b/dev-libs/libjcat/libjcat-0.1.8.ebuild
index 20c253ee26f3..11fd5361f10f 100644
--- a/dev-libs/libjcat/libjcat-0.1.8.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
+IUSE="+gpg gtk-doc +introspection +man +pkcs7 test vala"
RDEPEND="dev-libs/glib:2
dev-libs/json-glib:=
diff --git a/dev-libs/libmateweather/files/libmateweather-1.24.0-fix-tzdata-hints.patch b/dev-libs/libmateweather/files/libmateweather-1.24.0-fix-tzdata-hints.patch
deleted file mode 100644
index d1c3cab11651..000000000000
--- a/dev-libs/libmateweather/files/libmateweather-1.24.0-fix-tzdata-hints.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 354086a51ea676b6575dbb3ec62d749ec0a7c607 Mon Sep 17 00:00:00 2001
-From: rbuj
-Date: Fri, 22 May 2020 20:19:57 +0200
-Subject: [PATCH] Locations: America/Godthab was renamed to America/Nuuk
-
----
- data/Locations.xml.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/Locations.xml.in b/data/Locations.xml.in
-index 5488867..62529b9 100644
---- a/data/Locations.xml.in
-+++ b/data/Locations.xml.in
-@@ -6482,7 +6482,7 @@
- -->
- Danmarkshavn
-
--
-+
-
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 555daa233eeb..22dc25a5d736 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/bluez/bluez-5.58-r1.ebuild b/net-wireless/bluez/bluez-5.58-r1.ebuild
index c0100067a8b9..dc6017eb67c7 100644
--- a/net-wireless/bluez/bluez-5.58-r1.ebuild
+++ b/net-wireless/bluez/bluez-5.58-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0/3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86"
IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session"
# Since this release all remaining extra-tools need readline support, but this could
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index ce5e3f7f341c..8803160a99de 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 144a5e516b1b..e2b47d92c069 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,11 @@
#--- END OF EXAMPLES ---
+# Sam James (2021-07-12)
+# Haskell is (only) available on amd64/x86 right now in Gentoo
+# bug #801649
+dev-util/diffoscope -haskell
+
# Ionen Wolkens (2021-07-01)
# gui-libs/egl-wayland with nvidia-drivers is supported on this arch.
x11-base/xwayland -video_cards_nvidia
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index f1751dec36f1..8fa70e683bc3 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -10,10 +10,6 @@
python_single_target_python3_10
python_targets_python3_10
-# Michał Górny (2021-01-07)
-# Prebuilt kernel rebuilds are supported on stable yet.
-dist-kernel
-
# Sam James (2020-12-22)
# Not yet stable
lirc
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 5b5be3520b97..e9acf79d2f25 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,11 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Sam James (2021-07-12)
+# Haskell is only available on amd64/x86 right now in Gentoo
+# bug #801649
+dev-util/diffoscope haskell
+
# Ionen Wolkens (2021-07-01)
# gui-libs/egl-wayland with nvidia-drivers is only usable on some arches.
x11-base/xwayland video_cards_nvidia
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 5b0df73f6d2b..885311c091f4 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Marek Szuba (2021-07-11)
+# Causes 35 tests to fail with "fatal llvm error"
+dev-db/postgresql llvm
+
# Marek Szuba (2021-07-05)
# sys-cluster/ucx fails to compile on this arch
sys-cluster/slurm ucx
@@ -9,13 +13,6 @@ sys-cluster/slurm ucx
# net-dialup/mgetty fails to compile on this arch
mail-mta/courier fax
-# Marek Szuba (2021-07-05)
-# dev-db/postgresql not keyworded here yet
-dev-db/libdbi-drivers postgres
-dev-libs/cyrus-sasl postgres
-mail-mta/courier postgres
-net-libs/courier-authlib postgres
-
# Ye Cao (2021-07-02)
# Dependencies not keyworded, not tested
app-text/texlive-core xetex
@@ -43,8 +40,8 @@ dev-cpp/eigen doc test
dev-python/networkx extras pandas
# - sci-libs/umfpack (and a lot of its own deps in turn)
dev-python/scipy sparse
-# - dev-db/libdbi, sys-cluster/ceph
-net-analyzer/rrdtool dbi rados
+# - sys-cluster/ceph
+net-analyzer/rrdtool rados
# - sys-cluster/rdma-core | sys-fabric/ofed, sys-cluster/knem, sys-fabric/infinipath-psm, sys-fabric/librdmacm
sys-cluster/openmpi openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_dynamic-sl openmpi_ofed_features_rdmacm openmpi_ofed_features_udcm
# - sci-libs/hdf5, sys-fabric/ofed, dev-db/mariadb | dev-db/mysql
@@ -52,7 +49,7 @@ sys-cluster/slurm hdf5 ofed slurmdbd
# Ye Cao (2021-06-24)
# Dependencies not keyworded, not tested
-media-gfx/imagemagick fftw openexr wmf
+media-gfx/imagemagick openexr wmf
# Yixun Lan (2021-05-24)
# Dependencies not keyworded, not tested
@@ -129,12 +126,10 @@ dev-libs/libpcre jit
# This includes also packages which do not support python-3 or
# do not support python-3.7 yet.
-app-admin/syslog-ng amqp dbi geoip2 kafka mongodb redis spoof-source smtp snmp test
+app-admin/syslog-ng amqp geoip2 kafka mongodb redis spoof-source smtp snmp test
app-arch/p7zip wxwidgets
-app-crypt/mit-krb5 doc
app-doc/doxygen doc
app-editors/emacs mailutils
-app-misc/pax-utils python
app-text/asciidoc test
app-text/ghostscript-gpl cups
app-text/po4a test
@@ -153,7 +148,6 @@ dev-python/urllib3 test
dev-util/catalyst iso
dev-util/pkgconf test
dev-vcs/git cvs highlight subversion
-dev-vcs/mercurial zsh-completion
media-libs/harfbuzz doc
sys-libs/libcxx libcxxabi libunwind static-libs
sys-libs/libcxxabi libunwind
diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask
index df40319274bd..c18421fa6944 100644
--- a/profiles/arch/riscv/use.mask
+++ b/profiles/arch/riscv/use.mask
@@ -22,10 +22,6 @@ lua_single_target_luajit
lua_targets_lua5-2
lua_targets_luajit
-# Ben Kohler (2019-01-09)
-# no fam providers keyworded yet
-fam
-
# Sergei Trofimovich (2019-11-27)
# valgrind has no RISCV port.
valgrind
@@ -35,7 +31,6 @@ bluetooth
emacs
fuse
java
-kerberos
latex
libedit
mono
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index db99db7e76b6..4f1ddc270e52 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,11 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Sam James (2021-07-12)
+# Haskell is (only) available on amd64/x86 right now in Gentoo
+# bug #801649
+dev-util/diffoscope -haskell
+
# Ionen Wolkens (2021-07-04)
# Needed until media-libs/libsdl2[vulkan] is unmasked on this arch.
games-fps/yamagi-quake2 vulkan
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 469e5f74c244..e0bd80001526 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -10,10 +10,6 @@
python_single_target_python3_10
python_targets_python3_10
-# Michał Górny (2021-01-07)
-# Prebuilt kernel rebuilds are supported on stable yet.
-dist-kernel
-
# Sam James (2020-11-10)
# media-gfx/openvdb is not stable on x86
# ... and has failing tests right now anyway
diff --git a/profiles/base/package.mask b/profiles/base/package.mask
index 6f21ce80d960..f6ee04f609fa 100644
--- a/profiles/base/package.mask
+++ b/profiles/base/package.mask
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Andreas K. Hüttel (06.07.2021)
+# Andreas K. Hüttel (2021-07-06)
# Root privilege escalation, CVE-2017-18925, bug 751415
sys-apps/opentmpfiles
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index d9a86e696f2b..83513d5d82c1 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -136,10 +136,6 @@ media-gfx/blender doc
# but making it do so while vendored is a non-trivial task.
mail-mta/protonmail-bridge gui
-# Michał Górny (2020-11-29)
-# libclangformat-ide is masked for removal.
-dev-qt/qt-creator clang
-
# Michał Górny (2020-09-27)
# The respective dependencies are masked for removal.
net-im/telepathy-connection-managers gadu icq meanwhile steam yahoo
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 836f3aa19578..eaa49d098f58 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,11 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in package.use.mask
+# Sam James (2021-07-12)
+# Haskell isn't stable on amd64 (or anywhere)
+# bug #801649
+dev-util/diffoscope haskell
+
# Andreas K. Hüttel (2021-05-30)
# dev-perl/Net-Netmask-2.0.100 needs ... and ... which ends
# up pulling in a Test-Simple version newer than 5.32.
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 1201801394bb..ac54fe933f14 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,12 @@
# This file is only for generic masks. For arch-specific masks (i.e.
# mask everywhere, unmask on arch/*) use arch/base.
+# Marek Szuba (2021-07-12)
+# Effectively EOL, no packages in the tree strictly require this
+# particular version
+lua_single_target_lua5-2
+lua_targets_lua5-2
+
# Hans de Graaff (2021-07-09)
# Mask Ruby 2.5 as EOL
ruby_targets_ruby25
diff --git a/profiles/package.mask b/profiles/package.mask
index 1b3664790b01..e14710af6a64 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,31 @@
#--- END OF EXAMPLES ---
+# Marek Szuba (2021-07-12)
+# No releases since March 2015, no upstream repo activity since November
+# 2019. Unmaintained in Gentoo. Depends on effectively EOLed Lua 5.2,
+# fails to build against any other version. Removal in 30 days (Bug #801883)
+app-crypt/cardpeek
+
+# Marek Szuba (2021-07-12)
+# Effectively EOL, no packages in the tree strictly require this
+# particular version. Removal, of both the ebuilds and target support,
+# in 30 days (bug #801865).
+dev-lang/lua:5.2
+
+# Craig Andrews (2021-07-10)
+# Masked until November, 2021
+# This release adds enforcement of the Taproot protocol change to the Bitcoin
+# rules, beginning in November. Protocol changes require user consent to be
+# effective, and if enforced inconsistently within the community may compromise
+# your security or others! If you do not know what you are doing, learn more
+# before November. (You must make a decision either way - simply not upgrading
+# is insecure in all scenarios.)
+# To learn more, see https://bitcointaproot.cc
+>=net-p2p/bitcoind-0.21.1
+>=net-p2p/bitcoin-qt-0.21.1
+>=net-libs/libbitcoinconsensus-0.21.1
+
# Lars Wendler (2021-07-10)
# Masked for testing
>=mail-client/claws-mail-4.0.0
@@ -304,11 +329,6 @@ dev-python/pyls-black
# see bug: https://bugs.gentoo.org/787410
media-gfx/povtree
-# Joonas Niilola (2021-06-12)
-# A library without consumers, old dep of tree-cleaned gnome-mplayer,
-# EAPI-5. Removal in ~30 days. #776898
-media-libs/gmtk
-
# Sam James (2021-06-12)
# Masked until all reverse dependencies support
# OCaml 4.12.
@@ -316,11 +336,6 @@ media-libs/gmtk
>=dev-lang/ocaml-4.12
=dev-ml/camlp4-4.12
-# Alfredo Tupone (2021-06-11)
-# Masked for removal in 30 days. No more supported
- (2021-06-10)
# Based on unsupported grub-legacy, replaced by
# pvgrub2.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 4dd3b6b9e539..f3d9b655d5c0 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -606,6 +606,7 @@ app-emulation/snapd:apparmor - Enable AppArmor support.
app-emulation/snapd:cgroup-hybrid - Default to hybrid (legacy) cgroup hierarchy instead of unified (modern).
app-emulation/snapd:forced-devmode - Automatically disable application confinement if feature detection fails.
app-emulation/spice:smartcard - Enable smartcard remoting using app-emulation/libcacard
+app-emulation/uade:fuse - Enable sys-fs/fuse uadefs frontend for on-the-fly WAV conversion
app-emulation/vagrant:virtualbox - Use VirtualBox provider.
app-emulation/vice:cpuhistory - Enable 65xx CPU history support (may decrease performance)
app-emulation/vice:ethernet - Enable ethernet emulation
@@ -1697,6 +1698,7 @@ dev-java/openjfx:media - Compile media module, based on gstreamer-minimal (does
dev-java/openjfx:source - Install JavaFX sources
dev-java/rxtx:lfd - Installs and uses LockFileServer daemon (lfd)
dev-java/sbt:binary - Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.
+dev-lang/R:lto - Use link-time optimization for R and its recommended packages.
dev-lang/bas:lr0 - Use the LR0 parser instead of the recursive descending parser
dev-lang/crystal:blocking-stdio-hack - Keep STDIO file descriptors in blocking mode.
dev-lang/crystal:debug - Build each module as a separate object file. Speeds build up.
@@ -1730,8 +1732,6 @@ dev-lang/gnat-gpl:graphite - Add support for the framework for loop optimization
dev-lang/gnat-gpl:libssp - Build SSP support into a dedicated library rather than use the code in the C library (DO NOT ENABLE THIS IF YOU DON'T KNOW WHAT IT DOES)
dev-lang/gnat-gpl:lto - Build using Link Time Optimizations (LTO)
dev-lang/gnat-gpl:mpx - Enable support for Intel Memory Protection Extensions (MPX)
-dev-lang/gnat-gpl:nopie - Disable PIE support (NOT FOR GENERAL USE)
-dev-lang/gnat-gpl:nossp - Disable SSP support (NOT FOR GENERAL USE)
dev-lang/gnat-gpl:nptl - Enable support for Native POSIX Threads Library, the new threading module (requires linux-2.6 or better usually)
dev-lang/gnat-gpl:objc - Build support for the Objective C code language
dev-lang/gnat-gpl:objc++ - Build support for the Objective C++ language
@@ -2412,7 +2412,6 @@ dev-python/cvxopt:glpk - Use GNU Linear Programming Kit sci-mathematics/glpk
dev-python/drf-yasg:validation - Enable swagger spec validation using swagger-spec-validator
dev-python/editorconfig-core-py:cli - Install command line interface as well as python library
dev-python/falcon:cython - Build cython-based python modules
-dev-python/gmpy:mpir - Use sci-libs/mpir as gmp implementation
dev-python/hiredis:system-libs - Use dev-libs/hiredis from system
dev-python/hypothesis:cli - Install a CLI tool used to write tests.
dev-python/icalendar:doc - Generate examples and other extra documentation
@@ -2542,7 +2541,6 @@ dev-qt/qt-creator:ctfvisualizer - Build the Chrome Trace Format visualizer plugi
dev-qt/qt-creator:designer - Enable designer for QtWidgets-based UIs
dev-qt/qt-creator:glsl - Build the GLSL editor plugin
dev-qt/qt-creator:help - Enable the integrated documentation viewer
-dev-qt/qt-creator:ios - Build plugin for Apple iOS devices
dev-qt/qt-creator:lsp - Add support for the Language Server Protocol (LSP)
dev-qt/qt-creator:mcu - Build plugin for MCU devices
dev-qt/qt-creator:mercurial - Add support for dev-vcs/mercurial version control system
@@ -2564,7 +2562,6 @@ dev-qt/qt-creator:systemd - Add support for retrieving application output from j
dev-qt/qt-creator:valgrind - Enable integration with dev-util/valgrind
dev-qt/qt-creator:webassembly - Build WebAssembly plugin
dev-qt/qt-creator:webengine - Use dev-qt/qtwebengine to view documentation
-dev-qt/qt-creator:winrt - Build plugin for WinRT devices
dev-qt/qt-docs:3d - Install documentation for dev-qt/qt3d
dev-qt/qt-docs:assistant - Install documentation for dev-qt/assistant
dev-qt/qt-docs:bluetooth - Install documentation for dev-qt/qtbluetooth
@@ -2782,7 +2779,6 @@ dev-util/diffoscope:squashfs - Use sys-fs/squashfs-tools
dev-util/diffoscope:ssh - Use net-misc/openssh
dev-util/diffoscope:tar - Use app-arch/tar
dev-util/diffoscope:tcpdump - Use net-analyzer/tcpdump
-dev-util/diffoscope:xz - Use app-arch/xz-utils
dev-util/diffoscope:zip - Use app-arch/unzip
dev-util/edb-debugger:jumbo-build - Experimental jumbo (also known as unity) build capability
dev-util/edi:clang - Provide integration with sys-devel/clang and dev-util/bear for autocompletion, inline errors and information about compilation units.
@@ -4128,7 +4124,6 @@ media-libs/gd:webp - Enable support for the webp format
media-libs/gegl:lensfun - Enable support for media-libs/lensfun.
media-libs/gegl:umfpack - Enable sparse solving via sci-libs/umfpack.
media-libs/gmmlib:custom-cflags - Do not override user CFLAGS like -march, -msse and similar with lib defaults. Not tested by upstream.
-media-libs/gmtk:dconf - Enable support for gnome-base/dconf
media-libs/grilo:playlist - Enable support for playlists through dev-libs/totem-pl-parser
media-libs/gst-plugins-bad:bzip2 - Enable bzip2 encoder/decoder plugin
media-libs/gst-plugins-bad:egl - Enable EGL support
@@ -4559,6 +4554,9 @@ media-sound/dir2ogg:mac - Add support for decoding Monkey's Audio files
media-sound/dir2ogg:wma - Add support for wma files through mplayer
media-sound/drumstick:fluidsynth - Enable support for media-sound/fluidsynth
media-sound/drumstick:network - Build Network RT backend
+media-sound/easyeffects:bs2b - Enable use of media-libs/libbs2b
+media-sound/easyeffects:calf - Enable use of media-plugins/calf for adding various FX
+media-sound/easyeffects:rubberband - Enable usse of media-libs/rubberband for the pitch shifting FX
media-sound/easytag:nautilus - Build gnome-base/nautilus extension
media-sound/ecasound:lv2 - Add support for Ladspa V2
media-sound/ecasound:oil - Use dev-libs/liboil for inner loop optimizations
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index d188bc039948..5b39bcc12246 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 2ea1e4443086..b8a5715375dc 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,2 +1,3 @@
DIST z3-4.8.10.tar.gz 4731869 BLAKE2B 92487f71a0c8d961949dc23032d8fa3ff157fe7acc29b41d0d79326f8b59c60e19f43527cccf4e51872c0f0664598f9063876b04cc581f918aa48c37a13c4f3f SHA512 d2741d7ad3e1d5ee3fec92095b061a96a700c3327b2eb2090d4162bdcaeaebca8c072ef79c5daac1f6de3456165c2cc38e13f1045bc707779d1027b943837c5b
DIST z3-4.8.11.tar.gz 4799940 BLAKE2B 5478f9f45f2dc8ea5d2b781e79d886e77eed5ae034498b434dae349aa76f05836d8fd3134a08b381830b57acb3896ac51337d5bbe480dcce4770f2cd4fbee841 SHA512 ceab703d0413d0135e0f4e6c3ba2bb58d6a4823385edb0bf7ecc96949a3073b687d415a2674c86c9f876adb52823f98f9fbbc107d799ed756dc16292f9864894
+DIST z3-4.8.11b.tar.gz 4801435 BLAKE2B 903a04246fe4dedc96fda653fa9e3a57a80b951d20b992306bd07bc778cf0a94cf36fe4ed3f178bb26196a1ca294834c784a117fe906d52b82f874a43869d110 SHA512 dfcfc85209dd00aa5f07de0a7e7186a33442b72b94b05c01f53350b9281551be2a2c21ad5e7814bc2c52a3329be8df578e6be8c387cbfdc3a9d3bef0611d6613
diff --git a/sci-mathematics/z3/z3-4.8.11b.ebuild b/sci-mathematics/z3/z3-4.8.11b.ebuild
new file mode 100644
index 000000000000..985b483904f9
--- /dev/null
+++ b/sci-mathematics/z3/z3-4.8.11b.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake-multilib python-single-r1 toolchain-funcs
+
+DESCRIPTION="An efficient theorem prover"
+HOMEPAGE="https://github.com/Z3Prover/z3/"
+SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
+S=${WORKDIR}/z3-${P}
+
+SLOT="0/4.8"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc examples gmp isabelle java python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ java? ( >=virtual/jdk-1.8 )"
+BDEPEND="
+ doc? ( app-doc/doxygen )"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
+ -DZ3_USE_LIB_GMP=$(usex gmp)
+ -DZ3_ENABLE_EXAMPLE_TARGETS=OFF
+ -DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
+ -DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
+ -DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
+ -DZ3_INCLUDE_GIT_DESCRIBE=OFF
+ -DZ3_INCLUDE_GIT_HASH=OFF
+ )
+
+ cmake_src_configure
+}
+
+multilib_src_test() {
+ cmake_build test-z3
+ set -- "${BUILD_DIR}"/test-z3 /a
+ echo "${@}" >&2
+ "${@}" || die
+}
+
+multilib_src_install_all() {
+ dodoc README.md RELEASE_NOTES
+ use examples && dodoc -r examples
+ use python && python_optimize
+
+ if use isabelle; then
+ insinto /usr/share/Isabelle/contrib/${P}/etc
+ newins - settings <<-EOF
+ Z3_COMPONENT="\$COMPONENT"
+ Z3_HOME="${EPREFIX}/usr/bin"
+ Z3_SOLVER="${EPREFIX}/usr/bin/z3"
+ Z3_REMOTE_SOLVER="z3"
+ Z3_VERSION="${PV}"
+ Z3_INSTALLED="yes"
+ Z3_NON_COMMERCIAL="yes"
+ EOF
+ fi
+}
+
+pkg_postinst() {
+ if use isabelle; then
+ if [[ -f ${ROOT}/etc/isabelle/components ]]; then
+ sed -e "/contrib\/${PN}-[0-9.]*/d" \
+ -i "${ROOT}/etc/isabelle/components" || die
+ cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
+ contrib/${P}
+ EOF
+ fi
+ fi
+}
+
+pkg_postrm() {
+ if use isabelle; then
+ if [[ ! ${REPLACING_VERSIONS} ]]; then
+ if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
+ # Note: this sed should only match the version of this ebuild
+ # Which is what we want as we do not want to remove the line
+ # of a new Isabelle component being installed during an upgrade.
+ sed -e "/contrib\/${P}/d" \
+ -i "${ROOT}/etc/isabelle/components" || die
+ fi
+ fi
+ fi
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b89d827cf66c..1b2f976c85a3 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/file/file-5.40-r3.ebuild b/sys-apps/file/file-5.40-r3.ebuild
index 879174d8cc32..a35b94c33d95 100644
--- a/sys-apps/file/file-5.40-r3.ebuild
+++ b/sys-apps/file/file-5.40-r3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 45b319d6ec17..44c6a165d6a9 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1 +1,2 @@
DIST gnome-disk-utility-40.1.tar.xz 1387480 BLAKE2B ef3650cadd2f5e264abbf805fa0af1c7e9e30e067c946d91dd879600e2db5b9af83cc8f7990954cd8d859a7456d4054ddb9bcad0ed716a08b848f78dddda98d8 SHA512 be7a298f6ca9afad5dfd420a5ff5386a1e096f7d956339d5528702b2bd2b657dad4b9017b0ae519d13480fe0806fa64fd1c94e2c1136ee00a6b17c7f21a0acf1
+DIST gnome-disk-utility-40.2.tar.xz 1387320 BLAKE2B fa5df2f3c18a6635e41fdbab7382b036771028b86bff6adf94241aa2919d2a489f1829299e6efb46ab25daccba01919d372269250a3456319f4057a0dcec76cd SHA512 a674968270fa00874f69e1d3db7afea9cab7d5a0cbedbc1aae02282941d5e92f4816b27f35b6775e758148fa27750460adbe4c6f591a68caab0c6c9d709fa50c
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-40.2.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-40.2.ebuild
new file mode 100644
index 000000000000..3192512980a0
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-40.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Disk Utility for GNOME using udisks"
+HOMEPAGE="https://wiki.gnome.org/Apps/Disks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="fat elogind gnome systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+ >=media-libs/libdvdread-4.2.0:0=
+ >=dev-libs/glib-2.31:2
+ >=x11-libs/gtk+-3.16.0:3
+ >=media-libs/libcanberra-0.1[gtk3]
+ >=gui-libs/libhandy-1.1.90:1=
+ >=app-arch/xz-utils-5.0.5
+ >=x11-libs/libnotify-0.7:=
+ >=app-crypt/libsecret-0.7
+ >=dev-libs/libpwquality-1.0.0
+ >=sys-fs/udisks-2.7.6:2
+ elogind? ( >=sys-auth/elogind-209 )
+ systemd? ( >=sys-apps/systemd-209:0= )
+"
+RDEPEND="${DEPEND}
+ x11-themes/adwaita-icon-theme
+ fat? ( sys-fs/dosfstools )
+ gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
+"
+# libxml2 for xml-stripblanks in gresource
+BDEPEND="
+ dev-libs/libxml2:2
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local emesonargs=(
+ -Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none))
+ $(meson_use gnome gsd_plugin)
+ -Dman=true
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/sys-apps/osinfo-db/osinfo-db-20210621.ebuild b/sys-apps/osinfo-db/osinfo-db-20210621.ebuild
index 8ce74ca0d1ea..109cfb6ee818 100644
--- a/sys-apps/osinfo-db/osinfo-db-20210621.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20210621.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
BDEPEND="sys-apps/osinfo-db-tools"
diff --git a/sys-apps/secilc/secilc-3.2.ebuild b/sys-apps/secilc/secilc-3.2.ebuild
index 5bb8db55a984..f77d113c66ba 100644
--- a/sys-apps/secilc/secilc-3.2.ebuild
+++ b/sys-apps/secilc/secilc-3.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
S="${WORKDIR}/${P}/${PN}"
else
SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~x86"
fi
LICENSE="GPL-2"
diff --git a/sys-apps/shadow/files/shadow-4.8-revert-bin-merge.patch b/sys-apps/shadow/files/shadow-4.8-revert-bin-merge.patch
deleted file mode 100644
index 08382fcb9500..000000000000
--- a/sys-apps/shadow/files/shadow-4.8-revert-bin-merge.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 97839741..ff153d92 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2,8 +2,8 @@
- EXTRA_DIST = \
- .indent.pro
-
--ubindir = ${bindir}
--usbindir = ${sbindir}
-+ubindir = ${prefix}/bin
-+usbindir = ${prefix}/sbin
- suidperms = 4755
- sgidperms = 2755
-
diff --git a/sys-apps/systemd/files/249-libudev-static.patch b/sys-apps/systemd/files/249-libudev-static.patch
new file mode 100644
index 000000000000..73375b716e9b
--- /dev/null
+++ b/sys-apps/systemd/files/249-libudev-static.patch
@@ -0,0 +1,26 @@
+From f2c57d4f3805775e0ffdc80ce578eaa737017d31 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert
+Date: Fri, 9 Jul 2021 13:05:23 -0400
+Subject: [PATCH] libudev: add "Libs.private: -lrt -pthread" to libudev.pc
+
+This resolves a failure when linking cryptsetup.static against libudev.a.
+
+```
+libtool: link: x86_64-pc-linux-gnu-gcc -Wall -O2 -pipe -march=amdfam10 -static -O2 -o cryptsetup.static lib/utils_crypt.o lib/utils_loop.o lib/utils_io.o lib/utils_blkid.o src/utils_tools.o src/utils_password.o src/utils_luks2.o src/utils_blockdev.o src/cryptsetup.o -pthread -pthread -Wl,--as-needed ./.libs/libcryptsetup.a -largon2 -lrt -ljson-c -lpopt -luuid -lblkid -lssl -lcrypto -lz -ldl -ldevmapper -lm -lpthread -ludev -pthread
+/usr/lib/gcc/x86_64-pc-linux-gnu/11.1.0/../../../../x86_64-pc-linux-gnu/bin/ld: /usr/lib/gcc/x86_64-pc-linux-gnu/11.1.0/../../../../lib64/libudev.a(src_libsystemd_sd-daemon_sd-daemon.c.o): in function `sd_is_mq':
+(.text.sd_is_mq+0x3a): undefined reference to `mq_getattr'
+```
+---
+ src/libudev/libudev.pc.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libudev/libudev.pc.in b/src/libudev/libudev.pc.in
+index 89028aaa6bf2..1d6487fa4084 100644
+--- a/src/libudev/libudev.pc.in
++++ b/src/libudev/libudev.pc.in
+@@ -16,4 +16,5 @@ Name: libudev
+ Description: Library to access udev device information
+ Version: {{PROJECT_VERSION}}
+ Libs: -L${libdir} -ludev
++Libs.private: -lrt -pthread
+ Cflags: -I${includedir}
diff --git a/sys-apps/systemd/systemd-248.3-r1.ebuild b/sys-apps/systemd/systemd-248.3-r1.ebuild
index a6e3d207945c..cbf86f5cc09b 100644
--- a/sys-apps/systemd/systemd-248.3-r1.ebuild
+++ b/sys-apps/systemd/systemd-248.3-r1.ebuild
@@ -319,7 +319,6 @@ multilib_src_configure() {
$(meson_native_true vconsole)
# static-libs
- $(meson_use static-libs static-libsystemd)
$(meson_use static-libs static-libudev)
)
diff --git a/sys-apps/systemd/systemd-249-r1.ebuild b/sys-apps/systemd/systemd-249-r3.ebuild
similarity index 99%
rename from sys-apps/systemd/systemd-249-r1.ebuild
rename to sys-apps/systemd/systemd-249-r3.ebuild
index 3bc38914353f..d11da3bdbde0 100644
--- a/sys-apps/systemd/systemd-249-r1.ebuild
+++ b/sys-apps/systemd/systemd-249-r3.ebuild
@@ -219,6 +219,7 @@ src_prepare() {
# Add local patches here
PATCHES+=(
"${FILESDIR}/249-hostnamed-error-variable.patch"
+ "${FILESDIR}/249-libudev-static.patch"
)
if ! use vanilla; then
@@ -322,7 +323,6 @@ multilib_src_configure() {
$(meson_native_true vconsole)
# static-libs
- $(meson_use static-libs static-libsystemd)
$(meson_use static-libs static-libudev)
)
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 7b82142e7ac7..714f276a62f0 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -321,7 +321,6 @@ multilib_src_configure() {
$(meson_native_true vconsole)
# static-libs
- $(meson_use static-libs static-libsystemd)
$(meson_use static-libs static-libudev)
)
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index 619d7082e0a6..e1ffaf9b6f09 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -1,2 +1,3 @@
DIST tcp-wrappers_7.6.q-28.debian.tar.xz 36104 BLAKE2B 209fd9730785db8afc8ebec581f7132cfb4352f8807d2cea4715daf5c11aa08a92cf084ab1ff31222f5b265f032286ce2dcf49a238e9dc5616161c400fce4f08 SHA512 2c63201937737c19b4e5ca97dbc0ede9fc2d3b8fc344f8854a7d2afc0109ccb9ee52af94ba8a8498da910336a4f473825daa7a0cca26a0d93e1078e67abe16b0
+DIST tcp-wrappers_7.6.q-31.debian.tar.xz 36256 BLAKE2B 3ffd8b014c120f54b9231f375d3ec77a1894db8c48e56a57b52c5d796be42b78a1ddc35a45c816a05a1cbc603b88e3fe6131b4a562fb9d2169685031ecbf44d5 SHA512 de2bd7b081fca0f182def93795014332baf7b5edf339eaf81dff82772aea1dc866ccddccd5273e7dc49cf760953e164a66f1e5945cb54f2b8dab090c11712c33
DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild
new file mode 100644
index 000000000000..7ab6995f3d7f
--- /dev/null
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multilib-minimal usr-ldscript
+
+MY_PV=$(ver_cut 1-2)
+DEB_PV=$(ver_cut 3)
+MY_P="${PN//-/_}_${MY_PV}"
+DESCRIPTION="TCP Wrappers"
+HOMEPAGE="http://ftp.porcupine.org/pub/security"
+SRC_URI="http://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
+ mirror://debian/pool/main/t/${PN}/${PN}_${MY_PV}.q-${DEB_PV}.debian.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="tcp_wrappers_license"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="ipv6 netgroups static-libs"
+
+RDEPEND="netgroups? ( net-libs/libnsl:= )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-7.6-redhat-bug11881.patch"
+ "${FILESDIR}/${PN}-7.6.28-no-external-malloc.patch"
+)
+
+src_prepare() {
+ # Apply Debian patchset except for the series file which just lists
+ # the patches
+ eapply $(sed -e 's:^:../debian/patches/:' ../debian/patches/series || die)
+
+ default
+
+ multilib_copy_sources
+}
+
+temake() {
+ append-cppflags "-DHAVE_WEAKSYMS -DHAVE_STRERROR -DSYS_ERRLIST_DEFINED"
+
+ if use ipv6; then
+ append-cppflags "-DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len"
+ fi
+
+ local myemakeargs=(
+ REAL_DAEMON_DIR="${EPREFIX}/usr/sbin"
+ TLI= VSYSLOG= PARANOID= BUGS=
+ AUTH="-DALWAYS_RFC931"
+ AUX_OBJ="weak_symbols.o"
+ DOT="-DAPPEND_DOT"
+ HOSTNAME="-DALWAYS_HOSTNAME"
+ NETGROUP=$(usex netgroups -DNETGROUPS "")
+ STYLE="-DPROCESS_OPTIONS"
+ LIBS=$(usex netgroups -lnsl "")
+ LIB=$(usex static-libs libwrap.a "")
+ AR="$(tc-getAR)" ARFLAGS=rc
+ CC="$(tc-getCC)"
+ RANLIB="$(tc-getRANLIB)"
+ COPTS="${CFLAGS} ${CPPFLAGS}"
+ LDFLAGS="${LDFLAGS}"
+ "$@"
+ )
+
+ emake "${myemakeargs[@]}"
+}
+
+multilib_src_configure() {
+ tc-export AR RANLIB
+ temake config-check
+}
+
+multilib_src_compile() {
+ # https://bugs.gentoo.org/728348
+ unset STRINGS
+ temake all
+}
+
+multilib_src_install() {
+ into /usr
+ use static-libs && dolib.a libwrap.a
+ dolib.so shared/libwrap.so*
+
+ insinto /usr/include
+ doins tcpd.h
+
+ if multilib_is_native_abi; then
+ gen_usr_ldscript -a wrap
+ dosbin tcpd tcpdchk tcpdmatch safe_finger try-from
+ fi
+}
+
+multilib_src_install_all() {
+ doman *.[358]
+ dosym hosts_access.5 /usr/share/man/man5/hosts.allow.5
+ dosym hosts_access.5 /usr/share/man/man5/hosts.deny.5
+
+ insinto /etc
+ newins "${FILESDIR}"/hosts.allow.example hosts.allow
+
+ dodoc BLURB CHANGES DISCLAIMER README*
+}
+
+pkg_preinst() {
+ # don't clobber people with our default example config
+ [[ -e ${EROOT}/etc/hosts.allow ]] && cp -pP "${EROOT}"/etc/hosts.allow "${ED}"/etc/hosts.allow
+}
diff --git a/sys-apps/util-linux/files/util-linux-2.37-avoid_autoreconf.patch b/sys-apps/util-linux/files/util-linux-2.37-avoid_autoreconf.patch
new file mode 100644
index 000000000000..44ea6e5c2bed
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.37-avoid_autoreconf.patch
@@ -0,0 +1,136 @@
+--- util-linux-2.37/config.h.in
++++ util-linux-2.37/config.h.in
+@@ -216,9 +216,6 @@
+ /* Define to 1 if you have the `cap-ng' library (-lcap-ng). */
+ #undef HAVE_LIBCAP_NG
+
+-/* Do we need -lcrypt? */
+-#undef HAVE_LIBCRYPT
+-
+ /* Define if libeconf is available */
+ #undef HAVE_LIBECONF
+
+--- util-linux-2.37/configure
++++ util-linux-2.37/configure
+@@ -4965,12 +4965,7 @@
+ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+ if test x"${MISSING+set}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+- *)
+- MISSING="\${SHELL} $am_aux_dir/missing" ;;
+- esac
++ MISSING="\${SHELL} '$am_aux_dir/missing'"
+ fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --is-lightweight"; then
+@@ -25591,7 +25586,10 @@
+
+ else
+
++
++ old_LIBS="$LIBS"
+ LIBS="$LIBS -lcrypt"
++
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -25612,10 +25610,7 @@
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+-
+-$as_echo "#define HAVE_LIBCRYPT 1" >>confdefs.h
++if ac_fn_c_try_link "$LINENO"; then :
+
+ have_libcrypt=yes
+ have_crypt=yes
+@@ -25626,7 +25621,11 @@
+ $as_echo "$as_me: WARNING: crypt() is not available" >&2;}
+
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++
++ LIBS="$old_LIBS"
++
+
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+@@ -25768,12 +25767,8 @@
+
+
+
+- old_CFLAGS="$CFLAGS"
+- old_CPPFLAGS="$CPPFLAGS"
+- old_LDFLAGS="$LDFLAGS"
+- CFLAGS="$CFLAGS "
+- CPPFLAGS="$CPPFLAGS "
+- LDFLAGS="$LDFLAGS $SELINUX_LIBS"
++ old_LIBS="$LIBS"
++ LIBS="$LIBS $SELINUX_LIBS"
+
+ # This function is missing in old libselinux 1.xx versions
+ for ac_func in security_get_initial_context
+@@ -25788,9 +25783,7 @@
+ done
+
+
+- CFLAGS="$old_CFLAGS"
+- CPPFLAGS="$old_CPPFLAGS"
+- LDFLAGS="$old_LDFLAGS"
++ LIBS="$old_LIBS"
+
+
+ fi
+--- util-linux-2.37/Makefile.in
++++ util-linux-2.37/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.16.2 from Makefile.am.
++# Makefile.in generated by automake 1.16.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2020 Free Software Foundation, Inc.
+@@ -4649,6 +4649,8 @@
+ GZIP_ENV = --best
+ DIST_ARCHIVES = $(distdir).tar.xz
+ DIST_TARGETS = dist-xz
++# Exists only to be overridden by the user if desired.
++AM_DISTCHECK_DVI_TARGET = dvi
+ distuninstallcheck_listfiles = find . -type f -print
+ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+@@ -14854,7 +14856,7 @@
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=../.. --prefix="$$dc_install_base" \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+- && $(MAKE) $(AM_MAKEFLAGS) dvi \
++ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+@@ -14920,7 +14922,8 @@
+ done
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-recursive
+-install-exec: install-exec-recursive
++install-exec: $(BUILT_SOURCES)
++ $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive
+ install-data: install-data-recursive
+ uninstall: uninstall-recursive
+
+@@ -16157,7 +16160,8 @@
+ uninstall-man8
+
+ .MAKE: $(am__recursive_targets) all check check-am install install-am \
+- install-data-am install-exec-am install-strip uninstall-am
++ install-data-am install-exec install-exec-am install-strip \
++ uninstall-am
+
+ .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+ am--depfiles am--refresh check check-am check-local clean \
diff --git a/sys-apps/util-linux/files/util-linux-2.37-lcrypt_link_fix.patch b/sys-apps/util-linux/files/util-linux-2.37-lcrypt_link_fix.patch
new file mode 100644
index 000000000000..2da99b2841d6
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.37-lcrypt_link_fix.patch
@@ -0,0 +1,50 @@
+From 637cc045ee464909c261d6fa16c71ed15cd455e3 Mon Sep 17 00:00:00 2001
+From: Alex Xu <351006+Hello71@users.noreply.github.com>
+Date: Wed, 16 Jun 2021 13:58:25 +0000
+Subject: [PATCH] build-sys: Update configure.ac
+
+1. the test incorrectly used AC_COMPILE_IFELSE instead of
+ AC_LINK_IFELSE, defeating the purpose of checking -lcrypt.
+2. the test did not properly restore LIBS, causing later checks to all
+ fail if libcrypt wasn't found.
+3. HAVE_LIBCRYPT only controls whether to use -lcrypt, it is not
+ needed or used in any source files.
+
+[kzak@redhat.com: - improve commit message
+ - use UL_{SET,RESTORE}_FLAGS() rather than directly
+ modify $LIBS]
+
+Signed-off-by: Karel Zak
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5181d524c..939c6d2d3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -845,8 +845,8 @@ char *c = crypt("abc","pw");
+ have_libcrypt=no
+ have_crypt=yes
+ ],[
+- LIBS="$LIBS -lcrypt"
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++ UL_SET_FLAGS([], [], [-lcrypt])
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #ifdef HAVE_CRYPT_H
+ #include
+ #else
+@@ -856,12 +856,12 @@ char *c = crypt("abc","pw");
+ ]], [[
+ char *c = crypt("abc","pw");
+ ]])],[
+- AC_DEFINE([HAVE_LIBCRYPT], [1], [Do we need -lcrypt?])
+ have_libcrypt=yes
+ have_crypt=yes
+ ],[
+ AC_MSG_WARN([crypt() is not available])
+ ])
++ UL_RESTORE_FLAGS
+ ])
+ AM_CONDITIONAL([HAVE_LIBCRYPT], [test "x$have_libcrypt" = xyes])
+
diff --git a/sys-apps/util-linux/files/util-linux-2.37-lcrypt_use_LIBS.patch b/sys-apps/util-linux/files/util-linux-2.37-lcrypt_use_LIBS.patch
new file mode 100644
index 000000000000..2173195be612
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.37-lcrypt_use_LIBS.patch
@@ -0,0 +1,91 @@
+From 75cba8d5cdb2a0e84c23de26007feac977837a6f Mon Sep 17 00:00:00 2001
+From: Karel Zak
+Date: Fri, 18 Jun 2021 17:21:13 +0200
+Subject: [PATCH] build-sys: use $LIBS rather than LDFLAGS
+
+Fixes: https://github.com/karelzak/util-linux/pull/1349
+Signed-off-by: Karel Zak
+---
+ configure.ac | 8 ++++----
+ m4/ul.m4 | 29 +++++++++++------------------
+ 2 files changed, 15 insertions(+), 22 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 939c6d2d3..234cebc68 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -845,7 +845,7 @@ char *c = crypt("abc","pw");
+ have_libcrypt=no
+ have_crypt=yes
+ ],[
+- UL_SET_FLAGS([], [], [-lcrypt])
++ UL_SET_LIBS([-lcrypt])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #ifdef HAVE_CRYPT_H
+ #include
+@@ -861,7 +861,7 @@ char *c = crypt("abc","pw");
+ ],[
+ AC_MSG_WARN([crypt() is not available])
+ ])
+- UL_RESTORE_FLAGS
++ UL_RESTORE_LIBS
+ ])
+ AM_CONDITIONAL([HAVE_LIBCRYPT], [test "x$have_libcrypt" = xyes])
+
+@@ -883,10 +883,10 @@ AS_IF([test "x$with_selinux" = xno], [
+ UL_PKG_STATIC([SELINUX_LIBS_STATIC], [libselinux])
+ AM_CONDITIONAL([HAVE_SELINUX], [true])
+
+- UL_SET_FLAGS([], [], [$SELINUX_LIBS])
++ UL_SET_LIBS([$SELINUX_LIBS])
+ # This function is missing in old libselinux 1.xx versions
+ AC_CHECK_FUNCS([security_get_initial_context])
+- UL_RESTORE_FLAGS
++ UL_RESTORE_LIBS
+ ])
+ ])
+ AC_SUBST([SELINUX_LIBS])
+diff --git a/m4/ul.m4 b/m4/ul.m4
+index 951db7371..724579462 100644
+--- a/m4/ul.m4
++++ b/m4/ul.m4
+@@ -67,28 +67,21 @@ AC_DEFUN([UL_SET_ARCH], [
+ ])
+
+
+-dnl UL_SET_FLAGS(CFLAGS, CPPFLAGS, LDFLAGS)
+-dnl
+-dnl Sets new global CFLAGS, CPPFLAGS and LDFLAG, the original
+-dnl setting could be restored by UL_RESTORE_FLAGS()
+-dnl
+-AC_DEFUN([UL_SET_FLAGS], [
+- old_CFLAGS="$CFLAGS"
+- old_CPPFLAGS="$CPPFLAGS"
+- old_LDFLAGS="$LDFLAGS"
+- CFLAGS="$CFLAGS $1"
+- CPPFLAGS="$CPPFLAGS $2"
+- LDFLAGS="$LDFLAGS $3"
++dnl UL_SET_LIBS(LIBS)
++dnl
++dnl Sets new global LIBS, the original setting could be restored by UL_RESTORE_LIBS()
++dnl
++AC_DEFUN([UL_SET_LIBS], [
++ old_LIBS="$LIBS"
++ LIBS="$LIBS $1"
+ ])
+
+-dnl UL_RESTORE_FLAGS()
++dnl UL_RESTORE_LIBS()
+ dnl
+-dnl Restores CFLAGS, CPPFLAGS and LDFLAG previously saved by UL_SET_FLAGS()
++dnl Restores LIBS previously saved by UL_SET_LIBS()
+ dnl
+-AC_DEFUN([UL_RESTORE_FLAGS], [
+- CFLAGS="$old_CFLAGS"
+- CPPFLAGS="$old_CPPFLAGS"
+- LDFLAGS="$old_LDFLAGS"
++AC_DEFUN([UL_RESTORE_LIBS], [
++ LIBS="$old_LIBS"
+ ])
+
+
diff --git a/sys-apps/util-linux/util-linux-2.37.ebuild b/sys-apps/util-linux/util-linux-2.37.ebuild
index 2b3ff76f988c..e12e94830621 100644
--- a/sys-apps/util-linux/util-linux-2.37.ebuild
+++ b/sys-apps/util-linux/util-linux-2.37.ebuild
@@ -90,6 +90,10 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
# https://github.com/karelzak/util-linux/pull/1329
"${FILESDIR}/${P}-ppc-nortas.patch"
+
+ "${FILESDIR}/${P}-lcrypt_link_fix.patch" # 801403
+ "${FILESDIR}/${P}-lcrypt_use_LIBS.patch" # 801403
+ "${FILESDIR}/${P}-avoid_autoreconf.patch" # 801403
)
rm_man() {
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index b0564243c359..d20d983e28e2 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/polkit/polkit-0.119-r2.ebuild b/sys-auth/polkit/polkit-0.119-r2.ebuild
index c131ef15de3b..41df2eecdaa9 100644
--- a/sys-auth/polkit/polkit-0.119-r2.ebuild
+++ b/sys-auth/polkit/polkit-0.119-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc64 ~riscv ~s390 x86"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc64 ~riscv ~s390 x86"
IUSE="elogind examples gtk +introspection kde nls pam selinux systemd test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 13d8a3cbd685..6c6c2644bcc7 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/automake/files/automake-1.16.2-skip-tags-lisp-space-without-etags.patch b/sys-devel/automake/files/automake-1.16.2-skip-tags-lisp-space-without-etags.patch
deleted file mode 100644
index 70ca8f783c3e..000000000000
--- a/sys-devel/automake/files/automake-1.16.2-skip-tags-lisp-space-without-etags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 77d39959511295f5a30332d5d03f0a6956bd9460 Mon Sep 17 00:00:00 2001
-From: Karl Berry
-Date: Tue, 24 Mar 2020 18:30:18 -0700
-Subject: [PATCH] tests: require etags for tags-lisp-space test.
-
-* t/tags-lisp-space.sh (required): set to etags.
----
- t/tags-lisp-space.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/tags-lisp-space.sh b/t/tags-lisp-space.sh
-index d0a940ba3..44312b0b7 100755
---- a/t/tags-lisp-space.sh
-+++ b/t/tags-lisp-space.sh
-@@ -18,7 +18,7 @@
- # if there are CONFIG_HEADERS.
- # See automake bug#38139.
-
--required=''
-+required=etags
- . test-init.sh
-
- # some AC_CONFIG_FILES header is needed to trigger the bug.
diff --git a/sys-devel/gcc/gcc-10.3.0-r1.ebuild b/sys-devel/gcc/gcc-10.3.0-r1.ebuild
index d5f3fa84bd97..6a6c8083e88c 100644
--- a/sys-devel/gcc/gcc-10.3.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-10.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="2"
inherit toolchain
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
RDEPEND=""
BDEPEND="${CATEGORY}/binutils"
diff --git a/sys-devel/gcc/gcc-8.5.0.ebuild b/sys-devel/gcc/gcc-8.5.0.ebuild
index 25bd0b691652..702b52a10067 100644
--- a/sys-devel/gcc/gcc-8.5.0.ebuild
+++ b/sys-devel/gcc/gcc-8.5.0.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1"
inherit toolchain
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 597698a134a5..94cf4826ae76 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/genfstab/genfstab-24.ebuild b/sys-fs/genfstab/genfstab-24.ebuild
index 7773f1880dce..d26d48dc6e40 100644
--- a/sys-fs/genfstab/genfstab-24.ebuild
+++ b/sys-fs/genfstab/genfstab-24.ebuild
@@ -10,6 +10,6 @@ S="${WORKDIR}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
BDEPEND="app-text/asciidoc"
diff --git a/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs-2.patch b/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs-2.patch
new file mode 100644
index 000000000000..a3a4642e8281
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs-2.patch
@@ -0,0 +1,38 @@
+From 27ab05863dc56fcd7254bccf30797f9e3c448cac Mon Sep 17 00:00:00 2001
+From: Mike Gilbert
+Date: Mon, 12 Jul 2021 10:36:04 -0400
+Subject: [PATCH] libdm: add SELINUX_STATIC_LIBS and UDEV_STATIC_LIBS to
+ make.tmpl.in
+
+Fixes link failure for dmsetup.static.
+---
+ libdm/make.tmpl.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in
+index a306101d5..2309fb3e5 100644
+--- a/libdm/make.tmpl.in
++++ b/libdm/make.tmpl.in
+@@ -55,7 +55,7 @@ RM = rm -f
+
+ LIBS += @LIBS@ $(PTHREAD_LIBS) $(SELINUX_LIBS) $(UDEV_LIBS) $(RT_LIBS) $(M_LIBS)
+ # Extra libraries always linked with static binaries
+-STATIC_LIBS = $(PTHREAD_LIBS)
++STATIC_LIBS = $(PTHREAD_LIBS) $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS)
+ DEFS += @DEFS@
+ # FIXME set this only where it's needed, not globally?
+ CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
+@@ -71,8 +71,10 @@ PTHREAD_LIBS = @PTHREAD_LIBS@
+ READLINE_LIBS = @READLINE_LIBS@
+ EDITLINE_LIBS = @EDITLINE_LIBS@
+ SELINUX_LIBS = @SELINUX_LIBS@
++SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@
+ UDEV_CFLAGS = @UDEV_CFLAGS@
+ UDEV_LIBS = @UDEV_LIBS@
++UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@
+ BLKID_CFLAGS = @BLKID_CFLAGS@
+ BLKID_LIBS = @BLKID_LIBS@
+ SYSTEMD_LIBS = @SYSTEMD_LIBS@
+--
+2.32.0
+
diff --git a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
index 339b9d3d225f..2d515b2b1447 100644
--- a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
+ static? ( !systemd )
systemd? ( udev )"
DEPEND_COMMON="
diff --git a/sys-fs/lvm2/lvm2-2.02.188.ebuild b/sys-fs/lvm2/lvm2-2.02.188.ebuild
index 05bdee02a554..d685c793532f 100644
--- a/sys-fs/lvm2/lvm2-2.02.188.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.188.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
+ static? ( !systemd )
systemd? ( udev )"
DEPEND_COMMON="
diff --git a/sys-fs/lvm2/lvm2-2.03.12.ebuild b/sys-fs/lvm2/lvm2-2.03.12.ebuild
index 5a5bd509c37a..93957db3a69f 100644
--- a/sys-fs/lvm2/lvm2-2.03.12.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.12.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
+ static? ( !systemd )
systemd? ( udev )"
DEPEND_COMMON="
@@ -60,6 +61,7 @@ PATCHES=(
#"${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed
"${FILESDIR}"/${PN}-2.03.12-dynamic-static-ldflags.patch #332905
"${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs.patch #370217, #439414 + blkid
+ "${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs-2.patch
"${FILESDIR}"/${PN}-2.03.05-pthread-pkgconfig.patch #492450
"${FILESDIR}"/${PN}-2.03.12-static-libm.patch #617756
"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index c4d95f4642c7..96945940028a 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,4 +1,3 @@
DIST mtools-4.0.27.tar.bz2 420579 BLAKE2B 3044fff1896427227e4585df81c208f7580302155cf119db426cfc7a24b3d5195b560b8810613f571eed77584d47bb5125007cdcb8551b303db62ce264853776 SHA512 21072e1b6d22ea00913dbc856c5fbe1ecfbfc0207432c7632f0026ae2d9555743eb0710c86e8939a6b3183a03693b8d1297121df9d5702dd5bf6121ad240572c
-DIST mtools-4.0.29.tar.bz2 440446 BLAKE2B b448fad8f5669230dc4fe32442c3a8b0ee570e1b084ac6b99b3239fa16fa97ba0ac5263aee34fefcb8726999178829a9ad6ed0444f41361518e5d24cfb3de083 SHA512 3671fa835bf7b410b33acbe0e4694da1609f284a99268e7c64ebdbf3ce9fc9e78cc5594d06eae5487e380b983ead190098d01a9fc1bc88b4eda324046172e62e
-DIST mtools-4.0.30.tar.bz2 442886 BLAKE2B dd66897c814c2afd842d6cb2a0865b4559a38c0c99468f6d96f16c869ed088f4a136c4ce798af39ca3115076dff9f303bd79145f17d502bc25d4b5b0a81f11e2 SHA512 9871dd2237c595286334d162bf9f494bc389cfc2cf098012484994212eff2c522fce357567b3fa5a7b314cc7336f7329fd9d71a2e1a0be2fdb3293dcbc4d98f5
DIST mtools-4.0.31.tar.bz2 446527 BLAKE2B 4b954362d0c177c5a2f7b098065f841ca075092b8c49230ca4098a1a34fe64bce32d31df1aae702f12b174a8176026687de9dea5344f3878c1acdba4a8a0c753 SHA512 6c50eadcd32563b593b58984fd6426faabab208283c0b81c7df194cc27fb7d6bf873916b152c74c4800374f0b70f7dd41c768d823d9efc78cab6efbb6ee37df5
+DIST mtools-4.0.32.tar.bz2 436537 BLAKE2B 6b057be3d053ecf1ebee72b6b73324ec2cdbd7daf87c927f6ec2f6ef203345ddb869d6d7cb645e21054304ae68fc7a33e77e7a0f0cb606d3b755da36e66ca69a SHA512 a66e7483c422abdaddbe9e6b2cd0ecc2f87b0bc4f40929ac2e4db8b8d88cfacf118b126cba3207307bff376d5572170a1ee5803618de0544f68d420ed06bcab9
diff --git a/sys-fs/mtools/mtools-4.0.30.ebuild b/sys-fs/mtools/mtools-4.0.30.ebuild
deleted file mode 100644
index 3ebdd3b6df91..000000000000
--- a/sys-fs/mtools/mtools-4.0.30.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
-HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
-IUSE="X elibc_glibc"
-
-RDEPEND="
- !elibc_glibc? ( virtual/libiconv )
- X? (
- x11-libs/libICE
- x11-libs/libXau
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXt
- )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- use !elibc_glibc && use !elibc_musl && append-libs "-liconv" #447688
- local myeconfargs=(
- --sysconfdir="${EPREFIX}"/etc/mtools
- $(use_with X x)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- local -a DOCS=( README* Release.notes )
- default
-
- insinto /etc/mtools
- doins mtools.conf
-
- # default is fine
- sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
-}
diff --git a/sys-fs/mtools/mtools-4.0.31.ebuild b/sys-fs/mtools/mtools-4.0.31.ebuild
index 3ebdd3b6df91..87146d25de94 100644
--- a/sys-fs/mtools/mtools-4.0.31.ebuild
+++ b/sys-fs/mtools/mtools-4.0.31.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
IUSE="X elibc_glibc"
RDEPEND="
diff --git a/sys-fs/mtools/mtools-4.0.29.ebuild b/sys-fs/mtools/mtools-4.0.32.ebuild
similarity index 100%
rename from sys-fs/mtools/mtools-4.0.29.ebuild
rename to sys-fs/mtools/mtools-4.0.32.ebuild
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.6-no-compress-man-pages.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.6-no-compress-man-pages.patch
new file mode 100644
index 000000000000..d8521436d955
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.8.6-no-compress-man-pages.patch
@@ -0,0 +1,226 @@
+From 80cca1a75f24ee239ace5577d49ccfec511480ca Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Mon, 12 Jul 2021 06:04:04 +0100
+Subject: [PATCH] Don't compress man pages
+
+---
+ kpartx/Makefile | 5 ++---
+ libdmmp/Makefile | 13 ++++---------
+ libmpathpersist/Makefile | 14 +++++---------
+ mpathpersist/Makefile | 5 ++---
+ multipath/Makefile | 10 ++++------
+ multipathd/Makefile | 5 ++---
+ 6 files changed, 19 insertions(+), 33 deletions(-)
+
+diff --git a/kpartx/Makefile b/kpartx/Makefile
+index 2906a98..cd351a4 100644
+--- a/kpartx/Makefile
++++ b/kpartx/Makefile
+@@ -21,7 +21,6 @@ all: $(EXEC)
+
+ $(EXEC): $(OBJS)
+ $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
+- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
+
+ install: $(EXEC) $(EXEC).8
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+@@ -33,11 +32,11 @@ install: $(EXEC) $(EXEC).8
+ $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
+ $(INSTALL_PROGRAM) -m 644 del-part-nodes.rules $(DESTDIR)$(libudevdir)/rules.d/68-del-part-nodes.rules
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
+- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
+
+ uninstall:
+ $(RM) $(DESTDIR)$(bindir)/$(EXEC)
+- $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
++ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
+ $(RM) $(DESTDIR)$(libudevdir)/kpartx_id
+ $(RM) $(DESTDIR)$(libudevdir)/rules.d/11-dm-parts.rules
+ $(RM) $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
+diff --git a/libdmmp/Makefile b/libdmmp/Makefile
+index 764a0bc..a859786 100644
+--- a/libdmmp/Makefile
++++ b/libdmmp/Makefile
+@@ -21,13 +21,13 @@ CFLAGS += $(LIB_CFLAGS) -fvisibility=hidden -I$(libdmmpdir) -I$(mpathcmddir) \
+ LIBDEPS += $(shell $(PKGCONFIG) --libs json-c) -L$(mpathcmddir) -lmpathcmd -lpthread
+
+ all: $(LIBS) doc
+-.PHONY: doc doc.gz clean install uninstall check speed_test dep_clean
++.PHONY: doc clean install uninstall check speed_test dep_clean
+
+ $(LIBS): $(OBJS)
+ $(CC) $(LDFLAGS) $(SHARED_FLAGS) -Wl,-soname=$@ -o $@ $(OBJS) $(LIBDEPS)
+ $(LN) $@ $(DEVLIB)
+
+-install: doc.gz
++install: doc
+ mkdir -p $(DESTDIR)$(usrlibdir)
+ $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(usrlibdir)/$(LIBS)
+ $(INSTALL_PROGRAM) -m 644 -D \
+@@ -41,7 +41,7 @@ install: doc.gz
+ $(DESTDIR)$(pkgconfdir)/$(PKGFILE)
+ perl -i -pe 's|__INCLUDEDIR__|$(includedir)|g' \
+ $(DESTDIR)$(pkgconfdir)/$(PKGFILE)
+- $(INSTALL_PROGRAM) -m 644 -t $(DESTDIR)$(man3dir) docs/man/*.3.gz
++ $(INSTALL_PROGRAM) -m 644 -t $(DESTDIR)$(man3dir) docs/man/*.3
+
+ uninstall:
+ $(RM) $(DESTDIR)$(usrlibdir)/$(LIBS)
+@@ -55,7 +55,7 @@ uninstall:
+
+ clean: dep_clean
+ $(RM) core *.a *.o *.gz *.so *.so.*
+- $(RM) docs/man/*.gz
++ $(RM) docs/man/*
+ $(MAKE) -C test clean
+
+ include $(wildcard $(OBJS:.o=.d))
+@@ -66,13 +66,8 @@ check: all
+ speed_test: all
+ $(MAKE) -C test speed_test
+
+-doc.gz: doc $(patsubst %,%.gz,$(wildcard docs/man/*.3))
+-
+ doc: docs/man/dmmp_strerror.3
+
+-docs/man/%.3.gz: docs/man/%.3
+- gzip -c $< >$@
+-
+ docs/man/dmmp_strerror.3: $(HEADERS)
+ TEMPFILE=$(shell mktemp); \
+ cat $^ | perl docs/doc-preclean.pl >$$TEMPFILE; \
+diff --git a/libmpathpersist/Makefile b/libmpathpersist/Makefile
+index 57103e5..37c765a 100644
+--- a/libmpathpersist/Makefile
++++ b/libmpathpersist/Makefile
+@@ -12,7 +12,7 @@ LIBDEPS += -lmultipath -lmpathcmd -ldevmapper -lpthread -ldl
+
+ OBJS = mpath_persist.o mpath_updatepr.o mpath_pr_ioctl.o
+
+-all: $(DEVLIB) man
++all: $(DEVLIB)
+
+ $(LIBS): $(OBJS) $(VERSION_SCRIPT)
+ $(CC) $(LDFLAGS) $(SHARED_FLAGS) -Wl,-soname=$@ \
+@@ -21,10 +21,6 @@ $(LIBS): $(OBJS) $(VERSION_SCRIPT)
+ $(DEVLIB): $(LIBS)
+ $(LN) $(LIBS) $@
+
+-man:
+- $(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz
+- $(GZIP) mpath_persistent_reserve_out.3 > mpath_persistent_reserve_out.3.gz
+-
+ install: all
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir)
+ $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS)
+@@ -32,14 +28,14 @@ install: all
+ $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir)
+ $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(includedir)
+ $(LN) $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
+- $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir)
+- $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir)
++ $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3 $(DESTDIR)$(man3dir)
++ $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3 $(DESTDIR)$(man3dir)
+ $(INSTALL_PROGRAM) -m 644 mpath_persist.h $(DESTDIR)$(includedir)
+
+ uninstall:
+ $(RM) $(DESTDIR)$(syslibdir)/$(LIBS)
+- $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3.gz
+- $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3.gz
++ $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3
++ $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3
+ $(RM) $(DESTDIR)$(includedir)/mpath_persist.h
+ $(RM) $(DESTDIR)$(syslibdir)/$(DEVLIB)
+
+diff --git a/mpathpersist/Makefile b/mpathpersist/Makefile
+index 5126801..0aba3cb 100644
+--- a/mpathpersist/Makefile
++++ b/mpathpersist/Makefile
+@@ -14,13 +14,12 @@ all: $(EXEC)
+
+ $(EXEC): $(OBJS)
+ $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) $(CFLAGS) $(LIBDEPS)
+- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
+
+ install:
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
+- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
+
+ clean: dep_clean
+ $(RM) core *.o $(EXEC) *.gz
+@@ -29,7 +28,7 @@ include $(wildcard $(OBJS:.o=.d))
+
+ uninstall:
+ $(RM) $(DESTDIR)$(bindir)/$(EXEC)
+- $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
++ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
+
+ dep_clean:
+ $(RM) $(OBJS:.o=.d)
+diff --git a/multipath/Makefile b/multipath/Makefile
+index 0828a8f..55b6f7b 100644
+--- a/multipath/Makefile
++++ b/multipath/Makefile
+@@ -16,8 +16,6 @@ all: $(EXEC)
+
+ $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so
+ $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
+- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
+- $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz
+
+ install:
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+@@ -26,16 +24,16 @@ install:
+ $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir)
+ $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
+- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
+- $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
++ $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
+
+ uninstall:
+ $(RM) $(DESTDIR)$(bindir)/$(EXEC)
+ $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules
+ $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
+- $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
+- $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
++ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
++ $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5
+
+ clean: dep_clean
+ $(RM) core *.o $(EXEC) *.gz
+diff --git a/multipathd/Makefile b/multipathd/Makefile
+index d053c1e..cf3339f 100644
+--- a/multipathd/Makefile
++++ b/multipathd/Makefile
+@@ -38,7 +38,6 @@ all : $(EXEC)
+
+ $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so
+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(EXEC) $(LIBDEPS)
+- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
+
+ cli_handlers.o: cli_handlers.c
+ $(CC) $(CFLAGS) -Wno-unused-parameter -c -o $@ $<
+@@ -52,11 +51,11 @@ ifdef SYSTEMD
+ $(INSTALL_PROGRAM) -m 644 $(EXEC).socket $(DESTDIR)$(unitdir)
+ endif
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
+- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
+
+ uninstall:
+ $(RM) $(DESTDIR)$(bindir)/$(EXEC)
+- $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
++ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
+ $(RM) $(DESTDIR)$(unitdir)/$(EXEC).service
+ $(RM) $(DESTDIR)$(unitdir)/$(EXEC).socket
+
+--
+2.32.0
+
diff --git a/sys-fs/multipath-tools/metadata.xml b/sys-fs/multipath-tools/metadata.xml
index 9a20c9e5bc2b..9b1922756da5 100644
--- a/sys-fs/multipath-tools/metadata.xml
+++ b/sys-fs/multipath-tools/metadata.xml
@@ -8,4 +8,7 @@
+
+ opensvc/multipath-tools
+
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
new file mode 100644
index 000000000000..8dff4dda6bf3
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit linux-info systemd toolchain-funcs udev
+
+DESCRIPTION="Device mapper target autoconfig"
+HOMEPAGE="http://christophe.varoqui.free.fr/"
+SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="systemd rbd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/json-c:=
+ dev-libs/libaio
+ dev-libs/userspace-rcu:=
+ >=sys-fs/lvm2-2.02.45
+ >=virtual/libudev-232-r3
+ sys-libs/readline:0=
+ rbd? ( sys-cluster/ceph )
+ systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}
+ test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.8.5-respect-flags.patch
+ "${FILESDIR}"/${PN}-0.8.6-no-compress-man-pages.patch
+)
+
+src_prepare() {
+ default
+
+ # The upstream lacks any way to configure the build at present
+ # and ceph is a huge dependency, so we're using sed to make it
+ # optional until the upstream has a proper configure system
+ if ! use rbd ; then
+ sed \
+ -e "s/libcheckrbd.so/# libcheckrbd.so/" \
+ -e "s/-lrados//" \
+ -i libmultipath/checkers/Makefile \
+ || die
+ fi
+}
+
+src_compile() {
+ # LIBDM_API_FLUSH involves grepping files in /usr/include,
+ # so force the test to go the way we want #411337.
+ emake \
+ CC="$(tc-getCC)" \
+ LIB="${EPREFIX}/$(get_libdir)" \
+ LIBDM_API_FLUSH=1 \
+ PKGCONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+ dodir /sbin /usr/share/man/man{3,5,8}
+ emake \
+ DESTDIR="${D}" \
+ LIB="${EPREFIX}/$(get_libdir)" \
+ RUN=run \
+ unitdir="$(systemd_get_systemunitdir)" \
+ libudevdir='${prefix}'/"$(get_udevdir)" \
+ pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \
+ install
+
+ newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
+ newinitd "${FILESDIR}"/multipath.rc multipath
+
+ einstalldocs
+
+ find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "If you need multipath on your system, you must"
+ elog "add 'multipath' into your boot runlevel!"
+ fi
+}
diff --git a/sys-fs/udev/files/249-libudev-static.patch b/sys-fs/udev/files/249-libudev-static.patch
new file mode 100644
index 000000000000..73375b716e9b
--- /dev/null
+++ b/sys-fs/udev/files/249-libudev-static.patch
@@ -0,0 +1,26 @@
+From f2c57d4f3805775e0ffdc80ce578eaa737017d31 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert
+Date: Fri, 9 Jul 2021 13:05:23 -0400
+Subject: [PATCH] libudev: add "Libs.private: -lrt -pthread" to libudev.pc
+
+This resolves a failure when linking cryptsetup.static against libudev.a.
+
+```
+libtool: link: x86_64-pc-linux-gnu-gcc -Wall -O2 -pipe -march=amdfam10 -static -O2 -o cryptsetup.static lib/utils_crypt.o lib/utils_loop.o lib/utils_io.o lib/utils_blkid.o src/utils_tools.o src/utils_password.o src/utils_luks2.o src/utils_blockdev.o src/cryptsetup.o -pthread -pthread -Wl,--as-needed ./.libs/libcryptsetup.a -largon2 -lrt -ljson-c -lpopt -luuid -lblkid -lssl -lcrypto -lz -ldl -ldevmapper -lm -lpthread -ludev -pthread
+/usr/lib/gcc/x86_64-pc-linux-gnu/11.1.0/../../../../x86_64-pc-linux-gnu/bin/ld: /usr/lib/gcc/x86_64-pc-linux-gnu/11.1.0/../../../../lib64/libudev.a(src_libsystemd_sd-daemon_sd-daemon.c.o): in function `sd_is_mq':
+(.text.sd_is_mq+0x3a): undefined reference to `mq_getattr'
+```
+---
+ src/libudev/libudev.pc.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libudev/libudev.pc.in b/src/libudev/libudev.pc.in
+index 89028aaa6bf2..1d6487fa4084 100644
+--- a/src/libudev/libudev.pc.in
++++ b/src/libudev/libudev.pc.in
+@@ -16,4 +16,5 @@ Name: libudev
+ Description: Library to access udev device information
+ Version: {{PROJECT_VERSION}}
+ Libs: -L${libdir} -ludev
++Libs.private: -lrt -pthread
+ Cflags: -I${includedir}
diff --git a/sys-fs/udev/udev-249.ebuild b/sys-fs/udev/udev-249-r1.ebuild
similarity index 99%
rename from sys-fs/udev/udev-249.ebuild
rename to sys-fs/udev/udev-249-r1.ebuild
index d23c86c0aeb8..0154e132439e 100644
--- a/sys-fs/udev/udev-249.ebuild
+++ b/sys-fs/udev/udev-249-r1.ebuild
@@ -94,6 +94,7 @@ pkg_setup() {
src_prepare() {
local PATCHES=(
+ "${FILESDIR}/249-libudev-static.patch"
)
default
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index beb688728a1e..8a7f2e3d7f31 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 4b96eaf2d3b0..76153f69418a 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -3,21 +3,14 @@ DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22
DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca
DIST bcache-tools-1.0.8_p20141204.tar.gz 22158 BLAKE2B dd36102c5668cab3072ea635a5a30128df6cd75b75e7f8bba17ad0a830746ff2f75a46b56d4211aeb4657453d3bbeb98b8b794c53ff724b3fbf0874068d70dc9 SHA512 53d6e764d6d42c4367b0bd98199cae3c18054d5707a7880af3a422f9db332b44941015eaed7e1cd170b3546307ed54a2f99558a68d98c76b7bb6234d29206b54
DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
-DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
-DIST btrfs-progs-v5.11.tar.xz 2212292 BLAKE2B e19933e1c0d3f80db931554c1cb4b1d25c5b2f2c5ea0ec19623696b24d696247536d615d569cc28c9a84b1484e38141945465251272b2d1df2cadde5af4dee88 SHA512 20b10ba0f6978d0cb202f055edf41abeb36b629fd6d5cc7cb9ebc82ef79d2bef31ff7c9681770c7ea7b126cfb4cafd6d610476fd5cc7506189f74dc214445cf0
DIST btrfs-progs-v5.12.1.tar.xz 2220424 BLAKE2B 1e6120609feb37dd2ced04b27d8cba9a28c3b962add6f037927dcb05bdcd46a229f981f7f68231ee58e7e36a65fae4e6041e92c0db11dba56fe63b09bca30cc7 SHA512 a4044ad7e40e232442601f102ea1c64a65aa4d9765be303813d2547a5b730c5f2f84c9b9c652a4218ab16821fdd049dd8573a1f7f6cc27974c2c4389243e20f5
DIST btrfs-progs-v5.6.1.tar.xz 2117064 BLAKE2B 9183300e7c086cb8f03ac14139d3d2a424461f4c5afc0e7b9bb588f4c0ddd2c41d7cefe91787b1cabe6397f8abeb6e958900e7742a80d3519382e98c3b197c9d SHA512 8f523249a5c2bfe1c0d52b0dc5d31d52b330b1c616d3ec423fa1fb4a845441bfeaa32abbe42a444a4fc84016a482c8102a3eb451ac423b542e332e9c26e76dc6
-DIST btrfs-progs-v5.7.tar.xz 2182728 BLAKE2B 47573baa26cde058003b402dadba28f278b4b3ffd270d002ab8fd72d94ee41d3fdfb3d36c0c579e24ea6afae4b2dea2ca704d9dd809fcd10fbc146d63d48980c SHA512 72c3af13ca589f2e0b96cb7602319035ef8aab6ee224fff3544a5d0bfc013a66552dde4533ec5e64696d404b8905431cd0f25367c40fd34ea39be7c0ed8c2d16
DIST busybox-1.27.2.tar.bz2 2216527 BLAKE2B 77b8fa325b9ba691c0ac944537efdf5d87011b1a87c1c244588136f78055be9f2a71c77eea5edf1d20cfe50e59b15527511b14160930c946ed4e82c9608cb991 SHA512 d99e86b652562ebe1a5d50e1ba3877a1d1612997c17cb8d8e4212da181211a9b741a881cb051f14cb3ee8aea40226cf2cde80a076baed265d3bc0a4e96a5031c
DIST busybox-1.31.1.tar.bz2 2430221 BLAKE2B 95c2345bc715eb7a1f08816a40add9b7a6176ef509a84069343ec2caddec58d8d57a07676ca2b03c209734169321433e27ba963b4c8b98dbfda4e409dcc347b4 SHA512 0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf
-DIST busybox-1.32.0.tar.bz2 2439463 BLAKE2B 75937ae6e1401d7ab947d80f4b206112023ff2b7d04257ffa2c254cadabb92282ba04d5d608659b6c98fade1ccd0b0f6b204c8758263d59dea6508a3157a7c69 SHA512 1b1227af69a97e820e28f5f1c62413e4e179202ab525725ea0b1afe9b9f9a5f00e5e32f4603e804ba1596b0fedd60d60457a6d2b8fcedfab45b6e049caeb319b
-DIST busybox-1.33.0.tar.bz2 2448841 BLAKE2B bc25c2187cd7e357dd2f75b3eaae33ab9da318bbcec861e0b6b00da8466a86a17a71933035958f70badb9f1f143fa7f11f114c12a52f3680042730471f56cefe SHA512 20f8f5197c5cbc8b244f69d82d6628066296c7306a9736ee1344cb555882854412cf7f264490f9a735251c139b9621004f48e972d06ef2623a3c99278f8e765a
DIST busybox-1.33.1.tar.bz2 2453694 BLAKE2B 2dce3427ab7703c56cbb3bdc0c93c1fe1c6dc24c5b467b6213b8f9cf55223ec63136b3837970e41293cc3d55d320599945d29a69a4ef8b4b3ab9fb5e2a527632 SHA512 d24931432f65e4e79cf54a6c2b91c9cafba817b637d337f456ce8f505434fc06c4345c65cde4fe2a019650a8a089a6f5336bfafb5ef64a4f14659a9d0b3ddb1a
DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
DIST cryptsetup-2.3.3.tar.xz 11104768 BLAKE2B 54aa6f087c5366e843c1f9b649fd77ec8be8c4e65c783a2a84a036b4ef460c9d070bdd8aff72f87a7a3136f13581e84534940b435f0b49eb1951d1a755cab47a SHA512 d613efb80e003364a21832da3fefe3891d36a891119cc0efa970aad40ba135dfcd42b32a0c19c31ad879d4eddf27864beccbea1d4b31a47a4e075bc0f756365c
-DIST cryptsetup-2.3.4.tar.xz 11114004 BLAKE2B 680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19 SHA512 db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
-DIST cryptsetup-2.3.5.tar.xz 11146364 BLAKE2B fb37c1a7308ecb82630f3a50b70bedcc540dab40a5c716a9d1ac218c7b9ed275da1a1a8f7ceffd8f0d2f5779b4e99c09ccd725c7babe7954e1d31226e85f21ae SHA512 60695a445608e2019ffc4f4ea4d7f6819849991bf2862e5648920abccea33990210554fcbf5a512659b513b27d3759fe3c1e64e96f02d9301463a48f2dbf04bf
DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2 SHA512 5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665
DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
DIST dropbear-2020.80.tar.bz2 2287654 BLAKE2B 3cec03034e3ca2befd1b895ecffbf0e0ea00af3e642ac00b4ccaf330d1eeb99840ef328374e9d53d033e801c82ee3a55dba884a2aa6741c1274a2c8cfc4490e0 SHA512 7fccc1003b73540fa1da9763771519f8ae52608f7a1c5f66736db1885a87c346bd9711bcf017c48ba712a83ff04f01c12bea7180ed596fe58038fe656d2fd3d3
@@ -25,33 +18,23 @@ DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B eb80ff88d75ae97365570f8793aee855cc
DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 0eda7428862c13dfd02308f0321d22c134679197bad5b247baa6f0ca386433db6749b97529709d43934afa73d8d0801379bb342456a0fd3dab7df01f5a90fd31 SHA512 5297a4d7bf944806d8ee77227eac596b5e5efed2c665561d40094c40b9f321616c60975a2716f1499a9f72243df6e3b6e2267b98ec1fdc1dfd646d7be887fc4d
DIST eudev-3.2.10.tar.gz 1961960 BLAKE2B 3708c78fad3abad6aa4b2beaaa325e25e118621aa2e6cb351732f6d8349dc17da9be852cab79045c7a513e927c2d1266c6443814fd264943765d98fb5b404e75 SHA512 d0a076d8a54e9d4ca9ca48cf885d082965144b322950d351b7ead4a5035c2dad6fd66b7f137d7281982876c3c50330cdd5e599788f23e1369388181dd178941d
-DIST eudev-3.2.9.tar.gz 1959836 BLAKE2B 8792ded8a7d1dfbc16fae249283b58251656961cf360d72932c3fc6ea3e752f6334c21e9ebd9ee3ad0da03a590f8405b3bb7413eec3f964984225f7813311ef6 SHA512 09e49fff9848e72507ef14b9d4cfab2d1443f16d5b3d54d2b0e4f6b04c471ca41f09200cb8772e9f850f0dc4a574a7ec7eede7ce11cbabda65e210a89287531f
-DIST expat-2.2.10.tar.xz 425432 BLAKE2B 5d84d7dec5aae6ca7906bd2a2b8a249457111e064295b83b6c9927b5ef0dc97e7220bac1da17781e24541259ae81b60a2314cd372bfbdfc2e08fab082377df4a SHA512 a8e0c8a9cf7e6fbacdc6e709f3c99c533ab550fba52557d24259bb8b360f9697624c7500c0e9886fa57ee2b529aadd0d1835d66fe8112e15c20df75cd3eb090f
DIST expat-2.2.9.tar.xz 422460 BLAKE2B ea0e0bd005bbfd355e819e2b157859878a20ad9a6807cc5a10a6656f062e2443adb483adb0452d751b3d460834e3f613b8ecf7cdaf743be1b15815d005d01fa6 SHA512 e082874efcc4b00709e2c0192c88fb15dfc4f33fc3a2b09e619b010ea93baaf7e7572683f738463db0ce2350cab3de48a0c38af6b74d1c4f5a9e311f499edab0
DIST expat-2.4.1.tar.xz 445024 BLAKE2B 2ae66d284a03176ef7290093f59bb7ad98011dfbf3c7c3515ba4e4b99f849474def6ce6d9844c944fed22d86ac4ea1a38863646be914d9432eda7b69d890be65 SHA512 9dc760dbf701f75e55c4479d81417622f8c750d8473498458a382a4c2932a2976a059cb3589f88855188e5173ec7868d285c4601428e0ca625df7a59cf975191
DIST fuse-2.8.6.tar.gz 505334 BLAKE2B c44533625ead8acc5a16f61064635492c54aa91780018e3895baf18abe3ca00c9ec7f6606183a4f986037201db79697c07d03adf57c5a87e7888b8823d83aa8a SHA512 03cacc45c8ba6700fcdfa9064ef4e10d3ad6fc0e4fc49d41693de2caf03d44513d449b00a7c5d200d055d9481821252509259f5f3d2d6127fa51957a006a90fd
DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
DIST genkernel-3.5.3.3.tar.xz 331180 BLAKE2B 0f83b973505ccb0a92ae24e92509710bf96991f36ca55975ffefdf1bd3e835bd72bb413688468a05e6a5fff2ec16e64816f8ccfe2530c9f1e9169d19a86a2231 SHA512 9170731f59a1476aa597549ac55feb3583bed249e50d1697292571caf25c5ca746a1db9e811f2009d55aea21d739ef0ab3e385acd81504bbbccc8f7346205d71
DIST genkernel-4.0.10.tar.xz 460816 BLAKE2B d5922eede1192bb95ca235106a70118826c2c4c078f741e25954485f142d858bf612f35b94553fc409e4f6641b256a2940f83131c5b4bc7d6dbae85019bee7ff SHA512 29dc29b346b132cc6e7ea5298e49c93d01ba28531928cb7a6125864c7d03b74f70bc74043b220dfbbb6651ad67fcbc3d8ed8a2d0f40d271b83e9a8ab0325a2dd
-DIST genkernel-4.1.2.tar.xz 465288 BLAKE2B 89e26a861854d0cde808331db4bf3055495e9ec4be16952c495e481a5f9684601603ba22e5edda8f882fcddd68d1e406756cdc519936b90e33fe640107c8e529 SHA512 4b10f25ed8d97ffe075372aac22e0aff7be72405f02d9d8faddcc70063d04719dc93f9836d4f8375afca9b6870fcb15bda6ed796e5b2d2ef208ba3203d229a3e
-DIST genkernel-4.2.1.tar.xz 481988 BLAKE2B d2f4263ea1d66927e7087ad4c852e83a66d5fbf57a937fb20223d54533ec1d894236c9305e82ec91a44272abc990be5feb29572ce8a407f61eb015a262518734 SHA512 6999706a695817fe453d17ce5b18e3cb234d25abd61ada7eea0769eed6541306e5d76d21061a65f66d7ae3622936531b5af01099b35ccfc1b4d372b0ff5241ce
DIST genkernel-4.2.3.tar.xz 486688 BLAKE2B bd6546ef3c7205e14b8d7e563899fc13bd0c1f90e929c6a805f9e89758fb56fac5cc4ebf6f44d708cf199fc6e2a42704a9d4314bdcceb11e402afb9877608cc6 SHA512 a35b87931e080fe1b61032f8ea655b774c29d652086b7bf31f98aa829490edf8a9e9dbd41c5b8274b64db1946b162977d907f3665da1d99a62666f745f62b6f1
DIST gnupg-1.4.22.tar.bz2 3746546 BLAKE2B 9a2d37eeab10f2a7353804098e865ad45db846696a00a47f5bebf47145f79e0d2bf9c01c0195e2fe79af07946a3feac0d4589656c3e698a3a548ff1dd74ce759 SHA512 c03acac0fa55761470bb085d78a44e2b99ebb187e8396cbb031a184b1e40bef2a40c91da07755d1a20610a3daa6aa1eefea2d12a0dbd5a79a45466166419c708
DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e SHA512 78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612
-DIST hwids-20200813.1.tar.gz 3680906 BLAKE2B 652cf4b05ead42a750c6f41ad78650ea8b0125f90563dec37bfa8388d021ceab12e94fd2f949b3f7b3b7c09a356d279b91e62164af2cf066cfee07ab583f8b83 SHA512 5ba15067969fa19d3218f523c1a0186568841466de4d18c563b5f09202ab7185c4df02b962f70eb6d3e99915caad8a743fc6c6349f49b666db742f9ced8053fc
-DIST hwids-20201207.tar.gz 3749352 BLAKE2B a968e6daf5686c4f73d9d900fbe80a5b3844c006102ed8801f88e378dc43c1bb66aaeced42bc2703a9c8ad624a1a7167bba485b1bf0c0d0e6043920e015c9177 SHA512 ec638edd1bbf00bd66e9baa50e3b9c9a5004a96a359e6bea306f1509c69bb3c7ede3569174007ab8bde11d49300da452b06be96136cde6bd2d84a76cff9251c2
DIST hwids-20210613.tar.gz 3867741 BLAKE2B 64c4b0a83058a2052f7b132241008a3cc75452e93a9a57a9159c357c23fd09ee256abc2b94e700b5d8e8bd4e231ae12932d2c2f32fb03853207739cb3387047d SHA512 4568f6b8c0ca80ec772bd2785d4dc169d1d13a721472a15399158d9a7f31abbe414c5c8cfdf1a3b81cce4e33742a4b6e005e97e3e907643d0afdc8e953624fea
DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c
-DIST kmod-28.tar.xz 552448 BLAKE2B af41a0c5681fb94eb5264f46ed2ae666d171d4e2d0dc21419a3c2f4b12a783350a06b408fb02a7afb00fcea1cd994ee35864c1ec8b7a8cc58a8c9dcdeffaf1b3 SHA512 50646dc72675a5e17b01e327e3d41b972f18aaeac20c8b00983c4d099c6218f35c32c184a833a2d7f716755d6a86851c90913d2835874cef933bdc4a9722df9a
DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998
DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4a5c285141f89c42237326ae3bfb99c937eef05d87b466c3d8f5cf022725ccee5c0dbc74d4eb57523a8a2892864b65 SHA512 28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b
-DIST libgcrypt-1.9.2.tar.bz2 3206187 BLAKE2B e0ceb02b0c26a7246c4146640a9dcea01429a365bd484532b9d85fdb0c8f4ac1308862e70899a1593f4665e4b2d16ceaa10029702f67720897975258a25d8ab0 SHA512 d2e3dc89788763229f554382b3cf0c3a2680f774258abc4c1fd9ef1ad44920d57d14422af9b6b405e42742e691d19ab2ee458fddf057e778964519eee090f016
DIST libgcrypt-1.9.3.tar.bz2 3219061 BLAKE2B 51a6273ba28829c016d9a93fffa181aec24170d0e4d3a363c788f336219e1531274344adeea289f3cc09161fdb2e56846551367a8ac880b14e03a52ab0dd551a SHA512 977e766887c14f19aa1b9fcc0214303036a649e41cd4278de76da7d734cf36888e2e1b6275590dac523dcb4ba8ab07993e6ee8209fd5f1a3383d738b09a060d6
DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de
-DIST libgpg-error-1.39.tar.bz2 961676 BLAKE2B 8753a9295ca57ba79142ffbc7fa01a986addcdd6a8860cf80c9e1bf9f6f9dfce874f804205a5cdd956e026eb006f2662110c63e7ed52c7a42ee0c45923ae52be SHA512 b28be183ac3d3920363558c4b5b2c24f9074a302799915cc076674bb349dcfb6f09160bec1d3fb62e04047c3ce432d345f36b0905100a88cc730b53d4eb78e42
-DIST libgpg-error-1.41.tar.bz2 967117 BLAKE2B 9dc95bc09f55915d904e0f956ecf9281615028b8b8d876dbc786b752068fefea56adfb5dd5db65bad656ab664d567e56541e44a584c7f8672c30537ed05c4db0 SHA512 578d1d8090b9f6e6cbe59d9aeebec7df81aae492f75ec343f8df530950d30866fa0a7903ca050bf7bf721413f7b2708abe34f7467e2b208cc1447ffc9bd5b9a5
DIST libgpg-error-1.42.tar.bz2 973996 BLAKE2B eb3381ec7106cfe5dca333391f473e97b03df83f247d3067e9f933ed7206f826e59d2b74b8c28d41e785ffe1c2980b680470064eb2fa2ff1ee3d8fa8be5b81a8 SHA512 f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4
DIST libxcrypt-4.4.23.tar.gz 536009 BLAKE2B b7311dec9e528abf6229f6c105e806a31a1e525e71d26252c8f30a3e1dbd61a7752b7303bd167d9ddc99b04261f02e3c7b50cc36bbc3348a337f4089f6e1c6f3 SHA512 4d5854a082a8c707416507611881c1407f0ea0bda0557c5f7ae6b70d8dd1c7a0828afe29d8f2e7754f5f97b824aaa03671dae6d4dad329fcd131b94b77ddb713
DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
@@ -60,24 +43,17 @@ DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd5178328859
DIST open-iscsi-2.0-872.tar.gz 900081 BLAKE2B 6a4911347c55c1c4906350247ae7d92c2aee9627e1ab01cb5d705b02614b6c585ea042fef85a425b8f177645741f8d36e3efb40a57536bb79dbc5cdb6fe7998c SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0
DIST open-iscsi-2.0.878.tar.gz 607489 BLAKE2B f08f7a49dee6a377aed1d5efba100c4c357e95683e841e3c7960a49a40601cf8047dd28403866d963ef6850eb23c03ac39e0861575e21c452190a20534cbec48 SHA512 2eb26e5e69b88614d9b6262fffce94b93f9afc0742415ad6c2505daacd3014cd9d73bd89c36f452d004e2c4f312f372aab1ddc55e1bdec73c58de60181d73b33
DIST popt-1.18.tar.gz 580569 BLAKE2B c9c42eb12aa21764cde5e9b4a8b30125b547ae690b4d9d0d40b45bd3c1f7ae0b09d5086a588cf37e7bed71fe770ff840c0fd40ecf4ce5b7c1e874b938b6e0324 SHA512 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5
-DIST strace-5.11.tar.xz 1926632 BLAKE2B df47612c0928466f8b5788c4a7dc74208fe76c6967d3219b0eb753131fba315e715626c2cd1ed56d3e8ba0eb9a338589a8cbd6205fe876123ac26fdf0fab8d31 SHA512 688bec8d620c7ca701561ed7479e42687cc30737f944b82201731d827775cd2864787ecca7c93ba149b06d5d654d9f6bd109a977f8138bab34339cd5930828f0
DIST strace-5.12.tar.xz 2009060 BLAKE2B 9a7a07e5d2d38c8b456f54d0e1d7c776066b20327fa08d562e426a7096f708dffa00f0c2121683fa71f7029db958d450c5a6abf5ae5970dc02732f5aa7cef591 SHA512 289cf82da4c69270458953b45d09c8eb05a6624898d3ac493c3ec293cd5ad07205084ad0af021dab2be9c0dc53f0301816113a746d96c78780b79231a185e7c9
DIST strace-5.7.tar.xz 1805044 BLAKE2B 487a1481357642be21c83cf387710bc75f17bd0af87ff07f914faa99120a619f33d2caba034d50dbdbc03aa3f758dae86d04fc6c25b3f6254ac3f0578a19884a SHA512 aef481238196204495cf9507cd48ce30af799f79904478e6be57a267311a999c868f18540cc1e025f5e486730cfe9ccb256f528f6f796d204a7347ebdf2042f1
-DIST strace-5.8.tar.xz 1813640 BLAKE2B 315edf404fa57890dcff512f9fd76818e8e7d5ad06bc297b68561ec7073297c2e5aaf2c3d9a102382f5833bedacb2a54540068a9f9438094c9180f45b5dc4715 SHA512 633c3daa2dd3d273839cbb8ebd7f6512a38b39af0d0d89f4676c2067e199f346615406d85e3e13f9e4da8dbeb62095185895ffae986eb99b64775a4287e38f4c
DIST thin-provisioning-tools-0.8.5.tar.gz 305585 BLAKE2B 7e4bde537535db79e97ddab3cba775c89854362dac7da491c040badf5e3546d2e6ac4b8da8462edb59f50a2ecd95fe9c5e3349fca5e9acd588efaaf990617ca4 SHA512 1f9a1b6b9059f0b23ec3a00ddef223599292d447894316525f13b9c1e4f29d0371cb901d199cb503be4342555e016e5e6eb2d6e0e10c44b08e6c9478c573e1d4
DIST thin-provisioning-tools-0.9.0.tar.gz 500998 BLAKE2B ac269fb6dfd1baf1572da27582ac2cd763b07aaac130a9467d05581e7a0ba1309d7dbf4c6095407111667e57af2e8183318d558ed23853f9c84b9c151c0878d9 SHA512 e1796fb3948847d72ca8247cae58017507c0a847a00201b93668eeb8fbfea4107c4c2affa5c211c149798a89b10474e83d2bd61a5545a668299be97aed591e0f
DIST unionfs-fuse-0.24.tar.bz2 30381 BLAKE2B c3886d7b0cbd4ac62712d7d94bf9544481200e4354539b29770a88974ea3298b0f594cecfc6f7accff3595004ad1453075b947a2633b5300a3684fedba4995e5 SHA512 e0e414f4edbf641ec9d0135a8723e43fc75412359b482f7aedd66fe8245e4df03943c5ecb6f8de4fdbd97f0346033c691e766cc4f4a755f5b43748e1441d3fbd
DIST unionfs-fuse-2.0.tar.gz 46537 BLAKE2B 2f5a0da5adb15c408e7b9d0c3658e389a1aea4a9a5f2f3809fc724af43cf2a4b309e4220e46647e3f3fc9b19d48c8d62692e190cf8536182abfe551bfacfcc24 SHA512 5b60204632f498931fff7671cc9f40b1800d34cb8c0d0de0773626e2653eb0a36647566c92c1d0cf79543e01b934602ef5603a06508407f352e48ef27a7ee758
DIST util-linux-2.35.2.tar.xz 5150488 BLAKE2B 93eb90ab33db7795b46425ec4ec87f8a2d3d6e0dad671345375ea02efd654bf72041932d30b41bea494e4b62952e2fd14ea9f9e6c738d4eb4b050bd170b9bb0e SHA512 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2
-DIST util-linux-2.36.2.tar.xz 5348032 BLAKE2B 17e49515f8d0430f3ed26b80bf1d6e811d847141020d0dae1340dc92887549b7b711f3db6e3913120871fc912435def73586a7aef09d8d9cc6ff7ca331b2770f SHA512 6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b
-DIST util-linux-2.36.tar.xz 5242420 BLAKE2B a03b626a376815f37a17b3808d1d421c7ec27a133edf857116603de38f7e13f527687691d0c8aa68f4f6868be6f3bcc64573d759308d74731107e02067449ce6 SHA512 cbb4975da8d99a1edd45514171d59ea7b019ce0f77a81e88b447a733f725e91c53540d9dc78bc626dc011dca129b8b150aaf9e64ccf62a4202ae816581acf4fd
DIST util-linux-2.37.tar.xz 5519268 BLAKE2B 37d4f260d636539c60b7196545c7c542c7e08a24cf3395be0c14054b5f05765c9f8234ded1c8fed60855e76bf0cfedc557d45e99b37d1e6b4a0244897fe06860 SHA512 84cf1df46165f286caa1a1204b335dc1fc826a8e1d52a817c28eb80ef19734eccd6efdfb078e87ade9e4381a9102e59d4df83e9bb100e4c73aff2aa4bfb85615
-DIST xfsprogs-5.11.0.tar.xz 1297180 BLAKE2B 0ae0c2eccdf124b9fc2f9a4ef71073324f3645bc9a4f2959978fa06ee4dae4ecaf4eee40e6b130b65eb390d8af0f9d1485aeac073a8ac5e30fce46eef9cdb7a4 SHA512 7a77f938a54176652ce0b53cab13509754aab560c02d74ab03a9fcebf2728d703f89ad9d281ef00fcc0dbabb5497cab2b2b656bbe7598037a16fff70126e5d66
DIST xfsprogs-5.12.0.tar.xz 1299332 BLAKE2B 96e8831ca83d362792853188939017b53343232c99ed514fda50ea9afa828ea8f8ecc753249b211037c2635b45bfbcc849f90fe277102e4745e6b4f13fc6fc20 SHA512 d31263529cd5e0aad2b4414aca91f352c6df9de9a241655e43b5592a3ca120efdcfcd8cf84401ebd1b3fcf67027f0923fecc6f961bdaf12fb00c3ac67abd5fe7
DIST xfsprogs-5.6.0.tar.xz 1253112 BLAKE2B 7928b29458e3ad8251b48b6fb14a515e0128701c40cdfa63c05fc85173c70da3f34c948b7791f12ac5bb8d5f0c634016dac71c328a8917d1065aa7fb4cac3291 SHA512 a6bee55b0a23316c73f3921234d1dbaa4cbe91c12e79264e5f9bfe1356a24baa0ab25270405a46e4613a7e48443ef21997ff4f5962663777bed373f89ca29701
-DIST xfsprogs-5.7.0.tar.xz 1258772 BLAKE2B 3dab72c1c64d88194f677ed434fe00c8c2eac10c7c6d471d3b32595eb27a76ec1fa20955a08d7c2e371a0d160bce741afad0998731d2fee497917e0d7a4e70f7 SHA512 6a333b7e4fc6afb1689f6bbbbf07b97058cce2fde437fd3ed5b010276c050f886e5c0317ea16aedb23f579a9fed5edc4e7e64b4af5f0331dc8fd97b3251dd231
DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
DIST zstd-1.4.5.tar.gz 1987927 BLAKE2B 1497d4e87040e5c71466468ebf1a57f4073666f2b005229925bc1d95a4b4fcb2a51d88bb79be20f21860e5750da42f8aac21d2997421d07ba37bd6bb12a28b55 SHA512 b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387
-DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133
DIST zstd-1.5.0.tar.gz 1867111 BLAKE2B e503d17478b94128eb3ec578178f9d7023e941434dcc07790e12fd6c9933518f34fba5d7795ab7b145e4e499597644a6edd2830106649c5a749c962d5afe2f31 SHA512 25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33
diff --git a/sys-kernel/genkernel/genkernel-4.1.2-r3.ebuild b/sys-kernel/genkernel/genkernel-4.1.2-r3.ebuild
deleted file mode 100644
index 8635d2185822..000000000000
--- a/sys-kernel/genkernel/genkernel-4.1.2-r3.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999 -> latest Git branch "master"
-# genkernel-VERSION -> normal genkernel release
-
-EAPI="7"
-
-inherit bash-completion-r1
-
-# Whenever you bump a GKPKG, check if you have to move
-# or add new patches!
-VERSION_BCACHE_TOOLS="1.0.8_p20141204"
-VERSION_BOOST="1.73.0"
-VERSION_BTRFS_PROGS="5.7"
-VERSION_BUSYBOX="1.32.0"
-VERSION_COREUTILS="8.32"
-VERSION_CRYPTSETUP="2.3.4"
-VERSION_DMRAID="1.0.0.rc16-3"
-VERSION_DROPBEAR="2020.80"
-VERSION_EUDEV="3.2.9"
-VERSION_EXPAT="2.2.9"
-VERSION_E2FSPROGS="1.45.6"
-VERSION_FUSE="2.9.9"
-VERSION_GPG="1.4.23"
-VERSION_HWIDS="20200813.1"
-VERSION_ISCSI="2.0.878"
-VERSION_JSON_C="0.13.1"
-VERSION_KMOD="27"
-VERSION_LIBAIO="0.3.112"
-VERSION_LIBGCRYPT="1.8.6"
-VERSION_LIBGPGERROR="1.39"
-VERSION_LVM="2.02.187"
-VERSION_LZO="2.10"
-VERSION_MDADM="4.1"
-VERSION_POPT="1.18"
-VERSION_STRACE="5.8"
-VERSION_THIN_PROVISIONING_TOOLS="0.8.5"
-VERSION_UNIONFS_FUSE="2.0"
-VERSION_UTIL_LINUX="2.36"
-VERSION_XFSPROGS="5.7.0"
-VERSION_XZ="5.2.5"
-VERSION_ZLIB="1.2.11"
-VERSION_ZSTD="1.4.5"
-
-COMMON_URI="
- https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
- https://dl.bintray.com/boostorg/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
- https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
- https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
- mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
- https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
- https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
- https://dev.gentoo.org/~whissi/dist/dropbear/dropbear-${VERSION_DROPBEAR}.tar.bz2
- https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
- https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
- https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
- https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
- mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
- https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
- https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
- https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
- https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
- https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
- mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
- mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
- https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
- https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
- https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
- http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
- https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
- https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
- https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
- https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
- https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
- https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
- https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
- https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
-"
-
-if [[ ${PV} == 9999* ]] ; then
- EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
- inherit git-r3
- S="${WORKDIR}/${P}"
- SRC_URI="${COMMON_URI}"
-else
- SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
- ${COMMON_URI}"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ibm +firmware"
-
-# Note:
-# We need sys-devel/* deps like autoconf or automake at _runtime_
-# because genkernel will usually build things like LVM2, cryptsetup,
-# mdadm... during initramfs generation which will require these
-# things.
-DEPEND=""
-RDEPEND="${DEPEND}
- app-arch/cpio
- >=app-misc/pax-utils-1.2.2
- app-portage/elt-patches
- dev-util/gperf
- sys-apps/sandbox
- sys-devel/autoconf
- sys-devel/autoconf-archive
- sys-devel/automake
- sys-devel/libtool
- virtual/pkgconfig
- firmware? ( sys-kernel/linux-firmware )"
-
-if [[ ${PV} == 9999* ]]; then
- DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-PATCHES=( "${FILESDIR}"/${P}-post-release-fixes.patch )
-
-src_unpack() {
- if [[ ${PV} == 9999* ]]; then
- git-r3_src_unpack
- else
- local gk_src_file
- for gk_src_file in ${A} ; do
- if [[ ${gk_src_file} == genkernel-* ]] ; then
- unpack "${gk_src_file}"
- fi
- done
- fi
-}
-
-src_prepare() {
- default
-
- if [[ ${PV} == 9999* ]] ; then
- einfo "Updating version tag"
- GK_V="$(git describe --tags | sed 's:^v::')-git"
- sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
- einfo "Producing ChangeLog from Git history..."
- pushd "${S}/.git" >/dev/null || die
- git log > "${S}"/ChangeLog || die
- popd >/dev/null || die
- fi
-
- # Update software.sh
- sed -i \
- -e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\
- -e "s:VERSION_BOOST:${VERSION_BOOST}:"\
- -e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
- -e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
- -e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
- -e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
- -e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
- -e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
- -e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
- -e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
- -e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
- -e "s:VERSION_FUSE:${VERSION_FUSE}:"\
- -e "s:VERSION_GPG:${VERSION_GPG}:"\
- -e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\
- -e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
- -e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
- -e "s:VERSION_KMOD:${VERSION_KMOD}:"\
- -e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
- -e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
- -e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
- -e "s:VERSION_LVM:${VERSION_LVM}:"\
- -e "s:VERSION_LZO:${VERSION_LZO}:"\
- -e "s:VERSION_MDADM:${VERSION_MDADM}:"\
- -e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
- -e "s:VERSION_POPT:${VERSION_POPT}:"\
- -e "s:VERSION_STRACE:${VERSION_STRACE}:"\
- -e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
- -e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
- -e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
- -e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
- -e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
- -e "s:VERSION_XZ:${VERSION_XZ}:"\
- -e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
- -e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
- "${S}"/defaults/software.sh \
- || die "Could not adjust versions"
-}
-
-src_compile() {
- if [[ ${PV} == 9999* ]] ; then
- emake
- fi
-}
-
-src_install() {
- insinto /etc
- doins "${S}"/genkernel.conf
-
- doman genkernel.8
- dodoc AUTHORS ChangeLog README TODO
- dobin genkernel
- rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
- if use ibm ; then
- cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
- else
- cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
- fi
-
- insinto /usr/share/genkernel
- doins -r "${S}"/*
-
- fperms +x /usr/share/genkernel/gen_worker.sh
-
- newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
- insinto /etc
- doins "${FILESDIR}"/initramfs.mounts
-
- pushd "${DISTDIR}" &>/dev/null || die
- insinto /usr/share/genkernel/distfiles
- doins ${A/${P}.tar.xz/}
- popd &>/dev/null || die
-}
-
-pkg_postinst() {
- # Wiki is out of date
- #echo
- #elog 'Documentation is available in the genkernel manual page'
- #elog 'as well as the following URL:'
- #echo
- #elog 'https://wiki.gentoo.org/wiki/Genkernel'
- #echo
-
- local replacing_version
- for replacing_version in ${REPLACING_VERSIONS} ; do
- if ver_test "${replacing_version}" -lt 4 ; then
- # This is an upgrade which requires user review
-
- ewarn ""
- ewarn "Genkernel v4.x is a new major release which touches"
- ewarn "nearly everything. Be careful, read updated manpage"
- ewarn "and pay special attention to program output regarding"
- ewarn "changed kernel command-line parameters!"
-
- # Show this elog only once
- break
- fi
- done
-
- if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
- ewarn ''
- ewarn 'Default kernel filename was changed from "kernel-genkernel--"'
- ewarn 'to "vmlinuz-". Please be aware that due to lexical ordering the'
- ewarn '*default* boot entry in your boot manager could still point to last kernel'
- ewarn 'built with genkernel before that name change, resulting in booting old'
- ewarn 'kernel when not paying attention on boot.'
- fi
-
- # Show special warning for users depending on remote unlock capabilities
- local gk_config="${EROOT}/etc/genkernel.conf"
- if [[ -f "${gk_config}" ]] ; then
- if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
- if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
- ewarn ""
- ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
- ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
- ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
- ewarn "in genkernel v4+ initramfs!"
- fi
- fi
-
- if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
- elog ""
- elog "Please remove 'emerge @module-rebuild' from genkernel config"
- elog "file (${gk_config}) and make use of new MODULEREBUILD option"
- elog "instead."
- fi
- fi
-
- local n_root_args=$(grep -o -- '\/dev/null | wc -l)
- if [[ ${n_root_args} > 1 ]] ; then
- ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
- ewarn "If you are appending non-persistent device names to kernel command-line,"
- ewarn "next reboot could fail in case running system and initramfs do not agree"
- ewarn "on detected root device name!"
- fi
-
- if [[ -d /run ]] ; then
- local permission_run_expected="drwxr-xr-x"
- local permission_run=$(stat -c "%A" /run)
- if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
- ewarn "Found the following problematic permissions:"
- ewarn ""
- ewarn " ${permission_run} /run"
- ewarn ""
- ewarn "Expected:"
- ewarn ""
- ewarn " ${permission_run_expected} /run"
- ewarn ""
- ewarn "This is known to be causing problems for any UDEV-enabled service."
- fi
- fi
-}
diff --git a/sys-kernel/genkernel/genkernel-4.2.1-r1.ebuild b/sys-kernel/genkernel/genkernel-4.2.1-r1.ebuild
deleted file mode 100644
index 8ef9edd2ce09..000000000000
--- a/sys-kernel/genkernel/genkernel-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999 -> latest Git branch "master"
-# genkernel-VERSION -> normal genkernel release
-
-EAPI="7"
-
-inherit bash-completion-r1
-
-# Whenever you bump a GKPKG, check if you have to move
-# or add new patches!
-VERSION_BCACHE_TOOLS="1.0.8_p20141204"
-VERSION_BOOST="1.75.0"
-VERSION_BTRFS_PROGS="5.11"
-VERSION_BUSYBOX="1.33.0"
-VERSION_COREUTILS="8.32"
-VERSION_CRYPTSETUP="2.3.5"
-VERSION_DMRAID="1.0.0.rc16-3"
-VERSION_DROPBEAR="2020.81"
-VERSION_EUDEV="3.2.10"
-VERSION_EXPAT="2.2.10"
-VERSION_E2FSPROGS="1.46.2"
-VERSION_FUSE="2.9.9"
-VERSION_GPG="1.4.23"
-VERSION_HWIDS="20201207"
-VERSION_ISCSI="2.0.878"
-VERSION_JSON_C="0.13.1"
-VERSION_KMOD="28"
-VERSION_LIBAIO="0.3.112"
-VERSION_LIBGCRYPT="1.9.2"
-VERSION_LIBGPGERROR="1.41"
-VERSION_LVM="2.02.187"
-VERSION_LZO="2.10"
-VERSION_MDADM="4.1"
-VERSION_POPT="1.18"
-VERSION_STRACE="5.11"
-VERSION_THIN_PROVISIONING_TOOLS="0.9.0"
-VERSION_UNIONFS_FUSE="2.0"
-VERSION_UTIL_LINUX="2.36.2"
-VERSION_XFSPROGS="5.11.0"
-VERSION_XZ="5.2.5"
-VERSION_ZLIB="1.2.11"
-VERSION_ZSTD="1.4.9"
-
-COMMON_URI="
- https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz
- https://dl.bintray.com/boostorg/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2
- https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
- https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
- mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz
- https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
- https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
- https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
- https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
- https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
- https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
- https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
- mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
- https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz
- https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
- https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
- https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz
- https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
- mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
- mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
- https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
- https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
- https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
- http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz
- https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
- https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
- https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
- https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
- https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
- https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz
- https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
- https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
-"
-
-if [[ ${PV} == 9999* ]] ; then
- EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
- inherit git-r3
- S="${WORKDIR}/${P}"
- SRC_URI="${COMMON_URI}"
-else
- SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
- ${COMMON_URI}"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ibm +firmware"
-
-# Note:
-# We need sys-devel/* deps like autoconf or automake at _runtime_
-# because genkernel will usually build things like LVM2, cryptsetup,
-# mdadm... during initramfs generation which will require these
-# things.
-DEPEND=""
-RDEPEND="${DEPEND}
- app-arch/cpio
- >=app-misc/pax-utils-1.2.2
- app-portage/elt-patches
- dev-util/gperf
- sys-apps/sandbox
- sys-devel/autoconf
- sys-devel/autoconf-archive
- sys-devel/automake
- sys-devel/libtool
- virtual/pkgconfig
- firmware? ( sys-kernel/linux-firmware )"
-
-if [[ ${PV} == 9999* ]]; then
- DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-PATCHES=( "${FILESDIR}"/genkernel-4.2.1-post-release-fixes.patch )
-
-src_unpack() {
- if [[ ${PV} == 9999* ]]; then
- git-r3_src_unpack
- else
- local gk_src_file
- for gk_src_file in ${A} ; do
- if [[ ${gk_src_file} == genkernel-* ]] ; then
- unpack "${gk_src_file}"
- fi
- done
- fi
-}
-
-src_prepare() {
- default
-
- if [[ ${PV} == 9999* ]] ; then
- einfo "Updating version tag"
- GK_V="$(git describe --tags | sed 's:^v::')-git"
- sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
- einfo "Producing ChangeLog from Git history..."
- pushd "${S}/.git" >/dev/null || die
- git log > "${S}"/ChangeLog || die
- popd >/dev/null || die
- fi
-
- # Update software.sh
- sed -i \
- -e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\
- -e "s:VERSION_BOOST:${VERSION_BOOST}:"\
- -e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
- -e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
- -e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\
- -e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
- -e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
- -e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
- -e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
- -e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
- -e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
- -e "s:VERSION_FUSE:${VERSION_FUSE}:"\
- -e "s:VERSION_GPG:${VERSION_GPG}:"\
- -e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\
- -e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
- -e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
- -e "s:VERSION_KMOD:${VERSION_KMOD}:"\
- -e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
- -e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
- -e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
- -e "s:VERSION_LVM:${VERSION_LVM}:"\
- -e "s:VERSION_LZO:${VERSION_LZO}:"\
- -e "s:VERSION_MDADM:${VERSION_MDADM}:"\
- -e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
- -e "s:VERSION_POPT:${VERSION_POPT}:"\
- -e "s:VERSION_STRACE:${VERSION_STRACE}:"\
- -e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
- -e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
- -e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
- -e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
- -e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
- -e "s:VERSION_XZ:${VERSION_XZ}:"\
- -e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
- -e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
- "${S}"/defaults/software.sh \
- || die "Could not adjust versions"
-}
-
-src_compile() {
- if [[ ${PV} == 9999* ]] ; then
- emake
- fi
-}
-
-src_install() {
- insinto /etc
- doins "${S}"/genkernel.conf
-
- doman genkernel.8
- dodoc AUTHORS ChangeLog README TODO
- dobin genkernel
- rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
- if use ibm ; then
- cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
- else
- cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
- fi
-
- insinto /usr/share/genkernel
- doins -r "${S}"/*
-
- fperms +x /usr/share/genkernel/gen_worker.sh
-
- newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
- insinto /etc
- doins "${FILESDIR}"/initramfs.mounts
-
- pushd "${DISTDIR}" &>/dev/null || die
- insinto /usr/share/genkernel/distfiles
- doins ${A/${P}.tar.xz/}
- popd &>/dev/null || die
-}
-
-pkg_postinst() {
- # Wiki is out of date
- #echo
- #elog 'Documentation is available in the genkernel manual page'
- #elog 'as well as the following URL:'
- #echo
- #elog 'https://wiki.gentoo.org/wiki/Genkernel'
- #echo
-
- local replacing_version
- for replacing_version in ${REPLACING_VERSIONS} ; do
- if ver_test "${replacing_version}" -lt 4 ; then
- # This is an upgrade which requires user review
-
- ewarn ""
- ewarn "Genkernel v4.x is a new major release which touches"
- ewarn "nearly everything. Be careful, read updated manpage"
- ewarn "and pay special attention to program output regarding"
- ewarn "changed kernel command-line parameters!"
-
- # Show this elog only once
- break
- fi
- done
-
- if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
- ewarn ''
- ewarn 'Default kernel filename was changed from "kernel-genkernel--"'
- ewarn 'to "vmlinuz-". Please be aware that due to lexical ordering the'
- ewarn '*default* boot entry in your boot manager could still point to last kernel'
- ewarn 'built with genkernel before that name change, resulting in booting old'
- ewarn 'kernel when not paying attention on boot.'
- fi
-
- # Show special warning for users depending on remote unlock capabilities
- local gk_config="${EROOT}/etc/genkernel.conf"
- if [[ -f "${gk_config}" ]] ; then
- if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
- if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
- ewarn ""
- ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
- ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
- ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
- ewarn "in genkernel v4+ initramfs!"
- fi
- fi
-
- if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
- elog ""
- elog "Please remove 'emerge @module-rebuild' from genkernel config"
- elog "file (${gk_config}) and make use of new MODULEREBUILD option"
- elog "instead."
- fi
- fi
-
- local n_root_args=$(grep -o -- '\/dev/null | wc -l)
- if [[ ${n_root_args} > 1 ]] ; then
- ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
- ewarn "If you are appending non-persistent device names to kernel command-line,"
- ewarn "next reboot could fail in case running system and initramfs do not agree"
- ewarn "on detected root device name!"
- fi
-
- if [[ -d /run ]] ; then
- local permission_run_expected="drwxr-xr-x"
- local permission_run=$(stat -c "%A" /run)
- if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
- ewarn "Found the following problematic permissions:"
- ewarn ""
- ewarn " ${permission_run} /run"
- ewarn ""
- ewarn "Expected:"
- ewarn ""
- ewarn " ${permission_run_expected} /run"
- ewarn ""
- ewarn "This is known to be causing problems for any UDEV-enabled service."
- fi
- fi
-}
diff --git a/sys-kernel/genkernel/genkernel-4.2.3.ebuild b/sys-kernel/genkernel/genkernel-4.2.3.ebuild
index a7c583a33ed9..43f0f5489aaa 100644
--- a/sys-kernel/genkernel/genkernel-4.2.3.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.2.3.ebuild
@@ -90,7 +90,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
${COMMON_URI}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="Gentoo automatic kernel building scripts"
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 3c57285fb597..852e64862926 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-5.10-51.base.tar.xz 1649104 BLAKE2B 611e698ca58531702279ae9874c0
DIST genpatches-5.10-51.extras.tar.xz 3412 BLAKE2B dbbe9031fdf275673014bafe3ee7d15e668f61187b6809df769a660830d026172b1eef1eefbbae61a2471004c14deba15913b0d4b57cfdf3750954ca075074b0 SHA512 6276fbea90ad4655021bcfb4e22c247e861807fa0c1a0ea6ce2fa439264422beaf74d0c8e08bf5fb0951727e1c4c189db5fe6672ff182d6c993919c0fcbeacbf
DIST genpatches-5.10-52.base.tar.xz 1649944 BLAKE2B 9712926fab35abb79b0c4bcc448fca65c1941f0840bbcfa3dc3c13a22f7711105bf3dd9536d3ff00fc5717eed70df5977d6771c3bd62a51cb8d36df824432831 SHA512 04519253c689cb6d88e82b624ef2928fe1bb8203113267c74cba5c1dd87cda072071c795410598f7f5ccd2533b65958027c959809c4b12503ecf9a4d7eb3fe50
DIST genpatches-5.10-52.extras.tar.xz 3412 BLAKE2B a458b569dfb6643b5a13fcce6c5df46c844119009c0593c6e655a2b0b7589af70a682745fc79f14fbc4fd7e45c52a924b8cc4665a31665a6abe1ba0c8d779bc2 SHA512 5a8f76b2791fefc6f0990402bd5307870517e79daccd52b4d126b8b278dafc086b47649631b3b07f220e3b06d03f12f765bbfb837988257db737c34806a78744
+DIST genpatches-5.10-54.base.tar.xz 1652540 BLAKE2B 37ecda0a4f76784572985be5073e7a3f33eb3aa43e641a2bc083e987c88c45cbc277bdeb20bb6ae4d264a17b65273119790ba8dcba7e22fd76ea8d0bd1be1cfb SHA512 85587df46e72cde33fb869f16b7fcc995a4d947552ab4bfb45ffcc852dad1f4b56a58d81446a00a142b9e628bd2fcc8c4922b50a282706f430b0bd9e20aa34e4
+DIST genpatches-5.10-54.extras.tar.xz 3416 BLAKE2B 3602707190ed04f62c4b2e8e0e765a53cf436b437373e71b6afd392cf05a73ac9e24f89293aac17c3730cdd696485ebf9d98161b248c9acafbfbe0b0c2db8ab8 SHA512 e4aad3f799dbcf00f813e39c8b9b355f17914a33d1ef422b3e7ee48c48e77a69925cc5664f0f171d1a632f622417b9d7ec88e56b1575c8e5f82af94f64337f42
DIST genpatches-5.12-11.base.tar.xz 611232 BLAKE2B af0db172fa831bc84b1935d387e3d7b360c5a94d8499b6fa204f21b7a822c844e88a87f4a2724d0b8b508676ee564dbbe304893bfdd3197d67c8f6aeae011cb2 SHA512 f422bc1aca29732db09184ca2fcf7478536a87e73b59325f063c73103c8ce425858baa78b185eab61a80dda15e3818b45a669c69f7898382aa3563b315ad45b3
DIST genpatches-5.12-11.extras.tar.xz 3412 BLAKE2B 2eba600cd1e769a7252b063968b87cf5f54f285f791f84089fd1f3060e3400a76dd645841bbb213830cedf274e41959ed48cbee081d556c82f059e2a3de4db51 SHA512 2bc29ba1aa4b71b2407906f2c86339eb15fb124f964ddd3fa9f4a39dd94ac18fc95d0780cf1fdb99286b1a27aa88ada32665feffd9a3ca7f53bfb66f0212e7e2
DIST genpatches-5.12-12.base.tar.xz 650292 BLAKE2B 81b5a3b95390522c328acdb390fd1e8515028e55dee9a3693992ce2aa5c2defcea37b14c385d72e0c6a9b31f239c7d02eea45e4428332f477e897fa94c02d71e SHA512 bea0fee6fade3b1322a52ec2201b828ab28bfb3c0528ea562ac7e3cfaebeb758b971820a2b1ba695dafe219ceb2548c07713b3684491b893e6055ce4f8943916
@@ -30,6 +32,8 @@ DIST genpatches-5.12-17.base.tar.xz 738268 BLAKE2B 61336204dbaf80bb44c29927ff59e
DIST genpatches-5.12-17.extras.tar.xz 3412 BLAKE2B abbc0dbb59a91d6733f5c56918aee4d0bedfaa9f87687979f0b2b01778e2a934396c5b797050d1d05e52c2432f6fd32891176b4cb64709273ba810a1b7166884 SHA512 d36015ad8ee2bf8efb5c0b0786a661326d7833ab1d185e9e06791474b03036022bc6d6d1a22c1d4d086922b9db43ecec97a8dd5ff9daafd591a7b3092f839e5f
DIST genpatches-5.12-18.base.tar.xz 738968 BLAKE2B cf0e62aad4cbe5c00d09a47e901761762934f34257e7064e65e9e9a29203c80a88ce31d55bff7156d8a09070dd67c79c383b0f1516757fbec1f5c722e844bff4 SHA512 31283759d7bb2a9b674489f4074a3027d52b5276df9e574d2d040007cdf679237ced0466724ddd81cb20714c7676f12b09f7c0014c1335227dc3bcc0358da701
DIST genpatches-5.12-18.extras.tar.xz 3420 BLAKE2B 783c9491317343e26eb9a25b48486c8b9c47f80e2c3048cea50e17ef1e6dcd9e5ab40a3f02bd02b5949933ca6634ffaaeb507416534ca35308ba35e5bbcfcff3 SHA512 53f513fe4ab0bae00b69055f8962cb8200ea90bdfba9c4ab95bdcb58f6654f5739438a6540a18a530e8160375c8d5ee2a767054b509c3a79dbda02721857403a
+DIST genpatches-5.12-19.base.tar.xz 744220 BLAKE2B 63163732eeff70cf0eb344950247f69992145a4e7cbbe966eadaffda3be3f0e645b3d7cfc9c2284156385e761c02613ceec331b777b282da77b3d169cf3fb807 SHA512 8689a4f3fec6c29a88f7389296659579c13a2b664b94dc8147bd1b266019c310c30d19198db01feb60a421b1362aa15e72feb4cb19ac2ac2136ce12c42a21915
+DIST genpatches-5.12-19.extras.tar.xz 3420 BLAKE2B dd43bf044652067aec7069cc2e8c1b9441ac06750b64dfd355ad53221df08fb68981363b9749a6f93ebfe81e728ad8791f7a5ad2e9d4557da6d2a1904efc05cd SHA512 501379a816043c5bc0c4724a999957d8c5b4cca214d12e2d64577ff24943230e6ae5e60512b634a5507ea5f8823e7511b20a5c099bab149309045e0fd17c4b24
DIST genpatches-5.4-123.base.tar.xz 3488228 BLAKE2B 0fe5c3056c3cb060f4921e3b7a4046e03e4e777d033619f0496eda68c645c6209fb07713a4bc2565000f9c17e6203a8bc5392fc597dd49167bb0348988b53026 SHA512 e71b8f9d622d3ea2fa8165a39a27240ac007d899d7324c60240221d7761c1287f14b631b074536460702922b8daf00bc2714358aaf7f69ac257af7d5d5b18bd1
DIST genpatches-5.4-123.extras.tar.xz 1772 BLAKE2B da9bc0d9513d010364506850d1c23d13e1a1ef8c4cb8d60e3430d12f4cc2ea87a74643ba9fa1a061eabdee9985b1931aab1b2587ee26bec9b2cf165b90fe83e5 SHA512 ff3b417825ba200b32abf888b6cf6e8d754526e57a30c06fbe4f961c84f67cd921b93b9848fc6b49f120b4cf8ddba9284755da73869db35327af7549d63f3cd1
DIST genpatches-5.4-128.base.tar.xz 3571424 BLAKE2B a58c2b8f20730c3357ce30cbc8b24f0609bd7ca2a8f5d37780cfbe4edb560fa49bcf1925ec40dbf61aebfe9a87be0f35ade4b999509420eb0caf5731ce649e89 SHA512 c84d65acdc4274b528306af958b0c72851fdce008c9ed6f78965ea22f09f8668b6075cfda9101b2e7a7bc55ccea64491000b1aede8cffa4ad927c7c1bb003489
@@ -46,6 +50,8 @@ DIST genpatches-5.4-133.base.tar.xz 3628504 BLAKE2B d3d99348c475bbeda9a1d0a7e363
DIST genpatches-5.4-133.extras.tar.xz 1768 BLAKE2B abad0014d2d982087ac982d0f017587fba8ea2b5180e67a92ed4b5a62c4129a5d275f6556cbf782b459900e03696355e4017c4c833cefc571c7cf4bbf2b5c907 SHA512 121ad821cd6628166a1ca005f2b408737ba8c9c1b8315c13926bda862b49d2ed330fea169a348b0209d903fca7a8d4ebdb50cf7dd527efde49ca9d69de4106df
DIST genpatches-5.4-134.base.tar.xz 3632276 BLAKE2B 475eaa6bb0c7291fbed3722ecfa8c05c5352677844481d4b37f2d5ba4b8a77697b6f43f1005aa1f899a561b3ba38670a160026fb935c2a1e75db7f1a9c292044 SHA512 4bfbf7ea9d909f2913094e7c0a34fd570540c4e9bc471ab8e90b2c73d1c99e6da23a11c0e254f4adfa6d155c51c763224a4851f4105a2a8ed69fd11c73a58101
DIST genpatches-5.4-134.extras.tar.xz 1768 BLAKE2B 894032d098f79b3c247b1e0ab19646e9c79414c4070fbf19679286f7305dbabee8c39c11dfe7c7a1009f36d64f99b0627b75b455cda62b2143fc5a5102937cd8 SHA512 5d6b703ae705a8587a7abea96e64cc51f34d8762e5a93c5c9f410a52d7bac4c44aca2d21bbede8354ad5aa1fbef45aeaffedc7db69c21ea2a94c22a0069da398
+DIST genpatches-5.4-135.base.tar.xz 3632876 BLAKE2B cc4bc930c2f181b98dde258a696bcdd8f23fcb9098707d5f158f24cd5fca4f8958dc321e8ad348b9ffd96c53bb231bc2f171b9e491427fffb2fd05dc5fd23ceb SHA512 1250c964bc3c062cb9e8109da1d1276cb5e2d7c25e1175ee56672d1a6da4be3c73f52fdc9547a70c627057265fd5af6b6b99d977c0c85a45376bf5b99bedcdf7
+DIST genpatches-5.4-135.extras.tar.xz 1772 BLAKE2B 3adbde4f0977e2da60f29937e53a1f0892ce6278745c63511e486587efc10c1c6a4a8e05375492382d1102090733d4a1fa93f380b47e734affa2ce65382e255f SHA512 6ef12e03081b927af5bd6b820f150116fa3e848a457aa9fccdd4172c3e85dbf6ba78050878884d325b059f1fa4681de85a38d475ecd55dafddc60bd8362cba77
DIST gentoo-kernel-5.10.38-1.amd64.xpak 65538346 BLAKE2B 76d5e8b10d970fc54d1dcb5d21702a1726e91cc9e8076b4d2372aec073798a23335271859f1a950b87243367cd8d7f346e3a782f01a83f04cb8c26686cb222a0 SHA512 0f6077e98326eb33a602c7bb76641f4ba43f6c9510b8ae729e0ef134f915727eb556b7d6123ec79ec648b36b242a545f6e98515d1586d7612491c4e14bc9cf87
DIST gentoo-kernel-5.10.38-1.arm64.xpak 59263514 BLAKE2B 38a1a90a97261a72cf285351c5a3cefc352d306933616bb874408c788b4fa7b3d9746a25d75e77729931fb1dc28e9279b20f22936f95c354100e7d08c90c1156 SHA512 041defc35d7d94bb3890cb8b9a402465927d6a9bce07a2443ad720a8dc210cc67028be067be29bd1c64c0a2f6d55a4512cae4442fb4db63446911de799090af5
DIST gentoo-kernel-5.10.38-1.x86.xpak 57251643 BLAKE2B 398526f7c368f91ed6d3043483a48988730fb9ee928b9eff3b7495cdd5ec0bada1f8b81895ecde852dc0832b97dadb4dd4ec1f2304e273e664d4d18bd90af57a SHA512 5477ac06ecaf2ffec60befee3d09f358461b423744f03f6c9d90b4528c032602e29a1df862c65525bd076806735764d312e7a277faadf63053b3d7a3fc818c48
@@ -67,6 +73,8 @@ DIST gentoo-kernel-5.10.47-1.x86.xpak 57221591 BLAKE2B e069b66b20c0c9fe3ab35cea6
DIST gentoo-kernel-5.10.48-1.amd64.xpak 65536136 BLAKE2B be9827d86c0fe12b750aa5ea9236287a80612774e04e2226828d1224428133fcea711690b0680e9831235d6b38a6c96cdea5b0047b54291d27178d3d562e18f7 SHA512 9d029ac037d5ec184c12bc9a7f4b6383205185dfa88a9624c5b207087c4094a020f9c972ddf233ec2a0335aef9ca65feebb92b9b7a6241d04fe6f098e251297a
DIST gentoo-kernel-5.10.48-1.arm64.xpak 59043938 BLAKE2B 3747e7835e6d3ac4b0659d97a9d45eb9276a09258dac16488e7d701202d524a91406c179a388e215dea878614d66d01a5ffb4d45e898662d11dc597535993571 SHA512 167b5760026c6fff7bcc1ee4b5ae6e6befc287dab065495fdd712fef5249571ba6c72a270e54d9ff4ba41b81a08cced954994016b63e37813911372d686e3046
DIST gentoo-kernel-5.10.48-1.x86.xpak 57223594 BLAKE2B cdaf9e1f4d49cfb1e772a5c5ad92bfcdca846a16a540032136845c1fc7256c6df405e2d1613377dc5046209a750bfb9b6d543203d604853b2f2d7dfb6e786c5e SHA512 3c1e1895a89cff6f03fda61613c8bc1c62cce4c98992e354b9572965728ece2e7556121edc725a942a23b9eccdc52d6282ef3bd929cb79052ce2ff495a849db4
+DIST gentoo-kernel-5.10.49-1.amd64.xpak 65485861 BLAKE2B 8968b059a030ec15baa34647f0738e7f7666e889feb070e6476a38fd4c13d60e30b0837b62e258dc74c8e8b936c7dc0c717c110e117750e79bb24980530d2ca8 SHA512 d3524763ee27f9529ea8dcc02335f59b04c2da8fcb9c093154b38632fdcee654e2641c888e4fcc9edfa54131763d2182d34df4ef8dc68a5033921130ecb87f9a
+DIST gentoo-kernel-5.10.49-1.x86.xpak 57214239 BLAKE2B 9f9740028a1c6498781a283f0fe823a137c9e49c3c51a217a89c54aaf9bd3ebf8c8c4205ac6c8e92c0a9b8c375b40b27d30054db05ce30908a9f40be17a3cfc4 SHA512 65626b07476e7d6c82643691f0197e63dd2756789b1a241c6918b305e1dc98500e27114fa781c93f46028aeff6f4194f0b84768d155829add3d50eb8febeebcd
DIST gentoo-kernel-5.12.10-1.amd64.xpak 66370289 BLAKE2B 74f9046d711902b5cb650c0c1eac07f4dab42037fc93ee3f9ec70b14a708d1244ec65d54e11e1ab169384bdf2663816dba33e58d22853f30133341296ce65db8 SHA512 e42a2d5122d17a6abfe75c17585e96d0fcb87ab21dd3bfbddce6f22c7b73b66daf358b642c4b3658d2d5e43a3c586da5bd48e90e00520ec2cbd696493510f410
DIST gentoo-kernel-5.12.10-1.arm64.xpak 62567249 BLAKE2B e20ff0b59f3f0781cbb7d1a2eb290e46cdb8fc0f4aa189bb70f7ad5d02b54a5a30bdb3d91c779bfdb04daf01efe5c85376c4a3faa52cead80743aae588993e26 SHA512 ee5daf6872844476018ddab8445e3dbd25d1585a8cd2b6195028b8f8690cb262befcfdef3e0267a422f30c4ca0036dd6c985331cbacdc0c8e79f9c7c9755f4ba
DIST gentoo-kernel-5.12.10-1.x86.xpak 58113734 BLAKE2B 093fc8ae00efefb2eb38cd0ce145f16e046be2f5110ad18d957ae122b97a1d4a6e6d8cce4c42f53ece1dabe9ebd99640c922686a8a00f7186bdc5f8b82f44144 SHA512 5c58a7277e1c3b1017ead2584dd6c768b2b4476f0da0c3dbd28facec64c1f37a3db9119d869720f6f63e3e1c53ffb8d69efef8f5008e0a71f8f55098d2ce9d83
@@ -85,6 +93,8 @@ DIST gentoo-kernel-5.12.14-1.x86.xpak 58064174 BLAKE2B b614ad928d99685a4b9348215
DIST gentoo-kernel-5.12.15-1.amd64.xpak 66395917 BLAKE2B b77c5e26863dc1c10da3c82904ef035f93c7bbbf60925f7c91836b7cfbb3d32335a8cad78a9b1a90a6d462f34fb798c393f7f992c54ffe6e1a5391b1e63652a4 SHA512 3efe58c6e9d948981fe51fc93ceb73de2f9a049cd396c62e743b3c5033eaf60b05d3100b2377060d1ba6245118281a49447bb5404dd4cc12b616a682fc4c252a
DIST gentoo-kernel-5.12.15-1.arm64.xpak 59971350 BLAKE2B 4231ed09d6efd9acae82078d259bef241223770fc95c24145a940ff3e4d712cfe52677a358d4fe26a6bf74129feaa3abad67e2d17eedd1e04f34758fd7ac5e1e SHA512 9eb582dab725c1716b777986e0adf90b353ca481763b27c65240d6b4d8e52d54ca394848b3ff7977651606341e39fbc19b0002caaa8174916f298bfe480087d9
DIST gentoo-kernel-5.12.15-1.x86.xpak 58062337 BLAKE2B 2ea33f13f41f6153e117dc99fdb805ff6a24071b6231730ff159ea2597e203655e5d6daa632f4fc8ace6444d8ffec7e624d222500b32e7b33035ac5a56b3efcb SHA512 62cae2c8e1fb42b3cf2ab48ade6fcbffcc03fe3b48c0d00fa7f2d3229e43a615887907e70b3219c3b040061134134f95c11c9b2d33a1f0ae568df7ec47507395
+DIST gentoo-kernel-5.12.16-1.amd64.xpak 66344196 BLAKE2B bf0ee9d5f5186527a829b8c040167c176f5a26aeb24fe31522349b161ebb2e5007c0c993c6a99a1d224713522f82c2c235d0b40466952c2afccacddf874444ed SHA512 3f2d4b25c2978a54ed5ce384a902a782c757dd2edd627a08122d9d85c7e89f6d642ade287c66f751d5bae099a708c4852f3b853991ebbcb1dafad9162fcdbf56
+DIST gentoo-kernel-5.12.16-1.x86.xpak 58066447 BLAKE2B 34d639113540707e4fe2f104f7672b9f0447bc19c46b547b3ba0f2b21b6f58594bfe0cc3d63f382ea51b69a71b571cfd427263b2e0d97c9308d122e6f1639675 SHA512 49f9485f3ed2c85d592f668753c352d0095e555e2f1a72292d224c19868b0b3717afde7bbf7ab87b5c1d8985280059098d5b3931c3c904e34cd740b53bb88325
DIST gentoo-kernel-5.4.120-1.amd64.xpak 61385726 BLAKE2B 4eda28bcfaaeb8caaa0d74c6fb37b203528ccd9853c775bcd40dc9f4698edc282a5c70602b42945b98840b1ea3d6b0d620b7726c65c83c16363e1c7542822cc1 SHA512 c36c7c5f309dea87df6af0567929f7fe09656ac49e33fd7edca62522aa45656e53d717dca5a9702b246446f25d7c3249ef0fdae8554f71cedf90339bc8b620eb
DIST gentoo-kernel-5.4.120-1.arm64.xpak 56380077 BLAKE2B d9d0a98d00b17925c852b75875ba4eb373624cd1fc35df60aa50796e81facb5067146f3008313b5776aae7b251ae6559118cb36f1480813073341dfa37de01ac SHA512 c207f79b59ae38ab58a2f7341c8d21e3fc388eb949417a033d4dfd9fb0a7acdcac4a1d5ce8528708e7a2dfba1b241f0cf03235b5c2fb9dd1c930a36a8bebd2f5
DIST gentoo-kernel-5.4.120-1.x86.xpak 53191725 BLAKE2B 816d230d0755058eb5ff090977e607b5d077ff5d49766da19416593aafaa529becb742abe6ef59f0212e64affe95e45a313559b5741257c05826be539e9a849f SHA512 86ce9f57c0b14f6edf3403fe2868d7c32f7d55ffa714ffeecd4c3830eb88633aaa71455e8a962a2ace0363981b2b820b4fab50ed10893ccf7470945c6e31a196
@@ -106,6 +116,8 @@ DIST gentoo-kernel-5.4.129-1.x86.xpak 53134201 BLAKE2B c7d76168ceb139ff7e206e500
DIST gentoo-kernel-5.4.130-1.amd64.xpak 61373618 BLAKE2B 4431a12633d68d87e95826fa71e45fc61a7a6c53f3d8879583ac74802c00460048400386da61b625ebcb7eb192302cf5ca0d63a95597d51ccf144ece5c168ba5 SHA512 c84fda865821ca57b77ee2f93dd7986688a115d2a90b99ee4154bcb2f1fc6c7ad96c729a0f484ee25e70318f30935aba0eb4b228631a90d9ec6d936c3c076b00
DIST gentoo-kernel-5.4.130-1.arm64.xpak 56048219 BLAKE2B 72e54faf0ed99e570e71504afe5b721875fc4d491d73cff91c6534abd612962d9360c1efb01c0757ba9764211b3030b5c6032d63106b7eee9d8fb9d55683da36 SHA512 4b7cab1a6fd68b9c46cf4f4d5d78eb6d66bff424af9c3d2a844a072ee2578f679d636c2f185b033a55ae12ee3d7cfec5aeb2accb87a3a5e6ae1e19601c620374
DIST gentoo-kernel-5.4.130-1.x86.xpak 53128397 BLAKE2B a4183f65fe7bc2b869b3556342434b90f577c88266a4462cfe4fd080584c333b7c934649894d9c570f1949b018614b96e17cd6b118aad08fd22e48d3a44515ea SHA512 2ec7337c2ca20eb43c0423318199e36b8d64454d0594910d84d965d725ac416509f8be2b60d70f76f8a8d40a8c17b0d928f6cf8e20b8271d3f7008921d4ca10d
+DIST gentoo-kernel-5.4.131-1.amd64.xpak 61358364 BLAKE2B 198334bf55e0b55316d6e0373a5cfbcd707a7cae0492b5dd72befd10dac53bc9369dc85f47483e79abf4d8db0a56ccc79ee47b55ebcae49c3df93882a3c13db3 SHA512 2c4b41fa72283ba2d09d09254141e3f1b5aa1cfdf80d84efde927a54a0ce1b3d911cfdbbe065ad3983134eee8f68c3656a722b5236edd7cc5295fdd02f339bb4
+DIST gentoo-kernel-5.4.131-1.x86.xpak 53137168 BLAKE2B 3b7a631de49d5ba7de28e839bb5c67218b7e2f13ad051efde3d9b70142be81636e21d0d3cf48b94911851e5dab38db523e552a52034aa8901bc331fea86127ae SHA512 49a7e2eef8572a51c9cdf24f16908d4527fa5d27db4a673fcea03277864fde724d92e667d4cb4ae0dea0d92a783720c19d5a5160439dcbe404694236a02a5b90
DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.49.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.49.ebuild
new file mode 100644
index 000000000000..9c5c8c94672d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.49.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+ https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+ https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+ amd64? (
+ https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+ -> ${BINPKG}.amd64.xpak
+ )
+ x86? (
+ https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+ -> ${BINPKG}.x86.xpak
+ )"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ !sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}"
+BDEPEND="
+ sys-devel/bc
+ sys-devel/flex
+ virtual/libelf
+ virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+ default
+ ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+ tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+ eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+ local PATCHES=(
+ # meh, genpatches have no directory
+ "${WORKDIR}"/*.patch
+ )
+ cd "${MY_P}" || die
+ default
+}
+
+src_configure() {
+ # force ld.bfd if we can find it easily
+ local LD="$(tc-getLD)"
+ if type -P "${LD}.bfd" &>/dev/null; then
+ LD+=.bfd
+ fi
+
+ tc-export_build_env
+ local makeargs=(
+ V=1
+
+ HOSTCC="$(tc-getBUILD_CC)"
+ HOSTCXX="$(tc-getBUILD_CXX)"
+ HOSTCFLAGS="${BUILD_CFLAGS}"
+ HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+ CROSS_COMPILE=${CHOST}-
+ AS="$(tc-getAS)"
+ CC="$(tc-getCC)"
+ LD="${LD}"
+ AR="$(tc-getAR)"
+ NM="$(tc-getNM)"
+ STRIP=":"
+ OBJCOPY="$(tc-getOBJCOPY)"
+ OBJDUMP="$(tc-getOBJDUMP)"
+
+ # we need to pass it to override colliding Gentoo envvar
+ ARCH=$(tc-arch-kernel)
+
+ O="${WORKDIR}"/modprep
+ )
+
+ mkdir modprep || die
+ cp "usr/src/linux-${KPV}/.config" modprep/ || die
+ emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+ kernel-install_test "${KPV}" \
+ "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+ "lib/modules/${KPV}"
+}
+
+src_install() {
+ mv lib usr "${ED}"/ || die
+
+ # strip out-of-source build stuffs from modprep
+ # and then copy built files
+ find modprep -type f '(' \
+ -name Makefile -o \
+ -name '*.[ao]' -o \
+ '(' -name '.*' -a -not -name '.config' ')' \
+ ')' -delete || die
+ rm modprep/source || die
+ cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.16.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.16.ebuild
new file mode 100644
index 000000000000..550411ea18c7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.12.16.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+ https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+ https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+ amd64? (
+ https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+ -> ${BINPKG}.amd64.xpak
+ )
+ x86? (
+ https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+ -> ${BINPKG}.x86.xpak
+ )"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ !sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}"
+BDEPEND="
+ sys-devel/bc
+ sys-devel/flex
+ virtual/libelf
+ virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+ default
+ ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+ tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+ eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+ local PATCHES=(
+ # meh, genpatches have no directory
+ "${WORKDIR}"/*.patch
+ )
+ cd "${MY_P}" || die
+ default
+}
+
+src_configure() {
+ # force ld.bfd if we can find it easily
+ local LD="$(tc-getLD)"
+ if type -P "${LD}.bfd" &>/dev/null; then
+ LD+=.bfd
+ fi
+
+ tc-export_build_env
+ local makeargs=(
+ V=1
+
+ HOSTCC="$(tc-getBUILD_CC)"
+ HOSTCXX="$(tc-getBUILD_CXX)"
+ HOSTCFLAGS="${BUILD_CFLAGS}"
+ HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+ CROSS_COMPILE=${CHOST}-
+ AS="$(tc-getAS)"
+ CC="$(tc-getCC)"
+ LD="${LD}"
+ AR="$(tc-getAR)"
+ NM="$(tc-getNM)"
+ STRIP=":"
+ OBJCOPY="$(tc-getOBJCOPY)"
+ OBJDUMP="$(tc-getOBJDUMP)"
+
+ # we need to pass it to override colliding Gentoo envvar
+ ARCH=$(tc-arch-kernel)
+
+ O="${WORKDIR}"/modprep
+ )
+
+ mkdir modprep || die
+ cp "usr/src/linux-${KPV}/.config" modprep/ || die
+ emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+ kernel-install_test "${KPV}" \
+ "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+ "lib/modules/${KPV}"
+}
+
+src_install() {
+ mv lib usr "${ED}"/ || die
+
+ # strip out-of-source build stuffs from modprep
+ # and then copy built files
+ find modprep -type f '(' \
+ -name Makefile -o \
+ -name '*.[ao]' -o \
+ '(' -name '.*' -a -not -name '.config' ')' \
+ ')' -delete || die
+ rm modprep/source || die
+ cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.131.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.131.ebuild
new file mode 100644
index 000000000000..19484744cb5c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.131.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+ https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+ https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+ amd64? (
+ https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+ -> ${BINPKG}.amd64.xpak
+ )
+ x86? (
+ https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+ -> ${BINPKG}.x86.xpak
+ )"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ !sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}"
+BDEPEND="
+ sys-devel/bc
+ sys-devel/flex
+ virtual/libelf
+ virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+ default
+ ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+ tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+ eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+ local PATCHES=(
+ # meh, genpatches have no directory
+ "${WORKDIR}"/*.patch
+ )
+ cd "${MY_P}" || die
+ default
+}
+
+src_configure() {
+ # force ld.bfd if we can find it easily
+ local LD="$(tc-getLD)"
+ if type -P "${LD}.bfd" &>/dev/null; then
+ LD+=.bfd
+ fi
+
+ tc-export_build_env
+ local makeargs=(
+ V=1
+
+ HOSTCC="$(tc-getBUILD_CC)"
+ HOSTCXX="$(tc-getBUILD_CXX)"
+ HOSTCFLAGS="${BUILD_CFLAGS}"
+ HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+ CROSS_COMPILE=${CHOST}-
+ AS="$(tc-getAS)"
+ CC="$(tc-getCC)"
+ LD="${LD}"
+ AR="$(tc-getAR)"
+ NM="$(tc-getNM)"
+ STRIP=":"
+ OBJCOPY="$(tc-getOBJCOPY)"
+ OBJDUMP="$(tc-getOBJDUMP)"
+
+ # we need to pass it to override colliding Gentoo envvar
+ ARCH=$(tc-arch-kernel)
+
+ O="${WORKDIR}"/modprep
+ )
+
+ mkdir modprep || die
+ cp "usr/src/linux-${KPV}/.config" modprep/ || die
+ emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+ kernel-install_test "${KPV}" \
+ "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+ "lib/modules/${KPV}"
+}
+
+src_install() {
+ mv lib usr "${ED}"/ || die
+
+ # strip out-of-source build stuffs from modprep
+ # and then copy built files
+ find modprep -type f '(' \
+ -name Makefile -o \
+ -name '*.[ao]' -o \
+ '(' -name '.*' -a -not -name '.config' ')' \
+ ')' -delete || die
+ rm modprep/source || die
+ cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 32c5749112fa..e260a4fa259e 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.10-51.base.tar.xz 1649104 BLAKE2B 611e698ca58531702279ae9874c0
DIST genpatches-5.10-51.extras.tar.xz 3412 BLAKE2B dbbe9031fdf275673014bafe3ee7d15e668f61187b6809df769a660830d026172b1eef1eefbbae61a2471004c14deba15913b0d4b57cfdf3750954ca075074b0 SHA512 6276fbea90ad4655021bcfb4e22c247e861807fa0c1a0ea6ce2fa439264422beaf74d0c8e08bf5fb0951727e1c4c189db5fe6672ff182d6c993919c0fcbeacbf
DIST genpatches-5.10-52.base.tar.xz 1649944 BLAKE2B 9712926fab35abb79b0c4bcc448fca65c1941f0840bbcfa3dc3c13a22f7711105bf3dd9536d3ff00fc5717eed70df5977d6771c3bd62a51cb8d36df824432831 SHA512 04519253c689cb6d88e82b624ef2928fe1bb8203113267c74cba5c1dd87cda072071c795410598f7f5ccd2533b65958027c959809c4b12503ecf9a4d7eb3fe50
DIST genpatches-5.10-52.extras.tar.xz 3412 BLAKE2B a458b569dfb6643b5a13fcce6c5df46c844119009c0593c6e655a2b0b7589af70a682745fc79f14fbc4fd7e45c52a924b8cc4665a31665a6abe1ba0c8d779bc2 SHA512 5a8f76b2791fefc6f0990402bd5307870517e79daccd52b4d126b8b278dafc086b47649631b3b07f220e3b06d03f12f765bbfb837988257db737c34806a78744
+DIST genpatches-5.10-54.base.tar.xz 1652540 BLAKE2B 37ecda0a4f76784572985be5073e7a3f33eb3aa43e641a2bc083e987c88c45cbc277bdeb20bb6ae4d264a17b65273119790ba8dcba7e22fd76ea8d0bd1be1cfb SHA512 85587df46e72cde33fb869f16b7fcc995a4d947552ab4bfb45ffcc852dad1f4b56a58d81446a00a142b9e628bd2fcc8c4922b50a282706f430b0bd9e20aa34e4
+DIST genpatches-5.10-54.extras.tar.xz 3416 BLAKE2B 3602707190ed04f62c4b2e8e0e765a53cf436b437373e71b6afd392cf05a73ac9e24f89293aac17c3730cdd696485ebf9d98161b248c9acafbfbe0b0c2db8ab8 SHA512 e4aad3f799dbcf00f813e39c8b9b355f17914a33d1ef422b3e7ee48c48e77a69925cc5664f0f171d1a632f622417b9d7ec88e56b1575c8e5f82af94f64337f42
DIST genpatches-5.11-25.base.tar.xz 1030312 BLAKE2B c3e0f5840c32292d36be31a8606934bfa1ccb7e31f04cd214574009577907d00912bacce1f85dddeda77ba99f40f61fa5aa5259a693c74abd63a05be5a44f2aa SHA512 5adbe3770562b57d7180a44ccca8e665cc5b0d9ba5168c4b3555b348708edd7469464bd770124d9a8641095bdbe786d843ae3da64b845d577999c9e40360c970
DIST genpatches-5.11-25.extras.tar.xz 1772 BLAKE2B 0bd2afbd93cd7553c8e058f61c515ed9d47e9f328529e6cf36a7100b363dc8e4c3004afa06a0c0b95963bcf69a216ae6a7bf595062401725a4a25f942f44a3e8 SHA512 114094a87bad0dc4a265847fa18b88a2795daf151de8451bb4fbe4af70f3f4bcff8905d8d90522f85914bb7ba7227ebab7f69ab59112afb2187332b393450fec
DIST genpatches-5.12-11.base.tar.xz 611232 BLAKE2B af0db172fa831bc84b1935d387e3d7b360c5a94d8499b6fa204f21b7a822c844e88a87f4a2724d0b8b508676ee564dbbe304893bfdd3197d67c8f6aeae011cb2 SHA512 f422bc1aca29732db09184ca2fcf7478536a87e73b59325f063c73103c8ce425858baa78b185eab61a80dda15e3818b45a669c69f7898382aa3563b315ad45b3
@@ -26,6 +28,8 @@ DIST genpatches-5.12-17.base.tar.xz 738268 BLAKE2B 61336204dbaf80bb44c29927ff59e
DIST genpatches-5.12-17.extras.tar.xz 3412 BLAKE2B abbc0dbb59a91d6733f5c56918aee4d0bedfaa9f87687979f0b2b01778e2a934396c5b797050d1d05e52c2432f6fd32891176b4cb64709273ba810a1b7166884 SHA512 d36015ad8ee2bf8efb5c0b0786a661326d7833ab1d185e9e06791474b03036022bc6d6d1a22c1d4d086922b9db43ecec97a8dd5ff9daafd591a7b3092f839e5f
DIST genpatches-5.12-18.base.tar.xz 738968 BLAKE2B cf0e62aad4cbe5c00d09a47e901761762934f34257e7064e65e9e9a29203c80a88ce31d55bff7156d8a09070dd67c79c383b0f1516757fbec1f5c722e844bff4 SHA512 31283759d7bb2a9b674489f4074a3027d52b5276df9e574d2d040007cdf679237ced0466724ddd81cb20714c7676f12b09f7c0014c1335227dc3bcc0358da701
DIST genpatches-5.12-18.extras.tar.xz 3420 BLAKE2B 783c9491317343e26eb9a25b48486c8b9c47f80e2c3048cea50e17ef1e6dcd9e5ab40a3f02bd02b5949933ca6634ffaaeb507416534ca35308ba35e5bbcfcff3 SHA512 53f513fe4ab0bae00b69055f8962cb8200ea90bdfba9c4ab95bdcb58f6654f5739438a6540a18a530e8160375c8d5ee2a767054b509c3a79dbda02721857403a
+DIST genpatches-5.12-19.base.tar.xz 744220 BLAKE2B 63163732eeff70cf0eb344950247f69992145a4e7cbbe966eadaffda3be3f0e645b3d7cfc9c2284156385e761c02613ceec331b777b282da77b3d169cf3fb807 SHA512 8689a4f3fec6c29a88f7389296659579c13a2b664b94dc8147bd1b266019c310c30d19198db01feb60a421b1362aa15e72feb4cb19ac2ac2136ce12c42a21915
+DIST genpatches-5.12-19.extras.tar.xz 3420 BLAKE2B dd43bf044652067aec7069cc2e8c1b9441ac06750b64dfd355ad53221df08fb68981363b9749a6f93ebfe81e728ad8791f7a5ad2e9d4557da6d2a1904efc05cd SHA512 501379a816043c5bc0c4724a999957d8c5b4cca214d12e2d64577ff24943230e6ae5e60512b634a5507ea5f8823e7511b20a5c099bab149309045e0fd17c4b24
DIST genpatches-5.4-123.base.tar.xz 3488228 BLAKE2B 0fe5c3056c3cb060f4921e3b7a4046e03e4e777d033619f0496eda68c645c6209fb07713a4bc2565000f9c17e6203a8bc5392fc597dd49167bb0348988b53026 SHA512 e71b8f9d622d3ea2fa8165a39a27240ac007d899d7324c60240221d7761c1287f14b631b074536460702922b8daf00bc2714358aaf7f69ac257af7d5d5b18bd1
DIST genpatches-5.4-123.extras.tar.xz 1772 BLAKE2B da9bc0d9513d010364506850d1c23d13e1a1ef8c4cb8d60e3430d12f4cc2ea87a74643ba9fa1a061eabdee9985b1931aab1b2587ee26bec9b2cf165b90fe83e5 SHA512 ff3b417825ba200b32abf888b6cf6e8d754526e57a30c06fbe4f961c84f67cd921b93b9848fc6b49f120b4cf8ddba9284755da73869db35327af7549d63f3cd1
DIST genpatches-5.4-128.base.tar.xz 3571424 BLAKE2B a58c2b8f20730c3357ce30cbc8b24f0609bd7ca2a8f5d37780cfbe4edb560fa49bcf1925ec40dbf61aebfe9a87be0f35ade4b999509420eb0caf5731ce649e89 SHA512 c84d65acdc4274b528306af958b0c72851fdce008c9ed6f78965ea22f09f8668b6075cfda9101b2e7a7bc55ccea64491000b1aede8cffa4ad927c7c1bb003489
@@ -40,6 +44,8 @@ DIST genpatches-5.4-133.base.tar.xz 3628504 BLAKE2B d3d99348c475bbeda9a1d0a7e363
DIST genpatches-5.4-133.extras.tar.xz 1768 BLAKE2B abad0014d2d982087ac982d0f017587fba8ea2b5180e67a92ed4b5a62c4129a5d275f6556cbf782b459900e03696355e4017c4c833cefc571c7cf4bbf2b5c907 SHA512 121ad821cd6628166a1ca005f2b408737ba8c9c1b8315c13926bda862b49d2ed330fea169a348b0209d903fca7a8d4ebdb50cf7dd527efde49ca9d69de4106df
DIST genpatches-5.4-134.base.tar.xz 3632276 BLAKE2B 475eaa6bb0c7291fbed3722ecfa8c05c5352677844481d4b37f2d5ba4b8a77697b6f43f1005aa1f899a561b3ba38670a160026fb935c2a1e75db7f1a9c292044 SHA512 4bfbf7ea9d909f2913094e7c0a34fd570540c4e9bc471ab8e90b2c73d1c99e6da23a11c0e254f4adfa6d155c51c763224a4851f4105a2a8ed69fd11c73a58101
DIST genpatches-5.4-134.extras.tar.xz 1768 BLAKE2B 894032d098f79b3c247b1e0ab19646e9c79414c4070fbf19679286f7305dbabee8c39c11dfe7c7a1009f36d64f99b0627b75b455cda62b2143fc5a5102937cd8 SHA512 5d6b703ae705a8587a7abea96e64cc51f34d8762e5a93c5c9f410a52d7bac4c44aca2d21bbede8354ad5aa1fbef45aeaffedc7db69c21ea2a94c22a0069da398
+DIST genpatches-5.4-135.base.tar.xz 3632876 BLAKE2B cc4bc930c2f181b98dde258a696bcdd8f23fcb9098707d5f158f24cd5fca4f8958dc321e8ad348b9ffd96c53bb231bc2f171b9e491427fffb2fd05dc5fd23ceb SHA512 1250c964bc3c062cb9e8109da1d1276cb5e2d7c25e1175ee56672d1a6da4be3c73f52fdc9547a70c627057265fd5af6b6b99d977c0c85a45376bf5b99bedcdf7
+DIST genpatches-5.4-135.extras.tar.xz 1772 BLAKE2B 3adbde4f0977e2da60f29937e53a1f0892ce6278745c63511e486587efc10c1c6a4a8e05375492382d1102090733d4a1fa93f380b47e734affa2ce65382e255f SHA512 6ef12e03081b927af5bd6b820f150116fa3e848a457aa9fccdd4172c3e85dbf6ba78050878884d325b059f1fa4681de85a38d475ecd55dafddc60bd8362cba77
DIST gentoo-kernel-config-5.10.32.tar.gz 1269 BLAKE2B 4a21a57d567d9a527ef829f375275c65347b2e6461b00e50099458c496af0a7b3b863a6e1d8421ad18c52c64c1c4cd7e5fd416673b67738cde6253af8a9f18db SHA512 a83ef22a7f9f83f01bd65a5470f0678111b0a7dcf1dc564e04264f68cc54833dbed4cccffe2864caf3ac14169611259f0bb786c1aefe194372d6d3f67fa64c00
DIST gentoo-kernel-config-5.10.42.tar.gz 3992 BLAKE2B b04f585ccc823c25baafea011a5df9e4ed79f5537fb0c47726bb54d3f6197627b078a6f8510707a68edd9308f7ede84ca3f9bff78e64e06c9ea3d53db496c10f SHA512 5d42e1ac694441acb8ea13fa3e80615bd18f0932a37f50c3d34c8c2f95ef4dfa6541407ddcad802b4fb13468e0e85d8cd09ac37d3612260f9a81d081cb4b6713
DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.49.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.49.ebuild
new file mode 100644
index 000000000000..45a37c020601
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.49.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.42
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+ https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+ https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+ https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+ -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+ amd64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+ -> kernel-x86_64-fedora.config.${CONFIG_VER}
+ )
+ arm64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+ -> kernel-aarch64-fedora.config.${CONFIG_VER}
+ )
+ ppc64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+ -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+ )
+ x86? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+ -> kernel-i686-fedora.config.${CONFIG_VER}
+ )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+ !sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+ debug? ( dev-util/pahole )"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+ local PATCHES=(
+ # meh, genpatches have no directory
+ "${WORKDIR}"/*.patch
+ )
+ default
+
+ # prepare the default config
+ case ${ARCH} in
+ amd64)
+ cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ arm)
+ return
+ ;;
+ arm64)
+ cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ ppc64)
+ cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ x86)
+ cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ *)
+ die "Unsupported arch ${ARCH}"
+ ;;
+ esac
+
+ local myversion="-gentoo-dist"
+ use hardened && myversion+="-hardened"
+ echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+ local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+ local merge_configs=(
+ "${T}"/version.config
+ "${dist_conf_path}"/base.config
+ )
+ use debug || merge_configs+=(
+ "${dist_conf_path}"/no-debug.config
+ )
+ if use hardened; then
+ merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+ tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+ if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+ merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+ fi
+ fi
+ kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.16.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.16.ebuild
new file mode 100644
index 000000000000..8cc6b8c1b940
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.16.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.12.5
+CONFIG_HASH=17639df044f5f81bbf267f566426eae4a5187875
+GENTOO_CONFIG_VER=5.10.42
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+ https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+ https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+ https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+ -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+ amd64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+ -> kernel-x86_64-fedora.config.${CONFIG_VER}
+ )
+ arm64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+ -> kernel-aarch64-fedora.config.${CONFIG_VER}
+ )
+ ppc64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+ -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+ )
+ x86? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+ -> kernel-i686-fedora.config.${CONFIG_VER}
+ )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+ !sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+ debug? ( dev-util/pahole )"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+ local PATCHES=(
+ # meh, genpatches have no directory
+ "${WORKDIR}"/*.patch
+ )
+ default
+
+ # prepare the default config
+ case ${ARCH} in
+ amd64)
+ cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ arm)
+ return
+ ;;
+ arm64)
+ cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ ppc64)
+ cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ x86)
+ cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ *)
+ die "Unsupported arch ${ARCH}"
+ ;;
+ esac
+
+ local myversion="-gentoo-dist"
+ use hardened && myversion+="-hardened"
+ echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+ local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+ local merge_configs=(
+ "${T}"/version.config
+ "${dist_conf_path}"/base.config
+ )
+ use debug || merge_configs+=(
+ "${dist_conf_path}"/no-debug.config
+ )
+ if use hardened; then
+ merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+ tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+ if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+ merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+ fi
+ fi
+ kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.131.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.131.ebuild
new file mode 100644
index 000000000000..1bf22439675a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.131.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+ https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+ https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+ https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+ -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+ amd64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+ -> kernel-x86_64.config.${CONFIG_VER}
+ )
+ arm64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+ -> kernel-aarch64.config.${CONFIG_VER}
+ )
+ ppc64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+ -> kernel-ppc64le.config.${CONFIG_VER}
+ )
+ x86? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+ -> kernel-i686.config.${CONFIG_VER}
+ )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+ !sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+ debug? ( dev-util/pahole )"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}"
+
+pkg_pretend() {
+ ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+ ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
+
+ kernel-install_pkg_pretend
+}
+
+src_prepare() {
+ local PATCHES=(
+ # meh, genpatches have no directory
+ "${WORKDIR}"/*.patch
+ )
+ default
+
+ # prepare the default config
+ case ${ARCH} in
+ amd64)
+ cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+ ;;
+ arm64)
+ cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+ ;;
+ ppc64)
+ cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+ ;;
+ x86)
+ cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+ ;;
+ *)
+ die "Unsupported arch ${ARCH}"
+ ;;
+ esac
+
+ echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+ local merge_configs=(
+ "${T}"/version.config
+ "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+ )
+ use debug || merge_configs+=(
+ "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+ )
+ [[ ${ARCH} == x86 ]] && merge_configs+=(
+ "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+ )
+
+ kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index a4f5e8a2a7bd..de6c03a84ffe 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -16,6 +16,9 @@ DIST genpatches-4.14-247.extras.tar.xz 3340 BLAKE2B 253bdbc0df0d88ebaa2c8b51979c
DIST genpatches-4.14-248.base.tar.xz 5122664 BLAKE2B 1f43c126a36a9fa540512b1d0a38e1af593099d57134dea02f8dfe5355c981026a01c7a2e91024833f7182803a3a67d769f8178df266ca780d229ac6466da49c SHA512 9a7fa678db39b6413cd5664a73564f137f9a9de0effb7ecc8ea775ad1af9c0ab9e3ff3edfab616d4459996f0688d49fade076c39ae6058ccf338b622fb1e33a8
DIST genpatches-4.14-248.experimental.tar.xz 5712 BLAKE2B 3d988dd1ea6036fdc974b1292b6ee6d397c24f0b574e341b663d5311999f01449faeefc5b8d307b173d295d57a197fc2d26ab3cbfbf960af604ac928887e9f92 SHA512 c5c68478493ca32aabdf01547c64069f9ac7506d12a59636b3b41dfeee182c27aba02e65e50c557a772f050233ff651a0396c4c28e89b51207468c7143115b4f
DIST genpatches-4.14-248.extras.tar.xz 3340 BLAKE2B a0906876bb9d64c2039957485672c795a9026d055c570e4d0156c05af0bc23ad066c67ee21e6f9bba41c36f36693e1ea7fe7d167a2d1a9e05f4413cf4a034744 SHA512 4360b20d8e8e00b2ca5c0f1d0a5878d6f44a74dccb0cdb34d2176cb01ea1b7dd8cf27cf5547b776189d8645e526cacd2fa7ef5f8f5706b1ff1260e8b70be0f32
+DIST genpatches-4.14-249.base.tar.xz 5128896 BLAKE2B c5ea0e008c99c5792de62af5ce8c6829c4540ce2178a611fbc268032bf916c65e7a5be68b1c2fc2ba984d24e042bd0a3863bf15b491306990bb97032114f8ec8 SHA512 6520dcaf9aee4334d3bbbdfd82b023a1bab316eafaf535d3360bef5d2a12d42a936b93c24f55cc3b11a59fee2e53d1b2ed3b7994862f06ec66b6ca767e6cca8f
+DIST genpatches-4.14-249.experimental.tar.xz 5704 BLAKE2B 1af9937c158f9229d445b0f657a13b544f9b4d213246458c1a4373155ae57e85bf9695649cce87a8d3952eeb36f31dc6893bbd752532478867e3a9b51e526b3e SHA512 9624e9052ee9b69df6d9db63825a47cd113ddb2505ba29cd0cc002f3fe5a30167dcbccf0bdd42659b600a12f4640e444d665cc6a3aeb18102b28cd41240ef46b
+DIST genpatches-4.14-249.extras.tar.xz 3340 BLAKE2B 0c33e0d9b6ec90831af0a42660dcf2114116186e2f47dd98a4cb4efa34c7ec42f95f79badd71c32c6f9235fe0b2eee07fec2070387ed5859c663eae9924f9fc3 SHA512 10aad39f5adf040a81a0e56d80ec4c2779870195bd174bf359a7228a286149d7ac9eccfa57731654ac469b4a0d1a3df4c40975bf7ef12c22aa348b3eb880a909
DIST genpatches-4.19-183.base.tar.xz 4496972 BLAKE2B 50b2a224e191ab6aac262b592752b78cc2259bde77a3191d069afc5f27a987b1749f9886883e3d20e2e52d2a1a38b01fb53d8bc5872220b88bf794476899136e SHA512 954ee22987946fa1961ed843fad5439e9adae501e7e6b37c9a5f42b3e89a87c0b4b688111bb3df2643db1febf6cd6297b0eaaef3484a4087cb5f41239978d3d4
DIST genpatches-4.19-183.experimental.tar.xz 7500 BLAKE2B fa2afd996ff04ceda3c59126fe7de12085c9abbf91101d88c94e9c0e01e8590c8b129aeabef872a238f51d230eb3acb21b0f30e6169dcf5f9c8bf62e2c34a054 SHA512 e36f71faca3ad33c465148fcf8f5ae44bf1ae07e06cd03b32420930b09bd9a698306e26579d69c14a87735805380bef8424cdddd375df878eca920ed5f78986e
DIST genpatches-4.19-183.extras.tar.xz 3316 BLAKE2B 776b600248dbebfb9f87af1b6149ac9867f94559d1e7cb4b9018144d2fc6c901cda19099e0cbc07f1b5837d6cf9a0dfdfa2e034a1ead20dfb042c029a36a62b4 SHA512 00dca69d69edf3dc7c902d992e08c67a9907d398c29d60fab3df4703efb6ee296c2693fc5acc2c47f32bc93fb8be33ab0bee1be98ec1a009810e26cf12d94b14
@@ -34,6 +37,9 @@ DIST genpatches-4.19-194.extras.tar.xz 3316 BLAKE2B 4adfa0a49bc354ef59df796aef9a
DIST genpatches-4.19-195.base.tar.xz 4734836 BLAKE2B 740d5514d2c380d417c766696f0c012a0aaeb52111edfd69b369751684fb9bbc3e7bb8839e0b273445670d1423c2296c05831928d062959d336b3696cd228079 SHA512 1dd57bd3857ac7b6686f8c47bcf4e52f550dc4511452b3fc6c8fac29388a2eafd61da9c9c4a239a473d1e1e81c1b3d6d5b763f70c35955964258ee91d43e54ef
DIST genpatches-4.19-195.experimental.tar.xz 5468 BLAKE2B 06acac718651e1f03380531d0af9775c1ec7d5084d3befa992098b4140f71c9818f8802e3e4506c41b1bcd56b6b683d971d5b86a8ac726b46a646258b57062cc SHA512 87e3d412c6ab7d242a74f5ba57e970ec996c2a0efbbfee86e76f5fd92d77cb15d1533187799ad3cae61c1608effb620e399253223845186ef395ac4e35f637b3
DIST genpatches-4.19-195.extras.tar.xz 3316 BLAKE2B 453752d45bb34f5d0763087ddbcf418158ae6739783c9775b01442cfc33adcea85fe5e874ebb8dad77f5267bef62f58d327762df6d61036293c72a229a063018 SHA512 e78c6b63311bbb67a650f4d9e258b0209a5cb182eaa1e8db68423b6e199d7050bb293e2966667c2e430aaaa06ec5372b3d9fbea8effd7eaf6cf388fde9d338ad
+DIST genpatches-4.19-196.base.tar.xz 4746104 BLAKE2B 3b72fc3ae81dc5df6d437d888f030b14e456911c14578459018096a0b00e80b5187894d1321de6a36081e201d751e26ac040aa73c7cfbb69d7a1d071135243f2 SHA512 8a303a77d86e0f3e44f9b329d23721dccff8f373babfcf916e3d4d9de8aa969f4e99d56c9f3cacd0670d1f451a39bb8e6d2b676a25af6441e76cc325dbfffc0f
+DIST genpatches-4.19-196.experimental.tar.xz 5468 BLAKE2B c250bcc9a869e6500685dfd8518be35637f4b13ae3c0d478547dbf1a831e700a8a0635b86e5d3cd4a0336443afa3da99a25eb0691cdd3549f59271eb99937b33 SHA512 eabecaf60dae5daac22645b31fe60e2be89733af99c933380d37a9261edef848505d943f1d32c4d49fbe17095e3a161e188a988c6cecea5d5b45932d4d1b86c8
+DIST genpatches-4.19-196.extras.tar.xz 3316 BLAKE2B 842e58bbbcd28356d449dfd58cf4e6f3af081ad188a1c8da7b108aaf40d0e7832030a34b27f5a6cc9e230e3dac8fc4afd7610e2c02a40cec4957e1ab60312c06 SHA512 66846db87ed23ce86f0f8bf5aa1a81b60d969d95a2daa82d7de3e7db8039b220be810913fb4066f10f13268c551d51a5d9e99eb125d00910e7c4ee044e72246a
DIST genpatches-4.4-266.base.tar.xz 4099364 BLAKE2B 0bb0dfcabbd191b2dbfd73171ae5871580f75fba2a4343237c0ad6e68a9868d0818633bbf27abc82600f78bd983b50833b3d70d477369ecbbf16c87cfaeee2ec SHA512 cca98ce814f7eb12fb57163982111d2f063d0998d149e95c5bb8c06339461e5bc52e1201c1045342fbd2304be2838b9960272e5594dd62c89fcb4f100bb05ecb
DIST genpatches-4.4-266.experimental.tar.xz 83304 BLAKE2B d05c680a7df6aedbd790086b4654a90a810656b98dd912bcbd1d2cd1bc27e98104a3ea863315ccba7de2dfcefa4e337b510f604ab5a80059c9d090fe7d282a77 SHA512 b3e816541e7fa68f3bbfc443e9d89837c4bf8b28303853f3a05db4f2748725c3a7c4879820334b0850ed2f3b29e477f763aa004e7426bf2fb7d688b1221e63dc
DIST genpatches-4.4-266.extras.tar.xz 1788 BLAKE2B d7d582abe322309701d006c6744eebd331fac15bcb06ae76367e772fc815a28405fadfa9714669368b0a7c074ef1ac695dc7619da09ae9b70d2700bdb7a47726 SHA512 81ad23a472cc8052d6b94ab846850d796019314f6cded442572ed683c35bd99bb30f801c7f4d1b75262f633d299b0dde2df879d61848e3c6440b1a2760577904
@@ -52,6 +58,9 @@ DIST genpatches-4.4-275.extras.tar.xz 1792 BLAKE2B dafef2721ddd49c2df9beb1a07d32
DIST genpatches-4.4-276.base.tar.xz 4186868 BLAKE2B e4ee2e457da31e2d92c4614ffe7fd8c1af8733862629646d3589573956ec5da9cd4be480c5c7ca1733ed9ac185177a5e77a876285f5f380b490a9413995df93a SHA512 40f38aeac93647723d349988e085e5a80d00ecb6a94006c81a69bc0f4a45664a50283417042aa4067c68c59a48b144a6935c573a9f6a36521026fc94077cc63f
DIST genpatches-4.4-276.experimental.tar.xz 83272 BLAKE2B 617eac9c6de63dbe59e51b27856963a3d54f96bd12a7156ac204eb45a495187583f35748de7a67a31b6743cd0d39a66ae6225731c7ea3c8838ce0f347aba620e SHA512 3f92c01d5da5f7bed700aa2aef1b3f8825354e9e40e010cd7b542d6bf90602a9fd0c5b1d7ac5b05ed4ee61bbec47a3b3c4468ece3907df01c62128acab97f10c
DIST genpatches-4.4-276.extras.tar.xz 1788 BLAKE2B d62fccfdb7f6a4f8c7644c299030da02f1159705218022324360927f2298e6f80712f596cfe614263324e4dd16c64c886ad5aca7770af8f8a18806dfebca0363 SHA512 5a89a907bfe32f94156d2507a30f31646bb1e5f3b16902fdee1ec521314e26e90df02083bf63c08835f1fef3cba88844ce2ac87462465d18847eac517258c95e
+DIST genpatches-4.4-277.base.tar.xz 4187416 BLAKE2B c2779d779e5ed44d7f128c2800101667b66c88f85adaef263cd223035379c841e3b985be06a3528420d24ead90d7dee7d5a30a2153a7485fc94a9a7726ec06f9 SHA512 4c43c5557a7a3309bfd1a30bd973e2cf1ed50cac975faf30dd413161cbdb54be1b77031d742ca72b41ce84b60954402e0e821c20061c4f4255cf044997d4fc73
+DIST genpatches-4.4-277.experimental.tar.xz 83292 BLAKE2B 8079a93d182e10b8f5bdbcb431f5ea3ecfb1287118bf8108c094dbd2a2f2fb7c4175de8da6d91bf3b848a8ab093078b4c442432cffcfe2cebd39145b0ab01939 SHA512 6bbc0dcbbc59b4206c1c48d9c1b13915255542071fb8f95897a4ee2d9fc5d1cf8365f6842e6879706f0891b7853c33ed59fb8daac157ccfa9d5328d1d24716b1
+DIST genpatches-4.4-277.extras.tar.xz 1788 BLAKE2B a29ac28fe994f402aa15021d8e2651b77db84ee1c4b02fda927cec43f4950925d532d8c16976caae67dfaaea4468ffa56f3960b01c82d4185b9debf378e54258 SHA512 0b779c3cf24e77967ff5fa10be178b1856c9e808d7566500d4ede99a7b0903f27705c4d28a213974c134daadbf1c8612ff01a55fb678633a4c883703d522accb
DIST genpatches-4.9-268.base.tar.xz 4614764 BLAKE2B a5156251e1106347dcda111db6abbcb5f174c42dabfc3694f6b8fc45ded4414e41d8a56d062ae29828b8b033f08b3f541229c033c45d862bad6a52ab539667ac SHA512 468092419b2badd24cd4fbb87fcbe965b5e94145e4fb049916385dbcd1080d1b7a63fe0e17b046a5996a44ab915613d0d7389550fc74eb03f6669be0d6db60e4
DIST genpatches-4.9-268.experimental.tar.xz 106408 BLAKE2B 31f60f4d61bfd60d001a708584aa3f84a688a4e0e28665c6d82c4c2ad60201e3fb64b69e0611a1e607dee3036a5dcc56bb0ef01766122b666136e104fe1d6dbe SHA512 1b9eb7c2881216e49c0cb81f541b3ed3042f86b3c1ed43f463456ea3f41feb453026d524860fd7b9eb1a51177a1a911b33d9b34162bbc5281552bab3fef33c2c
DIST genpatches-4.9-268.extras.tar.xz 3340 BLAKE2B ec67f3d538afcd97de03ced99050a5ffa7529a880b86ea2258e66e5de4981aa12f12c7127ff302084fec9ed71416c66b349de3727f46e4f0262eea7a2a20da8f SHA512 33e415c7360542bf1e8a0e77ef7e3f8b3c4b8f761f1b07607740222a1be15ec88b3036330a35daf900f93e25dbedef16506ff40553b65a8b6e3b3f5d1d79c6a1
@@ -70,6 +79,9 @@ DIST genpatches-4.9-277.extras.tar.xz 3344 BLAKE2B 51ff57fd8cc27bee7f7515c8b995d
DIST genpatches-4.9-278.base.tar.xz 4724556 BLAKE2B 2bc0bd9624b337a61f7c2d4a87d962ab1b7c87ed7db24026fd43abb55860abe351e975317b4777babede271bc60eb62e1c7d41ef3ba3534678a70769538fc0ba SHA512 9445e011bd192abc5216fc54496be2da5fb57712e3659cb51daf47ca220bfd736bf62556b4a063817f452d23ce607a8407e6e1bed381a546f7f256d0fd0e2680
DIST genpatches-4.9-278.experimental.tar.xz 106372 BLAKE2B d77128a3af702f481067a3bd99a893f61e0628df5c99af319b46225bad80898ab2d86e6de84fb07d141f1c5e278101868c54bcf252c9fa54ed4d916c9e3b41ce SHA512 12647bcc98a6403d9db6d131348e06e45ade59e7baa6a533e029362b5b57286577425f1153619b38061d9a44ef9e43d29780d454cfb5f947ee7ee2a6581e9f31
DIST genpatches-4.9-278.extras.tar.xz 3340 BLAKE2B daf3dafb2bd985edb098bc20d29b95f030b236c46c64c5ffe9d98a8fb5837f80a7bf87d3b265ef6ad4d5aa8cfb9e262117c5d7942cf2a33f8b1ae080daa07f07 SHA512 6b7b95bb5a910d06f574fc3e22f60c6fb66f3a48ce56ff783483673e0c4570a4049740279d6bf28a25279b0885e60f7be8de1f91a58d42e7a629905abf6a7b87
+DIST genpatches-4.9-279.base.tar.xz 4727296 BLAKE2B 2a313b828c0a511726bfb0ff0508a6ffc6bc31d468571960af25fdaa41a5dbc278b0fab0a8c1bd69576fe1eedd39740e9e69d7c20dd8a90e591845591b71a69a SHA512 d9f72c859c0b7d511f02007b9401c4750331a4b0c4cc85e4dcb93204c2e2a19d8290e0f9eccde3575c3dc0c4fbdc73c5f87a6f8a4b9fe28a2ca47763b0c8e456
+DIST genpatches-4.9-279.experimental.tar.xz 106392 BLAKE2B 0ddde7930525240570dca9b33e64762e1f4adb92996f11b5fb329b731c66e571af4caff6d36952941ba15c2465ad90a01636a0d5473e9f0214a8dc0260f42d38 SHA512 3ef46c0cb06943481053eea4036def27584599a37b11bc1c318e09df884d0cb2870c17b6369f814032511b34023d25dcc14aaef636833143fe75d99629ce180c
+DIST genpatches-4.9-279.extras.tar.xz 3340 BLAKE2B d07f121d92d4940b4a98b388f0cf9e38ad5475d36103b80eb24a257e2f487e7f784c4467e46447da22e2f5c7840bb5205b4c38e5581dbec8fe3bd6cfa70a1985 SHA512 9188a6902710430706f5d85b46dc457c341a32d220525b63ac65a571934f8755881d7b6d4358df811f97037bce07d12581889945c665c7b6c81cc256ea579980
DIST genpatches-5.10-30.base.tar.xz 991908 BLAKE2B 524e7e66358b3bf311f1347e6a8c8daeed82e6a71340e51157a207580e4e028f230caea696c1e611d57d129113948938a62ef105adcf8f09c5041baedde93aa4 SHA512 3986617d71cd582ece369693624f0013cd88b57a65c3a051975da30931973b161e01fce104abc6d2f08295a2c27e536b98782435c1110086175c7fd5051d62d1
DIST genpatches-5.10-30.experimental.tar.xz 16544 BLAKE2B 3d9225f0f460fe316053360606a8284faccef03af7e22e1156045e71a24ea83fa900258cc80439089b0d5b54ac2022f548bc3f47fc04d7645d3c27033bc9f2bb SHA512 fce31c497391aff783eab83aa3a23949e13009a0422b6b5b1cbf295e133b8140215690c56c9550bd8b532e95490e40626a33bff152da066933e5a5270e392953
DIST genpatches-5.10-30.extras.tar.xz 1772 BLAKE2B 7fd98f16922f7a3ea703a5dd2622152b761a47fb7da8a108281e4a9ecb37f9295347a23081b2859039b8b47049ac530d74a05358b7fdb4a8c9a97fffd8103c44 SHA512 ca23be16f47ebea149496eafb0ce9c6068a3a46be01abf9d95b5e693e5a5063e7692003bc23658269d55f923233f1124854515a3f35a94dc385410c6978e25ac
@@ -103,6 +115,12 @@ DIST genpatches-5.10-52.extras.tar.xz 3412 BLAKE2B a458b569dfb6643b5a13fcce6c5df
DIST genpatches-5.10-53.base.tar.xz 1650792 BLAKE2B f4e4f7c7e49b78db706c2e5e47c1e0a3e99576316150f4c2443cca5885e18969181fc94febd3814de4fe9256b1324446be160b3d9992edd0375ff12496c501f0 SHA512 533a45b4fb2bbf531fcc8eb38928593a21af77144ea510e13d0d1d84919425a26371b9e1b5052fe6e7c1551683a5f88e1fd24512d9d2142fa8437f69de1c47ba
DIST genpatches-5.10-53.experimental.tar.xz 16872 BLAKE2B 934efa18181eb347c56d06c5b0a13dfd6234eeab5f3456e7e876b60ec31c9aaeb613db09ca220644d3fe30681fa6b821847e9d96bf4b295bb4192fd0d5c82b05 SHA512 158e7b8a3d288b741122ee856f89e3304e4083581f224e7e795ea6f5d81065d9f820a9869e48d88a44860ed59715dc015c6bfb6f0a862a2f265c841ab94ad096
DIST genpatches-5.10-53.extras.tar.xz 3420 BLAKE2B 3079e8f65de0ae8d927cce28fdaf97b902d5cbe3f419c9247a76d27bad296f5f002773ad176dbd086ed04d5346da86db91f1c2bc87247e14a86e0790cc2b1ebb SHA512 0402a07c174f9ab289654e0ff15647d53e5624fc729b73f7028f6c1619285914c5a672b42bd9029fc4f1f773631f86d51e6b48a5c96f84825761b42b76ea18f9
+DIST genpatches-5.10-54.base.tar.xz 1652540 BLAKE2B 37ecda0a4f76784572985be5073e7a3f33eb3aa43e641a2bc083e987c88c45cbc277bdeb20bb6ae4d264a17b65273119790ba8dcba7e22fd76ea8d0bd1be1cfb SHA512 85587df46e72cde33fb869f16b7fcc995a4d947552ab4bfb45ffcc852dad1f4b56a58d81446a00a142b9e628bd2fcc8c4922b50a282706f430b0bd9e20aa34e4
+DIST genpatches-5.10-54.experimental.tar.xz 16868 BLAKE2B af882931bd84ccc327825237f71dce6ea78af43a48e338c9e0580ce140562953fde5ef9d5d35e6cd81428771565cf8a99da1cdc2154adfbe0022cfca93101e26 SHA512 58c6d20ce2bc06e50b7697e2705e6cae16d82fadb5f86a6213f26cdc0aeea7bf40f34335a405caae3106f629d09fe8944bd85c7cae2a09231dc2bd5a8a0e5d84
+DIST genpatches-5.10-54.extras.tar.xz 3416 BLAKE2B 3602707190ed04f62c4b2e8e0e765a53cf436b437373e71b6afd392cf05a73ac9e24f89293aac17c3730cdd696485ebf9d98161b248c9acafbfbe0b0c2db8ab8 SHA512 e4aad3f799dbcf00f813e39c8b9b355f17914a33d1ef422b3e7ee48c48e77a69925cc5664f0f171d1a632f622417b9d7ec88e56b1575c8e5f82af94f64337f42
+DIST genpatches-5.10-55.base.tar.xz 1653096 BLAKE2B 405282f84e50eb5d88148b8249896ccea1ed1fcb5c8c5106ad35164c9af73eab2aab11f27805a08c9c2b99fdb52f7095c7a761b8fa3c4126410490ac4eb6c9e1 SHA512 08fb0ed8674606e9b70c9478d851decf028dfeb8df1afbc102a336f3c2fd943dd598752414d4df5a3c4d9ade53ca12830786920f409e1a197dd47c89381d8e2c
+DIST genpatches-5.10-55.experimental.tar.xz 16876 BLAKE2B 1833425f196cdbf6ba3af545095d0166f74e889c943b468070f28be1364b5b0508990cd0bbcbdebaced9a839fa624f477ba5ecc6770e0da42eb2b4a3f8be32ab SHA512 bba8db2862c4d478b80fa1e6e3a36853417f32d7b4bd1f514c0a4121580b490285b6a2edf8dbfd5f37b8c287c59ddd464988faf715b9bef1015eb653af6febac
+DIST genpatches-5.10-55.extras.tar.xz 3416 BLAKE2B baf2a2a3e18cf75f0bf03bed74edd5ece9bfc11c4870e36f8f3873a7308c685b2947ec1ecd52d909f9a683c1a38a1a820d41ed90f098a792002569c3f9f1a601 SHA512 ae8591c2aa132a67b5258ce1829fd59d8dd343628c9b9d2625798077b3bb0d7fdd577db8fab9a64851af383d40fb2344c1eb03287fbb9eb58a3e6c63c0b611fb
DIST genpatches-5.12-10.base.tar.xz 564792 BLAKE2B 127e64196c8aa0b65dab7de4dad4b97052c53451f27a1948453d8910afd59b3a5c4ffc316a439bd053b433b057df127bb252d994f6447a82dc1434eb317e0d1f SHA512 e4c9eebb61de9af0fa4a53472c18f39f87196a804c63ff796eff992f75450719400e7bed5cd8ddce6b09db8330be443ddb2ce0241d8058aedcdb5e332a4178eb
DIST genpatches-5.12-10.experimental.tar.xz 70008 BLAKE2B 5f0fd437d51b9ef16ffa3ef8750a7fc3ce5464a3f19e4c16b7e345b3fa3c36575609d7b9f82be33c8a1c919c67f2beb91d5c37f542436dda9af301b4bb78100b SHA512 ce221e96214790b911d5aaedb7b1336ed86ef1350412fba0e20e15241a892df17a8c97768bb9ece7f4abfc61374f0a9dea72a0de197f6821ed3be700a66818fe
DIST genpatches-5.12-10.extras.tar.xz 1772 BLAKE2B 31e3959f1dab1ae1ff5f39b75c455e559e96bd4527e94677494accfa75fd14df2667ecea8ba5df59d3fa1ec9464ba18a257a8a5e76c0602049732f66829785ad SHA512 6e2bf6f7eada61ece1f65d1461377ba5532dd45b57b58b7ee6dae9485809d4c329c6ba8d6d0d0ee9027612a01946f756069b50c44d60d2f543e9864231abd676
@@ -124,6 +142,9 @@ DIST genpatches-5.12-17.extras.tar.xz 3412 BLAKE2B abbc0dbb59a91d6733f5c56918aee
DIST genpatches-5.12-18.base.tar.xz 738968 BLAKE2B cf0e62aad4cbe5c00d09a47e901761762934f34257e7064e65e9e9a29203c80a88ce31d55bff7156d8a09070dd67c79c383b0f1516757fbec1f5c722e844bff4 SHA512 31283759d7bb2a9b674489f4074a3027d52b5276df9e574d2d040007cdf679237ced0466724ddd81cb20714c7676f12b09f7c0014c1335227dc3bcc0358da701
DIST genpatches-5.12-18.experimental.tar.xz 70196 BLAKE2B 0942cc1e961588fe66eb8390b8523894619cc64cc287ed6b9af1d97704537e501b31f14a91e35b51012a2ed23dab390b36e28447a16cbe5e2e6fe14b75088459 SHA512 206713e09aecc5a49562b4416572bd66a891cb5f7dda5a1d42edbcbc8c394f9829aae4bb7cc7b094650a523bbbcbb71b8df3eaf02c2e156572e5ffe4f69eeb78
DIST genpatches-5.12-18.extras.tar.xz 3420 BLAKE2B 783c9491317343e26eb9a25b48486c8b9c47f80e2c3048cea50e17ef1e6dcd9e5ab40a3f02bd02b5949933ca6634ffaaeb507416534ca35308ba35e5bbcfcff3 SHA512 53f513fe4ab0bae00b69055f8962cb8200ea90bdfba9c4ab95bdcb58f6654f5739438a6540a18a530e8160375c8d5ee2a767054b509c3a79dbda02721857403a
+DIST genpatches-5.12-19.base.tar.xz 744220 BLAKE2B 63163732eeff70cf0eb344950247f69992145a4e7cbbe966eadaffda3be3f0e645b3d7cfc9c2284156385e761c02613ceec331b777b282da77b3d169cf3fb807 SHA512 8689a4f3fec6c29a88f7389296659579c13a2b664b94dc8147bd1b266019c310c30d19198db01feb60a421b1362aa15e72feb4cb19ac2ac2136ce12c42a21915
+DIST genpatches-5.12-19.experimental.tar.xz 70184 BLAKE2B 9946d739b840ff39fdc31a0b9935a605d2997254bfcf29df2006547d35a8157f3d1bd942c4a022ac3a02ad781e68ab46dfe2a38b170d7e1f7c9d783c0d23da4f SHA512 206c29e54d6aa435bcb9d7b6b54aa7897387d53475b9431d1957665692f6d9487f0cbf52b1dcfb86f373f08ba75c1ce8b59b31ae10181c3e60978f8a359370d7
+DIST genpatches-5.12-19.extras.tar.xz 3420 BLAKE2B dd43bf044652067aec7069cc2e8c1b9441ac06750b64dfd355ad53221df08fb68981363b9749a6f93ebfe81e728ad8791f7a5ad2e9d4557da6d2a1904efc05cd SHA512 501379a816043c5bc0c4724a999957d8c5b4cca214d12e2d64577ff24943230e6ae5e60512b634a5507ea5f8823e7511b20a5c099bab149309045e0fd17c4b24
DIST genpatches-5.12-8.base.tar.xz 486256 BLAKE2B 55607b8e42132706dd6d5b2716ec252fdae5b7b2d0e4c7874aa4d9f558172f207d7597eb77030651a5c490b86eedeaf1174e9908277e989e06a4cc048b1ceecd SHA512 3651b48fd077624d7e9b9471bddfa3ed0b5d4656374b73b92192de26925a12b3c4923dba9764ff12c1fad94047b404c61f23cd2eb4d4383775eaaa0ded3e7907
DIST genpatches-5.12-8.experimental.tar.xz 70020 BLAKE2B 7f59721ed84415f1c2fff54fe5dfba2522d9498a63823d1246ba202b80838fd0c8ed16911ba48392f689515aa68535ce69b5b9968e25023edc07229139e901f7 SHA512 826b2cfdf0cadba52cadc17fcdcb7bdaf558d232565ee6055c45bce5a65b0e5aef47907a8c6edf62bb69d58be8e81339863bfe1803a21e215d2c00e5bb957cc0
DIST genpatches-5.12-8.extras.tar.xz 1772 BLAKE2B f8d4e1f2152ffa0fa46f592051faee455f0319ac11911c79d34f393109bac49d74d5c938f38037871ef777183b124066f4dfc46381c51a337fdef54589c981a0 SHA512 13ce1243c7f4b30a24c70cac04bdbe6ca29fa608638e5c47036ba4fa3e839dd0b7dd5d6cf2c628a7d86418c7eb5c520334d84b2b33e5db206c947fc5d4c6a8eb
@@ -166,6 +187,9 @@ DIST genpatches-5.4-133.extras.tar.xz 1768 BLAKE2B abad0014d2d982087ac982d0f0175
DIST genpatches-5.4-134.base.tar.xz 3632276 BLAKE2B 475eaa6bb0c7291fbed3722ecfa8c05c5352677844481d4b37f2d5ba4b8a77697b6f43f1005aa1f899a561b3ba38670a160026fb935c2a1e75db7f1a9c292044 SHA512 4bfbf7ea9d909f2913094e7c0a34fd570540c4e9bc471ab8e90b2c73d1c99e6da23a11c0e254f4adfa6d155c51c763224a4851f4105a2a8ed69fd11c73a58101
DIST genpatches-5.4-134.experimental.tar.xz 16908 BLAKE2B c099f7a7939394ad8a9a984b5e558e0b26a7af53077f8c2059702695dabdcac7eb824539a597668e8a0130e8a9451a63101c6b5b6992b18c725c4375e67aad69 SHA512 c68777539b7e64f67a462832e10803531f5d69bcff25bc31d76b5b1ed3b7404386cbb9cdcdff9ca58ceecdeba28885abc1658669a28b171915c4dcf896c6815e
DIST genpatches-5.4-134.extras.tar.xz 1768 BLAKE2B 894032d098f79b3c247b1e0ab19646e9c79414c4070fbf19679286f7305dbabee8c39c11dfe7c7a1009f36d64f99b0627b75b455cda62b2143fc5a5102937cd8 SHA512 5d6b703ae705a8587a7abea96e64cc51f34d8762e5a93c5c9f410a52d7bac4c44aca2d21bbede8354ad5aa1fbef45aeaffedc7db69c21ea2a94c22a0069da398
+DIST genpatches-5.4-135.base.tar.xz 3632876 BLAKE2B cc4bc930c2f181b98dde258a696bcdd8f23fcb9098707d5f158f24cd5fca4f8958dc321e8ad348b9ffd96c53bb231bc2f171b9e491427fffb2fd05dc5fd23ceb SHA512 1250c964bc3c062cb9e8109da1d1276cb5e2d7c25e1175ee56672d1a6da4be3c73f52fdc9547a70c627057265fd5af6b6b99d977c0c85a45376bf5b99bedcdf7
+DIST genpatches-5.4-135.experimental.tar.xz 16912 BLAKE2B c234446b36bf86e724e8720b365197a1069a399eceeebb94dde9cfd89e8675e256a770c80ef1c179c16adb13d0addb72677ebea436fa8277a4697f5f24c75a3e SHA512 3af8e6bf588da4cff5ee24765ba2012b470e3147f54fa04acf23143f0c2ea382bcc3e4cc283bf7edc67cddddec9810bf7a564dc12a40928b2031048b75307f09
+DIST genpatches-5.4-135.extras.tar.xz 1772 BLAKE2B 3adbde4f0977e2da60f29937e53a1f0892ce6278745c63511e486587efc10c1c6a4a8e05375492382d1102090733d4a1fa93f380b47e734affa2ce65382e255f SHA512 6ef12e03081b927af5bd6b820f150116fa3e848a457aa9fccdd4172c3e85dbf6ba78050878884d325b059f1fa4681de85a38d475ecd55dafddc60bd8362cba77
DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.239.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.239.ebuild
new file mode 100644
index 000000000000..590194dc8239
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.239.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="249"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.197.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.197.ebuild
new file mode 100644
index 000000000000..e20a8e324492
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.197.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="196"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.275.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.275.ebuild
new file mode 100644
index 000000000000..6f9d9a27c692
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.275.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="277"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.275.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.275.ebuild
new file mode 100644
index 000000000000..aeb65b787c76
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.275.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="279"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.49-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.49-r1.ebuild
new file mode 100644
index 000000000000..3acdc1cc65e4
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.49-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="55"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.49.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.49.ebuild
new file mode 100644
index 000000000000..9a5b5914fe74
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.49.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="54"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.12.16.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.12.16.ebuild
new file mode 100644
index 000000000000..4be3f5da3db9
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.12.16.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="19"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.131.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.131.ebuild
new file mode 100644
index 000000000000..6dafb4afcd6f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.131.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="135"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 19cc0b035e69..3a0f2644c8e8 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,8 +1,2 @@
-DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
-DIST patch-5.13-rc1.patch 60248581 BLAKE2B c105c2518de0ad29258262913226d44598f19f50df9f4b5bd0ca3afbf132e9b7d582537c9a91fea1209e3e77ced9ba86c83745ec32bb4c9c940fd843bd2858ea SHA512 0ed817a3b25b9d28889c5754344537cd2266254dbfca87a98a5799594323d5b2cf04d233d0b48289dcf4518ebbabe687e49e7fe00553cbbd0cd2ac0e25fdf46b
-DIST patch-5.13-rc2.patch 60699877 BLAKE2B b29e45aa17aefe5adff81bc803890200d810848122240b731fa27d1bc0b08448d8579d6bd2328d11ca67b78346fa2342881e838b9cd657803ce6714a93f8e383 SHA512 2d54f9920d1d639a363989e37aba1e82687e7d6848bb53c4936678f50f178678235e9f45671d9373b1b5e15cbb6837640002038fd8b74d72d0e55d70b54321ba
-DIST patch-5.13-rc3.patch 60916953 BLAKE2B 1a1a40b91cbe8ed65151931b1e309068c69ef45817e9bc526297fbbe59e8cb2c69176d71679b4f705a1071af5afc80e4f270f8bf7f089d483123550310b3abb0 SHA512 f0deb6c2482b1416d6e96bc4bdb9f9fe51654b6bd9317f0e68f3cfb252ade3c9c7950fa1f7eea09a61dffc109cb832c04fae6eff0a2178fe932f1bd42a7f17d9
-DIST patch-5.13-rc4.patch 61427853 BLAKE2B 7ce34ed0d43f79a193e549208114e0d5c648c965ed584b84959535867088c083227784b3db6b2072b238f73f10c39ce5e4ea8451dbeb107e0c24bcbb7ccac988 SHA512 39d352e6a32c47006492667aa552b92ca45a5a5919443dc00ee1b7ca2947398a4a2db59185df9e779a1b1a75ba93ea3d88ac07005e3072f24b31d1a6284bc131
-DIST patch-5.13-rc5.patch 61681306 BLAKE2B 541567d285b56080a572b3b62118288a4f1d817152512a89483043973bad89a64e27354a174b5ec6809df58b992e2a001c2e50d8d330ba356e41452f3304ed1e SHA512 47e03e9825c6ecc37778050319a58b5081ed562e2f8aa1bdc74bfb3a59422d2a81d3267603e5cdcad87dffe9ea2e434c453d4eb8a022fb9b12a3e8bd9ebf343f
-DIST patch-5.13-rc6.patch 61861957 BLAKE2B 95c185f46705f1e55fcd0d54c72b5520080780dcae087f1ab1ff195c62b5ad4a0a318c4094c3c942e85889808341fdce7aca8a823a4c2f4320c671217ea07b65 SHA512 8fb742686847e0fa0b920af523c8dfcc6fd4af54abf68ead6dc4105911d18229431079b03e2190aafe2cd2322176138ece51e514a0f9b6049e4026fb2e0440d4
-DIST patch-5.13-rc7.patch 62091807 BLAKE2B 1aad8503208b9d77033c3259b867a34507710c3d03f9980c9e451b7ea04e93a450ebdce4282c8b416403d53a099c6ea236904556a0d9b1fc59fe19019b00b3e3 SHA512 af9c1f41dec5d0d186d92f1a905338511c94fa0e7accc994a0fb0bd95d096a5a6a10952eb7f22362987d74977e535cd9ff88c3d22a07971366cbc1c539b92ead
+DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
+DIST patch-5.14-rc1.patch 68962675 BLAKE2B 0f5bc5de6167c3f2b884354a54dd9cbedc3d89508e9861ef7bebe181c650ab9dde4f604f8c5e77c27eef9c213345ac85d8c65e0c9a7f48cc918a2ad681fc3e59 SHA512 e68522063c08adf11c8cbdb86aa439347ed833be77cf189655e14df6e2e9c18479a69bfbcb8258411e896f32b15c53f8df04402f6ba0434179c3d37e0cabc5b9
diff --git a/sys-kernel/git-sources/git-sources-5.13_rc1.ebuild b/sys-kernel/git-sources/git-sources-5.13_rc1.ebuild
deleted file mode 100644
index 5279e1b05efd..000000000000
--- a/sys-kernel/git-sources/git-sources-5.13_rc1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="5.12"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- >=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
- postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-5.13_rc3.ebuild b/sys-kernel/git-sources/git-sources-5.13_rc3.ebuild
deleted file mode 100644
index 5279e1b05efd..000000000000
--- a/sys-kernel/git-sources/git-sources-5.13_rc3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="5.12"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- >=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
- postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-5.13_rc4.ebuild b/sys-kernel/git-sources/git-sources-5.13_rc4.ebuild
deleted file mode 100644
index 5279e1b05efd..000000000000
--- a/sys-kernel/git-sources/git-sources-5.13_rc4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="5.12"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- >=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
- postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-5.13_rc5.ebuild b/sys-kernel/git-sources/git-sources-5.13_rc5.ebuild
deleted file mode 100644
index 5279e1b05efd..000000000000
--- a/sys-kernel/git-sources/git-sources-5.13_rc5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="5.12"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- >=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
- postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-5.13_rc6.ebuild b/sys-kernel/git-sources/git-sources-5.13_rc6.ebuild
deleted file mode 100644
index 5279e1b05efd..000000000000
--- a/sys-kernel/git-sources/git-sources-5.13_rc6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="5.12"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- >=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
- postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-5.13_rc7.ebuild b/sys-kernel/git-sources/git-sources-5.13_rc7.ebuild
deleted file mode 100644
index 5279e1b05efd..000000000000
--- a/sys-kernel/git-sources/git-sources-5.13_rc7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="5.12"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- >=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
- postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-5.13_rc2.ebuild b/sys-kernel/git-sources/git-sources-5.14_rc1.ebuild
similarity index 97%
rename from sys-kernel/git-sources/git-sources-5.13_rc2.ebuild
rename to sys-kernel/git-sources/git-sources-5.14_rc1.ebuild
index 5279e1b05efd..d43c5c0ce00d 100644
--- a/sys-kernel/git-sources/git-sources-5.13_rc2.ebuild
+++ b/sys-kernel/git-sources/git-sources-5.14_rc1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
UNIPATCH_STRICTORDER="yes"
K_NOUSENAME="yes"
K_NOSETEXTRAVERSION="yes"
K_NOUSEPR="yes"
K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="5.12"
+K_BASE_VER="5.13"
K_EXP_GENPATCHES_NOUSE="1"
K_FROM_GIT="yes"
ETYPE="sources"
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 50671e14550a..e765f0bc853c 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -5,19 +5,15 @@ DIST 5020_BMQ-and-PDS-io-scheduler-v5.12-r1.patch 267548 BLAKE2B 77a1646ffbc67ed
DIST 5021_BMQ-and-PDS-gentoo-defaults-v5.11-r2.patch 348 BLAKE2B e81fa7e5157ad317babd4c636facb34b577c8cb850a77c945e94d62547ec687d61dbef3766e3772ba880e2b657bbbbf400a2d9c86efdced2dada7a108b4c1593 SHA512 192431f1b1c19e91d4fcf16e3a275151043c8f065eb5a909f68ff640108537f9d5105be9175a8eea12b0bbfc871ab1595f3e051e64c39bb2a32f8c75a1137bb3
DIST 5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch 348 BLAKE2B 50ac91380b7221aa30ead9e842f038117b0f4ef4b6538b8f083a9f4467db23ab2f74643e65197dd9201da9b6cde17b192ed09e7d544ad095391c2cde6d9f2b8f SHA512 166a73397b133e20b92c37b72ae1edfe4cce017293b978b523980e28526950dfedf1081252191ff95462896a16ee790dadf55cda2edc49452b960079d89a6a9b
DIST 5022_BMQ-and-PDS-compilation-fix.patch 1045 BLAKE2B 8bfdf114f40a4d4851c511003d0454b450ad1cffc59f360bef53b7cff9272a743e59da42e8ca067e2f48c1abd89dd4e03dcb681f9fb7a3180eff260cfed713ee SHA512 9af31d2be69411810b60e2a257e5a51e92a31ccf48f0191a6918ef2c4b6015221b7def543ea06309e0413ae7c76913bf35c0068825a1a9bfc98cd00fa0e9cc70
-DIST genpatches-5.10-1.base.tar.xz 3840 BLAKE2B 08ac1f83dc9a1cfc1d4cf0a3a5ab4c9d4686a80348247ec7cd1da6e49db92d6932a1864113f2631d5528a4ba732945b2afe73d03061bd3c532b3d1e4d9571999 SHA512 04356093c4df6a7ee0876b89be5b90f8bc90c920628e5fe69b5787ce82e003be05eaac142310f10f32d0549a6676af846734ae4ac188c2b96c2eca2cb0a6f4b0
-DIST genpatches-5.10-1.extras.tar.xz 1768 BLAKE2B e99d5d2137d5752845ba8284a0dd57620851c3620603e871973af5841b54e9bfdde92ea2408ddedb55355f2c954c80641b06098060043916d2483e10cfb8293a SHA512 0034e5ab57cccb2e969a3b9e1f674614ca853779c552c37be9c5afb0a37112bf8f2c30e1b21832d56320c70c1d622081b60369c6a86fa737a23c3ed953267453
DIST genpatches-5.11-1.base.tar.xz 3440 BLAKE2B eb1e9a9f2060023cb410bf3db8c4f4fe283eff47f545a434dfc1edb98aa513940f30a2a88566422192b79f7ab36c607b9bc63253c067070d9a479d6318fd34b3 SHA512 a862fe33272bb6b0e4095c862c74361f015fc57316b9dbbdf2782f2e57c131fbe7fe9b9ba81c3d5a7d71788f2d56abdbd28f1c7571973c3f378cd05199c0421f
DIST genpatches-5.11-1.extras.tar.xz 1772 BLAKE2B e6f8eae67db54099424f33e17bbfa66d36ae44c98d5f58969634a709a4b949a675a7ec1053eab4db4f745513d9730b68439ecf888e92f0fc9ef369822b39a388 SHA512 cf9d0ee27618b1b49322cefda8d85f66fd94820b9902948c8dd9a33d4e14acf511e7aabf611df5e070a4011e06d80164a512d124f5686b5b16fd81409098d8eb
DIST genpatches-5.12-1.base.tar.xz 3440 BLAKE2B 642d0cf2382de42feb6b5942f6449000b1b638ab80e0a4dec4a70c17201806f20e6e83542e11b44841fbf5806bced3b6ea3fb5f516846ca502eb22ceb4202f77 SHA512 27f023e4533601910c2bb5ba65171e7c0092f5b20fe76711c3bdb9b171bb9ed47dff2e5911d904dc97d28be181d48a74cc0960d8b77eba0b4cf84f05ba7c108a
DIST genpatches-5.12-1.extras.tar.xz 1772 BLAKE2B 3de99462690e77f87a30d211f7fc14937b41123739c28b1aeea2935383766685a5befa631cfc19afe583db9ca0aafa2ce4140a327707161e73ab14135e837432 SHA512 67c1d650540e50079264e66ce072e546f9001f776188760f794514f6edf78b85e115710b031573bd6cdd53aa599fa9afb743272dac19817a83df5f97354fef3c
-DIST genpatches-5.9-1.base.tar.xz 4004 BLAKE2B 8a4577d42262fa901186acc60d28221d00e5c9140886705f018d9989f818d96ee4d9a6586b292e7b1d945bea9e2408e3161a73e0999defe1b7f99d0a339eb7be SHA512 d6ba1051f9561aa30d7b196336c34930285d613e8119b152f1d6cc447cb22db5ac07c25f89d4ceddf58c9370c42699d0250a31449be2da3c591896b0c87d8718
-DIST genpatches-5.9-1.extras.tar.xz 1764 BLAKE2B 32d29f0448aef113ba9c9591c5d3b671d00d07abde9f35f365b48168887913bb2da95a8a52b852453307cabb111115a26178be4cbcc016e53a26a31f783a9df7 SHA512 df007dc98c1acdd31773f7dcf8aeb22812aa55e5593e8509b6a8762f2dcf06c95d69ad7cdce992e7a5fe730754bef26242acdc4e4da51ee29206fabb86c9cb0e
-DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
+DIST genpatches-5.13-1.base.tar.xz 3840 BLAKE2B 5843b75d53225fb5f3ad278a69884c70d3eda165faeec7895dac661d035324c69fb32ec4ca729a025bc8e73b81a17f085f60294b621a646dcdf8bb389fc37e41 SHA512 62f49080e44895da1ecf0dd4d88dbcf3fc1f6b227c09aebf7b4acd407655e0a7627cfaf870b26ec5ab508ab2e9ce36e86ca92bceb19566c8e4a2c509a7c459af
+DIST genpatches-5.13-1.extras.tar.xz 3412 BLAKE2B a93dc7964a3b26817e6a561b314e93958d887a08a519a8a8b1bf2e4bb78790ed03a217a54cb6d9b2af6f7a2f4e78f8a0fbebe2aac0c34c1c9b0ed884db3bbbb7 SHA512 f4470e1f4d72ef0d54b6b0bd6c427f722ffac8de9e8b0a29b69e032ce71d9c18ae447fa855bf4e9e45cd2084f0b7837d0514aebfd18f6a04a7a88a191e966435
DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
-DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
-DIST pf-sources-5.10_p12.patch 5244822 BLAKE2B ca004890e20a07864e858bf1834265f125d1a1a7130ecd2f4a1718b4be61dd8dbfd6c4ca7f5740219afc83f1a4645d159d57b546937bcabec59511abe3d78e58 SHA512 5aa8f303798f93e5ad2042878fa15f5ab717ad265fc6db5d35e2b429cf240ce57f042ff8c2c0ac442e552a4925093e1550f1405caffcce648b46140fb809266b
+DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
DIST pf-sources-5.11_p8.patch 5688583 BLAKE2B 5d845677efd1d6ac95282d24223c7aa26d33ea74670b37184fda20dded42b5de1c4b4fd06f29afb12c8fd3372feb208b7d655c1dba3b60cfd1f4dc5cecfe5116 SHA512 62105aa308543ae5bb2e79be77dd77f3d4d3430669423c6e9e528acb114edf3b3a3cdcc2371ea566a6a51dbc16ebfba64187dabf485a96dea7c0127162173675
DIST pf-sources-5.12_p1.patch 2785321 BLAKE2B 6010dcc736c6e068cb5aed9df790df6795f8b85f4169b9b6b66eb020f0e1821cd29630f421842c172f52fb41e4ac94f1671d506ec3f72f0bc883adbadd258302 SHA512 a861f3f96205de0c86a506bfd470116eeaabc8ec574e1940572abdfe166e16539f2fe874af5a0ea234741e5385e88491a49ba390a5493efc2fcc0c0283b43aa6
DIST pf-sources-5.12_p2.patch 4252808 BLAKE2B 2c23009ba31caa7f5e6268d854af2bb2f9db2831a67cb34ef535fe1914d913f057f514aa8ce7c1a8a63374498c56d9bcce0662ed4ec3a888e2e7518b339196c1 SHA512 e2da600deeea7e16667bd0c9e0be9349f47441a4d9c2f06f66fb4f2a78c1b2c596a502cc35c6d9aea3ffcdb26461299f3446b5bb5a9b88b059806eb4db80d2b2
@@ -25,4 +21,5 @@ DIST pf-sources-5.12_p3.patch 4818489 BLAKE2B f2d729477ebe5016889de4d216e7ae824d
DIST pf-sources-5.12_p4.patch 5002181 BLAKE2B 6e018a8c9f4eaec7b565fb3ad38cf371a59bce2620f2a95d6c1bac33205e717eb6ba312d573130d9316b744de6444714dd484a9d2906352a9bf9a953b3f5c2c2 SHA512 aeafa5a290fa3e3d942986ed6deff4f5ef60f0cb8307c1d77cbe34a5007d674e037c0cedc14ea9d090aa4f1ba4f69e80936af1d61391a656608a29528e4702cf
DIST pf-sources-5.12_p5.patch 5560118 BLAKE2B 4d47eee16ca58acb4aa38cbdde09742fed9575457dc2e90df00b0d0dc557a8f35156acb3777598a619834201c842d598fa2cb6087ebfe01722f5b67c85ce4bc3 SHA512 72d387fa0d76dbe6a5692a894de384adba6faf8e5523a849dd94d3d44cc12bbc07ae0b8c4a9da255cf4215488ef38987902698c62e191077c4613cf40b2faf63
DIST pf-sources-5.12_p6.patch 5790826 BLAKE2B 286f6311197cb12613e9a082896c08107153998dfc667f813212750e52c2cd5278e7e456b8658810442cb08c8559366b8d230a75a9db293f72f8a0db27285afd SHA512 ad8caafef8e9566ff9bf919dd7c4d8396f7ec8ea61e27b03451b24c2c007cf888de5f9dec9b9a4f3021c956d4cf4827af32db6a187c57248e6098e5574d48b5c
-DIST pf-sources-5.9_p7.patch 3027972 BLAKE2B 9247ea63b30f9d42d79303b73a900d468a71e703333932f7f15ae697cdba52c46358297023e037226c219fad5df912fb5d21e6f4b7190556ca799fa84924480e SHA512 c69e14f59bf98944b3329c65b7e2c271d74a756bc8c890130bf3cc68b4b96d31f1c33c4edb128580fcaefeb6e42dd04b1eb3d7f071b2d58bc764d26322bda8cd
+DIST pf-sources-5.13_p2.patch 2756507 BLAKE2B 8602f98e8fc857621418513956ed9103404d4e690420f3631c9c63ce4939a4cbdd4c05ddcc0c43c9db82369337e220c9bded31055b567f138249bf3e089eea95 SHA512 2b18e4b7d408b1cdb0c857e2bab71fbc9b20cc7616608f6056940ecb1318192539abfaf1147e663b7285085fee4d7c9117fe5a33e0db7ce0ef6e76ee27757169
+DIST prjc_v5.13-r1.patch 258898 BLAKE2B 013be3c3e9b342268359ecbcc10c7b95c7fe3741d2b9058db87da59d40aa9b34db898d31f1f1a0dab80598cab313499d8083ccea141c5200b5593c9d44647de7 SHA512 ad9276a80e28eec461a307ad44a1ed5acebf810b14ce8c9e6f1dc211be6ed7e72f535175fb65f3115fa217f8b635122c65c2c002ff00ba458c867d8bb6257f36
diff --git a/sys-kernel/pf-sources/pf-sources-5.10_p12.ebuild b/sys-kernel/pf-sources/pf-sources-5.13_p2.ebuild
similarity index 76%
rename from sys-kernel/pf-sources/pf-sources-5.10_p12.ebuild
rename to sys-kernel/pf-sources/pf-sources-5.13_p2.ebuild
index b51842937478..8dbab3d94ab7 100644
--- a/sys-kernel/pf-sources/pf-sources-5.10_p12.ebuild
+++ b/sys-kernel/pf-sources/pf-sources-5.13_p2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
# Define what default functions to run
ETYPE="sources"
@@ -22,6 +22,8 @@ K_SECURITY_UNSUPPORTED="1"
# already included in pf-sources
K_WANT_GENPATCHES="base extras"
+SHPV="${PV/_p*/}"
+
inherit kernel-2 optfeature
detect_version
@@ -29,15 +31,19 @@ DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's
HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
https://dev.gentoo.org/~mpagano/genpatches/"
SRC_URI="${KERNEL_URI}
- https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch
- https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
- https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz"
+ https://github.com/pfactum/pf-kernel/compare/v${SHPV}...v${SHPV}-pf${PV/*_p/}.diff -> ${P}.patch
+ https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
+ https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz
+ https://gitlab.com/alfredchen/projectc/-/raw/master/${SHPV}/prjc_v${SHPV}-r1.patch
+ https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
S="${WORKDIR}/linux-${PVR}-pf"
-PATCHES=( "${DISTDIR}/${P}.patch" )
+PATCHES=( "${DISTDIR}/${P}.patch"
+ "${DISTDIR}/prjc_v${SHPV}-r1.patch"
+ "${DISTDIR}/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch" )
K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
see: ${HOMEPAGE}."
diff --git a/sys-kernel/pf-sources/pf-sources-5.9_p7.ebuild b/sys-kernel/pf-sources/pf-sources-5.9_p7.ebuild
deleted file mode 100644
index 3535b5a2333a..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.9_p7.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Define what default functions to run
-ETYPE="sources"
-
-# No 'experimental' USE flag provided, but we still want to use genpatches
-K_EXP_GENPATCHES_NOUSE="1"
-
-# Just get basic genpatches, -pf patch set already includes vanilla-linux
-# updates
-K_GENPATCHES_VER="1"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
-
-# Not supported by the Gentoo security team
-K_SECURITY_UNSUPPORTED="1"
-
-# We want the very basic patches from gentoo-sources, experimental patch is
-# already included in pf-sources
-K_WANT_GENPATCHES="base extras"
-
-inherit kernel-2 optfeature
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
- https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="${KERNEL_URI}
- https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch
- https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
- https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PVR}-pf"
-
-PATCHES=( "${DISTDIR}/${P}.patch" )
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
- see: ${HOMEPAGE}."
-
-pkg_setup() {
- ewarn ""
- ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
- ewarn "If you need support, please contact the pf developers directly."
- ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
- ewarn "the ebuilds. Thank you."
- ewarn ""
-
- kernel-2_pkg_setup
-}
-
-src_prepare() {
- default
- kernel-2_src_prepare
-}
-
-pkg_postinst() {
- kernel-2_pkg_postinst
-
- optfeature "userspace KSM helper" sys-process/uksmd
-}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 1f852a6cc684..54f99062be21 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -24,6 +24,8 @@ DIST linux-5.10.47.tar.sign 991 BLAKE2B f0399021e8a5c19d7d871fb62a97dfba2b4431d0
DIST linux-5.10.47.tar.xz 116362372 BLAKE2B 6cfe773c5004d742e1f47f8ec408cd37b8183de5662370437b62a53ccb7960dc97499a90e41d94c8ff25207c4cc9428ca9fe6e15388e4be83ba34e83bb2df9da SHA512 80760ce0e55f146b1434cb21975cb1b3f94a6fa7f5c8edd9e534084596e8262ee5945f2b25b98039d9d405232083f995782bbdaafbb7b387bb785eafc3e2e9c8
DIST linux-5.10.48.tar.sign 991 BLAKE2B be367b874b4e24d84498e0d427225ed8ed33719fb5e698af2477d25092b4768586360f625141439ef52f459ee86d4c00bc5cc62eccf0d80663506077760ffdd5 SHA512 5928797677ffe2a6f045855d623720ee5ee4aac49e4693bbcf5392a976e9ce05553ea3c110f29133a35bb67444b4239652048af0576a9a5ec9148108a6d9182c
DIST linux-5.10.48.tar.xz 116361056 BLAKE2B 176c4ab03ef0df041eb98e03c1907e8b46ecbfa5ff77c95fd638e9123cedbd386bddb9bf884f682a78fa0292e3c2e4740bfe2c152e98f8c8079eb135d5ee729e SHA512 18958e0af1b6170e7388fe3bd1669af266980d7d8678ea2198a4828a1b0d261754a1c16e1044d5230275205395a34bfe943d868ab7e084b1a547123f7f9421ce
+DIST linux-5.10.49.tar.sign 991 BLAKE2B 21e7ae30246ef738b4d75fe2c57a2481027d1f6f1eb1789c15bd7b854b9de4527b4a6905109ba860072617e90ffcdddbada2fb97804be76be4ef7111ab365a83 SHA512 ab5969287e54b0926ecdeb0776b832cd645fe919bff7eba7255cabf3019b4acffaf208e2c8072c587c818ebdf591852b61d3395e0feedb673ae856a20f49cc65
+DIST linux-5.10.49.tar.xz 116374664 BLAKE2B 493574a46a965e34a6bd5c922e50969588472e7eabb0d524c82bbfbc86c312184e85a14a4cc9d7f7cdaa1a82c3982af7ec950eecfcee5f529b4790147861c49d SHA512 883763a2ce23c5c9d63f3707003dca1cf5422bdaecb3eef6dddbd402c78dad6f7e9a27051eddd5de89dc3db3b4bdc4d04db2fbf381961ac0d3c75e03a688bfb1
DIST linux-5.12.10.tar.sign 991 BLAKE2B e13957f787397e09e04c1fcca75af58b80f0340150c9c738628826c17b77efcf14ad65a45363193c2fc2780630b1b8315f427323e2b15f65ca1ee0294300da49 SHA512 0113060125fe4a5015c0bcec82e873db3d5a4a5ea82764f15509f0abfd51af34b25adec164d2e765cbe3c059caf71a5047881cabada9599cfba6c947ae4dd6d6
DIST linux-5.12.10.tar.xz 118148040 BLAKE2B b40ef5a11ca435299899e8131fa72af147455cd8ebee4c0e187572b1f628e66d2b6fbb318308bc911a598d8303d1ab3622d52966deaa5c48d59dcd65f4f58687 SHA512 b7f897582fbce307f8d24c4a1ea490050afd7d1e1af24ffa621e863238cb9ff8f1c1a378392a546a5880c9db50c8420504a052ff67d86c9ae3f82145d9f5f42b
DIST linux-5.12.11.tar.sign 991 BLAKE2B 4b01328a96e7dd0ac1487ed4d8d3f5369af6ec2a886cd0a6acb456271765c1e45aeb620b0bf61867973e3fb03a53eee0b0efcf60755257f696fe2bce8e8d3233 SHA512 67dd3f239f23686a5c9749c3122d549570403d71b95587371b56172077fdfcc9955ec70f64b6c71fc9869d55de5515f903235a21904840915a83e3b41f489b2d
@@ -36,6 +38,8 @@ DIST linux-5.12.14.tar.sign 991 BLAKE2B 433f6791cd56ec4f0f633fa406b1ef1df1c801fd
DIST linux-5.12.14.tar.xz 118157096 BLAKE2B 3bc213b432d61c358f85b932dec8bd44a1ef73442f20424ad5ce374b6982a6909c5b318d5e9848996989d5e421ab6c2128cdb51a3724adc95222f96a859486a1 SHA512 189bdb55fd874ba860833626a4142920c853f886562e52a6f182a9f63f1c9989a3d2b0733eb5ad55953dbbb10834cdb80ec9a5b42d44af8615c8a216ab037b79
DIST linux-5.12.15.tar.sign 991 BLAKE2B 668cc702b2c1bdac78b334b2c9c8f0bee20f1c6fae584c7bde8787831b8182024639f9862845520cbee9400abbe5248f418cc654cb1013e82afd2f42391faf67 SHA512 ec28cd3d5a8c293193579221adeb4077eb43c061fa12c825875ccdbabb6490962edb4177515ec56def97554ce2f042848fe126fd4f90fc6e550f223c9e9576ab
DIST linux-5.12.15.tar.xz 118166168 BLAKE2B 2d94859080bba686786b690733d6df4a17f6183c690854545b87d784d16fbc5050fc07be08b2360cc1d0a6fe11bd8f18add68c893d92bb52e10bb0f61ff4eb76 SHA512 99ac7c8550548f2626ff891024c9e613c98011f3513b17b46d4a0af98242449ff373e7429ccad7c893dddcd413961d1726b121242b3f1f6f4eace523b70754c2
+DIST linux-5.12.16.tar.sign 991 BLAKE2B abb400dbf710771ed416ad144501d9d65096da1957b80a7ccedbfffb5277d4db5e33bf4bf7c96bab5a0f7e6ca5bd09af5eed0ecd133aec9bb274099b3d32f016 SHA512 7c2ae2bad8f0d456d3a2b5ea5983092883c724b9b5bba21a99ab1eeb744d5a764d69e7d77b28a2499dbfd04e1e764ebf93a30e13e37c92f806b8d825bfdcefdf
+DIST linux-5.12.16.tar.xz 118169272 BLAKE2B 6585efa7db0e0f42ba8c1e64a5452a547c9f4d073756047d6ac8453d752c022f414b984df457242d8d9595cee4aedc4d3b5b59ae3566a2e824a2294e5111956d SHA512 6b3a5ebe96faf6dd7ae613e8d158c2f14341758ffdd84fb408eeb886ef3c03d25348d3b2aa74c4b48f3c187f511bff70d1090c0359b13b2d9a179cda7dd7bede
DIST linux-5.4.120.tar.sign 991 BLAKE2B 12c786791b72afccc4a3f9c412b900f25355920c3b253160bc9da0193983dfaaf4ed81886e5ffc252b07b34dec6d6daa59625bf46b1ebd6a7aca8522235923f6 SHA512 67b32fb8cfcd125ee66201d76eec364d7d8839a3055d43eac88eb812201969d0ed9d94d8c57e9be8b35f0a8972475381c6d41e480c7c6086cf351d4388f80c04
DIST linux-5.4.120.tar.xz 109107108 BLAKE2B d3ccfefaadfe4186cce3232dc0b58759914d0f9eb0ac7c82b855d0230a512b92e37801b75e32dde57ef5d6d6ee04c3bbd59f58a20e73304cf235c90c7dd2855b SHA512 b376e262164d8a79a4ffe478e42e38929fcc4b7f08dfaed24a842c238d55162ebcc1f6a5d0926a618e03f98f7f9623997306ffa66c6425f3e77865c2d70e1d54
DIST linux-5.4.125.tar.sign 991 BLAKE2B 3745764832f01f1d0247bf1ff6a4ea9e719d1a2881a563ab2bf665d1b0a9646ee831fe93f456df09cf7843a4c6310705b5ccc908ec927370992828a44327bc04 SHA512 d15ef5591e875300e1e6e6d0b9b809f2f022cd6064f1313c2b77b1a07c79a49a857657730eee0d0599933ee2e6940ffec2556220955c6a4bcddf5172ca1325f5
@@ -50,3 +54,5 @@ DIST linux-5.4.129.tar.sign 991 BLAKE2B 534f683bf0e6962b130f52c9f3e1a391131be838
DIST linux-5.4.129.tar.xz 109122036 BLAKE2B 73f422c32b382a5ef3f6cf8078447e68752408d78fac20d41f6fb4fa69bdb0706ff9ff5d7c480b0b1e3832559e9b253b1fbe0cbd4611c383cccd41e49012a8af SHA512 d5d420427433cc9bcfb5ff72c6b39c4c36adf745dc51e31109adcbc1ed1fd4ea02047940d01958b4bfcee98caac8f0154bf7a8497afa0e5f081712f035da8bd7
DIST linux-5.4.130.tar.sign 991 BLAKE2B 7d20be27037339889e8e207910a0bb9cc7326cd96aeef1a0de35cd9a7398d0f13df0b4dfd996b7d14802beb7d8beddd3468e417139c2b360292b473a31a686e3 SHA512 51c8c517bc446eb6aa11d072f8e349b9dc564bc7ba5b35783223e9898e957ec175ebeb96ae486bdc5a20e0227bb563fc915033b039951e9265fc7258a6a343ca
DIST linux-5.4.130.tar.xz 109118364 BLAKE2B e2c30781868d0d7b721d679b29af3f4260a471a2bf328119b562abb4c896db939252ea2f9ef650414925e4d9c0a150289dd960dc61dc5c654f44a773adc1e6c6 SHA512 d2bdf3ac52644c9dab720b5a74ccd8715b12cce9a227d3c5375d0e61e6bc95517b95c7ef825854b5039494690f4a1574db9f162b5f3bdb1d2d67dedc6c683ba7
+DIST linux-5.4.131.tar.sign 991 BLAKE2B 957f1dbfc098f63c35afa810ba8e0e10cec81e2a7599cda699dfd76dca0db4633245320575edc4c17d18d3c02806810a9dcb1c6366680893ac83214f8389f6e0 SHA512 f415553fb817866082ae561e7c641fa3ab3929afee437bf4c669ea6af2519cc098cda0b30f49a93387bab8c68748aff9e2e8e55c93c282a37fe43fb8f6c66d8e
+DIST linux-5.4.131.tar.xz 109116196 BLAKE2B 7736ea4b9c0e1f667375c91fc77c9d2ff2b40558dfddc17a691ebd9f558ea8b7c9b8d8af50ab7ebd52ba007be848a9680165bdf5289174ccd2678d4e905047c3 SHA512 d594f7fa2a598c9f24c1f669b9f3a27978f3dbec40a41f597f3ec3a0365ab565d5af042ffa65ca56f166b5a58ada57b0ded52667732eb460c2a7d01798328e36
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.49.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.49.ebuild
new file mode 100644
index 000000000000..12c958a4bb2d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.49.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.32
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+ https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+ -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+ verify-sig? (
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+ )
+ amd64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+ -> kernel-x86_64-fedora.config.${CONFIG_VER}
+ )
+ arm64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+ -> kernel-aarch64-fedora.config.${CONFIG_VER}
+ )
+ ppc64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+ -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+ )
+ x86? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+ -> kernel-i686-fedora.config.${CONFIG_VER}
+ )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+ arm? ( savedconfig )"
+
+RDEPEND="
+ !sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+ debug? ( dev-util/pahole )
+ verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+ if use verify-sig; then
+ einfo "Unpacking linux-${PV}.tar.xz ..."
+ verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+ < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+ assert "Unpack failed"
+ unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ default
+
+ # prepare the default config
+ case ${ARCH} in
+ amd64)
+ cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ arm)
+ return
+ ;;
+ arm64)
+ cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ ppc64)
+ cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ x86)
+ cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ *)
+ die "Unsupported arch ${ARCH}"
+ ;;
+ esac
+
+ echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+ local merge_configs=(
+ "${T}"/version.config
+ "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+ )
+ use debug || merge_configs+=(
+ "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+ )
+ kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.16.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.16.ebuild
new file mode 100644
index 000000000000..32d99a8f85d0
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.12.16.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.12.5
+CONFIG_HASH=17639df044f5f81bbf267f566426eae4a5187875
+GENTOO_CONFIG_VER=5.10.32
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+ https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+ -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+ verify-sig? (
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+ )
+ amd64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+ -> kernel-x86_64-fedora.config.${CONFIG_VER}
+ )
+ arm64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+ -> kernel-aarch64-fedora.config.${CONFIG_VER}
+ )
+ ppc64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+ -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+ )
+ x86? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+ -> kernel-i686-fedora.config.${CONFIG_VER}
+ )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+ arm? ( savedconfig )"
+
+RDEPEND="
+ !sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+ debug? ( dev-util/pahole )
+ verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+ if use verify-sig; then
+ einfo "Unpacking linux-${PV}.tar.xz ..."
+ verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+ < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+ assert "Unpack failed"
+ unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ default
+
+ # prepare the default config
+ case ${ARCH} in
+ amd64)
+ cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ arm)
+ return
+ ;;
+ arm64)
+ cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ ppc64)
+ cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ x86)
+ cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ *)
+ die "Unsupported arch ${ARCH}"
+ ;;
+ esac
+
+ echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+ local merge_configs=(
+ "${T}"/version.config
+ "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+ )
+ use debug || merge_configs+=(
+ "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+ )
+ kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.131.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.131.ebuild
new file mode 100644
index 000000000000..dc33930084ad
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.131.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+ https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+ -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+ verify-sig? (
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+ )
+ amd64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+ -> kernel-x86_64.config.${CONFIG_VER}
+ )
+ arm64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+ -> kernel-aarch64.config.${CONFIG_VER}
+ )
+ ppc64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+ -> kernel-ppc64le.config.${CONFIG_VER}
+ )
+ x86? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+ -> kernel-i686.config.${CONFIG_VER}
+ )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+ !sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+ debug? ( dev-util/pahole )
+ verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+pkg_pretend() {
+ ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+ ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
+
+ kernel-install_pkg_pretend
+}
+
+src_unpack() {
+ if use verify-sig; then
+ einfo "Unpacking linux-${PV}.tar.xz ..."
+ verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+ < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+ assert "Unpack failed"
+ unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ default
+
+ # prepare the default config
+ case ${ARCH} in
+ amd64)
+ cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+ ;;
+ arm64)
+ cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+ ;;
+ ppc64)
+ cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+ ;;
+ x86)
+ cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+ ;;
+ *)
+ die "Unsupported arch ${ARCH}"
+ ;;
+ esac
+
+ echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+ local merge_configs=(
+ "${T}"/version.config
+ "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+ )
+ use debug || merge_configs+=(
+ "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+ )
+ [[ ${ARCH} == x86 ]] && merge_configs+=(
+ "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+ )
+
+ kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 318d44468bc2..777e8dcc5238 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -6,11 +6,11 @@ DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a936
DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST patch-4.14.238.xz 4323756 BLAKE2B 9b62b261e91bcca58eeae6695c43237bb4e97e25139fe0a1ea11b3e8a257083ded8d74cd5d40eb5b3c0f26cf82883de5bc2a882a6e3b4d8f6e8109c70e5d0d1f SHA512 8a96694dbffd65986468e6163206f2a94d5032d10bdf983b10a73f981679400d1c6e63ca591e705dd8c6f209c0cdfa279a1f35e1b5fbb0aa23d11a06fd2d1bea
-DIST patch-4.19.196.xz 4068400 BLAKE2B f0dc28f984586a38466bd753001d124b13fa7a6a909461427ac5e33fa3dce659d96e07977e3cbe95db1a8728adcfb996b1ba136bd4bde1a9a2134174cfb539b6 SHA512 538028d0899a36ded4fe7d9082b3b30b413bba3ab8e9d987bf380e6f678ea8dbb0328042330908b6978c8057a32c13ba0f5bf5e3ca27676306c0b001dab36bed
-DIST patch-4.4.274.xz 3580640 BLAKE2B 43b46941949df737d93521a9e72c9343bbd9d090649316ff454ffc8fee35763b4bad4e2a953114edf9495c743546e425be9bc51d0b8fd420db9ba376f2e24cde SHA512 81c183e8dc6fa691ae3069f82a26bfe6ca6fe2c71760d29f5759bd1338e57a4704c3840a7700e06eae5fd100ba7da29a989f3d24ab54c7fdcf4b3775c1d22725
-DIST patch-4.9.274.xz 4006388 BLAKE2B 297bbfa6bc34a622938a80b68a5d2ab8976fcd791218d661b4a00fcda7285f19e3272a08281157f7d258f31d3708b1f8cc877f002acf5764436f46d470dc4433 SHA512 04dc7c9e6db1d5961ad9937c81ece3a0fba20a437ee3bfe86bff2289d4ec1dfd9273a10a1d485e0186ba6ea418f113cf8675c8f850f039ac97e83583884f4682
-DIST patch-5.10.48.xz 1556628 BLAKE2B 63f3005f29b511244654e3d5a091d8665c4753f268682f9fccd778a8eb5a6fade36e3ceeb93b11efeefd65128a31512ed5088b53ab0062786366744634823c4d SHA512 c31112a2cfe30ef9db16e25163a7336c98ff2e586793791580f20203b96b5663d9f466c65ba3534f1aa1cdaaaa362a0d6da31944e69added465403b449a14c6e
-DIST patch-5.12.15.xz 717144 BLAKE2B 3c08281c27f130a61f29b3dea2f6fb704be2d6b7d0f2e48a4fdeec93f3abdebb589e17f6ef4f54d16be6d1df39b3585a0d978440a03446b9b1f4db6093b7646e SHA512 de3e9a38b4a88ecfb9f01b631a6b278c9d4c7de1d30e31bbd34ca0e77388ace1913fc239e18047adcbee35f26836a3b91a29490c8dce933878705a81ad94d9a3
+DIST patch-4.14.239.xz 4328180 BLAKE2B 75c1b4410196289ce504da4422d92c27210031ae7026bba08f5c6042cdd437e97044589f89105fb27aade20271bd22e0a22189d2c5a7a3fedfb861926fd20f8b SHA512 69e01fe11b21c98c4022c22ff692d266f100e720fbf30fccf492a04903139e5f2f5aef12aa234be29b7fb094f91339d37202476f6547f76809a8d2a19989cca4
+DIST patch-4.19.197.xz 4078072 BLAKE2B c50bdb43e0ec2d1ed60b072ae7764736c3aabaffd0166995926dcbd43b1747c24bf0f358e978bdad44263f7616b4d9a37fc1c86bb64160e9f0f7d7ad791f3177 SHA512 a8d9ba04702037aca994308b33da85b30cc7e4cee6342fea8b219d3688363a73976df7f6b2df3c35d04ffda1b0868d43a51d160ea2ad6643e71b01c3d5800ae2
+DIST patch-4.4.275.xz 3580680 BLAKE2B 49a46e98c2dd4753f89c4d94f7afdefb0b14d701bbce73fed32a00723245d7419ca76460a00398f4492bc71937fefb2d535f0dba6ede9258fbcc38983675afa2 SHA512 b85f8fbcfc5289c3b18bf0f438bc03abb348c9285b76782f17fcdc0c4b380cc131d0d5008d319d7d5e5cef33b0ac71993cb91137fbd9b8004cf44c2ba08d8de0
+DIST patch-4.9.275.xz 4008012 BLAKE2B f79df47900dda5fbf517142f9aa0d6b77e73435d3534070df323635666d74feaf362689a78982c6c04155da684abdbde1347ae3236245155d59576d81340bdcd SHA512 deb78bd9699449a952486bfd155bf23f14ed68632a55923abe3e210c4ea2787c875c7975bc9b0084adfe5e34d33f334f687fa67ceec26f99c6bec70f8739deaf
+DIST patch-5.10.49.xz 1559144 BLAKE2B 1146ae6c6e444f6f47a24675790bd3211fbb912ff40d58f7de7a594c4a1f593b375cf954b26bab1bb919a56a8e9bdab0e6980ce841035221b9b8390d1bed001a SHA512 b395aae022e4c0dc71712c43bf2c35f90256422dc7c0a09b55696e2c222bef122bcc81a7f1c1be5d7152fd3f6471ec9e7b7a2030221985d088498c620523eace
+DIST patch-5.12.16.xz 721932 BLAKE2B 6507110c9cf6c8176a9838b187b6eae437b44f6c9f1d446827285f3b27de6a8ae764bbf0ff56251e97e377fc14ecb0c475d7a1a4e689ab7db18646ec63009d0a SHA512 6ac154d40031946793285175f45ba4d1f0de27b70e204ef03d0e94674c66f9259139a23b60cf7125a9626fdc4e2a917c4d1c5fb80cae5a64f021aac75a382ba4
DIST patch-5.13.1.xz 820 BLAKE2B ba521422f958141f8a1d326d8b615b181187be4aad3ee7cc4adddfdfac5806e7631bbdb3d6cc581b012cf6ea86da85c652ac1db114bdf95b7228704dc5dbbbfc SHA512 32992e98fb1d656d745ff5548639a11e7ac31ed10e0f632a80f1005daca81899fa2919552c6371e3f887ddd1252e6f45ba0ec1257f9706620acded3755c6c0db
-DIST patch-5.4.130.xz 3068656 BLAKE2B de379f24c092291b29385fc5345fbe3373a5afe8fc73ec4efd2a3a18e6700c21c41271dd1e57dcf6ab44cea90ae87f6b034468e32e3b8c07ff8d838a533f0bb3 SHA512 f860d127826f7c2f357e20ad80091bd5ba6d05503cf2cb417481ea7e96bf72e6b105415b03429f59287fd44def65ad817a7375fb3c3a92066329930e4aee837b
+DIST patch-5.4.131.xz 3069328 BLAKE2B 6f8f104f1b0f8f17f6219e53cc4dda51bc8dd6ea4fd3b1d93291fc120df941dd5bc313c8fa74e29c2adbc5e202fcd8dead9ae9170cc69a3f453009763a7fcbd5 SHA512 af5629d70d3b023a8c4cea321b98a897981a1d6459557491939a2705e566053b7524aa8f7b8a20dd93962944fb5c032e4408cd81cf2716e834be262fb6e2d84c
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.238.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.239.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.14.238.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.14.239.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.196.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.197.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.19.196.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.19.197.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.274.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.275.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.4.274.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.4.275.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.274.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.275.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.9.274.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.9.275.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.48.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.49.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.10.48.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.10.49.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.12.15.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.12.16.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.12.15.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.12.16.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.130.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.131.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.4.130.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.4.131.ebuild
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 629efe455d5c..1def5b86e504 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/glances/glances-3.2.1.ebuild b/sys-process/glances/glances-3.2.1.ebuild
index 19a9801e1225..1ed7716ee7bb 100644
--- a/sys-process/glances/glances-3.2.1.ebuild
+++ b/sys-process/glances/glances-3.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index d6b05e708bdc..6d84b595102b 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/dist-kernel/dist-kernel-5.10.49.ebuild b/virtual/dist-kernel/dist-kernel-5.10.49.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.49.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+ || (
+ ~sys-kernel/gentoo-kernel-${PV}
+ ~sys-kernel/gentoo-kernel-bin-${PV}
+ ~sys-kernel/vanilla-kernel-${PV}
+ )"
diff --git a/virtual/dist-kernel/dist-kernel-5.12.16.ebuild b/virtual/dist-kernel/dist-kernel-5.12.16.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.12.16.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+ || (
+ ~sys-kernel/gentoo-kernel-${PV}
+ ~sys-kernel/gentoo-kernel-bin-${PV}
+ ~sys-kernel/vanilla-kernel-${PV}
+ )"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.131.ebuild b/virtual/dist-kernel/dist-kernel-5.4.131.ebuild
new file mode 100644
index 000000000000..11d6573ded7c
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.131.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+ || (
+ ~sys-kernel/gentoo-kernel-${PV}
+ ~sys-kernel/gentoo-kernel-bin-${PV}
+ ~sys-kernel/vanilla-kernel-${PV}
+ )"
diff --git a/virtual/fam/fam-0-r1.ebuild b/virtual/fam/fam-0-r1.ebuild
index b3b834c9ea12..42f95524f48d 100644
--- a/virtual/fam/fam-0-r1.ebuild
+++ b/virtual/fam/fam-0-r1.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
DESCRIPTION="A virtual package to choose between gamin and fam"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| (
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 27d68018bd29..032f02faae73 100644
Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index 8bad2e8000b2..510d684e552b 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -4,3 +4,4 @@ DIST mod_h2-1.15.18.tar.gz 708704 BLAKE2B 1ad8bd317c42f517baf015cbdeb89040a74375
DIST mod_h2-1.15.19.tar.gz 708753 BLAKE2B 9193e9b307ead341e90dffe4547de444a3f47340f23e3a7171f8a0fdbd0c5749eddfd7f9e6b3e4a3afccda521437183a8e7039a79e554a4c6e18415678dfec57 SHA512 52717d173df26faaa82e1335366de448bd0b125032066e436546027580707ba872ae07e1e4e9b8b4fc5dbd02e212441d44b96092aac8732627117e109b95671a
DIST mod_h2-1.15.20.tar.gz 707590 BLAKE2B 245b21d55c5659ed4ada3bfa5ec369ca3154e629820980caa1badefeca05399a31fb4f94594068607af20a6936e8ac2439b23e31ddcb9db8d4bb2c907400a152 SHA512 3492b24fdcb6371a5734b85253d800baa6f1650ae3c6b4d08539ec5436cbaaee2ed41fa9515fa36a94c281048f08970b20ccb6373077251a475f6831aaae8524
DIST mod_h2-1.15.21.tar.gz 720305 BLAKE2B 9abe84867a383b9dd9e0841403544abc94c95ddc9a735bdcfb420d5a14ddb7e6ff5832455659b62ed5e9c865f9c467970d1863510a4fa63c655242cdc83a54b6 SHA512 bf0ab88e07c59c38189f7c670512ff01abdf6110d05a344182c557724028734edf68eea5227ac9b5c400810621ae1d30efac2394a369fbf6ef9558e2b3bcd17c
+DIST mod_h2-1.15.22.tar.gz 721713 BLAKE2B 59449f23b84cb3c0bb3a211af6c57bb6e5e77767466657addaa6cafd6cad96d7030f43785e98123af15c18fdf6ce3ec416d6e885661998d46962be5abf059159 SHA512 cc201edea4152ac8d82232a5e50f1ed6d4e358f04338d43dbdeb7cdd4f338dd8734b6f8b8febe0c9a8f2b67288d2db4bf12915f60c28935885b30b767a9043a1
diff --git a/www-apache/mod_h2/mod_h2-1.15.22.ebuild b/www-apache/mod_h2/mod_h2-1.15.22.ebuild
new file mode 100644
index 000000000000..9d7e1b600b10
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.15.22.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+ inherit git-r3
+else
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/icing/mod_h2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+ >=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+need_apache2_4
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_compile() {
+ default
+}
+
+src_install() {
+ default
+
+ APACHE2_MOD_DEFINE="HTTP2"
+ insinto "${APACHE_MODULES_CONFDIR}"
+ newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 785ef8107320..934ab79a89c5 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/nanoc-checking/Manifest b/www-apps/nanoc-checking/Manifest
new file mode 100644
index 000000000000..07510f3a4d65
--- /dev/null
+++ b/www-apps/nanoc-checking/Manifest
@@ -0,0 +1 @@
+DIST nanoc-checking-1.0.1.gem 10752 BLAKE2B 6f6f10cf97ab17cc328d827ab19490fa6e9d6f744594c167b4d9bf050c1288a7d5657d290402efbfa8d61d8e81550feae5022720464814e27af06d5025dfde96 SHA512 ef2b5a9c044f9bef19e4c75cc9ee99747a2ff0f8bece23c56d763f59c622488ccd980a19a3563207948fdb0d9edb91e86703778f7233bc0de76adf385c5694b0
diff --git a/www-apps/nanoc-checking/metadata.xml b/www-apps/nanoc-checking/metadata.xml
new file mode 100644
index 000000000000..9abf9c6b8ec2
--- /dev/null
+++ b/www-apps/nanoc-checking/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+graaff@gentoo.org
+
+ruby@gentoo.org
+Gentoo Ruby Project
+
+
diff --git a/www-apps/nanoc-checking/nanoc-checking-1.0.1.ebuild b/www-apps/nanoc-checking/nanoc-checking-1.0.1.ebuild
new file mode 100644
index 000000000000..63b0d6c7e17d
--- /dev/null
+++ b/www-apps/nanoc-checking/nanoc-checking-1.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+# Upstream has specs but they are not available in the gem and the
+# repository upstream is not tagged for this.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides checking functionality for Nanoc"
+HOMEPAGE="https://nanoc.ws/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "
+ >=www-apps/nanoc-cli-4.11.15:0
+ >=www-apps/nanoc-core-4.11.15:0
+"
diff --git a/www-apps/nanoc-cli/Manifest b/www-apps/nanoc-cli/Manifest
new file mode 100644
index 000000000000..bcde1a4ece75
--- /dev/null
+++ b/www-apps/nanoc-cli/Manifest
@@ -0,0 +1 @@
+DIST nanoc-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19fe17c6550378465d85e63c498c5773c1dcd49d685b7d4367488300394c2f5bf9e6a6dc6aea589617a27fe1bd6ed4a SHA512 3fe574c061d8d0dd034137800c88a34844d246e6ab9a7816aadb03cd2c43b5fe6d614f42e6b41bcd4df98be551edc69e35ca992f2d5ee8158f9c7eb3c7635750
diff --git a/www-apps/nanoc-cli/metadata.xml b/www-apps/nanoc-cli/metadata.xml
new file mode 100644
index 000000000000..9abf9c6b8ec2
--- /dev/null
+++ b/www-apps/nanoc-cli/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+graaff@gentoo.org
+
+ruby@gentoo.org
+Gentoo Ruby Project
+
+
diff --git a/www-apps/nanoc-cli/nanoc-cli-4.12.2.ebuild b/www-apps/nanoc-cli/nanoc-cli-4.12.2.ebuild
new file mode 100644
index 000000000000..77ad8311c5fe
--- /dev/null
+++ b/www-apps/nanoc-cli/nanoc-cli-4.12.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> nanoc-${PV}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+RUBY_S="nanoc-${PV}/nanoc-cli"
+
+ruby_add_rdepend "
+ >=dev-ruby/cri-2.15:0
+ >=dev-ruby/diff-lcs-1.3:0
+ ~www-apps/nanoc-core-${PV}
+ >=dev-ruby/zeitwerk-2.1:2
+"
+
+ruby_add_bdepend "test? (
+ dev-ruby/bundler
+ dev-ruby/rspec:3
+ dev-ruby/rspec-its
+ dev-ruby/fuubar
+ dev-ruby/minitest
+ dev-ruby/timecop
+ dev-ruby/tty-command
+ dev-ruby/yard
+ www-apps/nanoc-spec
+)
+"
+
+all_ruby_prepare() {
+ # Avoid unneeded development dependencies
+ sed -i -e '/simplecov/I s:^:#:' \
+ -e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
+ sed -i -e '/coverall/I s:^:#:' \
+ -e '/rubocop/ s:^:#:' Rakefile || die
+ sed -i -e '2i require "tmpdir"; require "pathname"' spec/spec_helper.rb || die
+
+ echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+ sed -i -e "s:require_relative 'lib:require './lib:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ # Avoid error handler specs failing due to different (rubygems?)
+ # output, meta_spec is affected by this.
+ rm -f spec/nanoc/cli/error_handler_spec.rb spec/meta_spec.rb || die
+
+ # Avoid test requiring a network interface
+ sed -i -e '/does not listen on non-local interfaces/askip "Needs network"' spec/nanoc/cli/commands/view_spec.rb || die
+
+ # Avoid tests requiring an additional dependency on nanoc-live
+ sed -i -e '/--live-reload is given/askip "Unpackaged nanoc-live"' spec/nanoc/cli/commands/view_spec.rb || die
+ sed -i -e '/watches with --watch/askip "Unpackaged nanoc-live"' spec/nanoc/cli/commands/compile_spec.rb || die
+}
+
+each_ruby_test() {
+ RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
+}
diff --git a/www-apps/nanoc-core/Manifest b/www-apps/nanoc-core/Manifest
index 94faa65dd386..773ac6576894 100644
--- a/www-apps/nanoc-core/Manifest
+++ b/www-apps/nanoc-core/Manifest
@@ -1 +1,2 @@
DIST nanoc-core-4.11.12.tar.gz 310160 BLAKE2B ef34bf6d28d5a9287053a939ef14bc59f99bde003d7bbcd7eee861ab882a6beaa48812137c8ad87fe464d27e371cfd40022467f8d10ac5f85ff16ef19215e340 SHA512 0503d0a6a0cf1ca9a9c57b831f320abb5102a3e7aa82c016d1f72c4d9f614ef53a0e4df30d50e05a98107fecacae4d70dfa5ee5c15910d575bc30df411430863
+DIST nanoc-core-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19fe17c6550378465d85e63c498c5773c1dcd49d685b7d4367488300394c2f5bf9e6a6dc6aea589617a27fe1bd6ed4a SHA512 3fe574c061d8d0dd034137800c88a34844d246e6ab9a7816aadb03cd2c43b5fe6d614f42e6b41bcd4df98be551edc69e35ca992f2d5ee8158f9c7eb3c7635750
diff --git a/www-apps/nanoc-core/files/nanoc-core-4.12.2-contracts.patch b/www-apps/nanoc-core/files/nanoc-core-4.12.2-contracts.patch
new file mode 100644
index 000000000000..ec3e11df41b2
--- /dev/null
+++ b/www-apps/nanoc-core/files/nanoc-core-4.12.2-contracts.patch
@@ -0,0 +1,16 @@
+Support for contracts is a development-only mechanism which impacts performance.
+It produces a warning on each run that is not easy to act on for our users,
+so patch this out altogether.
+
+--- a/lib/nanoc/core/contracts_support.rb 2021-07-11 08:54:09.979327770 +0200
++++ b/lib/nanoc/core/contracts_support.rb 2021-05-28 11:33:52.000000000 +0200
+@@ -90,8 +90,7 @@
+
+ contracts_loadable =
+ begin
++ false
+- require 'contracts'
+- true
+ rescue LoadError
+ false
+ end
diff --git a/www-apps/nanoc-core/nanoc-core-4.12.2.ebuild b/www-apps/nanoc-core/nanoc-core-4.12.2.ebuild
new file mode 100644
index 000000000000..a20f4d762fa3
--- /dev/null
+++ b/www-apps/nanoc-core/nanoc-core-4.12.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+RUBY_S="nanoc-${PV}/nanoc-core"
+
+ruby_add_rdepend "
+ >=dev-ruby/concurrent-ruby-1.1:1
+ dev-ruby/ddmemoize:1
+ dev-ruby/ddmetrics:1
+ dev-ruby/ddplugin:1
+ =dev-ruby/hamster-3*
+ >=dev-ruby/json_schema-0.19:0
+ dev-ruby/slow_enumerator_tools:1
+ >=dev-ruby/tty-platform-0.2:0
+ >=dev-ruby/zeitwerk-2.1:2
+"
+
+ruby_add_bdepend "test? (
+ dev-ruby/bundler
+ dev-ruby/rspec:3
+ dev-ruby/rspec-its
+ dev-ruby/fuubar
+ dev-ruby/minitest
+ dev-ruby/timecop
+ dev-ruby/tty-command
+ dev-ruby/yard
+ www-apps/nanoc-spec
+)
+"
+
+PATCHES=( "${FILESDIR}/${P}-contracts.patch" )
+
+all_ruby_prepare() {
+ # Avoid unneeded development dependencies
+ sed -i -e '/simplecov/I s:^:#:' \
+ -e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
+ sed -i -e '/coverall/I s:^:#:' \
+ -e '/rubocop/ s:^:#:' Rakefile || die
+ sed -i -e '1i require "tmpdir"; require "pathname"' spec/spec_helper.rb || die
+
+ echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+ sed -i -e "s:require_relative 'lib:require './lib:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ # Use useable tmp dir
+ sed -i -e 's:/tmp/whatever:'${T}'/whatever:' spec/nanoc/core/checksummer_spec.rb || die
+
+ # Avoid circular dependency on www-apps/nanoc
+ sed -i -e '/.all_outdated/,/^ end/ s:^:#:' spec/nanoc/core/feature_spec.rb || die
+ rm -f spec/nanoc/core_spec.rb || die
+}
+
+each_ruby_test() {
+ RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
+}
diff --git a/www-apps/nanoc-deploying/Manifest b/www-apps/nanoc-deploying/Manifest
new file mode 100644
index 000000000000..0153f88d029c
--- /dev/null
+++ b/www-apps/nanoc-deploying/Manifest
@@ -0,0 +1 @@
+DIST nanoc-deploying-1.0.1.gem 9728 BLAKE2B d646f56eada30fc5059069627f6b07fc6620cc952605086100e954aa9b79e7f696ecfe87ad85f1951fca1de75482943af869a28f6f4465fffc3497af9db36b7f SHA512 78e4247021b9e0ba717cf4b41bb913bbbafd7e0b149d16e681d7312f60cd0d2277de5e957f938c3194a521036da21b38696fe4ced5cd0b14cdce01aee207a744
diff --git a/www-apps/nanoc-deploying/metadata.xml b/www-apps/nanoc-deploying/metadata.xml
new file mode 100644
index 000000000000..9abf9c6b8ec2
--- /dev/null
+++ b/www-apps/nanoc-deploying/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+graaff@gentoo.org
+
+ruby@gentoo.org
+Gentoo Ruby Project
+
+
diff --git a/www-apps/nanoc-deploying/nanoc-deploying-1.0.1.ebuild b/www-apps/nanoc-deploying/nanoc-deploying-1.0.1.ebuild
new file mode 100644
index 000000000000..2cb1647c2ef6
--- /dev/null
+++ b/www-apps/nanoc-deploying/nanoc-deploying-1.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+# Upstream has specs but they are not available in the gem and the
+# repository upstream is not tagged for this.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides deploying functionality for Nanoc"
+HOMEPAGE="https://nanoc.ws/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "
+ www-apps/nanoc-checking:1
+ >=www-apps/nanoc-cli-4.11.15:0
+ >=www-apps/nanoc-core-4.11.15:0
+"
diff --git a/www-apps/nanoc-spec/Manifest b/www-apps/nanoc-spec/Manifest
new file mode 100644
index 000000000000..e6a04f47b7a1
--- /dev/null
+++ b/www-apps/nanoc-spec/Manifest
@@ -0,0 +1 @@
+DIST nanoc-spec-0.0.2.gem 6656 BLAKE2B de90b2f63a15a7168d491cd33f8994a9ef8f7b13b23f6e32d50c2bdf8467a68e4205c24c9ca79efccc1a5076d2af25cf1a31c49c946e2ff0e7add9d5bcb99d1f SHA512 78202adfcc1e9b414a1b2f8d85bf5a0ab3e52473cc490145d0b63f5c6cbd4c29c1c56b06b343ad6bd6ba2818f464abc7ece3c3a0ccd9c2dd38771110ef573d7c
diff --git a/www-apps/nanoc-spec/metadata.xml b/www-apps/nanoc-spec/metadata.xml
new file mode 100644
index 000000000000..9abf9c6b8ec2
--- /dev/null
+++ b/www-apps/nanoc-spec/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+graaff@gentoo.org
+
+ruby@gentoo.org
+Gentoo Ruby Project
+
+
diff --git a/www-apps/nanoc-spec/nanoc-spec-0.0.2.ebuild b/www-apps/nanoc-spec/nanoc-spec-0.0.2.ebuild
new file mode 100644
index 000000000000..1c524f55b21e
--- /dev/null
+++ b/www-apps/nanoc-spec/nanoc-spec-0.0.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides Nanoc::Spec, containing functionality for writing tests for Nanoc"
+HOMEPAGE="https://nanoc.ws/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+ruby_add_rdepend "
+ >=www-apps/nanoc-core-4.11.13:0
+"
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index 14201d6656a4..dc7d1a24ffb8 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1 +1,2 @@
DIST nanoc-4.11.12.tar.gz 310160 BLAKE2B ef34bf6d28d5a9287053a939ef14bc59f99bde003d7bbcd7eee861ab882a6beaa48812137c8ad87fe464d27e371cfd40022467f8d10ac5f85ff16ef19215e340 SHA512 0503d0a6a0cf1ca9a9c57b831f320abb5102a3e7aa82c016d1f72c4d9f614ef53a0e4df30d50e05a98107fecacae4d70dfa5ee5c15910d575bc30df411430863
+DIST nanoc-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19fe17c6550378465d85e63c498c5773c1dcd49d685b7d4367488300394c2f5bf9e6a6dc6aea589617a27fe1bd6ed4a SHA512 3fe574c061d8d0dd034137800c88a34844d246e6ab9a7816aadb03cd2c43b5fe6d614f42e6b41bcd4df98be551edc69e35ca992f2d5ee8158f9c7eb3c7635750
diff --git a/www-apps/nanoc/nanoc-4.12.2.ebuild b/www-apps/nanoc/nanoc-4.12.2.ebuild
new file mode 100644
index 000000000000..dc3d92d1356c
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.12.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="nanoc.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+RUBY_S="${P}/nanoc"
+
+ruby_add_rdepend "!minimal? (
+ dev-ruby/mime-types:*
+ dev-ruby/rack:*
+ www-servers/adsf
+)
+ >=dev-ruby/addressable-2.5
+ >=dev-ruby/colored-1.2:0
+ www-apps/nanoc-checking:1
+ ~www-apps/nanoc-cli-${PV}
+ ~www-apps/nanoc-core-${PV}
+ www-apps/nanoc-deploying:1
+ >=dev-ruby/parallel-1.12:1
+ >=dev-ruby/tty-command-0.8:0
+ >=dev-ruby/tty-which-0.4:0
+"
+
+ruby_add_bdepend "test? (
+ dev-ruby/rspec:3
+ dev-ruby/asciidoctor
+ dev-ruby/fuubar
+ dev-ruby/haml
+ dev-ruby/maruku
+ >=dev-ruby/mocha-0.13
+ dev-ruby/minitest
+ dev-ruby/mustache
+ dev-ruby/pry
+ dev-ruby/rdoc
+ >=dev-ruby/rouge-3.5.1:2
+ dev-ruby/rubypants
+ dev-ruby/systemu
+ dev-ruby/timecop
+ dev-ruby/vcr
+ dev-ruby/webmock
+ dev-ruby/yard
+)
+doc? (
+ dev-ruby/kramdown
+ dev-ruby/rdiscount
+ dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+ # Avoid unneeded development dependencies
+ sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
+ sed -i -e '/simplecov/I s:^:#:' \
+ -e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
+ sed -i -e '/coverall/I s:^:#:' \
+ -e '/rubocop/ s:^:#:' Rakefile || die
+
+ echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+ # Avoid basepath issues when generating gemspec
+ sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ # Avoid tests requiring a network connection or make assumptions
+ # about the local network environment.
+ rm -f test/checking/checks/test_{css,html}.rb spec/nanoc/cli/commands/view_spec.rb || die
+
+ # Avoid tests for unpackaged dependencies
+ rm spec/nanoc/filters/less_spec.rb \
+ test/filters/test_{markaby,rainpress}.rb || die
+
+ # Avoid non-fatal failing tests due to specifics in the environment
+ #sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
+ #sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
+ sed -i -e '124askip "ordering issues"' -e '168askip "ordering issues"' spec/nanoc/data_sources/filesystem_spec.rb || die
+}
+
+each_ruby_test() {
+ RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
+}
diff --git a/www-apps/roundup/files/roundup-2.0.0-test-pyjwt.patch b/www-apps/roundup/files/roundup-2.0.0-test-pyjwt.patch
new file mode 100644
index 000000000000..74f71dab57ff
--- /dev/null
+++ b/www-apps/roundup/files/roundup-2.0.0-test-pyjwt.patch
@@ -0,0 +1,91 @@
+# HG changeset patch
+# User John Rouillard
+# Date 1609557405 18000
+# Fri Jan 01 22:16:45 2021 -0500
+# Node ID a2fbd3592322379f0c54a75446d2a282c6f40075
+# Parent e3edb0b44d94df71f46094cdda9ed4e51e6c1de4
+pyjwt 2.00 changed return type of jwt.encode from byte to str
+
+Need to change tests to only do b2s conversion if using version before
+2.0.0. Note 2.0.0 drops support for python 2. Also it is not
+installed for the python 3.4 ci test by pip install.
+
+diff --git a/test/rest_common.py b/test/rest_common.py
+--- a/test/rest_common.py
++++ b/test/rest_common.py
+@@ -68,6 +68,8 @@ class TestCase():
+ url_pfx = 'http://tracker.example/cgi-bin/roundup.cgi/bugs/rest/data/'
+
+ def setUp(self):
++ from packaging import version
++
+ self.dirname = '_test_rest'
+ # set up and open a tracker
+ # Set optimize=True as code under test (Client.main()::determine_user)
+@@ -162,50 +164,58 @@ class TestCase():
+ 'iat': now_ts,
+ 'exp': plus1min_ts,
+ }
++
++ # in version 2.0.0 and newer jwt.encode returns string
++ # not bytestring. So we have to skip b2s conversion
+
++ if version.parse(jwt.__version__) >= version.parse('2.0.0'):
++ tostr = lambda x: x
++ else:
++ tostr = b2s
++
+ self.jwt = {}
+ self.claim = {}
+ # generate invalid claim with expired timestamp
+ self.claim['expired'] = copy(claim)
+ self.claim['expired']['exp'] = expired_ts
+- self.jwt['expired'] = b2s(jwt.encode(self.claim['expired'], secret,
++ self.jwt['expired'] = tostr(jwt.encode(self.claim['expired'], secret,
+ algorithm='HS256'))
+
+ # generate valid claim with user role
+ self.claim['user'] = copy(claim)
+ self.claim['user']['exp'] = plus1min_ts
+- self.jwt['user'] = b2s(jwt.encode(self.claim['user'], secret,
++ self.jwt['user'] = tostr(jwt.encode(self.claim['user'], secret,
+ algorithm='HS256'))
+ # generate invalid claim bad issuer
+ self.claim['badiss'] = copy(claim)
+ self.claim['badiss']['iss'] = "http://someissuer/bugs"
+- self.jwt['badiss'] = b2s(jwt.encode(self.claim['badiss'], secret,
++ self.jwt['badiss'] = tostr(jwt.encode(self.claim['badiss'], secret,
+ algorithm='HS256'))
+ # generate invalid claim bad aud(ience)
+ self.claim['badaud'] = copy(claim)
+ self.claim['badaud']['aud'] = "http://someaudience/bugs"
+- self.jwt['badaud'] = b2s(jwt.encode(self.claim['badaud'], secret,
++ self.jwt['badaud'] = tostr(jwt.encode(self.claim['badaud'], secret,
+ algorithm='HS256'))
+ # generate invalid claim bad sub(ject)
+ self.claim['badsub'] = copy(claim)
+ self.claim['badsub']['sub'] = str("99")
+- self.jwt['badsub'] = b2s(jwt.encode(self.claim['badsub'], secret,
++ self.jwt['badsub'] = tostr(jwt.encode(self.claim['badsub'], secret,
+ algorithm='HS256'))
+ # generate invalid claim bad roles
+ self.claim['badroles'] = copy(claim)
+ self.claim['badroles']['roles'] = [ "badrole1", "badrole2" ]
+- self.jwt['badroles'] = b2s(jwt.encode(self.claim['badroles'], secret,
++ self.jwt['badroles'] = tostr(jwt.encode(self.claim['badroles'], secret,
+ algorithm='HS256'))
+ # generate valid claim with limited user:email role
+ self.claim['user:email'] = copy(claim)
+ self.claim['user:email']['roles'] = [ "user:email" ]
+- self.jwt['user:email'] = b2s(jwt.encode(self.claim['user:email'], secret,
++ self.jwt['user:email'] = tostr(jwt.encode(self.claim['user:email'], secret,
+ algorithm='HS256'))
+
+ # generate valid claim with limited user:emailnorest role
+ self.claim['user:emailnorest'] = copy(claim)
+ self.claim['user:emailnorest']['roles'] = [ "user:emailnorest" ]
+- self.jwt['user:emailnorest'] = b2s(jwt.encode(self.claim['user:emailnorest'], secret,
++ self.jwt['user:emailnorest'] = tostr(jwt.encode(self.claim['user:emailnorest'], secret,
+ algorithm='HS256'))
+
+ self.db.tx_Source = 'web'
diff --git a/www-apps/roundup/roundup-2.0.0.ebuild b/www-apps/roundup/roundup-2.0.0.ebuild
index 335af1be6ac9..a66c26f72f10 100644
--- a/www-apps/roundup/roundup-2.0.0.ebuild
+++ b/www-apps/roundup/roundup-2.0.0.ebuild
@@ -36,6 +36,9 @@ RDEPEND="${DEPEND}
)"
DOCS="CHANGES.txt doc/*.txt"
+PATCHES=(
+ "${FILESDIR}/${P}-test-pyjwt.patch"
+)
distutils_enable_tests pytest
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index faeba844cbf5..c2a3e5b3a9c5 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/links/links-2.23.ebuild b/www-client/links/links-2.23.ebuild
index ee90982eb08e..45a610a3fcaf 100644
--- a/www-client/links/links-2.23.ebuild
+++ b/www-client/links/links-2.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode X zlib zstd"
GRAPHICS_DEPEND="media-libs/libpng:0="
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index 2b48a07f1c22..9dce31f41287 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit savedconfig toolchain-funcs
+inherit savedconfig toolchain-funcs desktop xdg
DESCRIPTION="a simple web browser based on WebKit/GTK+"
HOMEPAGE="https://surf.suckless.org/"
@@ -73,4 +73,25 @@ src_install() {
fi
save_config config.h
+
+ newicon "${S}"/"${PN}".png "${PN}".png
+
+ local mime_types="text/html;text/xml;application/xhtml+xml;"
+ mime_types+="x-scheme-handler/http;x-scheme-handler/https;"
+ make_desktop_entry \
+ "surf" \
+ "Surf" \
+ "surf" \
+ "Network;WebBrowser" \
+ "MimeType=${mime_types}\nStartupWMClass=surf"
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 169309ca0e22..f2f72a7b8b2e 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/puma/files/puma-3.12.1-ruby26-waitpid.patch b/www-servers/puma/files/puma-3.12.1-ruby26-waitpid.patch
deleted file mode 100644
index b28c69fa4d4b..000000000000
--- a/www-servers/puma/files/puma-3.12.1-ruby26-waitpid.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From b94c3e34faff024a5b1930af36e4d64bd6dde57f Mon Sep 17 00:00:00 2001
-From: MSP-Greg
-Date: Fri, 15 Mar 2019 17:26:20 -0500
-Subject: [PATCH] Puma::Cluster#stop_workers - use WNOHANG with nil return
- tests
-
-Ruby 2.6 introduced a bug that affects worker shutdown (waitpid).
-
-Added code using Process::WNOHANG along with needed logic. Adds worker status (via $?) and total shutdown time to log.
-
-Co-authored-by: MSP-Greg
-Co-authored-by: guilleiguaran
----
- lib/puma/cluster.rb | 20 +++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/lib/puma/cluster.rb b/lib/puma/cluster.rb
-index 93d65131..0879c96c 100644
---- a/lib/puma/cluster.rb
-+++ b/lib/puma/cluster.rb
-@@ -37,7 +37,25 @@ def stop_workers
- @workers.each { |x| x.term }
-
- begin
-- @workers.each { |w| Process.waitpid(w.pid) }
-+ if RUBY_VERSION < '2.6'
-+ @workers.each { |w| Process.waitpid(w.pid) }
-+ else
-+ # below code is for a bug in Ruby 2.6+, above waitpid call hangs
-+ t_st = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-+ pids = @workers.map(&:pid)
-+ loop do
-+ pids.reject! do |w_pid|
-+ if Process.waitpid(w_pid, Process::WNOHANG)
-+ log " worker status: #{$?}"
-+ true
-+ end
-+ end
-+ break if pids.empty?
-+ sleep 0.5
-+ end
-+ t_end = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-+ log format(" worker shutdown time: %6.2f", t_end - t_st)
-+ end
- rescue Interrupt
- log "! Cancelled waiting for workers"
- end
diff --git a/www-servers/puma/files/puma-3.12.5-cve-2020-11077.patch b/www-servers/puma/files/puma-3.12.5-cve-2020-11077.patch
deleted file mode 100644
index 4d26da28eee8..000000000000
--- a/www-servers/puma/files/puma-3.12.5-cve-2020-11077.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 089df0727ffab1b3b69f2e6da40597c52e346013 Mon Sep 17 00:00:00 2001
-From: Evan Phoenix
-Date: Tue, 19 May 2020 15:20:10 -0700
-Subject: [PATCH] Reduce ambiguity of headers
-
----
- ext/puma_http11/http11_parser.c | 4 +++-
- ext/puma_http11/http11_parser.rl | 4 +++-
- lib/puma/server.rb | 31 +++++++++++++++++++++++++++++++
- 3 files changed, 37 insertions(+), 2 deletions(-)
-
-diff --git a/ext/puma_http11/http11_parser.c b/ext/puma_http11/http11_parser.c
-index 453f8cd40..e8844a37e 100644
---- a/ext/puma_http11/http11_parser.c
-+++ b/ext/puma_http11/http11_parser.c
-@@ -14,12 +14,14 @@
-
- /*
- * capitalizes all lower-case ASCII characters,
-- * converts dashes to underscores.
-+ * converts dashes to underscores, and underscores to commas.
- */
- static void snake_upcase_char(char *c)
- {
- if (*c >= 'a' && *c <= 'z')
- *c &= ~0x20;
-+ else if (*c == '_')
-+ *c = ',';
- else if (*c == '-')
- *c = '_';
- }
-diff --git a/ext/puma_http11/http11_parser.rl b/ext/puma_http11/http11_parser.rl
-index 880c1d40b..62452ba7c 100644
---- a/ext/puma_http11/http11_parser.rl
-+++ b/ext/puma_http11/http11_parser.rl
-@@ -12,12 +12,14 @@
-
- /*
- * capitalizes all lower-case ASCII characters,
-- * converts dashes to underscores.
-+ * converts dashes to underscores, and underscores to commas.
- */
- static void snake_upcase_char(char *c)
- {
- if (*c >= 'a' && *c <= 'z')
- *c &= ~0x20;
-+ else if (*c == '_')
-+ *c = ',';
- else if (*c == '-')
- *c = '_';
- }
-diff --git a/lib/puma/server.rb b/lib/puma/server.rb
-index d870b383f..5b2cd94df 100644
---- a/lib/puma/server.rb
-+++ b/lib/puma/server.rb
-@@ -665,6 +665,37 @@ def handle_request(req, lines)
- }
- end
-
-+ # Fixup any headers with , in the name to have _ now. We emit
-+ # headers with , in them during the parse phase to avoid ambiguity
-+ # with the - to _ conversion for critical headers. But here for
-+ # compatibility, we'll convert them back. This code is written to
-+ # avoid allocation in the common case (ie there are no headers
-+ # with , in their names), that's why it has the extra conditionals.
-+
-+ to_delete = nil
-+ to_add = nil
-+
-+ env.each do |k,v|
-+ if k.start_with?("HTTP_") and k.include?(",") and k != "HTTP_TRANSFER,ENCODING"
-+ if to_delete
-+ to_delete << k
-+ else
-+ to_delete = [k]
-+ end
-+
-+ unless to_add
-+ to_add = {}
-+ end
-+
-+ to_add[k.gsub(",", "_")] = v
-+ end
-+ end
-+
-+ if to_delete
-+ to_delete.each { |k| env.delete(k) }
-+ env.merge! to_add
-+ end
-+
- # A rack extension. If the app writes #call'ables to this
- # array, we will invoke them when the request is done.
- #
-From 0a3c09a0603857f088571d0eb69e0b9adee0fed1 Mon Sep 17 00:00:00 2001
-From: Evan Phoenix
-Date: Tue, 19 May 2020 15:34:06 -0700
-Subject: [PATCH] Adjust test to match real world value
-
----
- test/test_puma_server.rb | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/test_puma_server.rb b/test/test_puma_server.rb
-index 9d40cd5f3..375eca399 100644
---- a/test/test_puma_server.rb
-+++ b/test/test_puma_server.rb
-@@ -137,6 +137,7 @@ def test_default_server_port
-
- req = Net::HTTP::Get.new("/")
- req['HOST'] = "example.com"
-+ req['X-FORWARDED-PROTO'] = "https,http"
-
- res = Net::HTTP.start @host, @server.connected_port do |http|
- http.request(req)
diff --git a/www-servers/puma/puma-5.3.2-r1.ebuild b/www-servers/puma/puma-5.3.2-r1.ebuild
index 058aacf262e4..aa275d9b6699 100644
--- a/www-servers/puma/puma-5.3.2-r1.ebuild
+++ b/www-servers/puma/puma-5.3.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 3888da8d7cae..2f36da9c1546 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,11 +1,9 @@
-DIST apache-tomcat-10.0.6-src.tar.gz 5987333 BLAKE2B b955d3708555c5530ebccaf9c6e8c344a679666bdd45361980d722d2cb48b618a03dc2514f973c182c2c1eaf96852e5a5eadad89575ee1bf524213211191a6a4 SHA512 229e8767b8f53f6b5c0e28f13a1daffd6fb8307a5239ae28ee1522087d881e4c9e3f1a0d39bfc852d5e54166dbb8a0a1577210a325845815c7281c4babc0b100
DIST apache-tomcat-10.0.7-src.tar.gz 6001147 BLAKE2B f1aee4748d404d02188369603824dcc97765e907cfc3872f54b1859ae950a9475d72862caa2179ac39e4cbdb8c23424f89c4cbbfff8a2e079a842b0054257009 SHA512 395b0280666c6779f6378cb87e9abdb637a823e7f89452b7324329f4c0a1fe0b315275dca5df2f80a38c6f1ef98541bd1ea762df7af9cb15e4466c3b89e4e7a8
DIST apache-tomcat-10.0.8-src.tar.gz 6010420 BLAKE2B 86390f04147d3082fbc9f15704121cbd6aa8ba756b4bc03e64a49aae3dca96c6b503949da0096f8ddf143bdeb1320b7601008683ce94bdad9ef235e1f73ad948 SHA512 c264be4cb29d87c95918d2723ab20bc7e2cb5149cb366cca348c6cd311b0f38ac500ed6b4756b20245a446ead50e7208f77093d6081563ed76d6691abfcbe14c
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da2577770e43314d2a86b8ee9b48b675f0d SHA512 322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b
DIST apache-tomcat-8.5.68-src.tar.gz 5907026 BLAKE2B 2312edb94f98ee98b594325fbc32521776e9cadc4422a3a46f3651f1fee072a99c5f6874378ac06215396504d34ad750edd6ec3399a3931554068195a8ee15ef SHA512 579a35f944ead756995d288b66ea8a4ab30289a90c32aa01119abcea85a8524f6594ce5cb7ac9df6d352c1e3b54a18c814b5d3a6409dce6a43614e3a89284066
DIST apache-tomcat-8.5.69-src.tar.gz 5916996 BLAKE2B 4a3ef958b6bb0089149877c25baaa2c1a0bcee473c0942b419c5c1d7071dcae4f8a6e6f1805efdee1201042feedc64e213fffbcdb35cf2b7f9a67217b8dcad48 SHA512 467dd38bd77d8b5ac6fa2acf9f6ee71d04467a3182647757fa47f5d1d9576c96e5061db61ba08b04318f1db9ee4f2bcac7b45f1f9f4f81cd1807a57483dd7bbb
-DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c SHA512 dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1
DIST apache-tomcat-9.0.48-src.tar.gz 6080015 BLAKE2B 9b2cac8143ca8186857d7d53e8737f2f7d2ec8e0ca03d32447ad25b429cbf37c1c7b39bc6e4b93679c08bd5f4940280d00946a70e9fa82f8c2a596ea18a2a4c6 SHA512 9b762f6d1a1f6c75e10f1bc05c39a647ae2165f3b81c09ff73cc286f3c487b034b9d14c73b808c73b35f55f642848831a0329d9d611c8bbb3928559e552a3ff3
DIST apache-tomcat-9.0.50-src.tar.gz 6086608 BLAKE2B 59b5eb1616d377193f330fd8c5abb6e98926ab0a2f75b1ea14251d249837aad733f55a0b79f2a67de57f612dd1afdeae53836be97e81701d8dc27ecb0a381d4a SHA512 1032d2d5c342fb495b76426fdc301e0e5546815e709e604061d7aa2cdab19bcd376adc957fd25dee1d574306186eafd2e9d24140dd5e725b130128592cac47a2
DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37
diff --git a/www-servers/tomcat/tomcat-10.0.6.ebuild b/www-servers/tomcat/tomcat-10.0.6.ebuild
deleted file mode 100644
index d66b5ff36790..000000000000
--- a/www-servers/tomcat/tomcat-10.0.6.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="5.1.1"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
-
-LICENSE="Apache-2.0"
-SLOT="10"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.15"
-SAPI_SLOT="5.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/glassfish-xmlrpc-api:0
- dev-java/jakartaee-migration:0
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
- dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
- acct-group/tomcat
- acct-user/tomcat
- virtual/jre"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- dev-java/ant-core
- virtual/jdk:1.8
- test? (
- dev-java/ant-junit:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}/${PN}-9.0.43-insufficient-ecj.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/jakarta/{el,servlet} || die
-
- eapply "${FILESDIR}/${PN}-10.0.4-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
- java-ant-2_src_configure
-
- eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
- LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "Please note that since version 10 the primary package for all implemented APIs"
- ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
- ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-9.0.46.ebuild b/www-servers/tomcat/tomcat-9.0.46.ebuild
deleted file mode 100644
index e39b539c70d3..000000000000
--- a/www-servers/tomcat/tomcat-9.0.46.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="5.1.1"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
- https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
-
-LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.15"
-SAPI_SLOT="4.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/glassfish-xmlrpc-api:0
- ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
- dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
- acct-group/tomcat
- acct-user/tomcat
- virtual/jre"
-DEPEND="${COMMON_DEP}
- app-admin/pwgen
- >=dev-java/ant-core-1.9.13
- virtual/jdk:1.8
- test? (
- >=dev-java/ant-junit-1.9:0
- dev-java/easymock:3.2
- )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}/${PN}-9.0.43-insufficient-ecj.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-
- mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
- ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
- ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
-}
-
-src_prepare() {
- default
-
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled servlet-api
- rm -rv java/javax/{el,servlet} || die
-
- eapply "${FILESDIR}/${PN}-9.0.46-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-
- java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
- java-ant-2_src_configure
-
- eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
- LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- # add missing docBase
- local apps="host-manager manager"
- for app in ${apps}; do
- sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
- output/build/webapps/${app}/META-INF/context.xml || die
- done
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw="$(pwgen -s -B 15 1)"
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
- eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
- elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
- elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
- elog "To manage Tomcat instances, run:"
- elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
- einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
- einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index df424aa4aaa5..13010f191e63 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/libfm-qt/libfm-qt-0.17.1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.17.1.ebuild
index 6be4abd5d622..441ffb46be9b 100644
--- a/x11-libs/libfm-qt/libfm-qt-0.17.1.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-0.17.1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
else
SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
fi
LICENSE="BSD GPL-2+ LGPL-2.1+"
diff --git a/x11-libs/pango/pango-1.48.7.ebuild b/x11-libs/pango/pango-1.48.7.ebuild
index 6c0f07e8f455..1557e6e9bf99 100644
--- a/x11-libs/pango/pango-1.48.7.ebuild
+++ b/x11-libs/pango/pango-1.48.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz
LICENSE="LGPL-2+ FTL"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
IUSE="gtk-doc +introspection sysprof test X"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/qtermwidget/qtermwidget-0.17.0.ebuild b/x11-libs/qtermwidget/qtermwidget-0.17.0.ebuild
index 900e0ee37d49..fee9612c3a15 100644
--- a/x11-libs/qtermwidget/qtermwidget-0.17.0.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-0.17.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
else
SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
fi
LICENSE="BSD GPL-2 LGPL-2+"
diff --git a/x11-libs/vte/vte-0.64.2.ebuild b/x11-libs/vte/vte-0.64.2.ebuild
index 4870cb12364d..d606f85d2d0b 100644
--- a/x11-libs/vte/vte-0.64.2.ebuild
+++ b/x11-libs/vte/vte-0.64.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
LICENSE="LGPL-3+ GPL-3+"
SLOT="2.91"
IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
REQUIRED_USE="vala? ( introspection )"
# Upstream is hostile and refuses to upload tarballs.
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 497d5de7d1e5..dd41cdc91797 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0-r1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0-r1.ebuild
index 0e2853aac367..f67891b32962 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0-r1.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0-r1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
else
SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
fi
LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
diff --git a/x11-misc/polybar/polybar-3.5.6.ebuild b/x11-misc/polybar/polybar-3.5.6.ebuild
index 609e610e7997..ebab3b6c6567 100644
--- a/x11-misc/polybar/polybar-3.5.6.ebuild
+++ b/x11-misc/polybar/polybar-3.5.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/polybar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
https://github.com/polybar/xpp/archive/${XPP_COMMIT}.tar.gz -> xpp-${XPP_COMMIT}.tar.gz
https://github.com/polybar/i3ipcpp/archive/${I3IPCPP_COMMIT}.tar.gz -> i3ipcpp-${I3IPCPP_COMMIT}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
LICENSE="MIT"
SLOT="0"
IUSE="alsa curl doc i3wm ipc mpd network pulseaudio"
diff --git a/x11-misc/qps/qps-2.3.0.ebuild b/x11-misc/qps/qps-2.3.0.ebuild
index 284ae332ada8..5a8e4d4a41e0 100644
--- a/x11-misc/qps/qps-2.3.0.ebuild
+++ b/x11-misc/qps/qps-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
LICENSE="GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
BDEPEND="
dev-qt/linguist-tools:5
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index e040dcc5d3bd..7e06b24fbf38 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/qterminal/qterminal-0.17.0.ebuild b/x11-terms/qterminal/qterminal-0.17.0.ebuild
index c19beb9ee0e0..6bc637216f8f 100644
--- a/x11-terms/qterminal/qterminal-0.17.0.ebuild
+++ b/x11-terms/qterminal/qterminal-0.17.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
else
SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
fi
LICENSE="GPL-2 GPL-2+"
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild
similarity index 80%
rename from x11-terms/rxvt-unicode/rxvt-unicode-9.26-r1.ebuild
rename to x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild
index 4fa68cb62a3e..f439e028a7e1 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r1.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild
@@ -36,7 +36,6 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
"${FILESDIR}"/${PN}-9.21-xsubpp.patch
- "${WORKDIR}"/${COLOUR_PATCH_NAME}
)
DOCS=(
Changes
@@ -50,6 +49,11 @@ DOCS=(
src_prepare() {
default
+ # Current patch is too aggressive to apply unconditionally, see Bug #801571
+ if use 24-bit-color; then
+ eapply "${WORKDIR}"/${COLOUR_PATCH_NAME}
+ fi
+
# kill the rxvt-unicode terminfo file - #192083
sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
@@ -59,21 +63,26 @@ src_prepare() {
src_configure() {
# --enable-everything goes first: the order of the arguments matters
- econf --enable-everything \
- $(use_enable 24-bit-color) \
- $(use_enable 256-color) \
- $(use_enable blink text-blink) \
- $(use_enable fading-colors fading) \
- $(use_enable font-styles) \
- $(use_enable gdk-pixbuf pixbuf) \
- $(use_enable iso14755) \
- $(use_enable mousewheel) \
- $(use_enable perl) \
- $(use_enable startup-notification) \
- $(use_enable unicode3) \
- $(use_enable utmp) \
- $(use_enable wtmp) \
+ local myconf=(
+ --enable-everything
+ $(use_enable 256-color)
+ $(use_enable blink text-blink)
+ $(use_enable fading-colors fading)
+ $(use_enable font-styles)
+ $(use_enable gdk-pixbuf pixbuf)
+ $(use_enable iso14755)
+ $(use_enable mousewheel)
+ $(use_enable perl)
+ $(use_enable startup-notification)
+ $(use_enable unicode3)
+ $(use_enable utmp)
+ $(use_enable wtmp)
$(use_enable xft)
+ )
+ if use 24-bit-color; then
+ myconf+=( --enable-24-bit-color )
+ fi
+ econf "${myconf[@]}"
}
src_compile() {
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index dd32bada261f..6e251473f162 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.8.0.ebuild b/x11-themes/QGnomePlatform/QGnomePlatform-0.8.0.ebuild
index ed668a55fa3a..60e88ef7b956 100644
--- a/x11-themes/QGnomePlatform/QGnomePlatform-0.8.0.ebuild
+++ b/x11-themes/QGnomePlatform/QGnomePlatform-0.8.0.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="A Qt Platform Theme aimed to accommodate GNOME settings"
HOMEPAGE="https://github.com/FedoraQt/QGnomePlatform"
SRC_URI="https://github.com/FedoraQt/QGnomePlatform/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
LICENSE="LGPL-2.1"
SLOT="0"
IUSE=""
diff --git a/x11-themes/adwaita-qt/adwaita-qt-1.3.1.ebuild b/x11-themes/adwaita-qt/adwaita-qt-1.3.1.ebuild
index 31e66f05b0ea..c8407ccd926e 100644
--- a/x11-themes/adwaita-qt/adwaita-qt-1.3.1.ebuild
+++ b/x11-themes/adwaita-qt/adwaita-qt-1.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/FedoraQt/${PN}/archive/${PV}/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
IUSE="gnome"
DEPEND="
diff --git a/x11-themes/lxqt-themes/lxqt-themes-0.17.0.ebuild b/x11-themes/lxqt-themes/lxqt-themes-0.17.0.ebuild
index aa6de5cb48e8..c76b8d165681 100644
--- a/x11-themes/lxqt-themes/lxqt-themes-0.17.0.ebuild
+++ b/x11-themes/lxqt-themes/lxqt-themes-0.17.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
else
SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
fi
LICENSE="LGPL-2.1+"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 7b075b29343a..c34b92396cff 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
index 65e8342992a3..fe478ccf2e52 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
@@ -129,5 +129,12 @@ distutils_enable_tests pytest
src_test() {
ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink herbstclient"
ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink herbstluftwm"
+
+ pushd python > /dev/null || die
+ distutils_install_for_testing
+ popd > /dev/null || die
+
+ # Ensure PYTHONPATH is exported, see https://bugs.gentoo.org/801658.
+ export PYTHONPATH
python_test
}
diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
index c167e7f353e2..37035a6a5ff8 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -129,5 +129,12 @@ distutils_enable_tests pytest
src_test() {
ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink herbstclient"
ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink herbstluftwm"
+
+ pushd python > /dev/null || die
+ distutils_install_for_testing
+ popd > /dev/null || die
+
+ # Ensure PYTHONPATH is exported, see https://bugs.gentoo.org/801658.
+ export PYTHONPATH
python_test
}
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 58f22b6df0fe..67f828dda5fb 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,3 +1,2 @@
-DIST icewm-2.3.4.tar.lz 1708239 BLAKE2B d19a7864642795b93a8d30a63c6ba0dcac4ee9b9e3a2b9e314e115aea8200f688ed46f70268f16d09c8c7a02c4ac9653c3937d1b029bdc5b69ddd5d3fba658c9 SHA512 97d613c3dda84bc52d6b31772df5422aef84b6055b7240e90e5e1a5433d0250ad8fde7a01c4d5c3e714265fed4a3feefde3d6e6b4e1433896c16d2b4708edb1a
DIST icewm-2.5.0.tar.lz 1722504 BLAKE2B caf5d61559dd5bb25583bebeaca82e54049e2a97d8e5eeb93942908481f68614cfe55afd4041b5d60e58e732fef1694f67c5918a130bc55b252ebae67a51482a SHA512 1f59b4dbe90ca47031e5abf999cdb23a8e9ea956d5a76a0dde9b3489dec4530bf0ce72e10b337615d0bcadf04007b00a7db6f43082504bef65b109f9115d9f52
DIST icewm-2.6.0.tar.lz 1722772 BLAKE2B 4d7055b77d88d0731517b668f525161a97b571f68cf0b2944e9b364653cb022f0b29d664ccc9539d1807005ab8954aa3ce31244911c2fafaa673ef5afeb447f1 SHA512 fe491c8c59aa530d48a20134857c787eccfeda5bd9529e063d865bd3c5f243ef41fbecba40aa06e7fa8037af89839958095debebc5d9b1acc9b5670bd0e12eb6
diff --git a/x11-wm/icewm/icewm-2.3.4.ebuild b/x11-wm/icewm/icewm-2.3.4.ebuild
deleted file mode 100644
index 6215cdd777d4..000000000000
--- a/x11-wm/icewm/icewm-2.3.4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools unpacker
-
-DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="https://ice-wm.org/ https://github.com/ice-wm/icewm"
-LICENSE="GPL-2"
-SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86"
-IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama"
-
-# Tests broken in all versions, patches welcome, bug #323907, #389533
-RESTRICT="test"
-
-REQUIRED_USE="|| ( alsa ao )"
-#?? ( gdk-pixbuf imlib )
-
-#fix for icewm preversion package names
-S="${WORKDIR}/${P/_}"
-
-# These are the core dependencies of icewm.
-# Look into configure.ac and search for PKG_CHECK_MODULES([CORE]
-CORE_DEPEND="
- media-libs/fontconfig
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrender
-"
-
-RDEPEND="
- ${CORE_DEPEND}
- dev-libs/glib:2
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXrandr
- alsa? (
- media-libs/alsa-lib
- media-libs/libsndfile[alsa]
- )
- ao? (
- media-libs/libao
- media-libs/libsndfile
- )
- bidi? ( dev-libs/fribidi )
- gdk-pixbuf? (
- x11-libs/gdk-pixbuf-xlib
- >=x11-libs/gdk-pixbuf-2.42.0:2
- )
- !gdk-pixbuf? (
- imlib? (
- gnome-base/librsvg:2
- media-libs/imlib2
- )
- !imlib? (
- media-libs/libpng:0=
- virtual/jpeg
- )
- )
- xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
- ${RDEPEND}
- $(unpacker_src_uri_depends)
- x11-base/xorg-proto
- gdk-pixbuf? ( gnome-base/librsvg:2 )
-"
-
-BDEPEND="
- app-text/asciidoc
- virtual/pkgconfig
- nls? ( >=sys-devel/gettext-0.19.8 )
-"
-
-pkg_pretend() {
- if use gdk-pixbuf && use imlib ; then
- einfo 'Confilcting USE flags have been enabled:'
- einfo '"gdk-pixbuf" and "imlib" exclude each other!'
- einfo 'Using "gdk-pixbuf".'
- fi
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local icesound
- if use alsa && use ao ; then
- icesound="alsa,ao"
- elif use alsa ; then
- icesound="alsa"
- elif use ao ; then
- icesound="ao"
- fi
-
- local myconf=(
- --enable-logevents
- --enable-xrandr
- --with-cfgdir="${EPREFIX}"/etc/icewm
- --with-docdir="${EPREFIX}"/usr/share/doc/${PF}/html
- --with-icesound="${icesound}"
- --with-libdir="${EPREFIX}"/usr/share/icewm
- $(use_enable bidi fribidi)
- $(use_enable debug)
- $(use_enable debug logevents)
- $(use_enable gdk-pixbuf)
- $(use_enable imlib imlib2)
- $(use_enable nls i18n)
- $(use_enable nls)
- $(use_enable xinerama)
- )
- if use truetype ; then
- myconf+=(
- --enable-shape
- )
- else
- myconf+=(
- --disable-xfreetype
- --enable-corefonts
- )
- fi
-
- econf "${myconf[@]}"
-
- sed \
- -e "s:/icewm-\$(VERSION)::" \
- -e "s:ungif:gif:" \
- -i src/Makefile || die
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog NEWS README.md TODO VERSION )
-
- default
-
- docinto html
- dodoc doc/icewm.html
- dodoc man/*.html
-
- exeinto /etc/X11/Sessions
- doexe "${FILESDIR}/icewm"
-}
diff --git a/x11-wm/icewm/icewm-2.5.0.ebuild b/x11-wm/icewm/icewm-2.5.0.ebuild
index 0502e23c0f4e..6215cdd777d4 100644
--- a/x11-wm/icewm/icewm-2.5.0.ebuild
+++ b/x11-wm/icewm/icewm-2.5.0.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86"
IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama"
# Tests broken in all versions, patches welcome, bug #323907, #389533
diff --git a/x11-wm/mutter/mutter-40.2.1.ebuild b/x11-wm/mutter/mutter-40.2.1.ebuild
index 1d0000a645b5..8429f5326103 100644
--- a/x11-wm/mutter/mutter-40.2.1.ebuild
+++ b/x11-wm/mutter/mutter-40.2.1.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
test? ( wayland )"
RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
# xorg-server is needed at build and runtime with USE=wayland for Xwayland