gentoo resync : 20.10.2021

11 files changed, 223 insertions, 6 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index f94bfffc8ffe..30df81f3a7c2 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/arj/Manifest b/app-arch/arj/Manifest
index 040df16099ce..761813559e52 100644
--- a/app-arch/arj/Manifest
+++ b/app-arch/arj/Manifest
@@ -4,5 +4,5 @@ AUX arj-3.10.22-implicit-declarations.patch 833 BLAKE2B 7162e7851dca555a1d904642
 AUX arj-3.10.22-interix.patch 1257 BLAKE2B 167249b08e73a1114f58781d732288397ba18030c00b3c0df99f5610946569de63fa5d5c2dcf6840cbc7785cc0f22948361ab5d21da6692fb0915a925f308804 SHA512 0ed64bd6d37dcca43651b32623881aaf94525c8dde82515f03ef748a642945366fe2da732aed7ac7c1f6165a6b03fd3b50f078afc135546704d06179d99227cd
 DIST arj_3.10.22-15.debian.tar.xz 16756 BLAKE2B f9bf45f103cf3f76867006bdbd61f6c5e04d75d9543e99e01304b285b8858034c60f38ea76bc8cdc502b44a8515fb7a04fd9d2f3d07f9ea19e1c5d3a4d448eff SHA512 66e1bc3188afc24573fe98374f9b0cf939d0d3c7a1b356e6367ef544fb0e64721fa686fd1e791f58508576f0f50994878347bcb054f48ebe240cc9ab97e00688
 DIST arj_3.10.22.orig.tar.gz 431467 BLAKE2B e40409b9f88a1a7e56de4200b464c3dc420659fa3991bf904ca86bbdb428fc8d17f095b9eabf3170712458ef2136e96545810201cc6755c15e45d4ae9a5e3a03 SHA512 4730dfdbab4f8095396c337578ed69bdaae52955ad468db50b52af8ad2846ecd6cfc05eb3ac0d03838c1c32ea60126f14a22b93e8181c06b9546456f3937ff76
-EBUILD arj-3.10.22-r7.ebuild 1263 BLAKE2B 3b185f881f8af90d4c4cabafdfe5591c7112804b0eedda95e8fb8111975a7d97ea74743a27475fa4d5124219d29a58cdd44982fb37fa4ddca6a4af2bc1ce9850 SHA512 ef3b7ecdb9b57cd51213a1e72ce77fae34207306c98e34009b5ad03f5d8e91ff5f889a86e077a084d951845a4fb8bc2685b5dffe064579a96ffd79f7cb393029
+EBUILD arj-3.10.22-r7.ebuild 1270 BLAKE2B d5e967cfa0ca78e2ad3f96a2c5d5b2e663fc7d36fbaa66d300a5bbd197ef8116cda796143229e6073ea2cdd0f5c159eee9e7ec33009bedd9fbb222e731250948 SHA512 992bc9a9dba7d0fb994f1c1df08886bac444a3ab70065f06b4dcf6ed24b9a8865466f176c4b812159ca8291a54c1cd2b58f6866be7167aead2a3b0f40a026bf1
 MISC metadata.xml 241 BLAKE2B 5c1b54358586f7e559555097bc0ed2152b557cd35dd5b28aeafb7992d810f57674e874a948a0345871cde19486fe6849ff5a5091e7ea67078f3295b935eb3e99 SHA512 5a82a671e4d5f34d32978ebd8acfc78e44d1d93df5e1c2eada2c3dc04d1e2db00c998346f1a71b6eeb0e0eaa964f70a33f7db6a73d551934d190f6e73baba28a
diff --git a/app-arch/arj/arj-3.10.22-r7.ebuild b/app-arch/arj/arj-3.10.22-r7.ebuild
index 2d32c5a42f08..25397e35a751 100644
--- a/app-arch/arj/arj-3.10.22-r7.ebuild
+++ b/app-arch/arj/arj-3.10.22-r7.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=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://debian/pool/main/a/arj/${MY_P}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 PATCHES=(
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 57c00113be8d..9a6b9f1b7046 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -2,5 +2,5 @@ AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611
 DIST gzip-1.10.tar.xz 775144 BLAKE2B 431dc0fd11061eabd9db86594777b86510b124b124fd74799eacd67334631af60f638be2638413bee0153a9da35528d0aecc5b5083152c395223705400c9103b SHA512 e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299
 DIST gzip-1.11.tar.xz 804096 BLAKE2B c251066f0bded6a6557a5cbfe5d20090c6446051c31fad610af4f9f7b2537c28fed1cfab424a459452db73b7d1df1361e5aeba163a9e980fc611faf408cac128 SHA512 af297c173297d588722f4d0f140a2ae4d3ea3861464191772fb2e11e47be43644b5ae01ed63f0051d6eb4751666284de53e14c4dd9f0c1d25f61cf676fbf11f3
 EBUILD gzip-1.10.ebuild 1081 BLAKE2B af51b89c49e389fd2f38996790b6102730594d4bd66c7a4177de9643523c9c9142b5758f7aa610aba7150f4c03f9871c59bf32a3f125084d636de066f77fb4bd SHA512 5616d9ae48821f18464c7e9227aee73293179febfb6b76aca227efa97edf58ad5ba776c5e3b3c5852089ddc86e06a7edb99955176a5f9d3b05e10a630c1abf69
-EBUILD gzip-1.11.ebuild 1089 BLAKE2B 7d6bb6607f6cde4a8fd683ad2ebdaaff7e5381f871e2471521f705d1e1297c339fce2d7640ca398c68e1201310cd5136253cae2a8bcdda4b7b242c44068ab99d SHA512 b62fe8096223eb97ca73a9fe928ae3d7942361bd07e9d755cf055aa24eaf27dd4f91c6b9d396e81274202daa1cfaf45680741b922fcba9e39e6c9cf9e622d153
+EBUILD gzip-1.11.ebuild 1332 BLAKE2B 7cb55947297327ac5887613bedc882fbb18766fbe6dde763e6a6954b3392c0392d82c109ecb77a8a434cca89a66cdf15c9237607d20a279d2efcc804cd3eeeba SHA512 26557604af167b197280f99d28ac374b536f33bec0062eaaf3e6bf23112287ef4d8d10f85adc24ee066afb2b14db2ade1cf38263d9d74369f1929fbaa3d7f2f9
 MISC metadata.xml 422 BLAKE2B b3ba7db4fdf23c9b1b801f21a3230898f260b131344538ff8644bc842dcd5f6bef5e4e2f8d475267d6d39047a87c00e1138e69d49892d21d58249346bde1e57c SHA512 6241ec1357f2f326c745589a18622987e9444e515157a53cb1188a21cd90e14e392db1e31b24f833ba05647ddfcfd6a89e13f6125ca15451bceb1a14e80fbc23
diff --git a/app-arch/gzip/gzip-1.11.ebuild b/app-arch/gzip/gzip-1.11.ebuild
index b41b9f810670..395fb2de49bb 100644
--- a/app-arch/gzip/gzip-1.11.ebuild
+++ b/app-arch/gzip/gzip-1.11.ebuild
@@ -20,6 +20,15 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
 )
 
+src_prepare() {
+	default
+	if [[ ${CHOST} == *darwin* && ${CHOST##*darwin} -le 17 ]] ; then
+		# Fix older Darwin inline definition problem
+		sed -i -e '/define _GL_EXTERN_INLINE_STDHEADER_BUG/s/_BUG/_DISABLE/' \
+			lib/config.hin || die
+	fi
+}
+
 src_configure() {
 	use static && append-flags -static
 	# avoid text relocation in gzip
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 6a94f155436b..c206ab40c693 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,6 +1,9 @@
 AUX rpm-4.16.0-autotools.patch 439 BLAKE2B 173435c31b0e06f47948711da00452d08dd644fcd8ed05e61f7ed31db56a670bacdb4ca1504dd64818752e30868541e3c50f8ab84833101607cf8c487cc93bba SHA512 fce8b036dfc55e5602721206788a1a755e2df8ef6b1cc94f047f7180f97efa750957ffa063cc18c274fff8b20f41181aa1c46c11ad2feed9689d50f4f696afea
 AUX rpm-4.16.1.3-libdir.patch 1152 BLAKE2B b54191dbe36af115b828fc111cea0348ed7edae47f8b9597a57f1b7e3b4848129dc50f1b001f5e8ae92f5f1c07cbe51330ccd8c15867e7624ea07756317eaca6 SHA512 8fd4c0ee785fb583172df7b7543ba790927a9d4953a0368bc4a641fe6e34b35011e3d3cbecaf80c58e79239e68bdab6797c8592f0c5185197df726a51e06d224
+AUX rpm-4.17.0-libdir.patch 855 BLAKE2B 81a2daf0577c8dc3feac190764125da7a616e24ccdd38c3715c3c68f7fc831cf2662e629f23ed88f7d133961a40ac7f63acd6c7f52e99f17abe53442b2a5f14e SHA512 68d884cf9d57d89138ee7d6882869b0560aa9cd3dc82b837c47732f2d0248b42fbdafbbcc1f3f04322cd750744d97e4512491fb0591eb0622b2a5d1918391c46
 AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400f84f39775bd585931e786acf45ab7a1da617f0214dcba90c78511ca22fc556896ae1963ec9160787fdaab902 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005
 DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e
+DIST rpm-4.17.0.tar.bz2 4514138 BLAKE2B e2618f7ac59189fb880d6be853aae99080b5008865298d095a123a010ab70f9e2e3ad9402124afbf8291a3863e9e805c9c65ab47cc435df82a729e81984394bf SHA512 d32af8649c6d47796a645b6ecbe580df97f5423bfb17414d5ed0016373f5cfab86ebcfad6c480fb8bfafaf3a960f9bc095ef6faad7b40bdb208cc60e4080b0c8
 EBUILD rpm-4.16.1.3.ebuild 3642 BLAKE2B 20e3eebb5667d0367ae7d40892a0898c093e81a5d06a7e663b662bdbe93a9b1f8e5c9c48295ad5ca0aa49d2ff14974c79453d9625fc1ab607f818a02ccdd976a SHA512 092048f92e01f0c8aa7f42ee16a416fd3119b9571bf59f8c27a89e4bf328ac1ee56e2200d3ba227c2caaeafe86c3bc21817a34b603d0a3e0e56b1266a8008604
+EBUILD rpm-4.17.0.ebuild 3911 BLAKE2B dc7861a2407f74e2b53e18d49767c8e74cb03615f5e6338e7bba9edac6ff58e39df41d41d65ec95900556e1dc3e98a09c7c486e15d68e46713c706b16eb43dc0 SHA512 21fd70ad3bec10245f074b08120fa8869e55164b35781661f7d1fc80c7ff7ea91e6a9a0f32f5c65febac0862e8a1f7ae5a5ac661219ff0f66d164d696592f7d7
 MISC metadata.xml 260 BLAKE2B 00f83151d62c157bea18101b36007f01e6da9d16d438671c37b929b1e19cfc202f379816a1b0d9e3faea99c44a43f97a5d43100266c683487dabba09f1378eea SHA512 d6fc386bd5be91d5dff3d7aa514f4d72e7301a47f888db95573d72505ee86987ae6412fdd8aec82842c006abe831d99f6178b1ac78a04a7dbf9e5bce1d249cb7
diff --git a/app-arch/rpm/files/rpm-4.17.0-libdir.patch b/app-arch/rpm/files/rpm-4.17.0-libdir.patch
new file mode 100644
index 000000000000..5bff26b71290
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.17.0-libdir.patch
@@ -0,0 +1,32 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -865,13 +865,7 @@ AC_ARG_WITH([rundir],
+ AC_DEFINE_UNQUOTED([RUNDIR],["${RUNDIR}"],[run-time variable directory])
+ AC_SUBST(RUNDIR)
+ 
+-if test X"$prefix" = XNONE ; then
+-    usrprefix="$ac_default_prefix"
+-else
+-    usrprefix=$prefix
+-fi
+-
+-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
++RPMCONFIGDIR="`echo ${libexecdir}/rpm/`"
+ AC_SUBST(RPMCONFIGDIR)
+ 
+ AC_SUBST(OBJDUMP)
+--- a/rpm.am
++++ b/rpm.am
+@@ -1,10 +1,10 @@
+ # Internal binaries
+ ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
+-rpmlibexecdir = $(prefix)/lib/rpm
++rpmlibexecdir = $(pkglibexecdir)
+ 
+ # Host independent config files
+ ## HACK: it probably should be $(datadir)/rpm
+-rpmconfigdir = $(prefix)/lib/rpm
++rpmconfigdir = $(pkglibexecdir)
+ 
+ # Libtool version (current-revision-age) for all our libraries
+ rpm_version_info = 11:0:2
diff --git a/app-arch/rpm/rpm-4.17.0.ebuild b/app-arch/rpm/rpm-4.17.0.ebuild
new file mode 100644
index 000000000000..2bc134671182
--- /dev/null
+++ b/app-arch/rpm/rpm-4.17.0.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{3,4} )
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit autotools lua-single perl-module python-single-r1 toolchain-funcs
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="https://rpm.org
+	https://github.com/rpm-software-management/rpm"
+SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2
+	http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# Tests are broken. See bug 657500
+RESTRICT="test"
+
+IUSE="acl caps +berkdb doc dbus nls openmp python selinux +sqlite test +zstd"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="!app-arch/rpm5
+	app-arch/libarchive:=
+	>=app-arch/bzip2-1.0.1
+	app-arch/xz-utils
+	>=app-crypt/gnupg-1.2
+	>=dev-lang/perl-5.8.8
+	dev-libs/elfutils
+	dev-libs/libgcrypt:=
+	>=dev-libs/popt-1.7
+	sys-apps/file
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/libintl
+	${LUA_DEPS}
+	dbus? ( sys-apps/dbus )
+	sqlite? ( dev-db/sqlite:3 )
+	python? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	acl? ( virtual/acl )
+	caps? ( >=sys-libs/libcap-2.0 )
+	zstd? ( app-arch/zstd:= )
+"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+	test? ( sys-apps/fakechroot )
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-rpm )
+"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	lua-single_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+
+	# Added USE=openmp and this check for bug #779769
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch
+	eapply "${FILESDIR}"/${PN}-4.17.0-libdir.patch
+
+	# fix #356769
+	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
+	# fix #492642
+	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
+
+	eapply_user
+	eautoreconf
+
+	# Prevent automake maintainer mode from kicking in (#450448).
+	touch -r Makefile.am preinstall.am || die
+}
+
+src_configure() {
+	# rpm no longer supports berkdb, but has readonly support.
+	# https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0
+	econf \
+		--without-selinux \
+		--with-crypto=libgcrypt \
+		$(use_enable berkdb bdb-ro) \
+		$(use_enable python) \
+		$(use_enable nls) \
+		$(use_enable openmp) \
+		$(use_enable dbus inhibit-plugin) \
+		$(use_enable sqlite) \
+		$(use_with caps cap) \
+		$(use_with acl) \
+		$(use_enable zstd zstd $(usex zstd yes no))
+}
+
+src_install() {
+	default
+
+	# remove la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# fix symlinks to /bin/rpm (#349840)
+	for binary in rpmquery rpmverify;do
+		ln -sf rpm "${ED}"/usr/bin/${binary} || die
+	done
+
+	if ! use nls; then
+		rm -rf "${ED}"/usr/share/man/?? || die
+	fi
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	dodoc CREDITS README*
+	if use doc; then
+		local docname
+		for docname in librpm; do
+			docinto "html/${docname}"
+			dodoc -r "docs/${docname}/html/."
+		done
+	fi
+
+	# Fix perllocal.pod file collision
+	perl_delete_localpod
+
+	use python && python_optimize
+}
+
+src_test() {
+	# Known to fail with FEATURES=usersandbox (bug #657500):
+	if has usersandbox ${FEATURES} ; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	emake check
+}
+
+pkg_postinst() {
+	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}/" || die
+	else
+		einfo "No RPM database found... Creating database..."
+		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}/" || die
+	fi
+}
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 6a9acdd4bd07..cff52dc4ede6 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1,8 +1,9 @@
 AUX snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 970 BLAKE2B 5288f515e3806394b540bd5187cc277467b462526fac35dc2112fde0529f952083a02dc3bdd349e8fd6d24598f1021904861dec683a03bf9c98d9bfc60bb0aa7 SHA512 070e4bb4c2e4f67d6c22743d82660506478fee8c6fd936508a2beb687a57fbb7325283fa2e9b3f6cdac599a5bc19519b35236752d1926554047444322ac7689f
+AUX snappy-1.1.9-clang-werror.patch 662 BLAKE2B 232e844f269658a757fbb904744b778d1f4c0f5127fb5596143463056238d8e0c1e448bfa0223cf061c2175e397c11965f1db9899434e8777fbc1bf310f0805b SHA512 82424729bbc8698fb0ff3827dfc5cbda9000cb5a80b6f668e30bcea38f1022a7008c60a56fc9b52dc57e771cf59766e4a43f60e04e0f750001c510e71f4263cc
 AUX snappy-1.1.9_external_gtest.patch 1092 BLAKE2B 392ee98254749dbf65ae8317dd2c26dfc140b768a08fe265cca26a0dce0eb43a1283eb55659c1fbf8e36e7037e65ec3f5ef970eb6436822fb6af212981f1facb SHA512 0b867b60b6e90551ab3c1ce4990775f2b0085d68fae72c4b63925f772b565cd86e9ad36659dae3a5cfb621ee628a0a547c82356f0f44d67ca2cc4ad9bfe16333
 AUX snappy-1.1.9_gcc_inline.patch 3166 BLAKE2B b4d05035647a97709ba43ee9673fbdaf1a160cc5859fd7401a8cdb67e04ba49bdfe98a9801257356841326b26759eff1022af3d5253628a87b0035af122a8fdd SHA512 5e8389e31a8d6e092843a3456f4a75d1f5f26af25d9d7ddfec283573a423522ce779b9ed4da5d2e3b6346153b5d137070611f88ebc907cfec64748afd29759f2
 DIST snappy-1.1.8.tar.gz 1096137 BLAKE2B e21f2ea23727f118920b7f67981354194f12d1d61eaa18eb1cb2f4285fabafdd221b88cf1e3b3261634f65469a714d3efe6b218c0b1e9d41639cdeb21097d75e SHA512 efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c
 DIST snappy-1.1.9.tar.gz 1102382 BLAKE2B 926d03156168e3d4800dc17144db3de2c182c6eb9970d87a00b94fb09b67e403479a64cbed75833b83fd03173c1bb8caaf248a55627e89fe2a34456f12ff3b42 SHA512 f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024
 EBUILD snappy-1.1.8.ebuild 1832 BLAKE2B 7fb98c5cb96af2d0c928871ec1f53c1402e536d1b9063b137822d6229ac90f6ea397a81a92269a3c67bb3e5551b05158439e552b6ac4deb3905ed8e34ee92f8d SHA512 11813434621156c662bdbb1acce6b1279f8ad3e7ddf0eb446cac0961357334cd3b89fa9f640c01cb29e49d8c560253184287eee0cc763d1da7cb83840fa09f11
-EBUILD snappy-1.1.9.ebuild 1131 BLAKE2B 0c61bfe91d39ec064a79747cdcf525d562c0169c92d9a8625050f31ebe2f02197960be270a36a739b3a03876b0d844539d89f0db5c0ee4bb4364b0c210b88234 SHA512 7730eff003d49da217949413286ea5340d5894b5644aba08bbe479368df95bb6c18889f0182cb5798d885501524c8a27985af015ea4efd302b7c47e762ebe0d7
+EBUILD snappy-1.1.9.ebuild 1171 BLAKE2B 561f36ded3988a51e03ead969d965d11415348e0cc1541fe1d52ec2264bd62feb52db7c4ccc8fc5a26e5a109544395a893b42b71c9f752580386f2767f9f1d81 SHA512 3c1af7733450e69145afc58f568d27735d20ea7570af7f9b4939a88ce440ed096f0888794e495271d848eba08d28e2301473a26af7fc018f9a35b07b6cb9ecb7
 MISC metadata.xml 744 BLAKE2B b404083b800d59914c748d3a31aa13bb341dcb8f5fc227d3c003428455d459d0d011b2cd10e7d5d3cef3e73f66b14611fd04be409567392943cf1d09f0e4f066 SHA512 204079f9e40c81853343be190058b8dda25a25015c91704c98574151e7b06760d9c8f475790f95ebcbdce48c0b06a8e3e612c3183db1f4aa0b7ced8024c22fd2
diff --git a/app-arch/snappy/files/snappy-1.1.9-clang-werror.patch b/app-arch/snappy/files/snappy-1.1.9-clang-werror.patch
new file mode 100644
index 000000000000..e89a8305e731
--- /dev/null
+++ b/app-arch/snappy/files/snappy-1.1.9-clang-werror.patch
@@ -0,0 +1,16 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,13 +66,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
+   endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
+ 
+-  # Use -Werror for clang only.
+-  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-    if(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
+-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+-    endif(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
+-  endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-
+   # Disable C++ exceptions.
+   string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
diff --git a/app-arch/snappy/snappy-1.1.9.ebuild b/app-arch/snappy/snappy-1.1.9.ebuild
index 1d6d63ebf93a..0d7529657a0a 100644
--- a/app-arch/snappy/snappy-1.1.9.ebuild
+++ b/app-arch/snappy/snappy-1.1.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV%%.*}"
-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 )"
 
@@ -23,6 +23,7 @@ DOCS=( format_description.txt framing_format.txt NEWS README.md )
 PATCHES=(
 	"${FILESDIR}/${P}_gcc_inline.patch"
 	"${FILESDIR}/${P}_external_gtest.patch"
+	"${FILESDIR}/${PN}-1.1.9-clang-werror.patch"
 )
 
 multilib_src_configure() {