gentoo resync : 28.11.2020

14 files changed, 184 insertions, 13 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 9c07b9ccce44..a444b8a92ab8 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index fcfe3887ebda..c33ab3c343e1 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,3 +1,5 @@
 DIST flatpak-1.8.2.tar.xz 1424468 BLAKE2B 4ade582176cd4ed494d0afc2a75b81168dc2263183d4ec2ef731b2d3ccbd96a7cc0fdb012f07966b4429529ab69c79b32abbcc4c1a8640b030d3ba2edfbce36d SHA512 f27c05b2621328dce31e4c31ae097765864bac84f6c1fada23f48c0235c6b85f447948a07861653f7bed4e17e43f8ff3d2c60263e23426c765c787b5f447a4e2
+DIST flatpak-1.9.2.tar.xz 1490540 BLAKE2B 23e5c4cefaadebb1e9fd599ba8e372ddef9e7e241b186032a142f60bc07b243926d3fb514cc62e90437d2e8ddb17098476b4d73913c2ad656b2719268705057a SHA512 ab4feb6c10161a1bd92e428623772c4217ce3700db412c6280de3415247ffd39eb800dc917937529a82328d778e089f45bd0a8b48fdd7e0c8bf34c494dcb085b
 EBUILD flatpak-1.8.2.ebuild 2341 BLAKE2B f27ddca127f893a74a0450e81178dafa9e01d2e824dee11e1a59f6fc584aef88c30735df457f5d5a34cf20236c69fa48251b1fd54c8167b9c89d404725437c2e SHA512 97afcccc5806149b2939ae93a725f83dd2899bfb37e66c27b6b44bdb83001b114a875ab8fa1b3a007269f9ec4be0eae8989fd549aac98aae48ab6721694c8c13
+EBUILD flatpak-1.9.2.ebuild 2341 BLAKE2B b1bd2925dba55a570bff569cf0072791688b876ee7350088c6d7ff06d6ef2f77adb3f4bb6c65d219bf1646459d75abeb330d0de3fd1071b61f55aac049d76458 SHA512 ef74cb57a6b9e4da6fec7df1b200588ea2e7891769909e94970be7a242666d9a85f378b21d7822782eea05c8c3664c8487275d12f4620b1d86861a2968ced84b
 MISC metadata.xml 324 BLAKE2B edeb76b1ab3c052555564fdca397116a0ca48a7b2eafddf8958e080a7c8ccab9a04613fe67504c4c1d51d75eccc8cd25cc0d4223958f21e37f8ae056b3fd4686 SHA512 667951ea59e4871daf2508bdb4e56a68638d37bbf6fce0a56923cf3c0632a28d2eae3aedbc38e8db04e80c03fe06918569b1697e890bf20055add72ab0c7c15d
diff --git a/sys-apps/flatpak/flatpak-1.9.2.ebuild b/sys-apps/flatpak/flatpak-1.9.2.ebuild
new file mode 100644
index 000000000000..c9f3f0c85a4c
--- /dev/null
+++ b/sys-apps/flatpak/flatpak-1.9.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools linux-info python-any-r1
+
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+DESCRIPTION="Linux application sandboxing and distribution framework"
+HOMEPAGE="https://flatpak.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc gtk kde introspection policykit seccomp systemd"
+RESTRICT+=" test"
+
+RDEPEND="
+	acct-group/flatpak
+	acct-user/flatpak
+	>=app-arch/libarchive-2.8:=
+	app-arch/zstd:=
+	>=app-crypt/gpgme-1.1.8:=
+	>=dev-libs/appstream-glib-0.5.10:=
+	>=dev-libs/glib-2.56:2=
+	>=dev-libs/libxml2-2.4:=
+	dev-libs/json-glib:=
+	dev-libs/libassuan:=
+	>=dev-util/ostree-2020.8:=[gpg(+)]
+	|| (
+		dev-util/ostree[curl]
+		dev-util/ostree[soup]
+	)
+	>=gnome-base/dconf-0.26:=
+	>=net-libs/libsoup-2.4:=
+	sys-apps/bubblewrap
+	sys-apps/dbus
+	>=sys-fs/fuse-2.9.9:0=
+	sys-apps/xdg-dbus-proxy
+	x11-apps/xauth
+	x11-libs/gdk-pixbuf:2=
+	x11-libs/libXau:=
+	policykit? ( >=sys-auth/polkit-0.98:= )
+	seccomp? ( sys-libs/libseccomp:= )
+	systemd? ( sys-apps/systemd:= )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/automake-1.13.4
+	>=sys-devel/gettext-0.18.2
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	sys-devel/bison
+	introspection? ( >=dev-libs/gobject-introspection-1.40 )
+	doc? (
+		>=dev-util/gtk-doc-1.20
+		dev-libs/libxslt
+	)
+	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
+"
+
+PDEPEND="
+	gtk? ( sys-apps/xdg-desktop-portal-gtk )
+	kde? ( kde-plasma/xdg-desktop-portal-kde )
+"
+
+python_check_deps() {
+	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	local CONFIG_CHECK="~USER_NS"
+	linux-info_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# This line fails because locales are in /usr/lib/locale/locale-archive.
+	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-sandboxed-triggers
+		--enable-xauth
+		--localstatedir="${EPREFIX}"/var
+		--with-system-bubblewrap
+		--with-system-dbus-proxy
+		$(use_enable doc documentation)
+		$(use_enable doc gtk-doc)
+		$(use_enable introspection)
+		$(use_enable policykit system-helper)
+		$(use_enable seccomp)
+		$(use_with systemd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index 7d7d1cf402ff..5a20caaa097c 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -3,5 +3,5 @@ AUX moreutils-0.64-respect-env.patch 344 BLAKE2B 1b1dc56d77f9ddb4ffc05e911ac7ee9
 DIST moreutils-0.64.tar.gz 92741 BLAKE2B 3e014a18a3b7615bcd83fd9b0a1e3010a059aae154395c2c1158f57634fe83c27503dc3aff1e116743cf80fc73ee2063ea60b03d4bece4119b962669095c71dc SHA512 94f131b9b02a8c1139dfe34abacab022687f51413c529288f57fa876676c028e200324ed855b910a7dbfb4290eb8b38b3dc182eda49988f521a550162b0a0eec
 DIST moreutils_0.63.orig.tar.xz 80468 BLAKE2B 39efa522c5bf9b982b70c1180f622a7d5a489cabbeb741f2a1a0674dfe9907ef85bccccf9f9cc4ae8d3c81442b1513f0692c070b4c00f052135528dc0e47eb6f SHA512 71bd5ec4d265dff708db372189146acb067c4edaf62888755d245ccb3f4b5bb54f6c31bda68991f78c27ab231de8ea7126f947834f3604b60d7142d0357cb66b
 EBUILD moreutils-0.63.ebuild 1506 BLAKE2B 279f0854c3238f533262718720f4e7cdccd69ea46b95095e81787f982418910384de1c202cf6be8404ef657eb1eba6fa60ca8df535a6c594f93c0ccb75b57394 SHA512 fce87829894fb3c5f55e82563568a280c010237e8fb011f1528e5e7660dbd421b2eced669a6ac9458e1eb62fd0041bb488d88f7a0bcbe8a563f688451749bd8a
-EBUILD moreutils-0.64.ebuild 1670 BLAKE2B 74f5df891e9f5e25124741c506375ab99eee21f76c7fe43521982c75a1c77c592a121155e12f5525528998364798fece7af90e1c05dc16f544a8274a07d3e3b6 SHA512 83bcf0e5f1127a94dd99174b77307ead201eaf6db85ca96c1bee3f7084f2f8215460a1bb923b2f14fe30ac29e70fc9451972e109170318a5a4141a257b2744e7
+EBUILD moreutils-0.64.ebuild 1692 BLAKE2B 83d6a26ec6dd356f2a2a1613ded2c63847077b2c88e4153e725451cb25ec7f79c184736141c667112b8f46da2608535692882dff16cb269776be894131f4f0e5 SHA512 51bf783fac4952b980d89d73b239a6f098b6bc85cb8a1f97ff871e827370069d29ca42bd2ef5ba3db8ea22b257f581da0a9ab592aeb4f4d7e6e49bc860be2c7b
 MISC metadata.xml 313 BLAKE2B d0cd446eb7516dec44ac4eb8a73d268652317a7dd1b3531f9e69341ae5a768a2dbc554fb577d499d139a684d190c400c08b5a14023c1a0db03cc599321c651e5 SHA512 07345c6cea216cf9e7043eab1a33cdc9bd9bf52adb5a4019afa401faddfbf0129f2297d01e2a9595cf9963e55ba53c4496b7ab79a9c33be85fac18ca60220a3f
diff --git a/sys-apps/moreutils/moreutils-0.64.ebuild b/sys-apps/moreutils/moreutils-0.64.ebuild
index dced88e9895e..e541ca91e98e 100644
--- a/sys-apps/moreutils/moreutils-0.64.ebuild
+++ b/sys-apps/moreutils/moreutils-0.64.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://git.joeyh.name/index.cgi/moreutils.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ppc ~ppc64 x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ppc ~ppc64 x86 ~x86-linux ~x64-macos"
 IUSE="+doc +perl"
 
 RDEPEND="
@@ -51,11 +51,11 @@ src_prepare() {
 
 src_compile() {
 	tc-export CC
-	emake CFLAGS="${CFLAGS}" DOCBOOKXSL=/usr/share/sgml/docbook/xsl-stylesheets PREFIX="${EPREFIX}/usr"
+	emake CFLAGS="${CFLAGS}" DOCBOOKXSL="${EPREFIX}"/usr/share/sgml/docbook/xsl-stylesheets PREFIX="${EPREFIX}/usr"
 }
 
 src_install() {
-	emake DESTDIR="${ED}" PREFIX="${EPREFIX}/usr" INSTALL_BIN=install install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" INSTALL_BIN=install install
 
 	# sys-process is more advanced than parallel from moreutils, rename it
 	if use doc; then
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 88f078af3a24..68969d228374 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,5 +1,5 @@
 AUX pkgcore-0.10.13-metadata-xsd.patch 750 BLAKE2B 93a75ca69597422da66b42aed94e0ad67b1b80802103b90b4306c8967ea5d1723860b9851085186e078c50e3c222cbe8a78bc0fa071ed7c0cf85b4218920f4dc SHA512 d2f2f16167b9d2c32b80783b4d21d04e47328209b3ccff24c057044286ae8896fb3205ec103edbe1f6fd5e20c4ed7871bf3c27b1fc134e8299c76b7ff86ba33b
 DIST pkgcore-0.10.13.tar.gz 647320 BLAKE2B ef80320a0a8d35ed68b1d77d52a3cfb2ffbadae2fe9f11efe3f42c68f55388074b5c4b2857f265f1add4cfe479cba9716d45afaf141d113b0874d409955269c7 SHA512 acc5ee2cc6fd0f897129f311e0484e28a1c8f374c5a2e56a29d228fee74b7be0cb6059171b743e0db35544b5b5779d35efcda21e46e65285653ba4155205281f
-EBUILD pkgcore-0.10.13-r1.ebuild 1135 BLAKE2B e6f41330ff8765fd4fdb3462def38de978469f9fa91f0044fd3722aec4cb681e741c2d4890b302a19bc9a825b37ea2f5277bd2b806686ad304ef8963ac11dd9f SHA512 0419a6f60d21d57bbe568b6a5030ea5e01f5a0bac128d672872abd4c01e27e7b6cbaa79fbad44234113a0a449b392472bc06a783572d8ad7b8c844f696b27847
+EBUILD pkgcore-0.10.13-r1.ebuild 1146 BLAKE2B 1b94b7836087ace2e4b5a3b366a97fc42bfda6de298d8db11a54c6b495c4c9f22b41d56e1c8d15a51cb3dca0fba0428ae23f93c3248b624f371e7c1d90fac034 SHA512 b9347581bf17afbaa09a57cea1a9a161d837fe64d430754d3579c6ec1844e5cda273253f52feca4a80e3fb5607e91c8d01b2646a3ec3903811bbd47d8f3520ea
 EBUILD pkgcore-9999.ebuild 1083 BLAKE2B d0c3f82381d3034f8b522f44c5c83d0437ea855a00c0ba8ab6f3f9ef066277b81b7664f07c2a4761d4293f7e6b14be9906945fa371ab40c8a4d6d3debeb53b47 SHA512 7262ab79c9418428103b97b8065069d2db1e8813a7f59a3a0d9a55c353931f85eb12814636305246936f3032bb6923a683c3f1d6608848e04f63b188d3a61885
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild
index a83f747b80ae..d09a6d18bd3d 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/restartd/Manifest b/sys-apps/restartd/Manifest
index 4c865f051a62..a04f5da7c746 100644
--- a/sys-apps/restartd/Manifest
+++ b/sys-apps/restartd/Manifest
@@ -1,3 +1,4 @@
+AUX restartd-0.2.2-fno-common.patch 1433 BLAKE2B 0e63b4ca36108331c249891c6fc45ae2d3605e6779973900135143e2307438fb78d64976a9a8be74fd387da5112297fc1ff1b3584d9a7139cbcd507c85327a1e SHA512 a1b5b60311e4e7a8a840a052b916a1af6cdcb20fde298886d42c313812049bda5e7c8ebd8e931c8e873441ea7dc2a41ad4de9fbf031e31043f167ed84a55f297
 DIST restartd_0.2.2.tar.gz 13777 BLAKE2B ccefeb3b6b8e7a288d52793a708a1158804530c3ac8351c9b40b33ce2ff725511c8ce19558f3100dc5f01a4d9f6b17252362d97979c2a7d54dbe71392593b070 SHA512 731d33e6ade389708801e6cb024c355062745d049ab389fc78fcc1918720c93601dc8fb3a56a8bbb626bffc0a240b16e33ff5a8614d27b2701eb6ca68018cc93
-EBUILD restartd-0.2.2-r1.ebuild 683 BLAKE2B 64c92becfc4b55cb598786ed94d1c2cb7798f2a63a1251b7ed942a550a5d64586614b1172af9dadd6143dbd1b793b4a5353b4cf682d6a74e6ffe87c9865c382b SHA512 f76698fa08444badbc49f9a08c5d70fbf6349bdf714ee46d8805eca66c7ca6bc1b848956e5ea0a2b696ab83cfd787aa08c08902cf2151eae955346cb509b270a
+EBUILD restartd-0.2.2-r1.ebuild 721 BLAKE2B bd1894497e2b5544ea8020559567081f28fd5ecb9743514add72f5d7c98288ec3c17dc186055a4cb34c4d0b353c2e12b4c830bbeb94328ce654756f9052c177e SHA512 77a4c94964c7a6e63709526087ac382e065e33a0e10ba004de97d32b0be1f64cfd07fd80574918385da73cf7323c786df82220539392c2e77c825ca6467a1d06
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/restartd/files/restartd-0.2.2-fno-common.patch b/sys-apps/restartd/files/restartd-0.2.2-fno-common.patch
new file mode 100644
index 000000000000..c0b0ad5ff8b1
--- /dev/null
+++ b/sys-apps/restartd/files/restartd-0.2.2-fno-common.patch
@@ -0,0 +1,66 @@
+--- a/config.c
++++ b/config.c
+@@ -22,6 +22,14 @@
+ #include <syslog.h>
+ #include "config.h"
+ 
++int debug;
++int config_process_number;
++int check_interval;
++int foreground;
++char *config_file;
++struct config_process_type *config_process;
++struct config_process_type config_process_type;
++
+ int
+ read_config (void)
+ {
+--- a/config.h
++++ b/config.h
+@@ -34,12 +34,12 @@
+ #define DEFAULT_CONFIG "/etc/restartd.conf"
+ #define VERSION "0.2.1"
+ 
+-int debug;			// Debug
+-int config_process_number;
+-int check_interval;
+-int foreground;
+-struct config_process_type *config_process;
+-char *config_file;
++extern int debug;			// Debug
++extern int config_process_number;
++extern int check_interval;
++extern int foreground;
++extern struct config_process_type *config_process;
++extern char *config_file;
+ 
+ typedef struct config_process_type
+ {
+@@ -51,7 +51,9 @@ typedef struct config_process_type
+   char processes[256];
+   char status[32];
+ 
+-} config_process_type;
++};
++
++extern struct config_process_type config_process_type;
+ 
+ int read_config ( /* char *config_file */ );
+ 
+--- a/main.c
++++ b/main.c
+@@ -35,6 +35,14 @@
+ 
+ #include "config.h"
+ 
++extern int debug;
++extern int config_process_number;
++extern int check_interval;
++extern int foreground;
++extern char *config_file;
++extern struct config_process_type *config_process;
++extern struct config_process_type config_process_type;
++
+ // SIGTERM & SIGHUP handler
+ void
+ got_signal (int sig)
diff --git a/sys-apps/restartd/restartd-0.2.2-r1.ebuild b/sys-apps/restartd/restartd-0.2.2-r1.ebuild
index dadb97c5f33b..6f78d10eb3a3 100644
--- a/sys-apps/restartd/restartd-0.2.2-r1.ebuild
+++ b/sys-apps/restartd/restartd-0.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,8 @@ SRC_URI="mirror://debian/pool/main/r/restartd/${PN}_${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_prepare() {
 	default
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index dceb3e6dc611..e1fc89782dc6 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -3,5 +3,5 @@ AUX stmpfiles-setup.initd 396 BLAKE2B 54796d5db9fc350a98e467cf763afaa82bc27f5477
 AUX stmpfiles.confd 56 BLAKE2B c26aafd0e47b01354c7f20869cd71d36d7a8560e9013863eca6abb736d78c1eeb3eec00427c6bc8d37ab5b9bb88155d11b9e18809da9110ed40c77a34ebb1a82 SHA512 464cb238b87a8fbeb57e6534d0f2d861e8ade4219be9b7e2faf05c799f717cd2f23d176393bdd3c3b236058aa6f8bda837ad947fbe8f9489405760e9bfedbe40
 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
 DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7
-EBUILD systemd-tmpfiles-246.ebuild 4485 BLAKE2B 23af3c77dec65abe104e3b3a6c094194181dde0121b7ffb86b23085bab5cd1c1fd16b7ccf6facfb20ad149a11e7235e85d20fc8b7e89572da0815a1e5bdcc353 SHA512 53197d3537a783ecd136ebf482886596ffc00f6daf36b11395be9ef6c097b7be649f4fdd8608cc1814b90b34fe8b4b8990246f79beac09a9de8e7a5df539aa0b
+EBUILD systemd-tmpfiles-246.ebuild 4491 BLAKE2B 17124a80e29a2211b42ea9d059bb8e45c6eadc7c1cd04d3bd25a263534f31cb6b7e942b294f55f68c558d5c56c7c9e531de11ee761cf89c77ab645660f35e273 SHA512 289624de6d5eaf333273969ad1fd82785fc17ac56a31b11e69857f264455acf00413250f0146de3337e34a24f2aea9ed88d4f862dbe19305742c3bc9459bba25
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
index 1aa64e928f2b..99967bb12780 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${P
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 2812f5d732cd..5a567887eec6 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,5 +1,5 @@
 DIST texinfo-6.6.tar.xz 4946900 BLAKE2B bd33297549d5285d7a4a65041b6025c489c6b436e9591eaf5187ef34f6e869bf7a2a82a00ebe11adc1c4b2904119e9e3f25d2496b5507f91f4b9ba548ba98604 SHA512 96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0
 DIST texinfo-6.7.tar.gz 9027808 BLAKE2B ac9a47ae98f27ae55ea1844c74ead6fba256635a56e7a226a1bbdd9ee9ab33565ff8cc7a874410afe6463741285c8fcfd8ff835ae2802009e2d0758405559140 SHA512 a52aaa2f0113c6f14b3cb94fbf7191770017ff6ce2016292770831279cfbb898c2f7f720adee620e08d9d80a9505df89a689ba0c25e92f6579b28b075f7b8ee2
 EBUILD texinfo-6.6-r1.ebuild 1342 BLAKE2B 665c2bf8e3397da1649684e45d82462007182a008b083f658088504c08f48a527dce41379c6bf02d2a41c3fe83d963cd5269c0c656832fac9410b8208c259a3a SHA512 b31b40fcc21303a30b143ad99da020b1abc7e10afa40ec7e837198fd2523e85da469ecee57485c72f5d4a8f8ad0f120012ac591709783b0abf8bd5586c4b8055
-EBUILD texinfo-6.7.ebuild 1632 BLAKE2B 994fede5bdcd020d1909dbb815a3d111d5e11c9472a8cd22020bf1e4ce6952408f7eb7b5595a54e4a176a17543decc2efef2b366d8360f6496043d73fa52f471 SHA512 5cc9fe2fe2b7996a56ea143a713fff4ddb8b67ab36979d7702c5621480937f889a604f09c2b74bfceb35edef9ee177305a56f72b2afaa4f3267d28959a255c69
+EBUILD texinfo-6.7.ebuild 1643 BLAKE2B d763ea7e51da9c47adc9f46a8bdbc40dd87508e02234836802c926e3547defa81aa35ee07c9d8228e872fbda4ceb02c507a2906387564b80ce55df32248611ea SHA512 98dad7f43cd0960e7fc12a38a8fc8f3f7fdf7896011ca92f50e7902b4cb4e959b7378e2e46beca9697ef9799ef75630c7987f3cf75276ed5538fe698f3c5c0ca
 MISC metadata.xml 539 BLAKE2B 5445a2b07c6bbecb3c33c64e80227f57ff80b17b0b440a3d0220a88ed1bb930deb1b0274eff8db1a64fe82c64e7f34b1183c533b1a1ca7b41694668e2c5b682b SHA512 4d0b0b223f04e6ebc4e7a7546dbf6b731fc0676657c8d3c3cd38a54c327f4eebda927f1793ead3f8f255bc82d7884b5acd6df8431674db48c2ebbbd1098cb032
diff --git a/sys-apps/texinfo/texinfo-6.7.ebuild b/sys-apps/texinfo/texinfo-6.7.ebuild
index 60ede9257314..cee372613a77 100644
--- a/sys-apps/texinfo/texinfo-6.7.ebuild
+++ b/sys-apps/texinfo/texinfo-6.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 IUSE="nls +standalone static"
 
 RDEPEND="