gentoo resync : 18.05.2019

25 files changed, 147 insertions, 151 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 30ec371ecb24..d4c074016012 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 171cf90bda33..289276ae2f5f 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -12,6 +12,6 @@ EBUILD brotli-1.0.4.ebuild 1416 BLAKE2B b9a5f452d97b3860b4954e9fd2aae10a03260597
 EBUILD brotli-1.0.5.ebuild 1453 BLAKE2B 9859a5e12bf48136d72d8710d353635f9d4a7e7dc81c936a10bf301e8024b04050c1550dbd67b5ceeeb188b0c4ae60b761de269e28c6ee611133aa2ec7f3bfb7 SHA512 b0524cd8a7e3ca3ba862d95888fd5bf233d94a81f89e65dd4425b9b111f6cb7d1fd8080d972d79d4b9c3ad47c46853c4516719a4605f531986ddc73caf8d234c
 EBUILD brotli-1.0.6-r1.ebuild 1684 BLAKE2B 6889f76600de558a02f39c6404b2ba9385ca83efa3989cd3c458aeff0c9a9d2804afff34ee359b9c427b5a5a24bfb3a28e31dc72d47bd2979033c60edd048957 SHA512 3e09194f3ee29fd8fb61809c9e360bf617e349ab630fee5bda43824448f0ec6c7b51de095a72312db8ad0ba65f24c367f26a8b5e792cc2ca4023a9415521f8a1
 EBUILD brotli-1.0.6.ebuild 1453 BLAKE2B 9859a5e12bf48136d72d8710d353635f9d4a7e7dc81c936a10bf301e8024b04050c1550dbd67b5ceeeb188b0c4ae60b761de269e28c6ee611133aa2ec7f3bfb7 SHA512 b0524cd8a7e3ca3ba862d95888fd5bf233d94a81f89e65dd4425b9b111f6cb7d1fd8080d972d79d4b9c3ad47c46853c4516719a4605f531986ddc73caf8d234c
-EBUILD brotli-1.0.7.ebuild 1689 BLAKE2B b4a7e2809ec7d65110cf89b73671dc82cf9ebdcf12d1002a8eacea0b48403934ffcf6a0e0eed15704e297857b98ac78150343669c95793b1d350a9048a415dcc SHA512 d9a4f16bcd537ff623589cb41d599e2f39bb28eb7f46aa61265c7d774e2c84e64539e2dd902ab54cf5fd0afeb2c302c3f8945fb1ec76db4f3d4bd171937b3655
-EBUILD brotli-9999.ebuild 1689 BLAKE2B b4a7e2809ec7d65110cf89b73671dc82cf9ebdcf12d1002a8eacea0b48403934ffcf6a0e0eed15704e297857b98ac78150343669c95793b1d350a9048a415dcc SHA512 d9a4f16bcd537ff623589cb41d599e2f39bb28eb7f46aa61265c7d774e2c84e64539e2dd902ab54cf5fd0afeb2c302c3f8945fb1ec76db4f3d4bd171937b3655
+EBUILD brotli-1.0.7.ebuild 1645 BLAKE2B 0fb97f08c5acba1c32dcca385c598257b809603cbe57468d16d517eb3fbd4bbe837320f61c6dd24757b18c48aee131b5236204626b78ff3e2288d49e4c212014 SHA512 4e16b5b8859bbd5de10533b07d58f0c368783adc3c90d90a83bb7dc08635ba127be62371973ee33222201b5e910c9596fe223e35d30340899805fb007434e8f3
+EBUILD brotli-9999.ebuild 1654 BLAKE2B 1e6551cfe5323ec32ea0e148398ae386d9cb07edf98d51dbc73d268bfd38472661c0cf4d987f443f749724fa7fdc851c80fc1eb9225e234a77f361409d080f1e SHA512 924f625e26b4cc7582c19ed8cf603e2ad8afbd1766e79348a73285f932ccae2012799a9f94962e118b62f14b9c96d8441586988f76ffb25902baa9fbea885849
 MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
diff --git a/app-arch/brotli/brotli-1.0.7.ebuild b/app-arch/brotli/brotli-1.0.7.ebuild
index 554f1fd3ffee..4debaa969ab4 100644
--- a/app-arch/brotli/brotli-1.0.7.ebuild
+++ b/app-arch/brotli/brotli-1.0.7.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_IN_SOURCE_BUILD="1"
 
-inherit cmake-multilib distutils-r1 eapi7-ver
+inherit cmake-multilib distutils-r1
 
 DESCRIPTION="Generic-purpose lossless compression algorithm"
 HOMEPAGE="https://github.com/google/brotli"
@@ -29,7 +29,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
@@ -40,7 +40,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
 		-DBUILD_TESTING="$(usex test)"
 	)
 	cmake-utils_src_configure
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
index 554f1fd3ffee..703ecf1488be 100644
--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_IN_SOURCE_BUILD="1"
 
-inherit cmake-multilib distutils-r1 eapi7-ver
+inherit cmake-multilib distutils-r1
 
 DESCRIPTION="Generic-purpose lossless compression algorithm"
 HOMEPAGE="https://github.com/google/brotli"
@@ -40,7 +40,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
 		-DBUILD_TESTING="$(usex test)"
 	)
 	cmake-utils_src_configure
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index c6d5894fdf9f..5978e15df5a0 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,3 +1,5 @@
 DIST engrampa-1.22.0.tar.xz 1358552 BLAKE2B 542bb963d232dd75eba6102926e2cf31b52cab16eb890039609cf6ec44e86a7d6bf49ee04da316bb46e49d9c012c1f100e4acb20541cb8f46e245946f83cbac8 SHA512 7b4c3b85184c1530ec72eba174ee571cc14490c88f5fef1232acd4197f1020107f5172d6d4271753f9f6fcfadcf049273095b3dfbcef6fdd25a51ad8d2e17382
+DIST engrampa-1.22.1.tar.xz 1363488 BLAKE2B 0f71e94af50443f9f562b0eed461ca1160fab0a5a3cd02c845fac09ee2466cb8634a458a6a4488ff5ac6674b0f525eccf754b8b1cc7e3f1729d4eb6ac224e025 SHA512 111eeb470555ae8edb7754159bb2e70b03cbbc7b1c9d61c253d9d67e50d84ff0e0654e16547883c39aeeb223e8ba58201d45b50819784fc6cf7a21f0cf176c70
 EBUILD engrampa-1.22.0.ebuild 1717 BLAKE2B 1b19d5b2a8a35909db0e38b59be3f5dd4afc87ac77800b946f1a91080f37c12e49f8843ec786f92e630adf727e7dbc6a68184f748f131eb9aefeae76efd0352a SHA512 640f9adac5ff1e040cb1e5bacb6ff9408bb8d5ab4b9db91c341090987ecb3bd6f19613314fb3bac69c113ef47f18b162401e26e8a1cd6ce69f5e8cf9be985caf
+EBUILD engrampa-1.22.1.ebuild 1719 BLAKE2B e6f541789b8ca0b4b2b0fa5b2b87e464ad1109d90915453fcc447376fe5318027d118d5545d384a38df5ff7e055736705544c5f30a9f62cf433736c6634c2369 SHA512 caabfba263c58a23c5f437fdda887baa9c58eac1c3fb1f7698d6488b34469f43911e3cd39b33bb5f7eaaa4186ca7b1f49b153286a39b8570bdc6df42e9d3e018
 MISC metadata.xml 702 BLAKE2B de15449aa20cc44e6068bd8047630353f3389845a3332b57631bacdc9b9c4b188f8152678240e0142142db322af7058b09060f74413ff55fd1980fe697f32d0d SHA512 b465ea239cabf4ad1cd6b1f5ba7f87151e637595191c1a88cf17059f96ca1b03ce57d4200fc793d56be2b6ddb2ded20be460a4e1ac1727180e9662f9baba4522
diff --git a/app-arch/engrampa/engrampa-1.22.1.ebuild b/app-arch/engrampa/engrampa-1.22.1.ebuild
new file mode 100644
index 000000000000..f1260b9b27e0
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.22.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Engrampa archive manager for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja magic packagekit"
+
+RDEPEND="
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/json-glib-0.14
+	virtual/libintl
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3[X]
+	x11-libs/pango
+	caja? ( >=mate-base/caja-1.17.1 )
+	magic? ( sys-apps/file )
+	packagekit? ( app-admin/packagekit-base )
+	!!app-arch/mate-file-archiver"
+
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-util/glib-utils
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	mate_src_configure \
+		--disable-run-in-place \
+		$(use_enable caja caja-actions) \
+		$(use_enable magic) \
+		$(use_enable packagekit)
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+
+	elog ""
+	elog "${PN} is a frontend for several archiving utilities. If you want a"
+	elog "particular achive format supported install the relevant package."
+	elog
+	elog "For example:"
+	elog "  7-zip   : emerge app-arch/p7zip"
+	elog "  ace     : emerge app-arch/unace"
+	elog "  arj     : emerge app-arch/arj"
+	elog "  cpio    : emerge app-arch/cpio"
+	elog "  deb     : emerge app-arch/dpkg"
+	elog "  iso     : emerge app-cdr/cdrtools"
+	elog "  jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip"
+	elog "  lha     : emerge app-arch/lha"
+	elog "  lzma    : emerge app-arch/xz-utils"
+	elog "  lzop    : emerge app-arch/lzop"
+	elog "  rar     : emerge app-arch/unrar"
+	elog "  rpm     : emerge app-arch/rpm"
+	elog "  unstuff : emerge app-arch/stuffit"
+	elog "  zoo     : emerge app-arch/zoo"
+}
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 266fe2ad8a5c..65f324203cbe 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -2,5 +2,5 @@ AUX 3.22-packages.match 589 BLAKE2B b53cde8851c08d4f538397d72d5e904b6862a091ca1c
 DIST file-roller-3.26.2.tar.xz 1436760 BLAKE2B a563f77dcc8d61e90e4e42fa4f08aded657d677b319b39f4c9fd16670a2309e81f142b7b8528e52db0be3f454efca15ccd7e9e25754a95b45800a9ca02969e12 SHA512 3572446081f931ce7cfd7eccdc9450d798164426a68bc332f9340b7c06b79ce4f1589b817c27322a0c1681d7f2cb8cf93462cde1e3df13ad40789faec1decc9f
 DIST file-roller-3.30.1.tar.xz 1443340 BLAKE2B 352b094b51d342ac71f2174b59dff262ba46b4697c21164ba18bf825d70cb609d59a35ce0efe1013e217e86754822accc11c59eb9bba7185a9f7efe5dded4def SHA512 8f3f55cd7d6769fbf8f72118bb8982775c3f83534266db1f2cc9bbfd9e8dd68545ab49baaa4e468ce22e616346dec9c99c11a0c5b4208dca2e648fac8756cea7
 EBUILD file-roller-3.26.2.ebuild 2307 BLAKE2B b6f4a7ef84cb8474b3febd688b84bb3252ce9ba8db33fa6b9eb820bd5b676fe76945f76479a7792babecb5ff165f0509f1b5007b9334bda2de8d68f37ee93b45 SHA512 c95ed77e3e8fe9a2cdfa28937719fdfcf757318d8a3ea24cd9aec9281ed18311b3f6b1ccece152662a807fd826b372f7aa8f3960d21f5fb1c2c7ef252e629062
-EBUILD file-roller-3.30.1.ebuild 2128 BLAKE2B a8ad9e6e5a08fd153e351b016315a267874c8c14a1a18ef35b4c6aacd443eba601195ee20e58a0038c84d4f337ad6c84f1c61b4a27b8f399f1d087106f4e0f82 SHA512 f3092c4c075a089c0c631e1f3ab503bf817023b9e60effe92d15f5201902da40f60581c9b7dbf3c666a63c8d5afffd83c31e5a7be384f3cc3efe1e22beb02373
+EBUILD file-roller-3.30.1.ebuild 2126 BLAKE2B 3ca2c6d6f7a288570dd54b2944962b61358c06ba1182a84a2d025c652103d67af751201e934867743e00e19cd0fe5e4004ebf6943931016351e52eef1b6a6ef5 SHA512 e642ec6cec104546dd84e83fe3d9f54abfc79a12ab2d2eb56419c431ada3e2a90b1ad269d354a8c18842456f753707cb9a4838eeabfee564092b960147d64af4
 MISC metadata.xml 648 BLAKE2B 8fc7347f0812f1b899096670b3ed809dd577e8173f8d7dac8175fbc6eb2939157d1a6100bcc39f15d22e8058e1daba2b4ac7b678baa83f1d24c1f14d77d2e989 SHA512 ea1b782f93ef9397e798d7f6cdd1e650ae95dcad71f439ec518a9e79ebc83a176c9876e85b9930d691e818f5b1efa636f5165d690cfd63b4c7ff9700ba2f956f
diff --git a/app-arch/file-roller/file-roller-3.30.1.ebuild b/app-arch/file-roller/file-roller-3.30.1.ebuild
index 63328057b6a6..5599e241ed3a 100644
--- a/app-arch/file-roller/file-roller-3.30.1.ebuild
+++ b/app-arch/file-roller/file-roller-3.30.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE="libnotify nautilus packagekit"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index b69a657508dc..6d35e935f5a4 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -2,5 +2,5 @@ AUX 1.2-optional-vapi.patch 1417 BLAKE2B 69bb7480a352894ec9c96f0566972a87004801a
 DIST gcab-0.8.tar.xz 337016 BLAKE2B 6f9ccf6d33c4bd32b6cda09083c98ee9b24ffc3b42be9019493a864011a4d3f1e2d1fa766bbdd0a5de29eb04608d91a2ad5c17aa25302e3d94d2ef6ca659d764 SHA512 044b1cbe71b08946031161ca97379df8500be5569d6f4989b8fd8f1d8c48ba0fe757306955de9137958eb870cd4024e4c56f833ce847e5a972339883b39454f2
 DIST gcab-1.2.tar.xz 76088 BLAKE2B 4d8f04ec6211745e841b88e93c5d156843bce9ca8668daf9d39f1197c814d619f7e61b1e20d163c8631da36bf395776c3b20a91a0ec97ff7c609997fa84a538d SHA512 b5cc114f5cea21c21d9ef2009cefce700b5a7f97609e20aa455b84fcefe1693ce2566ddc58dc2b7c97f7db772f8ae3a2f3cc9a0e1d2c23d93d5fbee9101d3f64
 EBUILD gcab-0.8.ebuild 924 BLAKE2B e1d26430d255f52f12ae93d5a5b034e384aa049ef75bea44c9dee082519f6cc166d8e4dd9dd2041879397d896d375aefff345578c96a5c9a1e712e1ee05107b1 SHA512 af2f575805991c4737106b77212c9b3f241bcf6fdc0ddd50fa497c6e6e4d6bf3a61dad3800512b19e3028016fc226f0cfe777d72edc57da2afb45add3f398795
-EBUILD gcab-1.2.ebuild 1154 BLAKE2B 87357df96560ed1a7536a76325937373c49a9e41cfba98b173ac5947a77e51dba4010442936b2a804dc7de302174333ab0dc220a9874e259686de8464f75ee91 SHA512 ce1e8912e6f86556b184b896e7a477bda4a104dbc8624299f5fdc03bb493e95aa281266f9dd4a9826c9b4bca37116e78f94b93f1d09d6d19a67844ac821b6d0e
+EBUILD gcab-1.2.ebuild 1150 BLAKE2B 9f3d6e6a0045882ac413df28d9c4a005d7bb127b3ac7dec2624bdf9d28b9d1f194a2ca0811f6627d521fb4360c6a99d95ce7c63670a8c97b85f3d69ecd280fda SHA512 8c893256dd0bac5e3faac7985f69166c9bed589dfbccc49a86d75d9654432cfa51f43672cb9b14c9afc848e34cfe0d515a7d8f9cd71af4a7c26f86db161daf5d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/gcab-1.2.ebuild b/app-arch/gcab/gcab-1.2.ebuild
index 734b3f1b4a88..4445fb2b6599 100644
--- a/app-arch/gcab/gcab-1.2.ebuild
+++ b/app-arch/gcab/gcab-1.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index 1cbe385b290d..7b8cd0d0cd60 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-autoar-0.2.2.tar.xz 295488 BLAKE2B 33f614846547921b208239f7756cab3561ec417f2030e3196bece43c47af2a6496fef82838d90fa3ddcf8742023b525bc4e8cbdfbf3fc925c92c74a8a6918c3b SHA512 78faf8f82eeab4cb5f1f364d6e9caa4d24f21f9b81a79ebde4404253f3e7ae120f44600f236612859810afc6fc6f1a8c6f2e065db98be79103255642139c10a2
 DIST gnome-autoar-0.2.3.tar.xz 297632 BLAKE2B 37b5861b1e0866200884aa1791fced6168c12aa740413a1330a08629aaf4e18105b02b36828619c20a15874ac41c779836627728c82fa1a79a1bab6dc9224d97 SHA512 f87299817c52e7862a6c1cc950b1c362db8e7465e008d988e70245a203c728a9179400aac8601c399abe361e5a1ac4558b1190641ad3afa7224f883546fae7bc
 EBUILD gnome-autoar-0.2.2.ebuild 959 BLAKE2B d53017a455006360c2fa8e5e8af3213c2aa30aa5949f2a44fde02a175d0372e70c9df17450ebd75df530708986827e683ec3c8f6a289574ff9d44aca6fc95356 SHA512 37c53366f03f0a1f538a1bd4a62e0aaf059439f825cdd641ad9ffbf7b8e2f5c8654624a4442b1cc5e38c6d74393ea90d38f3dbe07ce646738261abef803a0832
-EBUILD gnome-autoar-0.2.3.ebuild 953 BLAKE2B 1e96828e34735c5adf5c8fa6d53a4bb1456ef704522fe567b7c08b162d9ca113983bce8d5747995e64b2ace85c4268c3537c2ae6f8ccec9f86168ce858eecc6e SHA512 0a0e3a9052353597176849e800ae51d0349cf654259435bc28323ceeebe03e6e08143869dcdb8e85b502cb1d8d5f0d88a872be5e91308cd323347ef80e148383
+EBUILD gnome-autoar-0.2.3.ebuild 951 BLAKE2B 2b88f196ea5f84e3ca157e7ffb32f9ead635f380d7c2670769dc633a608a2eb86ac2c637a02bbb97428753957962718b6588163b66c1bea12abb40bf0e32ad36 SHA512 4573d081f43651ed59f51f9c9fa0df42c4cbeabd77e6c3521c80818773adbe17bc0723b36de98d5df088d7029a729b0a70438df4caf2e9ea790177d4ea07f8b4
 MISC metadata.xml 464 BLAKE2B 1144e271593c56474f4d7a733d09cb3d4bf042d6db45eaf81942d66e49a8c2a722d15cf8647af88c8406a7661365cded5b3ea9a8e4530d52e0f99cc5c847a1a8 SHA512 2ed7ffd5a60c7f0481868cf0f151ed8a9a097036cab309129a45b6bc5eb5ee21fc276deb3ed262d0309ffe5fcad531f05ef9c7e085e007760a9470878b61bc3c
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.2.3.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.2.3.ebuild
index faf98a8708b5..6e367c852a5c 100644
--- a/app-arch/gnome-autoar/gnome-autoar-0.2.3.ebuild
+++ b/app-arch/gnome-autoar/gnome-autoar-0.2.3.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE="gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=app-arch/libarchive-3.2.0
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index d1ade68291f6..bd59e33cc658 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -6,5 +6,5 @@ DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba
 DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 627949d24572b8345800e72a24d1e8d95cd0f19bb7fab70e2f36be011fee6f345eecfa9563640068b10888520aafdf30b1e3426b7e2743589cabd3ab5c270a22 SHA512 9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7
 EBUILD libarchive-3.3.1.ebuild 3438 BLAKE2B af5fa17a2a5ff850d88e81dbb88f2e275f4f601b1e61f7e067ff3c6806cb0bb115c307862ba5e74fb913aff9a7bda1399860e220e69c17826cae065e04a78d4a SHA512 31ae25cf9ec76a27098861dcec1a8a80fbfd132296febd7db47c10a8a34dc08a04657d41f66a3aacb0048e4154d740b8d346a287298e9067d555e8908b668194
 EBUILD libarchive-3.3.2.ebuild 3509 BLAKE2B 7338b74ba0ba1b9a120ddae5a320a834e6ce8cef981a2ad59aa26c6973a26e1088094a30334b50a013c34986dec783b872d9c57b117bddd90a11d048c7ebda02 SHA512 6affef3f8d8613fa74dedbf4788eaa103ba4bda8107084197f1790ea6ebd78ce7699dd4ee2ed718ea6c776e4a8b1572e8c00710e994f48f419374cff8d2034f4
-EBUILD libarchive-3.3.3.ebuild 3630 BLAKE2B 0391ef2aa944e8b77537f22bce5f966a2685b4265b46ca5f64e6308e9e9a18222474ac8470829927500e820c23e7cfd676298dd85ea594835918b1b59b9b013b SHA512 780eacbb7f7e882e5a5b95e0f390c8075e19cd794ffde86840cc34ae2df2038545acbe892b577071304ecf0c2e4eb8824c69920eb573995ab45ff0e900607dae
+EBUILD libarchive-3.3.3.ebuild 3623 BLAKE2B e0720f6485ca9b2f280fda13eeb19a54df3dae0ab1ac5c183389b14f99ee80e0b7d7542af25b9c4ca694f47f4f3172a684e1a02ea70c645f5951dc859a904e0b SHA512 b705e01c23a11f88e4025538d541855c10a5e61feaffb88b34d0c6a60a2d8c637792768153ab2bcafa2fc007819a0dc2b0e93eba3ac3d156819ff8fb63c645f7
 MISC metadata.xml 1447 BLAKE2B 342ab0c5aeb3fdae86b39228d4df3c98163b55c1fa23318b2b7a22f714303f1f0615d60d9c057b0a91f90e61e6a7357043096463ca3efe1e8d5cbcd2a5897ce9 SHA512 85b5c67f258ab07b14f15967024bd5d1f11a81bd203e67d40398b42b3728735e28cf2645a0db865c6b6ed81a64da6de470ce62c882d0f72dbceb5361f791b81d
diff --git a/app-arch/libarchive/libarchive-3.3.3.ebuild b/app-arch/libarchive/libarchive-3.3.3.ebuild
index 8245d8adaed7..5329c003de35 100644
--- a/app-arch/libarchive/libarchive-3.3.3.ebuild
+++ b/app-arch/libarchive/libarchive-3.3.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
 
 RDEPEND="
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 0cd0c9d4f03b..7a6768d3abf1 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,6 +1,4 @@
-DIST lz4-1.8.2.tar.gz 320742 BLAKE2B cd97b6a31a1f45d410d598af0b0b696b3ccc3ffdc4fd523316576ebc68e24e545b8ce359889b0dca1968b1c296cb69951617b91b49cbe8eb98cfdb9ce400803c SHA512 5fadc79334d37739c947d6dfc24f48ce82989fc5ee4f2bb8201ccf7ee3230b9e6e7c8488beb64050a035369f4247161d258bdb539578bec224ccebfef1b8a763
 DIST lz4-1.8.3.tar.gz 327897 BLAKE2B e2be80be14c67cf1a07cc6a2e6f6777a87abdd15499b9c32b8096e09284aea19620adf930e28454ce105e325cff684d2625e0a38211705f3c105a80b72f56be5 SHA512 5d284f75a0c4ad11ebc4abb4394d98c863436da0718d62f648ef2e2cda8e5adf47617a4b43594375f7b0b673541a9ccfaf73880a55fd240986594558214dbf9f
-EBUILD lz4-1.8.2.ebuild 831 BLAKE2B 7c1174195af69c90beabacba0e6d90f74d08deb479707bcde45805abdcb65ccdc7946c48baac5b5f07156db5b3a8a4d00d4a8666b4be013af0e173b493af40da SHA512 40dace38b210312b8131e906cbb4ec762826da994e11e2aa8cd8400e32aca3122c7d71148c6c220996a61463b4c2ef5ff7a57acf0cdc27c8fef6b7e44d610a65
 EBUILD lz4-1.8.3.ebuild 911 BLAKE2B 674ce798fb551fd4bdc4a0e5b2913f238532439e98c8887a5d3cb64e7bf5a7349e225dc290da191c97f01a2b03a8770409b915513c65d710bbc072de6b4aa8f6 SHA512 982493e85bf02014b490a10e4dc57e25e193e493ef6fcb65f77af84dab9501fef5087bd8d80f3e16f4cffa4cec025e7ecc1829ff163f5a043fd35fa4a55a3487
 EBUILD lz4-9999.ebuild 824 BLAKE2B dbc4eeaf3f65d527eaafd48a1083c43b76fd564b9dec1e6393c93445be4a0d9b56e540a4dd24df5438ea9b2ffeeb8a53a113a69b40f9b1ded3af4567b00122d8 SHA512 f28250733aa50bab0d908f5288d69d3d78af865433864716474d6d8fc639a44de61fb25dff06614bee003b9fee1d1a71528f9b96d2347c3562a5eb5736a340a9
 MISC metadata.xml 427 BLAKE2B 6d83f65cd913a612933b067bad6594e6e0e389a85a5b883e8d795f8c9591afa0bdb9b987ea35ceb3dbeebe3fbb81ca217a93fd5a8f8d42bec5aef6707dbf258b SHA512 022a6fcb7f89687c4817778b767e393f4488f893de14f0c68aff9aaa41a9ec3cae5034eed17c9d32e5ecff735cdad0f70bddfc0158d599f22bde70653e0d0f3e
diff --git a/app-arch/lz4/lz4-1.8.2.ebuild b/app-arch/lz4/lz4-1.8.2.ebuild
deleted file mode 100644
index d81702967f3f..000000000000
--- a/app-arch/lz4/lz4-1.8.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lz4/lz4.git"
-	EGIT_BRANCH=dev
-else
-	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-fi
-
-DESCRIPTION="Extremely Fast Compression algorithm"
-HOMEPAGE="https://github.com/lz4/lz4"
-
-LICENSE="BSD-2 GPL-2"
-# https://abi-laboratory.pro/tracker/timeline/lz4/
-SLOT="0/r131"
-IUSE="static-libs"
-
-CMAKE_USE_DIR=${S}/contrib/cmake_unofficial
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 251a8fdc9a27..553523396bf8 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1,4 +1,4 @@
 AUX snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 1017 BLAKE2B e9181a6a89bd62c3433c71008d182fcbdd2960e29542539f9ef5a48eff15347968a8a1a2d362633056f27df0a5ea84a5a721afcc375335295cb7c0cdd9267790 SHA512 52bf7db93ddfaba96fb16379f5d3e923bb27b6763db15698b5a5b6529c17e667b9b5c98108291a8eb9ddb98b7cfb0b5836602f66ac6beeacafa9da654e632ef4
 DIST snappy-1.1.7.tar.gz 1090550 BLAKE2B e389c96e093de5db92b896a7fa17a90d3ad0be07972e279321f24875f0f0c8c704ff478f4902a6356d458f93c249e3e06424d5a4efc9753a23ab12b7ee83a088 SHA512 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf
-EBUILD snappy-1.1.7.ebuild 1940 BLAKE2B d58db61ebf36bf7273ff88d75c6412bb8b6a212c7816e95d3d7d725f38a27e050aa4277427326f50e41fd22b23805aea455e82f98b4437a06c1a6746362b35a5 SHA512 dd676c961974ab6f7397c481edf2a02d8cb3778a17bb4538bc4cff2c22b759f210d5b0257b623e58a64a53f3ddd69c28a1c163147908d21c953426ef2a582648
+EBUILD snappy-1.1.7.ebuild 1936 BLAKE2B e78295119fe314d12951eb24007663ebb3fdf88fb06a826d31d632cc6c824422c5a7fac6e0e4a3362a15a8bb9adcf6345f07129740490dabf690abf0d2274ea7 SHA512 0dfbffe311100e5bb6e7a9bd3cfb3e3b687da8729f1253219a70ab98e0a22619794080babfafe4c1c7a1688b4cdedf52da7a5f50ee3c2c8542f5bff4fa7daebb
 MISC metadata.xml 584 BLAKE2B 9972ee3948809ca45ea18129bde88c5a93fbe73d24c6e125cd13a45bb381099110dc0e006cf76a57d0baf7d18001bf261dd1d6db1025750b114903725e2e3aa4 SHA512 5897170c6fb84f520d879b5df295608b92376150ed2535b578ff04c5cfb5a0ba334a7aee3ad1ef41a8ed45b3fb36425e1dc0e54c0fb880e0c2bf72803a2da552
diff --git a/app-arch/snappy/snappy-1.1.7.ebuild b/app-arch/snappy/snappy-1.1.7.ebuild
index be36d21461f1..5634d24aa2f9 100644
--- a/app-arch/snappy/snappy-1.1.7.ebuild
+++ b/app-arch/snappy/snappy-1.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,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 s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 # upstream killed static lib support with build system update
 # (and we have packages depending on the flag)
diff --git a/app-arch/unshield/Manifest b/app-arch/unshield/Manifest
index 7329db5552f9..57add58ae81a 100644
--- a/app-arch/unshield/Manifest
+++ b/app-arch/unshield/Manifest
@@ -1,5 +1,8 @@
+AUX unshield-1.4.3-mandir.patch 776 BLAKE2B 6d0c23a3cf0457ffb03f8f6a08667bfec7bd2fe1744867febfd9ce9a786a0e7b84408cbd5a2c23eb94c68d33a17d2c638ab7e44ea6ae0d95d5c0cc280b0ed585 SHA512 4acc69f49e3828f1dac5448b22d6015cd1c4f551c22c9d824d0650790ec509d02e7ef13f18b58bc338d25d7e93bf334d2ae1bbf198b2b831c183707b22bceceb
 DIST unshield-1.4.2.tar.gz 46051 BLAKE2B 76e8e724916f5c43c84b17db34f2c5905f99fe424679b9c9fef76e1892d0a2f90e6c195f1a02a8446473860578c34678e395f65cf5973019ed7be5d3dea14e84 SHA512 3ddd5df47198adade66acf89644efe3a1c87d60fcdf511f8e5c1fb29bbb07e77a9abc57a05b161ecb54a26a2a86242bbcba6e90df770b1325965ff5aa8eddf58
+DIST unshield-1.4.3.tar.gz 58822 BLAKE2B 89e23462610d7ffd25358cb1d9f234b5c80a580deb60e85610ddacc8e3aa92420cb0e885e80375089e93786565824813f23c54f7c4d60b7773f23d174c98e5d7 SHA512 2f058e0a28d0497e2afe231ded1b1bb16745401398eb1035e628d263351b10a1343c9664f3937b8912755db9dc5236a1b43e9bcba596affb7aa8b036f49382aa
 DIST unshield-1.4.tar.gz 37199 BLAKE2B 7f32cdbac3dca8e5e7dfca7e9ae7d12066b0484a8e75f611af173ec12dfd03dfd0ee7b79d05e3c7fb45a3285bbbfacf6020ad100907345a1501b3a8de81c81bc SHA512 b09c29fa8e5785f2ca90b40105304802d00d201dde42ef4f5e4b5504ca8edf10da426c7ed1daa8c0685980f085eb20437162812a2068a0c03c0dfd240edbf944
 EBUILD unshield-1.4.2.ebuild 846 BLAKE2B f9528f21ca70da097527aa4f3b7beb2d1c3f18dbb181a0dcb4f512d05ceaca4a7ba6e8c095507a0428c851ea84b3a5832a3997f8274284721ab7daf375bbb8bb SHA512 99f96f2328ae4efe4dc1cc78014b12d630b69413e0f98823d9ad895d45bf3a7bfd96ea132105786699d165440cfc64fa1352f2cbca472699947fb88e3b732772
+EBUILD unshield-1.4.3.ebuild 889 BLAKE2B c262543a00374f4ad4bee887587614121a4cd7a4a7e087e4a86b8fc7b2e85c1cff36617248f50790267f618b6704fca35ed1ee56ecc3557303d1c8119e267576 SHA512 1dd045a9f77de2dce8fbd1e2c5b0ef692adc52a4f14a8f2236862857bef0ad43c0d65bb5035ec8b87dba68f9ac236f820a3ddf466c9025f4be6e609c2d9cf585
 EBUILD unshield-1.4.ebuild 932 BLAKE2B bf19ee8b959311ca950bf81a1d518386614f26dbc5fd799a065fb67847a4c98b9b081a5df3c4624c9bd721995531e56d3b1b41cd5e6d36ec07778bfbf37665d8 SHA512 81c169fa18106e9a4bbebe63ac9f3f4e43f9d4750091a33f65336e36f2995fb1382d5a02bb51b17fb403a06a77ad3a6c0bf47fffa783205b1e53720fc35254a9
 MISC metadata.xml 224 BLAKE2B 39d3ea8455cb2158a24af3db4266dd569cd7765eafa967c5ae2a2cc9f9ceec9d0a8928b5e99d9e5bc5f610501bb6129f1648d6560e0a4980ef9e026dc821a164 SHA512 3c955bc3bb3a290848f9cc01472321c321ad63b98a10eb1a7986024db98c099e5a18c628c6398b37c42e69d333fe88d74cca5c22293aba196991aa317e6ed670
diff --git a/app-arch/unshield/files/unshield-1.4.3-mandir.patch b/app-arch/unshield/files/unshield-1.4.3-mandir.patch
new file mode 100644
index 000000000000..49f634fa8631
--- /dev/null
+++ b/app-arch/unshield/files/unshield-1.4.3-mandir.patch
@@ -0,0 +1,21 @@
+From cf53f87fae324e1a4c5d9ebd49b88947a9b02267 Mon Sep 17 00:00:00 2001
+From: Dan Church <amphetamachine@gmail.com>
+Date: Fri, 2 Nov 2018 11:00:20 -0500
+Subject: [PATCH] Fix man page install path
+
+Use the standard CMake variable to determine location.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e0c20d3..0aeecb5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -87,5 +87,5 @@ endif ()
+ add_subdirectory(lib)
+ add_subdirectory(src)
+ 
+-install(FILES man/unshield.1 DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/man/man1)
++install(FILES man/unshield.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libunshield.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
diff --git a/app-arch/unshield/unshield-1.4.3.ebuild b/app-arch/unshield/unshield-1.4.3.ebuild
new file mode 100644
index 000000000000..1577c7f0553f
--- /dev/null
+++ b/app-arch/unshield/unshield-1.4.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="InstallShield CAB file extractor"
+HOMEPAGE="https://github.com/twogood/unshield"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+
+# OpenSSL (or LibreSSL) is detected at build time, and used to determine
+# whether or not a hand-rolled md5 implementation is used. The build
+# system prefers OpenSSL's implementation if it's available, and OpenSSL
+# is common enough, so we prefer it too. Since the dependency is
+# automagic (there's no way to hide it), we require Open/LibreSSL
+# unconditionally.
+IUSE="libressl"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-mandir.patch" )
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 824ac91766d7..c72b9bf879f8 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,6 +1,4 @@
-DIST xz-5.2.3.tar.gz 1490665 BLAKE2B 470791a67fe635165559b0364c9c0e968f3fc32ba7af53d0173d620ca65c68428e0d4d18ada341a063ea3eabb1b51a71cf873218ca0622fd41e01c20a6f04078 SHA512 a5eb4f707cf31579d166a6f95dbac45cf7ea181036d1632b4f123a4072f502f8d57cd6e7d0588f0bf831a07b8fc4065d26589a25c399b95ddcf5f73435163da6
 DIST xz-5.2.4.tar.gz 1572354 BLAKE2B 877242324afd3c7eb21d3a9414c53843f4d1bb089206e8e545e280b32ff5372f7fb4a1b0c27cb6fdf0d0a27a668e9772ecc3fffc181df95d081ca9c2e987b83b SHA512 e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578
-EBUILD xz-utils-5.2.3.ebuild 2571 BLAKE2B 1788e6fad91fb53b24e7569cde03460bff0a2e3b47944fcefeef171a6aab6f8c4252d2b5bf85de7d2270bfccca81322e263dc9e533df609c4b20987cded81daa SHA512 fab45e4cf1b6641778a9ba2938899904f58ccc45a08eaa438bc48518abc029901839cc161d658cdae1196b253d11e9e066c5d401842cb6e77079eb3ba676c961
-EBUILD xz-utils-5.2.4-r2.ebuild 2681 BLAKE2B 799cd9c8adbd4ce02283e088dabe4e04fda65bed108e9d54320b796f4e4a5027ceb4f56684809b379cfb7fa0f9625338bf12ec3d4b32d9fcbc131fb7f707ed37 SHA512 d767afee370f31ef0d6e5bd7106ef0460c613220e3f4613ab857bc4b316709a176342d47dfbfecee0e51dbd3f117ab9e524531ed2cb8d2be546d9694d67b1507
-EBUILD xz-utils-9999.ebuild 2640 BLAKE2B acd0b41c7920abc224dbcfcc464986f98cc0be29c8c9bb2b5868f6c7fc8b3b25366171bf0938fa3ec7bc433f2fea2ebb959240ca29ed6e00a8718aadc415382f SHA512 4ba55614686767f42af701167beb3df92e1714b2010c34a52005e87a1090ce7bd707c82eb2e65873a6eea413f68cc147ac20f09c36f52f57e5c93bea24681127
+EBUILD xz-utils-5.2.4-r2.ebuild 2693 BLAKE2B aa5671f827997a8f32a850f64e4f797223fe6c290c10ebacd626a37bcf2d79e2682e08b8c3da914333f76040c39d104bc3c87eed5bb78cf34208409ce6a9776d SHA512 958d42f3cadcf435322b749c7a573f1148646b10b9113695871c996ea9d7d9a30e060c45afa069faa121f6dd74fb45c7ca017794af2fe26ec5002e7d9fbb98e9
+EBUILD xz-utils-9999.ebuild 2652 BLAKE2B 02d447457fb4c4911e913e8128a513a8f664a035534ad1a5df105024b1c5ce0b903ea0610010498413626bd00416804bb3ab2364ea48053ae40bb90f1d45d575 SHA512 60d58ec8c41c9aec1a6aadf07cae78764d8fb4ef1ea11426abead71f653906a3d2d47e5e4e247335a76c2d04da90c04c0a8b6dd33f525d046094f2e9d7c024ef
 MISC metadata.xml 462 BLAKE2B 66d5625b239d042389ce8fef820efdc3ce3b5cbf21f6d0aedc4874d450ea1897dc8438575f3efc5a491ea857a8b990e6a51b16d0ff0b4982b41307bb52535cf1 SHA512 8f4ca7b987587a240f932ff1719f096de148db6e11c4e0af5f2f55552cab5d0af1256be337dbe8493b584d2c25a70a308dc28b90712078fb58f40cae37cfe5b1
diff --git a/app-arch/xz-utils/xz-utils-5.2.3.ebuild b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
deleted file mode 100644
index 80a98b5080c0..000000000000
--- a/app-arch/xz-utils/xz-utils-5.2.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#           to avoid circular deps with autotools
-
-EAPI=5
-
-inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
-	inherit git-r3 autotools
-	SRC_URI=""
-	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
-else
-	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	S=${WORKDIR}/${MY_P}
-	EXTRA_DEPEND=
-fi
-
-DESCRIPTION="utils for managing LZMA compressed files"
-HOMEPAGE="https://tukaani.org/xz/"
-
-# See top-level COPYING file as it outlines the various pieces and their licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+"
-SLOT="0"
-IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
-
-RDEPEND="!<app-arch/lzma-4.63
-	!<app-arch/p7zip-4.57"
-DEPEND="${RDEPEND}
-	${EXTRA_DEPEND}"
-
-# Tests currently do not account for smaller feature set
-RESTRICT="!extra-filters? ( test )"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		eautopoint
-		eautoreconf
-	else
-		elibtoolize  # to allow building shared libs on Solaris/x64
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_enable nls)
-		$(use_enable threads)
-		$(use_enable static-libs static)
-	)
-	multilib_is_native_abi ||
-		myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
-	if ! use extra-filters; then
-		myconf+=(
-			# LZMA1 + LZMA2 for standard .lzma & .xz files
-			--enable-encoders=lzma1,lzma2
-			--enable-decoders=lzma1,lzma2
-			# those are used by default, depending on preset
-			--enable-match-finders=hc3,hc4,bt4
-			# CRC64 is used by default, though some (old?) files use CRC32
-			--enable-checks=crc32,crc64
-		)
-	fi
-
-	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-	gen_usr_ldscript -a lzma
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	rm "${ED}"/usr/share/doc/xz/COPYING* || die
-	mv "${ED}"/usr/share/doc/{xz,${PF}} || die
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
diff --git a/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild b/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
index fa809174d2ac..3ba0a112b9ef 100644
--- a/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
@@ -17,7 +17,7 @@ else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
 	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${MY_P}"
 	EXTRA_DEPEND=
 fi
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index ee898fc2451a..002f769a1c13 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -17,7 +17,7 @@ else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
 	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${MY_P}"
 	EXTRA_DEPEND=
 fi