Merge updates from master

11 files changed, 10 insertions, 171 deletions

diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.17.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.17.ebuild
index 8e150d3d2590..440d44e0a658 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.17.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.17.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.76.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.76.ebuild
index 9aed30f65a2e..888295412849 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.76.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.76.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.59.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.59.ebuild
index c53c20eb8511..f1c865a27bec 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.59.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.59.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-ruby/ffi/ffi-1.15.5.ebuild b/dev-ruby/ffi/ffi-1.15.5.ebuild
index 9f967080b22d..540bad8c2d60 100644
--- a/dev-ruby/ffi/ffi-1.15.5.ebuild
+++ b/dev-ruby/ffi/ffi-1.15.5.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND+=" dev-libs/libffi:="
 DEPEND+=" dev-libs/libffi:="
diff --git a/eclass/emboss-r2.eclass b/eclass/emboss-r2.eclass
deleted file mode 100644
index 65e1c83f16d9..000000000000
--- a/eclass/emboss-r2.eclass
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# Removal on 2022-03-15.
-
-# @ECLASS: emboss-r2.eclass
-# @MAINTAINER:
-# sci-biology@gentoo.org
-# ted.tanberry@gmail.com
-# @AUTHOR:
-# Original author: Author Olivier Fisette <ofisette@gmail.com>
-# Next gen author: Justin Lecher <jlec@gentoo.org>
-# Next gen author: Ted Tanberry <ted.tanberry@gmail.com>
-# @SUPPORTED_EAPIS: 7
-# @BLURB: Use this to easy install EMBOSS and EMBASSY programs (EMBOSS add-ons).
-# @DESCRIPTION:
-# The inheriting ebuild must provide EBO_DESCRIPTION before the inherit line.
-#
-# Example:
-#
-# EAPI=7
-#
-# EBO_DESCRIPTION="applications from the CBS group"
-#
-# inherit emboss-r2
-
-# @ECLASS_VARIABLE: EBO_DESCRIPTION
-# @PRE_INHERIT
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Completes the generic description of the embassy module as follows:
-#
-# EMBOSS integrated version of ${EBO_DESCRIPTION}, e.g.
-#
-# "EMBOSS integrated version of applications from the CBS group"
-#
-# Defaults to the upstream name of the module.
-
-case ${EAPI:-0} in
-	[0-6]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
-	7)     ;;
-	*)     die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
-esac
-
-if [[ ! ${_EMBOSS_R2_ECLASS} ]]; then
-_EMBOSS_R2_ECLASS=1
-
-inherit autotools flag-o-matic
-
-HOMEPAGE="http://emboss.sourceforge.net/"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-IUSE="mysql pdf png postgres X"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/libpcre:3
-	sci-libs/plplot:=
-	sys-libs/zlib
-	mysql? ( dev-db/mysql-connector-c:0= )
-	pdf? ( media-libs/libharu:= )
-	png? ( media-libs/gd:2=[png] )
-	postgres? ( dev-db/postgresql:= )
-	X? ( x11-libs/libXt )"
-
-if [[ ${PN} == embassy-* ]]; then
-	EMBASSY_PACKAGE=yes
-	# The EMBASSY package name, retrieved from the inheriting ebuild's name
-	EN=${PN:8}
-	# The full name and version of the EMBASSY package (excluding the Gentoo
-	# revision number)
-	EF="${EN^^}-${PV}"
-
-	[[ ${EBO_DESCRIPTION} ]] || die "EBO_DESCRIPTION was not set before inheriting emboss-r2.eclass"
-
-	DESCRIPTION="EMBOSS integrated version of ${EBO_DESCRIPTION}"
-	SRC_URI="ftp://emboss.open-bio.org/pub/EMBOSS/${EF}.tar.gz -> embassy-${EN}-${PV}.tar.gz"
-	RDEPEND+=" >=sci-biology/emboss-6.6.0-r1[mysql=,pdf=,png=,postgres=,X=]"
-
-	S="${WORKDIR}/${EF}"
-fi
-
-DEPEND="${RDEPEND}"
-
-# @ECLASS_VARIABLE: EBO_EAUTORECONF
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# If set, run eautoreconf from autotools.eclass after applying patches
-# in emboss-r2_src_prepare.
-
-# @FUNCTION: emboss-r2_src_prepare
-# @DESCRIPTION:
-# Does the following things
-#
-#  1. Renames configure.in to configure.ac, if possible
-#  2. Calls default_src_prepare (i.e. applies Gentoo and user patches)
-#  3. If EBO_EAUTORECONF is set, run eautoreconf
-
-emboss-r2_src_prepare() {
-	if [[ -e configure.in ]]; then
-		mv configure.{in,ac} || die
-	fi
-
-	default
-	[[ ${EBO_EAUTORECONF} ]] && eautoreconf
-}
-
-# @FUNCTION: emboss-r2_src_configure
-# @DESCRIPTION:
-# runs econf with following options.
-#
-#  --enable-shared
-#  --disable-static
-#  $(use_with X x)
-#  $(use_with png pngdriver)
-#  $(use_with pdf hpdf)
-#  $(use_with mysql mysql)
-#  $(use_with postgres postgresql)
-#  --enable-large
-#  --without-java
-#  --enable-systemlibs
-#
-#  can be appended to like econf, e.g.
-#    emboss-r2_src_configure --enable-foo
-
-emboss-r2_src_configure() {
-	local myconf=(
-		--enable-shared
-		--disable-static
-		$(use_with X x)
-		$(use_with png pngdriver "${EPREFIX}"/usr)
-		$(use_with pdf hpdf "${EPREFIX}"/usr)
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
-		$(use_with postgres postgresql "${EPREFIX}"/usr/bin/pg_config)
-		--enable-large
-		--without-java
-		--enable-systemlibs
-	)
-
-	[[ ${EMBASSY_PACKAGE} == yes ]] && \
-		append-cppflags "-I${EPREFIX}/usr/include/emboss"
-
-	econf "${myconf[@]}" "$@"
-}
-
-# @FUNCTION: emboss-r2_src_install
-# @DESCRIPTION:
-# Installs the package into the staging area and removes unnecessary .la files.
-
-emboss-r2_src_install() {
-	default
-
-	# delete .la files
-	find "${ED}" -name '*.la' -delete || die
-}
-
-fi
-
-EXPORT_FUNCTIONS src_prepare src_configure src_install
diff --git a/media-gfx/pngnq/pngnq-1.1-r1.ebuild b/media-gfx/pngnq/pngnq-1.1-r1.ebuild
index f8d71e93fc9d..4558a9745a30 100644
--- a/media-gfx/pngnq/pngnq-1.1-r1.ebuild
+++ b/media-gfx/pngnq/pngnq-1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD pngnq rwpng"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="media-libs/libpng:0="
 DEPEND="${RDEPEND}"
diff --git a/media-libs/libsdl2/libsdl2-2.0.20-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.20-r1.ebuild
index b3b23e5e783f..5b1fd5e3b71b 100644
--- a/media-libs/libsdl2/libsdl2-2.0.20-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.20-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 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="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/sys-process/parallel/parallel-20220222-r1.ebuild b/sys-process/parallel/parallel-20220222-r1.ebuild
index b107cc8a44e1..c3b6c6f0a019 100644
--- a/sys-process/parallel/parallel-20220222-r1.ebuild
+++ b/sys-process/parallel/parallel-20220222-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="dev-lang/perl:=
 	dev-perl/Devel-Size
diff --git a/www-servers/tomcat/tomcat-10.0.17.ebuild b/www-servers/tomcat/tomcat-10.0.17.ebuild
index 2d8f92da7a35..1880f8d73eaa 100644
--- a/www-servers/tomcat/tomcat-10.0.17.ebuild
+++ b/www-servers/tomcat/tomcat-10.0.17.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="10"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="amd64 ~amd64-linux"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.5.76.ebuild b/www-servers/tomcat/tomcat-8.5.76.ebuild
index 67b6462910bf..00727fd8a0a6 100644
--- a/www-servers/tomcat/tomcat-8.5.76.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.76.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-9.0.59.ebuild b/www-servers/tomcat/tomcat-9.0.59.ebuild
index bd49dfe74c96..164acb30f6e5 100644
--- a/www-servers/tomcat/tomcat-9.0.59.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.59.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="9"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?