From 5b9774380d3c8742954047f8b22854f7ba5aa4d7 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 5 Sep 2024 01:03:58 +0100 Subject: [PATCH 01/19] media-video/libva-utils: Stabilize 2.22.0 arm64, #938850 Signed-off-by: Sam James --- media-video/libva-utils/libva-utils-2.22.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/libva-utils/libva-utils-2.22.0.ebuild b/media-video/libva-utils/libva-utils-2.22.0.ebuild index 0b2ccdb9a7464..b08b407bf80c7 100644 --- a/media-video/libva-utils/libva-utils-2.22.0.ebuild +++ b/media-video/libva-utils/libva-utils-2.22.0.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then EGIT_REPO_URI="https://github.com/intel/libva-utils" else SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" + KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" fi LICENSE="MIT" From 722c9b4ba4b71000c41690f60f65ef48b77f3729 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 5 Sep 2024 01:03:59 +0100 Subject: [PATCH 02/19] sys-apps/systemd: Stabilize 254.17 arm64, #938902 Signed-off-by: Sam James --- sys-apps/systemd/systemd-254.17.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/systemd/systemd-254.17.ebuild b/sys-apps/systemd/systemd-254.17.ebuild index f470a551845e4..594ff20f83e3e 100644 --- a/sys-apps/systemd/systemd-254.17.ebuild +++ b/sys-apps/systemd/systemd-254.17.ebuild @@ -23,7 +23,7 @@ else MY_P=${MY_PN}-${MY_PV} S=${WORKDIR}/${MY_P} SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86" fi inherit bash-completion-r1 linux-info meson-multilib optfeature pam python-single-r1 From 7747dd477bbb887262607b84c53088c8bdae0320 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 5 Sep 2024 01:04:01 +0100 Subject: [PATCH 03/19] sys-apps/systemd: Stabilize 255.11 arm64, #938903 Signed-off-by: Sam James --- sys-apps/systemd/systemd-255.11.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/systemd/systemd-255.11.ebuild b/sys-apps/systemd/systemd-255.11.ebuild index 18938684d3a80..726c67ceab33d 100644 --- a/sys-apps/systemd/systemd-255.11.ebuild +++ b/sys-apps/systemd/systemd-255.11.ebuild @@ -25,7 +25,7 @@ else SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" if [[ ${PV} != *rc* ]] ; then - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86" fi fi From 85ef004f6fd2f4a060ca16a9005db29c9c2f374e Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 5 Sep 2024 01:04:02 +0100 Subject: [PATCH 04/19] dev-libs/openssl: Stabilize 3.0.14 arm64, #938907 Signed-off-by: Sam James --- dev-libs/openssl/openssl-3.0.14.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/openssl/openssl-3.0.14.ebuild b/dev-libs/openssl/openssl-3.0.14.ebuild index 6d9843c050005..e7ad25cf9b87f 100644 --- a/dev-libs/openssl/openssl-3.0.14.ebuild +++ b/dev-libs/openssl/openssl-3.0.14.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then else SRC_URI="mirror://openssl/source/${MY_P}.tar.gz verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}"/${MY_P} From 88400864719f26529533df67462f5470adc3862b Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 5 Sep 2024 01:04:03 +0100 Subject: [PATCH 05/19] net-dns/bind: Stabilize 9.16.50 arm64, #938923 Signed-off-by: Sam James --- net-dns/bind/bind-9.16.50.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-dns/bind/bind-9.16.50.ebuild b/net-dns/bind/bind-9.16.50.ebuild index 4ed4b7ee7847a..95d09246a9b84 100644 --- a/net-dns/bind/bind-9.16.50.ebuild +++ b/net-dns/bind/bind-9.16.50.ebuild @@ -38,7 +38,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" # -berkdb by default re bug #602682 IUSE="berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi" IUSE+=" json ldap lmdb mysql odbc postgres python selinux static-libs test xml +zlib" From 2cd954f31216b24f6f78d5e6dca9195334df6ff4 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 5 Sep 2024 01:04:05 +0100 Subject: [PATCH 06/19] net-dns/bind-tools: Stabilize 9.16.50 arm64, #938923 Signed-off-by: Sam James --- net-dns/bind-tools/bind-tools-9.16.50.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-dns/bind-tools/bind-tools-9.16.50.ebuild b/net-dns/bind-tools/bind-tools-9.16.50.ebuild index adf64d176ab1d..81e0a5f696974 100644 --- a/net-dns/bind-tools/bind-tools-9.16.50.ebuild +++ b/net-dns/bind-tools/bind-tools-9.16.50.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+caps doc gssapi idn libedit readline test xml" # no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687 RESTRICT="!test? ( test )" From 61d3a0160a8671d4be8e019b6c09bed5ddeb8e5f Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 5 Sep 2024 01:04:06 +0100 Subject: [PATCH 07/19] x11-libs/libXtst: Stabilize 1.2.5 arm64, #938940 Signed-off-by: Sam James --- x11-libs/libXtst/libXtst-1.2.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-libs/libXtst/libXtst-1.2.5.ebuild b/x11-libs/libXtst/libXtst-1.2.5.ebuild index c013d72eb18d9..047283382fe58 100644 --- a/x11-libs/libXtst/libXtst-1.2.5.ebuild +++ b/x11-libs/libXtst/libXtst-1.2.5.ebuild @@ -10,7 +10,7 @@ inherit xorg-3 DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] From 36cc97d499a03963c3f654f01ee60d85ad74a5ca Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 5 Sep 2024 01:04:07 +0100 Subject: [PATCH 08/19] x11-apps/x11perf: Stabilize 1.7.0 arm64, #938941 Signed-off-by: Sam James --- x11-apps/x11perf/x11perf-1.7.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-apps/x11perf/x11perf-1.7.0.ebuild b/x11-apps/x11perf/x11perf-1.7.0.ebuild index 92b9b8980e28a..42c6bd23175a5 100644 --- a/x11-apps/x11perf/x11perf-1.7.0.ebuild +++ b/x11-apps/x11perf/x11perf-1.7.0.ebuild @@ -8,7 +8,7 @@ inherit xorg-3 DESCRIPTION="X rendering operation stress test utility" SRC_URI="https://xorg.freedesktop.org/archive/individual/test/${P}.tar.xz" -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" RDEPEND=" media-libs/fontconfig From 96b4e15f524e31047b8e403a978f76d85c8d9deb Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 5 Sep 2024 01:04:09 +0100 Subject: [PATCH 09/19] x11-libs/libXfont2: Stabilize 2.0.7 arm64, #938942 Signed-off-by: Sam James --- x11-libs/libXfont2/libXfont2-2.0.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-libs/libXfont2/libXfont2-2.0.7.ebuild b/x11-libs/libXfont2/libXfont2-2.0.7.ebuild index c85dc0addeaad..bbb938611b4fa 100644 --- a/x11-libs/libXfont2/libXfont2-2.0.7.ebuild +++ b/x11-libs/libXfont2/libXfont2-2.0.7.ebuild @@ -10,7 +10,7 @@ inherit xorg-3 DESCRIPTION="X.Org Xfont library" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="bzip2 truetype" RDEPEND="sys-libs/zlib From 8fada67afd87bbf609df8f9f1be01e60cf7bc853 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 5 Sep 2024 01:04:10 +0100 Subject: [PATCH 10/19] app-shells/fzf: Stabilize 0.54.3 arm64, #938943 Signed-off-by: Sam James --- app-shells/fzf/fzf-0.54.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/fzf/fzf-0.54.3.ebuild b/app-shells/fzf/fzf-0.54.3.ebuild index d28daf5b98384..616369a9c9774 100644 --- a/app-shells/fzf/fzf-0.54.3.ebuild +++ b/app-shells/fzf/fzf-0.54.3.ebuild @@ -19,7 +19,7 @@ SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${P}-deps.tar.xz" LICENSE="MIT BSD-with-disclosure" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" src_prepare() { default From f27a179ecfc8c15fbf8d9de650d6df4b390d630c Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 5 Sep 2024 01:04:12 +0100 Subject: [PATCH 11/19] dev-ruby/json: Stabilize 2.7.2-r1 arm64, #938953 Signed-off-by: Sam James --- dev-ruby/json/json-2.7.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ruby/json/json-2.7.2-r1.ebuild b/dev-ruby/json/json-2.7.2-r1.ebuild index 9edf5b07ed21a..e5fe0e8036569 100644 --- a/dev-ruby/json/json-2.7.2-r1.ebuild +++ b/dev-ruby/json/json-2.7.2-r1.ebuild @@ -20,7 +20,7 @@ SRC_URI="https://github.com/flori/json/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="|| ( BSD-2 Ruby )" SLOT="$(ver_cut 1)" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc test" DEPEND="dev-util/ragel" From 8e8ff4a0496adcba959fb6d4095570b5c6c9c92d Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 5 Sep 2024 01:04:13 +0100 Subject: [PATCH 12/19] app-text/hunspell: Stabilize 1.7.2-r1 arm64, #938963 Signed-off-by: Sam James --- app-text/hunspell/hunspell-1.7.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/hunspell/hunspell-1.7.2-r1.ebuild b/app-text/hunspell/hunspell-1.7.2-r1.ebuild index a5bab72a63743..2063962ef9b71 100644 --- a/app-text/hunspell/hunspell-1.7.2-r1.ebuild +++ b/app-text/hunspell/hunspell-1.7.2-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/hunspell/hunspell/releases/download/v${PV}/${P}.tar. LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )" SLOT="0/$(ver_cut 1-2)" IUSE="ncurses nls readline static-libs" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" virtual/libiconv From 574d1779618384a872000276b7b7a900ef6af712 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 5 Sep 2024 01:04:15 +0100 Subject: [PATCH 13/19] app-text/pandoc-bin: Stabilize 3.3 arm64, #938981 Signed-off-by: Sam James --- app-text/pandoc-bin/pandoc-bin-3.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/pandoc-bin/pandoc-bin-3.3.ebuild b/app-text/pandoc-bin/pandoc-bin-3.3.ebuild index 99deb0ffec22e..1a9e4cefd9f7b 100644 --- a/app-text/pandoc-bin/pandoc-bin-3.3.ebuild +++ b/app-text/pandoc-bin/pandoc-bin-3.3.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="GPL-2+" SLOT="0" -KEYWORDS="-* amd64 ~arm64" +KEYWORDS="-* amd64 arm64" IUSE="+pandoc-symlink" RDEPEND=" From e19f4e6ebc085dc348d62d2f2382da9d85d387ae Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 5 Sep 2024 01:04:16 +0100 Subject: [PATCH 14/19] dev-cpp/robin-hood-hashing: Stabilize 3.11.5-r2 arm64, #939008 Signed-off-by: Sam James --- dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r2.ebuild b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r2.ebuild index a3cb06e4716a0..cc77a55b6b9ff 100644 --- a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r2.ebuild +++ b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r2.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit cmake -KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" SRC_URI="https://github.com/martinus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" DESCRIPTION="Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20" From 2235eff9a4f56b978ccafc7f47a60fb358374dde Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 5 Sep 2024 01:04:17 +0100 Subject: [PATCH 15/19] media-sound/fluidsynth: Stabilize 2.3.6 arm64, #939037 Signed-off-by: Sam James --- media-sound/fluidsynth/fluidsynth-2.3.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/fluidsynth/fluidsynth-2.3.6.ebuild b/media-sound/fluidsynth/fluidsynth-2.3.6.ebuild index ebeadc59760c0..1d8a00ab92855 100644 --- a/media-sound/fluidsynth/fluidsynth-2.3.6.ebuild +++ b/media-sound/fluidsynth/fluidsynth-2.3.6.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="LGPL-2.1+" SLOT="0/3" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv sparc x86" IUSE="alsa dbus debug doc ipv6 jack ladspa lash network oss pipewire portaudio pulseaudio +readline sdl +sndfile systemd threads" BDEPEND=" From d544721c8ea75913e57a6298e7d96742d97b1729 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 5 Sep 2024 01:04:19 +0100 Subject: [PATCH 16/19] dev-libs/expat: Stabilize 2.6.3 sparc, #939074 Signed-off-by: Sam James --- dev-libs/expat/expat-2.6.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/expat/expat-2.6.3.ebuild b/dev-libs/expat/expat-2.6.3.ebuild index 5371997c14974..e844e8e4c1a82 100644 --- a/dev-libs/expat/expat-2.6.3.ebuild +++ b/dev-libs/expat/expat-2.6.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="examples static-libs test unicode" RESTRICT="!test? ( test )" BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )" From 0640f2ece5907aa5d329ad08f6cc3705fb24d953 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 5 Sep 2024 01:04:20 +0100 Subject: [PATCH 17/19] dev-libs/expat: Stabilize 2.6.3 arm, #939074 Signed-off-by: Sam James --- dev-libs/expat/expat-2.6.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/expat/expat-2.6.3.ebuild b/dev-libs/expat/expat-2.6.3.ebuild index e844e8e4c1a82..79592d351c87b 100644 --- a/dev-libs/expat/expat-2.6.3.ebuild +++ b/dev-libs/expat/expat-2.6.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="examples static-libs test unicode" RESTRICT="!test? ( test )" BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )" From 88c9e540fd1e479443b18d4d818c8b80214554fa Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Wed, 4 Sep 2024 18:48:41 -0500 Subject: [PATCH 18/19] app-containers/docker: add 27.2.0 Closes: https://bugs.gentoo.org/938965 Signed-off-by: William Hubbs --- app-containers/docker/Manifest | 1 + app-containers/docker/docker-27.2.0.ebuild | 323 +++++++++++++++++++++ app-containers/docker/metadata.xml | 4 + 3 files changed, 328 insertions(+) create mode 100644 app-containers/docker/docker-27.2.0.ebuild diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest index bb7e59e2b53db..aa4ba4aa2367e 100644 --- a/app-containers/docker/Manifest +++ b/app-containers/docker/Manifest @@ -1,2 +1,3 @@ DIST docker-26.1.0.tar.gz 16390376 BLAKE2B 6703e9b153c430bc28aed2e7de7bada0203353d61f0a2ce3d49ddbd017eab196a685dd1ab1e719a6b287813eb5fa4f2c612e2cf1ab95789d6e79ebe5dac7ace3 SHA512 47b6b9af9947016884614b6bc25977e1db281da95c9b8b34c753c21c664a737a893f9fa65d92cbb897735aae3893567e106e6bababb5507e069b1e0981e48d50 DIST docker-27.1.2.tar.gz 16608463 BLAKE2B 27d8ab2e917c838007f8bc286899ed65e9f9a16d67d77034845ec5b04ef2733887dec3a18c224130823516738fb40c6c731962538b61603e94746e2c32d721a5 SHA512 26f85a1437ba4361dc050861dd9c3ba900f80e4fdc0eaf2bfcba33b6419c5d981c9ee5ab3bea9af208502eca372a2f76c42325abe9e3d2c1b2f725fe7b10df92 +DIST docker-27.2.0.tar.gz 16689537 BLAKE2B faf0bae9f7da127d5b65b9989acd82dc726bc3f09ace502df151b9f03a84b6f1ec2a946d905263aaa7d2e7d7a3cd4ad1a09291dcfc6691e73cc9a8738f150d55 SHA512 97abaf56d2249c1514beacf17fc9096848b960846e064f1a9bd800a59762a1f1888b32e83b3e8289e23656496ca0293fea65931210d68faaa8a713aab6e48b65 diff --git a/app-containers/docker/docker-27.2.0.ebuild b/app-containers/docker/docker-27.2.0.ebuild new file mode 100644 index 0000000000000..4f5f1df2aba3d --- /dev/null +++ b/app-containers/docker/docker-27.2.0.ebuild @@ -0,0 +1,323 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +EGO_PN=github.com/docker/docker +MY_PV=${PV/_/-} +inherit golang-vcs-snapshot linux-info optfeature systemd udev +GIT_COMMIT=3ab5c7d0036ca8fc43141e83b167456ec79828aa + +DESCRIPTION="The core functions you need to create Docker images and run Docker containers" +HOMEPAGE="https://www.docker.com/" +SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="apparmor btrfs +container-init +overlay2 seccomp selinux systemd" + +DEPEND=" + acct-group/docker + >=dev-db/sqlite-3.7.9:3 + apparmor? ( sys-libs/libapparmor ) + btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) + seccomp? ( >=sys-libs/libseccomp-2.2.1 ) + systemd? ( sys-apps/systemd ) +" + +# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies +# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies +RDEPEND=" + ${DEPEND} + >=net-firewall/iptables-1.4 + sys-process/procps + >=dev-vcs/git-1.7 + >=app-arch/xz-utils-4.9 + >=app-containers/containerd-1.7.21[apparmor?,btrfs?,seccomp?] + >=app-containers/runc-1.1.13[apparmor?,seccomp?] + !app-containers/docker-proxy + container-init? ( >=sys-process/tini-0.19.0[static] ) + selinux? ( sec-policy/selinux-docker ) +" + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies +BDEPEND=" + >=dev-lang/go-1.16.12 + dev-go/go-md2man + virtual/pkgconfig +" +# tests require running dockerd as root and downloading containers +RESTRICT="installsources strip test" + +S="${WORKDIR}/${P}/src/${EGO_PN}" + +# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552 +PATCHES=( + "${FILESDIR}/0001-Openrc-Depend-on-containerd-init-script.patch" +) + +pkg_setup() { + # this is based on "contrib/check-config.sh" from upstream's sources + # required features. + CONFIG_CHECK=" + ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS + ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG + ~KEYS + ~VETH ~BRIDGE ~BRIDGE_NETFILTER + ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE + ~NETFILTER_XT_MATCH_ADDRTYPE + ~NETFILTER_XT_MATCH_CONNTRACK + ~NETFILTER_XT_MATCH_IPVS + ~NETFILTER_XT_MARK + ~IP_NF_NAT ~NF_NAT + ~POSIX_MQUEUE + " + WARNING_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: is required for bind-mounting /dev/mqueue into containers" + + if kernel_is lt 4 8; then + CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES + " + fi + + if kernel_is le 5 1; then + CONFIG_CHECK+=" + ~NF_NAT_IPV4 + " + fi + + if kernel_is le 5 2; then + CONFIG_CHECK+=" + ~NF_NAT_NEEDED + " + fi + + if kernel_is ge 4 15; then + CONFIG_CHECK+=" + ~CGROUP_BPF + " + fi + + # optional features + CONFIG_CHECK+=" + ~USER_NS + " + + if use seccomp; then + CONFIG_CHECK+=" + ~SECCOMP ~SECCOMP_FILTER + " + fi + + CONFIG_CHECK+=" + ~CGROUP_PIDS + " + + if kernel_is lt 6 1; then + CONFIG_CHECK+=" + ~MEMCG_SWAP + " + fi + + if kernel_is le 5 8; then + CONFIG_CHECK+=" + ~MEMCG_SWAP_ENABLED + " + fi + + CONFIG_CHECK+=" + ~!LEGACY_VSYSCALL_NATIVE + " + if kernel_is lt 5 19; then + CONFIG_CHECK+=" + ~LEGACY_VSYSCALL_EMULATE + " + fi + CONFIG_CHECK+=" + ~!LEGACY_VSYSCALL_NONE + " + WARNING_LEGACY_VSYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \ + Containers with <=glibc-2.13 will not work" + + if kernel_is le 4 5; then + CONFIG_CHECK+=" + ~MEMCG_KMEM + " + fi + + if kernel_is lt 5; then + CONFIG_CHECK+=" + ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED + " + fi + + CONFIG_CHECK+=" + ~BLK_CGROUP ~BLK_DEV_THROTTLING + ~CGROUP_PERF + ~CGROUP_HUGETLB + ~NET_CLS_CGROUP ~CGROUP_NET_PRIO + ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED + ~IP_NF_TARGET_REDIRECT + ~IP_VS + ~IP_VS_NFCT + ~IP_VS_PROTO_TCP + ~IP_VS_PROTO_UDP + ~IP_VS_RR + " + + if use selinux; then + CONFIG_CHECK+=" + ~SECURITY_SELINUX + " + fi + + if use apparmor; then + CONFIG_CHECK+=" + ~SECURITY_APPARMOR + " + fi + + # if ! is_set EXT4_USE_FOR_EXT2; then + # check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY + # if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then + # echo " $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)" + # fi + # fi + + CONFIG_CHECK+=" + ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY + " + + # if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then + # if is_set EXT4_USE_FOR_EXT2; then + # echo " $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)" + # else + # echo " $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)" + # fi + # fi + + # network drivers + CONFIG_CHECK+=" + ~VXLAN ~BRIDGE_VLAN_FILTERING + ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH + ~XFRM ~XFRM_USER ~XFRM_ALGO ~INET_ESP + " + if kernel_is le 5 3; then + CONFIG_CHECK+=" + ~INET_XFRM_MODE_TRANSPORT + " + fi + + CONFIG_CHECK+=" + ~IPVLAN + " + CONFIG_CHECK+=" + ~MACVLAN ~DUMMY + " + CONFIG_CHECK+=" + ~NF_NAT_FTP ~NF_CONNTRACK_FTP ~NF_NAT_TFTP ~NF_CONNTRACK_TFTP + " + + # storage drivers + if use btrfs; then + CONFIG_CHECK+=" + ~BTRFS_FS + ~BTRFS_FS_POSIX_ACL + " + fi + + CONFIG_CHECK+=" + ~OVERLAY_FS + " + + linux-info_pkg_setup +} + +src_compile() { + export DOCKER_GITCOMMIT="${GIT_COMMIT}" + export GOPATH="${WORKDIR}/${P}" + export VERSION=${PV} + tc-export PKG_CONFIG + + # setup CFLAGS and LDFLAGS for separate build target + # see https://github.com/tianon/docker-overlay/pull/10 + CGO_CFLAGS+=" -I${ESYSROOT}/usr/include" + CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)" + + # let's set up some optional features :) + export DOCKER_BUILDTAGS='' + for gd in btrfs overlay2; do + if ! use $gd; then + DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" + fi + done + + for tag in apparmor seccomp; do + if use $tag; then + DOCKER_BUILDTAGS+=" $tag" + fi + done + + export EXCLUDE_AUTO_BUILDTAG_JOURNALD=$(usex systemd '' 'y') + + # build binaries + ./hack/make.sh dynbinary || die 'dynbinary failed' +} + +src_install() { + dosym containerd /usr/bin/docker-containerd + dosym containerd-shim /usr/bin/docker-containerd-shim + dosym runc /usr/bin/docker-runc + use container-init && dosym tini /usr/bin/docker-init + dobin bundles/dynbinary-daemon/dockerd + dobin bundles/dynbinary-daemon/docker-proxy + for f in dockerd-rootless-setuptool.sh dockerd-rootless.sh; do + dosym ../share/docker/contrib/${f} /usr/bin/${f} + done + + newinitd contrib/init/openrc/docker.initd docker + newconfd contrib/init/openrc/docker.confd docker + + systemd_dounit contrib/init/systemd/docker.{service,socket} + + udev_dorules contrib/udev/*.rules + + dodoc AUTHORS CONTRIBUTING.md NOTICE README.md + dodoc -r docs/* + + # note: intentionally not using "doins" so that we preserve +x bits + dodir /usr/share/${PN}/contrib + cp -R contrib/* "${ED}/usr/share/${PN}/contrib" +} + +pkg_postinst() { + udev_reload + + elog + elog "To use Docker, the Docker daemon must be running as root. To automatically" + elog "start the Docker daemon at boot:" + if systemd_is_booted || has_version sys-apps/systemd; then + elog " systemctl enable docker.service" + else + elog " rc-update add docker default" + fi + elog + elog "To use Docker as a non-root user, add yourself to the 'docker' group:" + elog ' usermod -aG docker ' + elog + + if has_version sys-fs/zfs; then + elog " ZFS storage driver is available" + elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info" + elog + fi + + optfeature "rootless mode support" sys-apps/shadow + optfeature "rootless mode support" sys-apps/rootlesskit + optfeature_header "for rootless mode you also need a network stack" + optfeature "rootless mode network stack" app-containers/slirp4netns +} + +pkg_postrm() { + udev_reload +} diff --git a/app-containers/docker/metadata.xml b/app-containers/docker/metadata.xml index 63036f19e3e50..dfe5565275066 100644 --- a/app-containers/docker/metadata.xml +++ b/app-containers/docker/metadata.xml @@ -25,6 +25,10 @@ Enables dependencies for the "overlay" graph driver, including necessary kernel flags. + + Enables dependencies for the "overlay2" graph driver, including + necessary kernel flags. + moby/moby From a85cf3fe2d7640e174961e5cc348798f8be760fd Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Wed, 4 Sep 2024 18:55:14 -0500 Subject: [PATCH 19/19] app-containers/docker-cli: add 27.2.0 Signed-off-by: William Hubbs --- app-containers/docker-cli/Manifest | 2 + .../docker-cli/docker-cli-27.2.0.ebuild | 72 +++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 app-containers/docker-cli/docker-cli-27.2.0.ebuild diff --git a/app-containers/docker-cli/Manifest b/app-containers/docker-cli/Manifest index 4dbb8662c204e..04aa39b9ea046 100644 --- a/app-containers/docker-cli/Manifest +++ b/app-containers/docker-cli/Manifest @@ -2,3 +2,5 @@ DIST docker-cli-26.1.0-man.tar.xz 79004 BLAKE2B 36dcf969c6567680990420d6d177101b DIST docker-cli-26.1.0.tar.gz 7213165 BLAKE2B 302236467f2b6f3f46b0f0c75e89c2cef0cd251d36e12f78a67c906cfb85b842b998fd3b07f4a2dfc0a04825a9b105d90f11d176055ded397f2d4e9145639d5d SHA512 1a1e9af1a836765ffa91f7f2e1b27911e2b6b373c308a7db332a7cd1825459ab1c04a93d03c9947b631bead0af21d9f03e06c3a60855cc56ca7039e50e38ba87 DIST docker-cli-27.1.2-man.tar.xz 79028 BLAKE2B 7813a44dd4625b9b446f4e2250bae472f994427f26c4c403d9140b2ab11e569e1244e44eb56564bd1ff7becb9a72f3bedb7804a9f10ad6c2250aea5ae572caf3 SHA512 a45f6d4785880203a147e26397ad22ad06384b2f7ee0d8598993a77d7ec145175be7fac3d47f826da1c1425885c720edee77f6ddd65986c116907b34a73771c9 DIST docker-cli-27.1.2.tar.gz 7142511 BLAKE2B ddfe471dd9628660d56ebaf7cdde4ed6c2047b91725c9f9d4bff08cfa8a51637d45dc3b6c0a08fa98c636c2b6c32759bd53e9db6e606c5e77cd21fa409ab12fd SHA512 5c75d32c8e9598282de32ac8a2ebbc2eda712a010449edbd6e66f0652c4e02b124df70596d9f1076de3c4a95920b4cc16c35fb343624de1363557ab48976e153 +DIST docker-cli-27.2.0-man.tar.xz 79052 BLAKE2B 019299b8cd0adbb1a3749f9aa37b1e38bf212b2c13eee81ae49f843bcc56ff3f41413e1021bebf5c88b4406d7928c2c40de026df861195aa2df79d9c724f8b87 SHA512 d61d6f9f9139f2d22268932d795a50e7b9b1ff993699ba87ca9353cb9908ac18c103a34ee9a486f3537988d6ba7317b05588cd84ff8327b86826ab7ed5023947 +DIST docker-cli-27.2.0.tar.gz 7236608 BLAKE2B 828f002d83de47efad370e28df2f5e50f75da7952bf4fcbe30d3d66c9bc281ee99fab820f7bca002c8eb13fa29b7518e951974b62008e213662c1d384a286c0d SHA512 5dce9e974a96b2518a73d50a9421d12feeb9cc792bb89000f26e04a91fdddade2648dea39aa721e48c9b07bfc18f7a6676fb7e286ae779556753886ec45e86c3 diff --git a/app-containers/docker-cli/docker-cli-27.2.0.ebuild b/app-containers/docker-cli/docker-cli-27.2.0.ebuild new file mode 100644 index 0000000000000..704097070ac4e --- /dev/null +++ b/app-containers/docker-cli/docker-cli-27.2.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +GIT_COMMIT=3ab42569583b58dbc6f167d842d5a3dd5972065f + +EGO_PN="github.com/docker/cli" +MY_PV=${PV/_/-} +inherit bash-completion-r1 golang-vcs-snapshot + +DESCRIPTION="the command line binary for docker" +HOMEPAGE="https://www.docker.com/" +SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="hardened selinux" + +RDEPEND="!