Merge updates from master

16 files changed, 25 insertions, 14 deletions

diff --git a/app-arch/tar/tar-1.35.ebuild b/app-arch/tar/tar-1.35.ebuild
index 46235bfc382e..5445ec29fecf 100644
--- a/app-arch/tar/tar-1.35.ebuild
+++ b/app-arch/tar/tar-1.35.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 LICENSE="GPL-3+"
 SLOT="0"
 if [[ -z "$(ver_cut 3)" || "$(ver_cut 3)" -lt 90 ]] ; then
-	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"
 fi
 IUSE="acl minimal nls selinux xattr"
 
diff --git a/dev-libs/crypto++/crypto++-8.8.0.ebuild b/dev-libs/crypto++/crypto++-8.8.0.ebuild
index 4b8afe50cf4c..1c34253d4269 100644
--- a/dev-libs/crypto++/crypto++-8.8.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.8.0.ebuild
@@ -25,7 +25,7 @@ LICENSE="Boost-1.0"
 # "recompile of programs required". Even if it doesn't,
 # verify with abidiff!
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv sparc ~x86 ~x64-macos"
 IUSE="+asm static-libs"
 
 BDEPEND="
diff --git a/dev-perl/HTTP-Date/HTTP-Date-6.60.0.ebuild b/dev-perl/HTTP-Date/HTTP-Date-6.60.0.ebuild
index 9d0e62b2a304..153e487ed588 100644
--- a/dev-perl/HTTP-Date/HTTP-Date-6.60.0.ebuild
+++ b/dev-perl/HTTP-Date/HTTP-Date-6.60.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Date conversion for HTTP date formats"
 
 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"
 
 RDEPEND="
 	!<dev-perl/libwww-perl-6
diff --git a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.110.0.ebuild b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.110.0.ebuild
index 700f19d70f7f..bf72abb1f798 100644
--- a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.110.0.ebuild
+++ b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.110.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provide https support for LWP::UserAgent"
 
 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-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-perl/IO-Socket-SSL-1.970.0
diff --git a/dev-perl/List-SomeUtils/List-SomeUtils-0.590.0.ebuild b/dev-perl/List-SomeUtils/List-SomeUtils-0.590.0.ebuild
index 013769fe7d04..40cef25251c2 100644
--- a/dev-perl/List-SomeUtils/List-SomeUtils-0.590.0.ebuild
+++ b/dev-perl/List-SomeUtils/List-SomeUtils-0.590.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Collection of List utilities missing from List::Util"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Perl-Tidy/Perl-Tidy-20230701.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20230701.0.0.ebuild
index 3ed7c19e1e49..0815215aba8b 100644
--- a/dev-perl/Perl-Tidy/Perl-Tidy-20230701.0.0.ebuild
+++ b/dev-perl/Perl-Tidy/Perl-Tidy-20230701.0.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://perltidy.sourceforge.net/ https://metacpan.org/release/Perl-Ti
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~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"
 
 BDEPEND="virtual/perl-ExtUtils-MakeMaker"
 
diff --git a/dev-perl/Test-Differences/Test-Differences-0.700.0.ebuild b/dev-perl/Test-Differences/Test-Differences-0.700.0.ebuild
index f91f09765879..043656819f10 100644
--- a/dev-perl/Test-Differences/Test-Differences-0.700.0.ebuild
+++ b/dev-perl/Test-Differences/Test-Differences-0.700.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Test strings and data structures and show differences if not ok"
 
 SLOT="0"
-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="
 	>=dev-perl/Capture-Tiny-0.240.0
diff --git a/dev-perl/Test-Trap/Test-Trap-0.3.5.ebuild b/dev-perl/Test-Trap/Test-Trap-0.3.5.ebuild
index 74006389dddb..ab1a1de91c33 100644
--- a/dev-perl/Test-Trap/Test-Trap-0.3.5.ebuild
+++ b/dev-perl/Test-Trap/Test-Trap-0.3.5.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Trap exit codes, exceptions, output, etc"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/XML-LibXML/XML-LibXML-2.20.900.ebuild b/dev-perl/XML-LibXML/XML-LibXML-2.20.900.ebuild
index cb5a76680737..0d597a71349e 100644
--- a/dev-perl/XML-LibXML/XML-LibXML-2.20.900.ebuild
+++ b/dev-perl/XML-LibXML/XML-LibXML-2.20.900.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl binding for libxml2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 IUSE="minimal"
 
 # >= on XML-Sax needed to avoid "miscompilation" (essentially empty install), as newer XML-Sax
diff --git a/dev-perl/YAML-LibYAML/YAML-LibYAML-0.880.0.ebuild b/dev-perl/YAML-LibYAML/YAML-LibYAML-0.880.0.ebuild
index 3e1cd3fff1c0..0550df3c3547 100644
--- a/dev-perl/YAML-LibYAML/YAML-LibYAML-0.880.0.ebuild
+++ b/dev-perl/YAML-LibYAML/YAML-LibYAML-0.880.0.ebuild
@@ -9,6 +9,6 @@ inherit perl-module
 
 DESCRIPTION="Perl YAML Serialization using XS and libyaml"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 PERL_RM_FILES=("t/author-pod-syntax.t")
diff --git a/dev-ruby/sqlite3/sqlite3-1.6.3-r1.ebuild b/dev-ruby/sqlite3/sqlite3-1.6.3-r1.ebuild
index ba4ed4569046..6185fa3199bd 100644
--- a/dev-ruby/sqlite3/sqlite3-1.6.3-r1.ebuild
+++ b/dev-ruby/sqlite3/sqlite3-1.6.3-r1.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="An extension library to access a SQLite database from Ruby"
 HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
 LICENSE="BSD"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/media-libs/exiftool/exiftool-12.64.ebuild b/media-libs/exiftool/exiftool-12.64.ebuild
index 4f47cffcf1e2..19b7685b4fd8 100644
--- a/media-libs/exiftool/exiftool-12.64.ebuild
+++ b/media-libs/exiftool/exiftool-12.64.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://exiftool.org/ https://exiftool.sourceforge.net"
 SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~ppc ppc64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 arm64 ppc ppc64 ~x86 ~x64-macos"
 IUSE="doc"
 
 src_install() {
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index cbddc6b7042e..70185d8cdc00 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,11 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Hans de Graaff <graaff@gentoo.org> (2023-08-19)
+# Ruby 3.0 is not compatible with OpenSSL 3. Please upgrade to a newer
+# Ruby version.
+ruby_targets_ruby30
+
 # Michael Orlitzky <mjo@gentoo.org> (2023-08-11)
 # PHP 7.x is end-of-life. Please upgrade to a newer slot.
 php_targets_php7-3
diff --git a/profiles/package.mask b/profiles/package.mask
index 0f7b3445b644..efa2cb51031a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (2023-08-19)
+# Ruby 3.0 is not compatible with OpenSSL 3 and consequently will be
+# masked earlier than its upstream EOL date. Please use a newer Ruby
+# version instead. Masked for removal on 2023-09-19.
+dev-lang/ruby:3.0
+
 # Sam James <sam@gentoo.org> (2023-08-18)
 # Masked for testing.
 =sys-libs/zlib-1.3-r1
diff --git a/sys-auth/passwdqc/passwdqc-2.0.3.ebuild b/sys-auth/passwdqc/passwdqc-2.0.3.ebuild
index 61e9f9ed8fb4..e6db275d8d89 100644
--- a/sys-auth/passwdqc/passwdqc-2.0.3.ebuild
+++ b/sys-auth/passwdqc/passwdqc-2.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.openwall.com/${PN}/${P}.tar.gz"
 
 LICENSE="Openwall BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	sys-libs/pam
diff --git a/www-servers/lighttpd/lighttpd-1.4.71.ebuild b/www-servers/lighttpd/lighttpd-1.4.71.ebuild
index 5e66877d0ed9..185c91df3348 100644
--- a/www-servers/lighttpd/lighttpd-1.4.71.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.71.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.t
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-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"
 IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls mmap mysql +nettle nss +pcre php postgres rrdtool sasl selinux ssl sqlite +system-xxhash test unwind webdav xattr +zlib zstd"
 RESTRICT="!test? ( test )"