2021-08-03 18:21:54 UTC

Add Debian patch to fix a sigabrt on hardened kernels.

Closes: https://bugs.gentoo.org/732162
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Hans de Graaff <graaff@gentoo.org>

acct-user/karma/karma-0.ebuild

@@ -7,7 +7,7 @@ inherit acct-user
 
 DESCRIPTION="A user for www-apps/karma-bin"
 
-ACCT_user_ID=118
+ACCT_USER_ID=118
 ACCT_USER_GROUPS=( karma )
 
 acct-user_add_deps

app-admin/hddtemp/hddtemp-0.3_beta15-r29.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=7
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
 IUSE="network-cron nls selinux"
 
 DEPEND=""

app-arch/zstd/zstd-1.5.0.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-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"
+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"
 IUSE="lz4 static-libs +threads"
 
 RDEPEND="app-arch/xz-utils

app-crypt/trousers/trousers-0.3.15.ebuild

@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~m68k ~ppc ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~m68k ~ppc ppc64 ~riscv ~s390 x86"
 IUSE="doc selinux" # gtk
 
 # gtk support presently does NOT compile.

app-doc/selflinux/selflinux-0.13.0.ebuild

@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="SelfLinux-${PV}"
-
-DESCRIPTION="german-language hypertext tutorial about Linux"
-HOMEPAGE="http://selflinux.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}-html.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-src_install() {
-	dohtml * -r
-}

app-emulation/docker-compose/docker-compose-1.29.2.ebuild

@@ -15,7 +15,7 @@ SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

app-emulation/virtualbox/files/virtualbox-6.1.26-configure-include-qt5-path.patch

@@ -0,0 +1,15 @@
+https://www.virtualbox.org/changeset/90377/vbox
+https://bugs.gentoo.org/805350
+https://bugs.gentoo.org/805365
+
+--- VirtualBox-6.1.26/configure
++++ VirtualBox-6.1.26/configure
+@@ -1624,6 +1624,8 @@ EOF
+         else
+           # Strip .../QtCore as we add components ourself:
+           INCQT5=`echo "$INCQT5"|$KBUILD_SED 's|\([^ ]*\)/QtCore|\1|g; s| $||g'`
++          # Strip .../QtGui as we add components ourself:
++          INCQT5=`echo "$INCQT5"|$KBUILD_SED 's|\([^ ]*\)/QtGui|\1|g; s| $||g'`
+           # store only the first path, remove all other paths
+           # most likely pkg-config gave us -I/usr/include/qt5 -I/usr/include/qt5/QtCore
+           INCQT5=`echo "$INCQT5"|$KBUILD_SED 's|\([^ ]*\) .*|\1|'`

app-emulation/virtualbox/virtualbox-6.1.26.ebuild

@@ -211,6 +211,8 @@ src_prepare() {
 		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
 	fi
 
+	eapply "${FILESDIR}/${P}-configure-include-qt5-path.patch" #805365
+
 	eapply "${WORKDIR}/patches"
 
 	default

app-forensics/aflplusplus/aflplusplus-3.13c-r1.ebuild

@@ -14,7 +14,7 @@ S="${WORKDIR}/AFLplusplus-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

app-misc/remind/Manifest

@@ -1,2 +1 @@
-DIST remind-03.01.15.tar.gz 363101 BLAKE2B a5e27b83c20428991982c3cae22b32be6cc054bfd51a868ee3515f5ec4a37aa24f8ec476f566860ca0fbb6f29e7c9f3e6ed023714e52091ebca103162936877f SHA512 335f3ca88237f1ae53768b9ecdeb03f0bb1e706a8afd3ba36121ec76048a08fbc0d5ec72b05e552394b4cf2131be335c49533e1212b7e713ef16002a0621fc84
 DIST remind-03.03.05.tar.gz 402481 BLAKE2B 8fabc3269a06aaf3502c2245653442ddf6c101c3f62718769418c28850da467d210f381ef3452e95b6dbc921fe06979b4c38be8b7389a9defd76865da66080f3 SHA512 56b37dfc50a6c6a8a284691d7f1c39d542b7309ec12a029c65b68f7921cd43521d3cef9fc8d21f4a9f4a7609b0e00013e7f2793b529f39f80d63ae1fe5194fd4

app-misc/remind/remind-03.01.15.ebuild

@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Ridiculously functional reminder program"
-HOMEPAGE="http://www.roaringpenguin.com/products/remind"
-SRC_URI="http://www.roaringpenguin.com/files/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="tk"
-
-RDEPEND="tk? ( dev-lang/tk dev-tcltk/tcllib )"
-
-DOCS="docs/WHATSNEW examples/defs.rem www/README.*"
-
-src_prepare() {
-	sed -i 's:$(MAKE) install:&-nostripped:' "${S}"/Makefile || die
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		ewarn "Testing fails if run as root. Skipping tests."
-	else
-		emake test
-	fi
-}
-
-src_install() {
-	default
-	dobin www/rem2html
-
-	if ! use tk ; then
-		rm "${D}"/usr/bin/tkremind "${D}"/usr/share/man/man1/tkremind* \
-			"${D}"/usr/bin/cm2rem*  "${D}"/usr/share/man/man1/cm2rem*
-	fi
-
-	rm "${S}"/contrib/rem2ics-*/{Makefile,rem2ics.spec} || die
-	insinto /usr/share/${PN}
-	doins -r contrib/
-}

app-misc/ttyload/files/ttyload-0.5.3-fix-sigabrt-in-strcpy.patch

@@ -0,0 +1,16 @@
+Subject: Fix SIGABRT in strcpy() call when running
+From: Ricardo Mones <mones@debian.org>
+Forwarded: https://github.com/lindes/ttyload/issues/8
+Last-Update: 2019-01-13
+
+--- a/ttyload.h
++++ b/ttyload.h
+@@ -34,7 +34,7 @@ typedef struct load_list {
+ /* storage for clock display along the bottom */
+ typedef struct clock_info {
+ 	int	pos;
+-	char	clock[6];
++	char	clock[7];
+         time_t  when;
+     } clock_info;
+ 

app-misc/ttyload/ttyload-0.5.3-r1.ebuild

@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="color-coded graph of load averages over time"
+HOMEPAGE="https://www.daveltd.com/src/util/ttyload https://github.com/lindes/ttyload"
+SRC_URI="https://www.daveltd.com/src/util/${PN}/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="ISC"
+SLOT="0"
+
+DEPEND="sys-libs/ncurses:0="
+
+RESTRICT="test"
+
+DOCS=( BUGS HISTORY LICENSE README.md TODO )
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}/ttyload-0.5.3-fix-sigabrt-in-strcpy.patch"
+
+	sed -i '10i#include <time.h>' "${PN}.h" || die
+
+	sed -e "s#make#$\(MAKE\)#" \
+		-e "s#^CFLAGS.*#CFLAGS=\$(INCLUDES) ${CFLAGS} \$(VERSION)#" \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin "${PN}"
+	doman "${PN}.1"
+	einstalldocs
+}

app-misc/uptimed/uptimed-0.4.2.ebuild

@@ -12,7 +12,6 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
-IUSE="static-libs"
 
 RDEPEND="
 	acct-group/uptimed
@@ -29,7 +28,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {

app-misc/uptimed/uptimed-0.4.3.ebuild

@@ -12,7 +12,6 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="static-libs"
 
 RDEPEND="
 	acct-group/uptimed
@@ -29,7 +28,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {

app-misc/uptimed/uptimed-0.4.4.ebuild

@@ -12,7 +12,6 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="static-libs"
 
 RDEPEND="
 	acct-group/uptimed
@@ -26,10 +25,6 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
 src_install() {
 	local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
 	default

app-office/kmymoney/Manifest

@@ -1,2 +1 @@
-DIST kmymoney-5.1.1.tar.xz 12059768 BLAKE2B 8b41bce8804d757ba9c801c7b1eeb214a8983c4686a9663a4b5255460139593b7f70e29f08294df810a02eab4190dc6de852be091760981fd84ff8191fda82a3 SHA512 2ed3e47b2e65c9d9e5a11b55f0d425192331b21d64f8a4a4f8921fdd67eac219bf3ae1418026071218d823acc9a36905dc5c499cb0ae2af4ced0e32d1720bf59
 DIST kmymoney-5.1.2.tar.xz 12640912 BLAKE2B 72abd190914eef258e6745ca9835de14bdb2060b0d025f8bdb1bc0e12b773fc891b143fe36adb8b7afcc86498601f6e1a7f9485f9a11c875f4c75bfe01d93738 SHA512 38c60998be4e3ffb49091eb2085b293c2d5265f6582e980d2dc60a66a00862b6afd3e2152c752a9fb14a7bf8b6255a0c39b69b65e2f5c976f23d965e3a1cdf46

app-office/kmymoney/kmymoney-5.1.1-r1.ebuild

@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_BRANCH="5.1"
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Personal finance manager based on KDE Frameworks"
-HOMEPAGE="https://kmymoney.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities addressbook calendar hbci holidays"
-[[ ${KDE_BUILD_TYPE} = live ]] && IUSE+=" experimental"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	>=app-crypt/gpgme-1.7.1-r1[cxx]
-	>=app-office/libalkimia-7.0.0:=
-	dev-db/sqlcipher
-	dev-libs/gmp:0=[cxx(+)]
-	dev-libs/kdiagram:5
-	dev-libs/libgpg-error
-	dev-libs/libofx:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	addressbook? (
-		kde-apps/akonadi:5
-		kde-apps/kidentitymanagement:5
-		>=kde-frameworks/kcontacts-${KFMIN}:5
-	)
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=net-libs/aqbanking-6.0.1
-		>=sys-libs/gwenhywfar-5.1.2:=[qt5]
-	)
-	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-pkg_setup() {
-	ecm_pkg_setup
-
-	if [[ ${KDE_BUILD_TYPE} = live ]] && use experimental; then
-		ewarn "USE experimental set: Building unfinished features."
-		ewarn "This *will* chew up your data. You have been warned."
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OFXIMPORTER=ON
-		-DENABLE_WEBENGINE=ON
-		-DENABLE_WEBOOB=OFF
-		-DUSE_QT_DESIGNER=OFF
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package addressbook KF5Akonadi)
-		$(cmake_use_find_package addressbook KF5Contacts)
-		$(cmake_use_find_package addressbook KF5IdentityManagement)
-		-DENABLE_LIBICAL=$(usex calendar)
-		-DENABLE_KBANKING=$(usex hbci)
-		$(cmake_use_find_package holidays KF5Holidays)
-	)
-	[[ ${KDE_BUILD_TYPE} = live ]] &&
-		mycmakeargs+=( -DENABLE_UNFINISHEDFEATURES=$(usex experimental) )
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 652636; bug 673052: needs kmymoney installed to succeed
-	local myctestargs=(
-		-E "(reports-chart-test|qsqlcipher-test)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "more options for online stock quote retrieval" dev-perl/Finance-Quote
-	fi
-	if has_version "app-office/kmymoney[quotes]"; then
-		elog "Please note: IUSE=quotes flag is gone in ${PN}-5.1.1. ${PN} still"
-		elog "does online stock quote retrieval without it, but dev-perl/Finance-Quote"
-		elog "may provide additional sources. To keep the functionality, run:"
-		elog "  emerge --noreplace dev-perl/Finance-Quote"
-	fi
-	ecm_pkg_postinst
-}

app-office/kmymoney/kmymoney-5.1.2.ebuild

@@ -17,7 +17,7 @@ HOMEPAGE="https://kmymoney.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"

app-portage/eix/eix-0.35.2.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
 IUSE="debug doc nls sqlite"
 
 DEPEND="

app-text/bibletime/Manifest

@@ -1 +1,2 @@
+DIST bibletime-3.0.1.tar.xz 1630180 BLAKE2B fe03cc8396f44ba0d68e27d50f60435c9d9501b620278c5d7565bea50c18f711675ac1020c6738790eb8452380ed974cba1a41bfb6f87778224d814c63e10aa3 SHA512 217e45c034d8fd8de4b7ef936f340a613fd7046b4700f828edd6d6f32f4bad4ecda2ec2c4425461af39c6926170fe080406238780e3c63bdbe0273679e0aef94
 DIST bibletime-3.0.tar.xz 1568732 BLAKE2B f1e9cb23d64d566d8b0934cfbdffabb52193f240523ad3ba79bbf0e3cd3ff516354791bf0b057354820cd3303c01d3ec50aa61f2e7843b1083c74d442d915a89 SHA512 85afc2781807345ea8fdefea6d179955fa76085c0a9c97e47321ea37ef9ea05367678c54bacfc10cf1d6085d46ba6fbd1c7d448044ffdfe3c96007ee8d7e5c00

app-text/bibletime/bibletime-3.0.1.ebuild

@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt Bible-study application using the SWORD library"
+HOMEPAGE="https://bibletime.info/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=app-text/sword-1.8.1
+	dev-cpp/clucene
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-libs/icu:=
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+	net-misc/curl
+	sys-libs/zlib"
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
+		-i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_HANDBOOK_HTML=no
+		-DBUILD_HANDBOOK_PDF=no
+		-DBUILD_HOWTO_HTML=no
+		-DBUILD_HOWTO_PDF=no
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}

app-text/kchmviewer/Manifest

@@ -0,0 +1 @@
+DIST kchmviewer-8.0.tar.gz 311899 BLAKE2B f317dcc17fa88f30a4a1867b59b16bdc78457b46f4f3d3b78bd5d9d50745bf2d2329df170568c7814a02814a77b319bbd1d9f8edc3c1da0071a6ce64965b26bf SHA512 28ae8ee8a6f4a9be2e8a9666f6326906e04f34ad80a363697fc7e5bfbc745e6671884add3f57b6a1264f2056428cb0a31504da9c69a0bede0c3b485a08e75048

app-text/kchmviewer/files/kchmviewer-8.0-custom-url-scheme-registration.patch

@@ -0,0 +1,59 @@
+From 9ac73e7ad15de08aab6b1198115be2eb44da7afe Mon Sep 17 00:00:00 2001
+From: George Yunaev <gyunaev@ulduzsoft.com>
+Date: Fri, 21 May 2021 15:57:21 -0700
+Subject: [PATCH] Custom URL scheme registration needs to be applied once per
+ https://doc.qt.io/qt-5/qwebengineurlschemehandler.html
+
+---
+ src/viewwindow_webengine.cpp | 20 +++++++++++++-------
+ src/viewwindow_webengine.h   |  3 ---
+ 2 files changed, 13 insertions(+), 10 deletions(-)
+
+diff --git a/src/viewwindow_webengine.cpp b/src/viewwindow_webengine.cpp
+index 631d84d..34f3396 100644
+--- a/src/viewwindow_webengine.cpp
++++ b/src/viewwindow_webengine.cpp
+@@ -63,16 +63,22 @@ ViewWindow::ViewWindow( QWidget * parent )
+     m_contextMenuLink = 0;
+     m_storedScrollbarPosition = -1; // see header
+ 
+-    // Use our network emulation layer. I don't know if we transfer the ownership when we install it,
+-    // so we create one per page. May be unnecessary.
+-    m_provider = new DataProvider_QWebEngine( this );
+-
+-    page()->profile()->installUrlSchemeHandler( EBook_CHM::urlScheme(), m_provider );
+-    page()->profile()->installUrlSchemeHandler( EBook_EPUB::urlScheme(), m_provider );
+-
+     // All links are going through us
+     //page()->setLinkDelegationPolicy( QWebPage::DelegateAllLinks );
+ 
++    // This needs to be done only once
++    static bool providerInstalled = false;
++
++    if ( !providerInstalled )
++    {
++        // Use our network emulation layer. We do not transfer the ownership when we install it. See https://doc.qt.io/qt-5/qwebengineurlschemehandler.html
++        DataProvider_QWebEngine * provider = new DataProvider_QWebEngine( 0 );
++
++        QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( EBook_CHM::urlScheme(), provider );
++        QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( EBook_EPUB::urlScheme(), provider );
++        providerInstalled = true;
++    }
++
+     connect( this, SIGNAL( loadFinished(bool)), this, SLOT( onLoadFinished(bool)) );
+ 
+     // Search results highlighter
+diff --git a/src/viewwindow_webengine.h b/src/viewwindow_webengine.h
+index 0adea31..3e96690 100644
+--- a/src/viewwindow_webengine.h
++++ b/src/viewwindow_webengine.h
+@@ -128,9 +128,6 @@ class ViewWindow : public QWebEngineView
+         // It is set to -1 if no scrollbar position has been set and the page is not loaded yet
+         // It is set to 0 if no scrollbar position has been set and the page is loaded already
+         int						m_storedScrollbarPosition;
+-
+-        // Data provider
+-        DataProvider_QWebEngine * m_provider;
+ };
+ 
+ #endif // VIEWWINDOW_WEBENGINE_H

app-text/kchmviewer/files/kchmviewer-8.0-underlinking.patch

@@ -0,0 +1,30 @@
+From e3b09edbbae17ad19661a7514afe5a9d84ca0ffa Mon Sep 17 00:00:00 2001
+From: George Yunaev <gyunaev@ulduzsoft.com>
+Date: Sun, 23 May 2021 15:03:06 -0700
+Subject: [PATCH] Adding support for old single-pass gcc linker which requires
+ a specific order of libraries. Thanks to @u-235 for reporting and patch.
+
+---
+ src/src.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/src.pro b/src/src.pro
+index e75d6a9..14c31a1 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -40,7 +40,6 @@ SOURCES += config.cpp \
+     textencodings.cpp \
+     treeitem_toc.cpp \
+     treeitem_index.cpp
+-LIBS += -lchm -lzip
+ TARGET = ../bin/kchmviewer
+ CONFIG += threads \
+     warn_on \
+@@ -106,6 +105,7 @@ unix:!macx: {
+     LIBS += ../lib/libebook/libebook.a
+     POST_TARGETDEPS += ../lib/libebook/libebook.a
+ }
++LIBS += -lchm -lzip
+ 
+ greaterThan(QT_MAJOR_VERSION, 4) {
+     # Qt 5

app-text/kchmviewer/kchmviewer-8.0.ebuild

@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg
+
+DESCRIPTION="Feature rich chm file viewer, based on Qt"
+HOMEPAGE="https://www.ulduzsoft.com/kchmviewer/"
+SRC_URI="https://github.com/gyunaev/${PN}/archive/refs/tags/RELEASE_${PV/./_}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/kchmviewer-RELEASE_8_0"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/chmlib
+	dev-libs/libzip:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-underlinking.patch"
+	"${FILESDIR}/${P}-custom-url-scheme-registration.patch"
+)
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	dodoc ChangeLog DBUS-bindings FAQ README
+	doicon packages/kchmviewer.png
+	dobin bin/kchmviewer
+	domenu packages/kchmviewer.desktop
+}

app-text/kchmviewer/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">gyunaev/kchmviewer</remote-id>
+	</upstream>
+</pkgmetadata>

app-text/vilistextum/Manifest

@@ -1,2 +1 @@
-DIST vilistextum-2.6.9.tar.bz2 147743 BLAKE2B 1cf6f187cb277271ddd9946984afb4d59336ea0cd446e62df3593070ccc63b3510a107e2b7e7b8dc757c63e4f5caf3790c7d998b6be325f4d22d2a6b9fea3432 SHA512 ce76a4061b766e4544d1a86986333314a3b6959439ba6995a2977c10b01b0142c524d4b215c3272a1dcfcc4f5b6fda03210de95d65cedecfc6a1c940cedf487d
 DIST vilistextum-2.8.0.20200411.tar.gz 219791 BLAKE2B 95b86d17e8dbf29b520aa48c88eb8c9e8abb01a234848ed55bdad0a63a7c0ec8ca9ae7c437fe7f84bbf7f4dad74fc8437a9e3b53493552e9e01b8029b10ef18a SHA512 40a219ebe7bebd61548a3bad794690cf091b67b70e8e6c44548a0c1b9f61077b141a035335e7128b191a8501103707f5324b00326a407e29ec0fee383c4d0917

app-text/vilistextum/files/vilistextum-2.6.9-blockquote.patch

@@ -1,113 +0,0 @@
-Many clients seem to use blockquote tags to flag quotes these days, so
-write them out as quotes, so they remain readable.
-
---- vilistextum-2.6.9/src/html_tag.c
-+++ vilistextum-2.6.9/src/html_tag.c
-@@ -87,8 +87,8 @@
- 
- 		else if CMP("P", str)  { start_p(); }
- 		else if CMP("/P", str) { paragraphen_ende(); }
--		else if CMP("BLOCKQUOTE", str)  { start_p(); }
--		else if CMP("/BLOCKQUOTE", str) { paragraphen_ende(); }
-+		else if CMP("BLOCKQUOTE", str)  { start_p(); quote++; }
-+		else if CMP("/BLOCKQUOTE", str) { paragraphen_ende(); if (quote>0) quote--;}
- 		else if CMP("Q", str)  { wort_plus_ch('"'); }
- 		else if CMP("/Q", str) { wort_plus_ch('"'); }
- 
---- vilistextum-2.6.9/src/multibyte.h
-+++ vilistextum-2.6.9/src/multibyte.h
-@@ -16,6 +16,7 @@
-  #define ATOI(n) wcstoi(n)
- 
-  #define ONESPACE L" "
-+ #define QUOTE L">"
-  #define WORT_PLUS_STRING(str) wort_plus_string(L##str)
- 
-  #define STRSTR(haystack, needle) wcsstr(haystack, L##needle)
-@@ -40,6 +41,7 @@
-  #define ATOI(n) atoi(n)
- 
-  #define ONESPACE " "
-+ #define QUOTE ">"
-  #define WORT_PLUS_STRING(str) wort_plus_string(str)
- 
-  #define STRSTR(haystack, needle) strstr(haystack, needle)
---- vilistextum-2.6.9/src/text.h
-+++ vilistextum-2.6.9/src/text.h
-@@ -26,6 +26,7 @@
- 
- int tab;
- int spaces;  
-+int quote;
- 
- void print_zeile();
- int is_zeile_empty();
---- vilistextum-2.6.9/src/text.c
-+++ vilistextum-2.6.9/src/text.c
-@@ -28,6 +28,7 @@
- int breite=76,
- 	hr_breite=76,
- 	paragraph=0,
-+	quote=0,
- 
- 	tab=4,         /* tabulator */
- 	spaces=0,      /* spaces at beginning of line */
-@@ -325,6 +326,12 @@
-       printf(" z0: zeilen_pos: %d\n",zeilen_pos);
- #endif
-       print_zeile();
-+      if (quote > 0)
-+      {
-+        i=0;
-+        while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
-+        zeile_plus_wort(ONESPACE,1,1);
-+      }
-       i=0;
-       while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
- 			if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
-@@ -345,6 +352,12 @@
-       printf(" z2: zeilen_len: %d\n",zeilen_len);
-       printf(" z2: zeilen_pos: %d\n",zeilen_pos);
- #endif
-+      if (quote > 0)
-+      {
-+        i=0;
-+        while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
-+        zeile_plus_wort(ONESPACE,1,1);
-+      }
-       i=0;
-       while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
- 			if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
---- vilistextum-2.6.9/tests/check_utf8
-+++ vilistextum-2.6.9/tests/check_utf8
-@@ -9,5 +9,6 @@
- rm -f utf-8-sampler.output.test
- ../src/vilistextum utf-8-sampler.html utf-8-sampler.output.test
- 
--diff >/dev/null utf-8-sampler.output utf-8-sampler.output.test
-+sed 's/^> //' utf-8-sampler.output.test | \
-+diff >/dev/null utf-8-sampler.output -
- 
---- vilistextum-2.6.9/tests/utf-8-sampler.output
-+++ vilistextum-2.6.9/tests/utf-8-sampler.output
-@@ -100,8 +100,8 @@
- ვეპხის ტყაოსანი შოთა რუსთაველი
- 
- ღმერთსი შემვედრე, ნუთუ კვლა დამხსნას სოფლისა შრომასა, ცეცხლს, წყალსა და
--მიწასა, ჰაერთა თანა მრომასა; მომცნეს ფრთენი და აღვფრინდე, მივჰხვდე მას ჩემსა
--ნდომასა, დღისით და ღამით ვჰხედვიდე მზისა ელვათა კრთომაასა.
-+მიწასა, ჰაერთა თანა მრომასა; მომცნეს ფრთენი და აღვფრინდე, მივჰხვდე მას
-+ჩემსა ნდომასა, დღისით და ღამით ვჰხედვიდე მზისა ელვათა კრთომაასა.
- 
- Tamil poetry of Cupiramaniya Paarathiyar: சுப்ரமணிய பாரதியார் (1882-1921)
- 
-@@ -446,7 +446,8 @@
- д, п, and/or т:
- 
-  Bulgarian:    [ бгдпт ]    [ бгдпт ]     Мога да ям стъкло и не ме боли.
-- Russian:  [ бгдпт ]    [ бгдпт ]    Я могу есть стекло, это мне не вредит.
-+ Russian:  [ бгдпт ]    [ бгдпт ]    Я могу есть стекло, это мне не
-+вредит.
-  Serbian:  [ бгдпт ]    [ бгдпт ]     Могу јести стакло а да ми не шкоди.
- 
-   ------------------------------------------------------------------------

app-text/vilistextum/files/vilistextum-2.6.9-darwin11.patch

@@ -1,23 +0,0 @@
-OSX Lion has wcscasecmp, but is not GNU
-
---- configure.in
-+++ configure.in
-@@ -67,6 +67,7 @@
- dnl Checks for library functions.
- AC_CHECK_FUNCS(strstr)
- AC_CHECK_FUNCS(strcasecmp)
-+AC_CHECK_FUNCS(wcscasecmp)
- 
- dnl create testsuite
- dnl AC_CONFIG_TESTDIR([tests])
---- src/html.c
-+++ src/html.c
-@@ -40,7 +40,7 @@
- 	link_inline[DEF_STR_LEN]; /* Link of a HTML-Tag */
- 
- /* ------------------------------------------------ */
--#if defined(MULTIBYTE) && ! defined(__GNU_LIBRARY__)
-+#if defined(MULTIBYTE) && ! defined(HAVE_WCSCASECMP)
- #include <wchar.h>
- static int wcscasecmp(const wchar_t *s1, const wchar_t *s2)
- {

app-text/vilistextum/files/vilistextum-2.6.9-gentoo.diff

@@ -1,22 +0,0 @@
-diff -ur vilistextum-2.6.9/src/Makefile.am vilistextum-2.6.9.new/src/Makefile.am
---- vilistextum-2.6.9/src/Makefile.am	2006-10-24 01:48:54.000000000 +0700
-+++ vilistextum-2.6.9.new/src/Makefile.am	2006-11-20 09:51:24.000000000 +0700
-@@ -6,7 +6,7 @@
- 											main.c main.h util.c util.h \
- 											multibyte.h unicode_entities.c unicode_entities.h
- 
--AM_CFLAGS = -Wall -O2 -ansi
-+AM_CFLAGS = -Wall -ansi
- AM_LDFLAGS = $(STATIC)
- 
- EXTRA_DIST = kilistextum.kaptn
-diff -ur vilistextum-2.6.9/tests/Makefile.am vilistextum-2.6.9.new/tests/Makefile.am
---- vilistextum-2.6.9/tests/Makefile.am	2004-07-06 19:06:20.000000000 +0700
-+++ vilistextum-2.6.9.new/tests/Makefile.am	2006-11-20 09:51:05.000000000 +0700
-@@ -16,5 +16,5 @@
- 
- test: check
- 
--all: check
-+all:
- 

app-text/vilistextum/files/vilistextum-2.6.9-prefix.patch

@@ -1,27 +0,0 @@
-* don't look in /usr/local
-* try to hack around not being able to use AM_ICONV
-
---- configure.in.orig	2006-10-23 22:20:19 +0200
-+++ configure.in	2010-03-18 19:32:13 +0100
-@@ -21,10 +21,6 @@
- AC_HEADER_STDC
- AC_CHECK_HEADERS(getopt.h) 	
- 
--dnl add /usr/local
--CFLAGS="$CFLAGS -I/usr/local/include"
--LDFLAGS="$LDFLAGS -L/usr/local/lib"
--
- dnl checking for options
- AC_MSG_CHECKING(if --enable-multibyte specified)
- AC_ARG_ENABLE(multibyte,
-@@ -41,7 +37,9 @@
- AC_CHECK_HEADERS(iconv.h,,
- 			AC_MSG_ERROR(Need libiconv or iconv.h for multibyte support))
- 
--AC_CHECK_LIB(iconv, iconv,,
-+dnl iconv_open_into is implemented only in GNU libiconv and not in other
-+dnl iconv implementations
-+AC_CHECK_LIB(iconv, libiconv_open_into,,
- 			AC_MSG_WARN([Generic iconv found but not libiconv. See INSTALL for details]))
- 
- dnl setting INTERNAL_LOCALE

app-text/vilistextum/vilistextum-2.6.9-r1.ebuild

@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch autotools
-
-DESCRIPTION="HTML to ASCII converter programmed to handle incorrect html"
-HOMEPAGE="https://bhaak.net/vilistextum/"
-SRC_URI="https://bhaak.net/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-#IUSE="unicode kde"
-IUSE="unicode"
-
-DEPEND="virtual/libiconv"
-RDEPEND=""
-# KDE support will be available once a version of kaptain in stable
-#	 kde? ( kde-misc/kaptain )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-gentoo.diff" \
-		"${FILESDIR}/${P}-prefix.patch" \
-		"${FILESDIR}/${P}-darwin11.patch" \
-		"${FILESDIR}/${P}-blockquote.patch"
-	eautoreconf
-}
-
-get_locale() {
-	locale -a | grep -i "$1\.utf.*8\$"
-}
-
-find_locale() {
-	local l t
-
-	# we basically prefer to find en_US.UTF-8, but it may not always be
-	# available, in which case it is better not to hardcode to use it
-	l=$(get_locale en_US)
-	if [[ -z ${l} ]] ; then
-		for t in "en_GB" "en_.*" ".*" ; do
-			l=$(get_locale ${t})
-			if [[ -n ${l} ]] ; then
-				l=${l%%$'\n'*}
-				break;
-			fi
-		done
-	fi
-	[[ -z ${l} ]] && die "Failed to find a unicode locale"
-	echo "${l}"
-}
-
-src_configure() {
-	# need hardwired locale simply because locale -a | grep -i utf-8 | head -n1
-	# isn't always returning the most sensical (and working) locale
-	econf \
-		$(use_enable unicode multibyte) \
-		$(use_with unicode unicode-locale $(find_locale))
-}
-
-src_test() {
-	if $(locale -a | grep -iq "en_US\.utf.*8"); then
-		emake -j1 check
-	else
-		ewarn "If you like to run the test,"
-		ewarn "please make sure en_US.UTF-8 is installed."
-		die "en_US.UTF-8 locale is missing"
-	fi
-}
-
-src_install() {
-	default
-	dohtml doc/*.html
-}

app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild

@@ -8,4 +8,4 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Nginx configuration files syntax"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1886"
 LICENSE="vim"
-KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux"

dev-db/libiodbc/libiodbc-3.52.15.ebuild

@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="|| ( LGPL-2 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gtk"
 
 RDEPEND="gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )"

dev-lang/mozart/Manifest

@@ -1,2 +1,2 @@
-DIST mozart-2.0.1-gentoo-patchset-1.tar.gz 39069 BLAKE2B 7490d13665314b3a998fb21bd8a342f262d92a395c3b0bbfa9a7813c044220c82ac02eb0103409127862c9bb4e4c44765b1228a7bdea2cb247492c94264f4fe0 SHA512 ce3cdb8ffebd95d6065439432905ad68b9cd8b86f58478092ab55df7ae7c72498a3e29bda462f3305aff6c99d010c45d786f905e2e906550ee61656ba122bbc6
+DIST mozart-2.0.1-gentoo-patchset-2.tar.gz 39435 BLAKE2B 18fe6f6e0d81d3b7901c73df567d79b6d8d8564bc49eb10dace2669de1448672a48dc0c509afbb5c506e8af65902ce36cb30f48c7fa26b6aa49cc09988218d42 SHA512 407da6fae39734097ab22fec5bc97ad1beb9103b13484ee0429a40a8f5803f6ed2abd2a64cfb56ccdddf9f82a2d9cd0883fe0a8f8a94bee963590606e1667127
 DIST mozart-2.0.1.tar.gz 2281261 BLAKE2B 7f071e9ec130a0b482b299f4dac15d64f632702d6ecf55b7af0993087064e533b4de80f77520a725f69f68648a9ce763c8c8826bb24e52af49eda8c3ccfba0b5 SHA512 a72a6fa68296d06af72327fd11310b3be152e5ad9a56f1fc4200ac7b89cd177e9a23a38c6721e1885d4f2ed0870065e919fb9fe3c9a2833fcd8e4ac0fd43aeb4

dev-lang/mozart/mozart-2.0.1.ebuild

@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake elisp-common java-pkg-2 java-ant-2
 
-PATCHSET_VER="1"
+PATCHSET_VER="2"
 
 DESCRIPTION="Advanced development platform for intelligent, distributed applications"
 HOMEPAGE="http://mozart2.org/"

dev-lang/python-exec/python-exec-2.4.8.ebuild

@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="2"
-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"
 # Internal Python project hack.  Do not copy it.  Ever.
 IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_} +native-symlinks test"
 RESTRICT="!test? ( test )"

dev-libs/fstrm/fstrm-0.6.1.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/farsightsec/fstrm/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="utils"
 
 BDEPEND="virtual/pkgconfig"

dev-libs/libgnt/Manifest

@@ -1,3 +1,2 @@
-DIST libgnt-2.14.0.tar.xz 102444 BLAKE2B 303dc33e60571ba4b5b9cc8ce477807b9b2ed6b4d1ed14e40c43e146a6d3d156741597befdf3e6c0c6816e9d43955f57f9e1b61e3f1f2d2fc451bf53f7236022 SHA512 0d9c5550374696a0e6ede5246cda3c372d7055d21b9ffaf10be88d6a469bdf18c7dd1113ec612acf4889c0e5686ea87bb0e8348ca8985fd5ff8913afc5813b38
 DIST libgnt-2.14.1.tar.xz 106564 BLAKE2B 19eddef51b44fa82982c705415fee43bf7495bc4692a7371fea782bcc21acdb932f15e1e8de6af962a529eea59f54c0b116d96b87ed3616201e6370760fac5b8 SHA512 434fff31a0946dabeaadbabaf96b4a7cf7f2a7da6d7794b7cf8a75f3f959388d89b32ce5921a20d5d6532ac2fd851ec2f6c18cc7cbc5a0ae97a00ff1ee3f74c3
 DIST libgnt-2.14.2.tar.xz 106128 BLAKE2B d3db0ba3a297c14f32cc49b4e5b3392f47031e9406d862520a2f014f4d4e93c13e2ba5a2d61df81637f9dd7961d64ba69b393ee5b3cfebd7eb2768e3f16f29d0 SHA512 17b39e132b44b23486d7d39fa02761997a28abf53f67bf71bbad86d35124e5deb0363d670b2fb5ac99d47256282b0ef6ad1886e12984c868bb0d13ea7ba7d860

dev-libs/libgnt/libgnt-2.14.0.ebuild

@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Pidgin's GLib Ncurses Toolkit"
-HOMEPAGE="https://keep.imfreedom.org/libgnt/libgnt"
-SRC_URI="mirror://sourceforge/pidgin/${P}.tar.xz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	!<net-im/pidgin-2.14.0
-	dev-libs/glib:2
-	dev-libs/libxml2
-	sys-libs/ncurses:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.14.0-optional_docs.patch"
-	"${FILESDIR}/${PN}-2.14.0-tinfo.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc)
-	)
-	meson_src_configure
-}

dev-libs/libgnt/libgnt-2.14.1.ebuild

@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pidgin/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="

dev-libs/libpcre/libpcre-8.45.ebuild

@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="3"
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"

dev-libs/librevenge/librevenge-9999.ebuild

@@ -1,47 +1,41 @@
-# 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 flag-o-matic multilib-minimal
 
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/librevenge"
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/libwpd/librevenge"
 	inherit git-r3 autotools
 else
 	SRC_URI="https://sf.net/projects/libwpd/files/${PN}/${P}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
+
 DESCRIPTION="Helper library for REVerse ENGineered formats filters"
 HOMEPAGE="https://sf.net/p/libwpd/librevenge"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0"
 IUSE="doc test"
+
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-"
+RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-libs/boost
 	test? ( dev-util/cppunit[${MULTILIB_USEDEP}] )
 "
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
 	default
-	[[ ${PV} = *9999 ]] && eautoreconf
-
-	# bug 651264
-	append-cxxflags -std=c++11
+	[[ ${PV} == *9999* ]] && eautoreconf
 }
 
 multilib_src_configure() {
 	local myeconfargs=(
-		--disable-static
 		--disable-werror
 		$(use_with doc docs)
 		$(use_enable test tests)

dev-libs/sdformat/Manifest

@@ -1,2 +1,3 @@
 DIST sdformat-9.2.0.tar.bz2 644484 BLAKE2B 2f6382414bd7d47bfafb66c8352e5a90cd236bdfcfc7c3119eab154b8d0bb5fddf2127b16e222bb90326dbf91f95b111643eede17ebe38f27bb164cf31d7f263 SHA512 bc9422207f56d7fd5f53249f856be5fe00f078e168d7e93ab10f5544e4963888cb7c0a1b1f449739e2490b0d5aad3c5a72d8408333dd6ae550b5d66f6bcde42a
 DIST sdformat-9.3.0.tar.bz2 648239 BLAKE2B 3dfedbcb7b52d3c9384f7a4b119b3e664b9e6bd6bd93bc5ad7a5db4228474bd3e6f8d98d1fd761f49386175e45b7083b57cee02cf4a930e19ba8ef78187af71b SHA512 16ff7643baf5738a1a833f1484c79566960c9093c4a3842ae82a14faca14feef34e7293fbc78c0fea78e8a1b1b9710414587ca5260c17562759df245d458b942
+DIST sdformat-9.5.0.tar.bz2 651125 BLAKE2B 08ca0e9df9620345905e5307b555fd72c106a59090b7d2fd8fb9cc32198d07fa31fa64e60a25dc47844ebc279bb6e3ad78e457e6ba563158404a3198222d08e9 SHA512 b96797df2a7f43b4d426673fad7dbc0a5e20a846a66d804c7c3eb01ec008b52f8bc119ae1e6062a4a748240fb7172c909fd1e66ac3b52f3d01bc5a347d734908

dev-libs/sdformat/sdformat-9.5.0.ebuild

@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Simulation Description Format (SDF) parser"
+HOMEPAGE="http://sdformat.org/"
+SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# subslot = libsdformat major
+SLOT="0/9"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/urdfdom-1:=
+	dev-libs/tinyxml
+	dev-libs/boost:=
+	sci-libs/ignition-math:6=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/ruby:*
+	virtual/pkgconfig
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_configure() {
+	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
+	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
+	local mycmakeargs=(
+		"-DUSE_INTERNAL_URDF=OFF"
+		"-DUSE_EXTERNAL_TINYXML=ON"
+	)
+	cmake-utils_src_configure
+}

dev-ml/llvm-ocaml/Manifest

@@ -2,3 +2,4 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
+DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85

dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc1.ebuild

@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]"
+for x in "${ALL_LLVM_TARGETS[@]}"; do
+	RDEPEND+="
+		${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
+done
+unset x
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+	test? ( dev-ml/ounit2 )
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable go bindings
+		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}

dev-ml/parmap/parmap-1.2.3.ebuild

@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${MY_PV/+/-}"
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86"
 IUSE="+ocamlopt"
 
 BDEPEND="dev-ml/dune-configurator"

dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 # Upper bound on ppxlib for bug #769536

dev-perl/Alien-Libxml2/Alien-Libxml2-0.170.0.ebuild

@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Install the C libxml2 library on your system"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.80.0.ebuild

@@ -11,7 +11,7 @@ DESCRIPTION="Interface to FITS headers"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r2.ebuild

@@ -12,7 +12,7 @@ HOMEPAGE="http://www.danga.com/memcached/ https://metacpan.org/release/Cache-Mem
 # Bug: https://bugs.gentoo.org/721730
 LICENSE="|| ( Artistic GPL-1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	virtual/perl-Encode

dev-perl/Class-Singleton/Class-Singleton-1.600.0.ebuild

@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Implementation of a Singleton class"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	>=virtual/perl-ExtUtils-MakeMaker-6.640.0

dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.130.0.ebuild

@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Guess OpenSSL include path"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/Crypt-Twofish/Crypt-Twofish-2.180.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="The Twofish Encryption Algorithm"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 src_compile() {
 	mymake=(

dev-perl/DBD-Pg/DBD-Pg-3.15.0.ebuild

@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="PostgreSQL database driver for the DBI module"
 
 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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/DBIx-SearchBuilder/DBIx-SearchBuilder-1.690.0.ebuild

@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Encapsulate SQL queries and rows in simple Perl objects"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/Data-HexDump/Data-HexDump-0.40.0.ebuild

@@ -11,4 +11,4 @@ inherit perl-module
 DESCRIPTION="Hexadecial Dumper"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~sparc x86"

dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.210.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Simple, transparent data interface, with caching"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/Data-Validate-IP/Data-Validate-IP-0.300.0.ebuild

@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="IPv4 and IPv6 validation methods"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/Date-Manip/Date-Manip-6.850.0.ebuild

@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl date manipulation routines"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="elibc_musl test"
 RESTRICT="!test? ( test )"
 

dev-perl/DateTime-Locale/DateTime-Locale-1.320.0.ebuild

@@ -12,7 +12,7 @@ DESCRIPTION="Localization support for DateTime"
 
 LICENSE="|| ( Artistic GPL-1+ ) unicode"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/DateTime/DateTime-1.540.0.ebuild

@@ -11,7 +11,7 @@ DESCRIPTION="A date and time object"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/Devel-Hide/Devel-Hide-0.1.400.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Forces the unavailability of specified Perl modules (for testing)"
 
 SLOT="0"
-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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/Devel-NYTProf/Devel-NYTProf-6.100.0.ebuild

@@ -11,7 +11,7 @@ inherit perl-module toolchain-funcs
 DESCRIPTION="Powerful feature-rich perl source code profiler"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.7.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Introspect overloaded operators"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/Digest-CRC/Digest-CRC-0.230.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Generic CRC functions"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker

dev-perl/Digest-HMAC/Digest-HMAC-1.40.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Keyed Hashing for Message Authentication"
 
 SLOT="0"
-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"
 
 RDEPEND="
 	>=virtual/perl-Digest-MD5-2.0.0

dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse a MIME Content-Type Header or Content-Disposition Header"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ppc ppc64 x86 ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/Email-Sender/Email-Sender-1.300.35.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A library for sending email"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/Event/Event-1.280.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Fast, generic event loop"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/Exception-Class/Exception-Class-1.450.0.ebuild

@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A module that allows you to declare real exception classes in Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Easily build XS extensions that depend on XS extensions"
 
 SLOT="0"
-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"
+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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/ExtUtils-F77/ExtUtils-F77-1.260.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module toolchain-funcs
 DESCRIPTION="Simple interface to F77 libs"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-perl/File-Which

dev-perl/FFI-CheckLib/FFI-CheckLib-0.280.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Check that a library is available for FFI"
 SLOT="0"
-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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/File-Listing/File-Listing-6.140.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse directory listings"
 
 SLOT="0"
-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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/File-ReadBackwards/File-ReadBackwards-1.60.0.ebuild

@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Read a file backwards by lines"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-solaris"

dev-perl/File-Remove/File-Remove-1.600.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Remove files and directories"
 LICENSE="|| ( Artistic GPL-1+ ) || ( CC0-1.0 public-domain MIT )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/File-ShareDir/File-ShareDir-1.118.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Locate per-dist and per-module shared files"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 

dev-perl/File-Which/File-Which-1.270.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl implementation of the which utility as an API"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test pwhich"
 RESTRICT="!test? ( test )"
 

dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Getopt::Long with usage text"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 arm ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 

dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.49.0.ebuild

@@ -11,7 +11,7 @@ DESCRIPTION="Dynamically create Perl language bindings"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-perl/glib-perl-1.320.0

dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.140.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="WWW color names and equivalent RGB values"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Defines RGB values for common color names"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/Gtk2-Unique/Gtk2-Unique-0.70.0.ebuild

@@ -11,7 +11,7 @@ inherit perl-module virtualx
 DESCRIPTION="Perl binding for C libunique library"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="

dev-perl/Gtk3-SimpleList/Gtk3-SimpleList-0.210.0.ebuild

@@ -11,7 +11,7 @@ DESCRIPTION="A simple interface to GTK+ 3's complex MVC list widget"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/Gtk3/Gtk3-0.38.0.ebuild

@@ -9,7 +9,7 @@ inherit perl-module virtualx
 DESCRIPTION="Perl interface to the 3.x series of the gtk+ toolkit"
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/HTML-Clean/HTML-Clean-1.400.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Cleans up HTML code for web browsers, not humans"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="!<app-text/html-xml-utils-5.3"

dev-perl/HTML-Form/HTML-Form-6.70.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Class that represents an HTML form element"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~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 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/HTML-HTMLDoc/HTML-HTMLDoc-0.210.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl interface to the htmldoc program for producing PDF-Files from HTML-Content"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/HTML-Mason/HTML-Mason-1.590.0.ebuild

@@ -11,7 +11,7 @@ DESCRIPTION="A HTML development and delivery Perl Module"
 HOMEPAGE="http://www.masonhq.com/ https://metacpan.org/release/HTML-Mason"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="modperl test"
 RESTRICT="!test? ( test )"
 

dev-perl/HTML-Object/HTML-Object-2.30.ebuild

@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/htmlobject/${MY_P}.tar.gz"
 HOMEPAGE="http://htmlobject.sourceforge.net"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="examples"
 
 RDEPEND="dev-perl/Data-FormValidator

dev-perl/HTML-Parser/HTML-Parser-3.760.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse HTML documents"
 
 SLOT="0"
-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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/HTML-Scrubber/HTML-Scrubber-0.190.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for scrubbing/sanitizing html"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.304.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Do interesting things with the contents of tables"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="

dev-perl/HTML-TableParser/HTML-TableParser-0.430.0.ebuild

@@ -11,7 +11,7 @@ DESCRIPTION="Extract data from an HTML table"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.310.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Determine Web browser, version, and platform from an HTTP user agent string"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc ~x86"
+KEYWORDS="amd64 ~hppa ~mips ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/HTTP-Cookies/HTTP-Cookies-6.100.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Storage of cookies"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-perl/HTTP-DAV/HTTP-DAV-0.490.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A WebDAV client library for Perl5"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	virtual/perl-File-Temp