gentoo resync : 13.06.2020

15 files changed, 123 insertions, 65 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index cc8393bf955f..d06899c40893 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index 8c2ef6bf71c4..732db9eb1ecb 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -5,6 +5,6 @@ DIST cabextract-1.9.1.tar.gz 469369 BLAKE2B 5bfc697b40cbf47b42ab7857804b703c9622
 DIST cabextract-1.9.tar.gz 466334 BLAKE2B 1a82bddca826ee35ed13e1c0b50deca3ae1b7e31d7f427f54b5d6cf9651a727b7cbf8049c1a4326237725e007baecb4356721489611bb5e015bd7460e2530758 SHA512 d144c1df9ed8e8c339bcadb3d1be2eb2576bb066e3f75a3480df0d5e81407a633554e4674b3bb43716c0cf33a0f2327e6f798cd6d7825bceefa0ad839fcc3f64
 EBUILD cabextract-1.8.ebuild 1119 BLAKE2B 7b7cea834a73c99aa79743f12b67e8c52a618c90454d02fd6f956883cff9264fdea75bdbab974713b7acb4d5cc54d2f409a3b1d4cea005836be3a336d5da0c25 SHA512 0d5e99a686cc5f005d02cc99b1f8e1558fe97fb2c1d949342f425fac323208928e0b8faa7c3c257f8c927bd8de697b93ebcb4b67e68c07c044cc323206d49f50
 EBUILD cabextract-1.9-r2.ebuild 1652 BLAKE2B d4a6d6344e732534e3e883cd9eb9ca7d7536b841a86e3369a90e84969fc55b56cc512e6a2e20cbd5325d65ab4c5dc4d09b4c802e166866a904579ace33763475 SHA512 ea30332d9bedaccce5436b6645f5f97fe5c2fa1ac20c186f02d19ab60ce4e9f6e91fe376c0b7804768cdc6f03e585e9397423be3ea30db887cd85b21935bb1b4
-EBUILD cabextract-1.9.1.ebuild 1553 BLAKE2B 0147613a37e5d8f07692a287d30260d3d7f6f70ce6bdbe6bc99ac5bdd01f625191080bc0a8967923cfa097b5a3784da69a1b7c0cc894def8050168bb8920ce41 SHA512 fd01c2e76f236176c99a1c80ea3edd695bac385a380e05bd0654229f2e2a1b3ee6e11f0be5e4ddd9b69a27634c40f6f68f72037620b98801d30ccd9042240388
+EBUILD cabextract-1.9.1.ebuild 1560 BLAKE2B 08b0ad83d50fa99ca59a258deb6775ebcf2c3787895a639393a3e54e4fa89d3da49889f8b162ed90a97772c252f2650e291a8154c176a96feea476e3310af242 SHA512 1db3172da8de0651bf7aa87ca45d08b12a25f6f7ed68af2611d68a6026caf27669130810af2012c9cee22aead89190c1e4f41573ec42a512879e977a85b0658d
 EBUILD cabextract-9999.ebuild 1546 BLAKE2B 9a1c3733324cc8fb74db68de8894356ad38bb514ad3d5712232d8dff9b6ee1aa840e2644ed6307d9015555c1ef658e628f9e40b6084bc412b259c562c9d3b36d SHA512 26529e282455c66c7c69071c1a0ed48553aa56f9195a84e45f56af3dab4654ebe786756283df27efc873cec1f44d119c2d86610eee03d9887ef59fe2ad67c296
 MISC metadata.xml 497 BLAKE2B dc1c758e518500bcadecefb0a3ac5d6bcd62e97113ccf69ee034707c416e8d7e8282060609f24d2406ada0a443624600b2a9ef554c4adaa9b315a6712491213f SHA512 5e1dc4d999b091846720b303fa59358955610a73cfa15f33bd51488d32e099f1651939e903227814b90857751c1b6408280493d8a0ae3c0f94828c61db53b6e3
diff --git a/app-arch/cabextract/cabextract-1.9.1.ebuild b/app-arch/cabextract/cabextract-1.9.1.ebuild
index e87577a0d6ee..4fa551d21e9f 100644
--- a/app-arch/cabextract/cabextract-1.9.1.ebuild
+++ b/app-arch/cabextract/cabextract-1.9.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 
 	LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index c09d524a12f6..f51ab2e6d46c 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1,5 +1,3 @@
-DIST gcab-1.3.tar.xz 77900 BLAKE2B 9ab61c1ab36561cd0bce075c8d491c8e28651c26ff5943a2ddc294a369f7627c300ed698363980dd839b64d512b678d7b3903addeea05657551af308b6e0c5ed SHA512 fd34722bc57a75e9a2aaec354af4629a35936928eb6db5646659c8dd51c8c6fd7fc6786c23f7e91a33a727bf8548327f50725081a8c7b1e0facb877341887b22
 DIST gcab-1.4.tar.xz 78240 BLAKE2B 8b857c116fab636db93463cee7d6b809c3c7b2bdf3896b7b5b5b66ebf270b284b356710933ec17584143bcef5c1f5c555811dd05ea98399f327047476a33fc16 SHA512 66a2e0d0a5888c555153356ce808f602053e71b76af19794db7e3bbf9516fe791805068838b4e208698cd645ada7a08610ac95f846fa81e00a9b955016306299
-EBUILD gcab-1.3.ebuild 1112 BLAKE2B b0dd04f6c01430785d0c3350aa4b9d5b03d5c236d6f4b12acb75fcb1769ed865ae9376f7953be4b246a17e2bc303faa0dbf6b624a66676706d0048d8d9de5de7 SHA512 8950ff175c3d2b19a3c7f07ec6ad9771391391021afada620b62c4cad6888b85c771f843d20bf03b34f1c0ae730eb646a1769834128bc7fa4992e9f70b021595
-EBUILD gcab-1.4.ebuild 1116 BLAKE2B 00040ef732da84b612dd02094f3315159798cbb3cb283a5e09d4b6affec88144c2dc7bbddc1e97cfc31030db440a2c598c49d5abfb83674a39f6a7448e92f157 SHA512 e2ed1fae6b1245253ebc459e18d44274b6e58d187f088dfbc8a2de037f216d18d7597ba5c0661f39ee97e0e6a46cddd1ffce9cd2adb47f571ce5c9fb7811b281
+EBUILD gcab-1.4.ebuild 1114 BLAKE2B 9500962bde5773ccd2002a8fe81fcbd2b84a50570d5e4f8e99c9df8fcb9d9cf846f6512bd6761adc9df7c64d6b25863bacd65ba36746bf67ab6ab763b150d6ef SHA512 56c9d4958df8a2f3f4c2a7fae774e94271586c68efee81af148b24ad72c7768eb07cf8d8589000b15359f7ee4d5ec41cc8bde6b9c24bee370048a27f52a39b94
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/gcab-1.3.ebuild b/app-arch/gcab/gcab-1.3.ebuild
deleted file mode 100644
index 271947393aa5..000000000000
--- a/app-arch/gcab/gcab-1.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson vala xdg
-
-DESCRIPTION="Library and tool for working with Microsoft Cabinet (CAB) files"
-HOMEPAGE="https://wiki.gnome.org/msitools"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
-
-IUSE="gtk-doc +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	sys-libs/zlib
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/meson-0.50.0
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		$(meson_use introspection)
-		-Dnls=true
-		$(meson_use vala vapi)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-	)
-	meson_src_configure
-}
diff --git a/app-arch/gcab/gcab-1.4.ebuild b/app-arch/gcab/gcab-1.4.ebuild
index 7f47c504609d..ae198f6020d2 100644
--- a/app-arch/gcab/gcab-1.4.ebuild
+++ b/app-arch/gcab/gcab-1.4.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/lha/Manifest b/app-arch/lha/Manifest
index 107134da99c2..41afaeec8914 100644
--- a/app-arch/lha/Manifest
+++ b/app-arch/lha/Manifest
@@ -1,5 +1,7 @@
 AUX lha-114i-file-list-from-stdin.patch 999 BLAKE2B f039b70dfbb82f9d2ada3df90621b4a10117c33e4a201c5f22f8093ede4da5ace496af62b24af0c7f59a8ab28a10afbb6cc2be4ccd1c427f5a4e796455f8cf69 SHA512 28c79640e0bc1b7e7e29f06bea319ebdb594568d5752f1067db472d054c91101fd5d9d769448e32463025d162adf70fd067a161a9aa4ad1b1e38aa0e8023173e
 AUX lha-114i-fix-getopt_long-declaration.patch 263 BLAKE2B d5b53f0624a9b039167289f32369ba2b2905e8a223201404ba8d9a63d1a2fd9cb73f7e5d40fc2a14bcb510a4e49905545947bb21cfd38871e80c92591ba0007b SHA512 0216d24e001b7dc0db179d8e809fa838fd1d1d965e7d3f4ead79b9b276c39ee2666d6268fd835f9ce35664452d662aaadeeab00cb121f3485765db4c6be9d145
 DIST lha-1.14i-ac20050924p1.tar.gz 285518 BLAKE2B 7e10ee4cfaeb7212f9dfbe254d33ec7b97bce41a042eed3d6f826790650f5059a19d2a334cc41a86112ba8d80904168a0b3c2785e7670577b2bda0b4d27f0dcc SHA512 efe43d407d273f8f724f7b205223bd122c76adac4b67ad5e9811e88cae03f1f3c3af4297aa6f24951a02558975bbafacf697e97ab0da578b4e0115b89237566f
+DIST lha-114i_p20201004.tar.gz 220541 BLAKE2B 64268deb40de67d5f4888f7d4b4529fa1b6ca02c562bd041d9edd1ac9cc74ccfa43198c79310bd354806e3095f6aba8c97256b49686feb8c713e3d8110137103 SHA512 9a9337cbb6a3d71253597750301e37163c5b495e712f2374adf2ac0d19f731ed49482a3f8b639e4c48c7ef6fa7ed9f9081516d77548e9c88ed3b9ac037efeb06
 EBUILD lha-114i-r9.ebuild 1130 BLAKE2B e26cbbcbfa1b0b49b006806f3c22ee4249620eeae8c9d0d5c6882d5bf617d426ff0bffa6d08172573f59ada05245447b8b56a8ec96cc7820c09f31d73f2ceeb9 SHA512 b0d901706937a0e4f01f34303bc458431c2a7d91f09ce0f1194f3a696315c3a6518edc77af5aee4773bbfe0451555e6a75cd2acf5c26c281050c221966dbd829
+EBUILD lha-114i_p20201004.ebuild 888 BLAKE2B 8ee857a0ee14ac257d970caa9dbf7e05aa8ed314990dbe717cd1ba1f5b91104476fb0f5d230781578c40ed6191d6a3e66fc55bab691f81dca5eb8beed4a17f76 SHA512 74f6b986e26392de3122be555d220670f122594281c47e9de74e0b36c4adc33f4560560f14b8c52bbff03a43df59ddd3693cd885dc5cd37709fdb8b97c8c8226
 MISC metadata.xml 434 BLAKE2B 414f7750d16ce40058d2ae20237ac880f3d239bb76111ae99afb6733876ae3f44d2aa5de0865a6139f4cc1efc706d2d35991ab61f5af4d5b74ad195c28eb9325 SHA512 8cfaf4a935f86fc33a86becdcd233d6edcf10fdec2f3d4e5af44cdf21c904917f29f83c203f2e00c31aca78d9e6189041f053edcbcb4573e258169fd21566e74
diff --git a/app-arch/lha/lha-114i_p20201004.ebuild b/app-arch/lha/lha-114i_p20201004.ebuild
new file mode 100644
index 000000000000..64f5b7ac288d
--- /dev/null
+++ b/app-arch/lha/lha-114i_p20201004.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_COMMIT="7c3cd95fdf0d2f9198bb779561724cd314bc39a6"
+
+DESCRIPTION="Utility for creating and opening lzh archives"
+HOMEPAGE="https://github.com/jca02266/lha https://lha.osdn.jp"
+SRC_URI="https://github.com/jca02266/lha/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="lha"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/${P/_p*}-file-list-from-stdin.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if [[ ${CHOST} == *-interix* ]]; then
+		export ac_cv_header_inttypes_h=no
+		export ac_cv_func_iconv=no
+	fi
+
+	default
+}
+
+src_install() {
+	default
+	dodoc olddoc/ChangeLog Hacking_of_LHa
+}
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 8ca62f99972c..9f5b5bd96fde 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,4 +1,4 @@
 DIST lz4-1.9.2.tar.gz 305796 BLAKE2B 0021487bee8657bc825fdd2b98a6dc8a6d10be3240fe0bebf6563e9c855a15bf5440a02d5cd6ee1f1e8502743348bcec1e866d3287b07e623887e9eb9da35eee SHA512 ae714c61ec8e33ed91359b63f2896cfa102d66b730dce112b74696ec5850e59d88bd5527173e01e354a70fbe8f036557a47c767ee0766bc5f9c257978116c3c1
-EBUILD lz4-1.9.2.ebuild 894 BLAKE2B 1238e4d1141998891506448323cde21d857f3ca37c3143b7c5181b82fcbdabfe45377476f0d25c892c162fd0804c8faf065b7e0b5914dd370a8cdae95ca5ab2f SHA512 eb86dbb3b5c8cf746b3a5f95ffe90fbe5efddf7fb9773cb4922cdd22ab4a61e8b5997a46577bd48631d917f608c5c6a03394f8b142f7ec83585e403640d51471
-EBUILD lz4-9999.ebuild 908 BLAKE2B 354fd13dbf07584303e6a570cf3cbb74d17f625c578db292ac6285550ec284924b8173f1a059a1bd8845ef116a1c8f8d2fcca661a85a7a9774e980f0960cb334 SHA512 a0de9680dec5c6810fd7298c5be32ef3b054577e041726d66e0a354fa76cec7ce7fff007a0c862f539db9c4edbc1fd6c5c85cea276b2dc5f8fe3fe0f172ac136
+EBUILD lz4-1.9.2.ebuild 907 BLAKE2B 1794c8dac046abae7904e1f31c3931e8cb70922b66342ea21444eeb80e1309afba5d56753485dbcf5018ed6c22352aba9d2506f6ad6a206d79f6ea4bd3caa9dc SHA512 d8209c7f4e8d11ce572afe98f888b25d27cd4208516bba101640472afc1e967b28d1ff0b3eee65ef6311fa9bb26221f528edfa939d267127f41416dc50eea4c3
+EBUILD lz4-9999.ebuild 921 BLAKE2B 4d6a935bb206d63cf7577218f6ac7bf984039ec629a6f555640c826a232d607af30014999f9168ddbb7bb35ccb6ea4f2484259fabdae11ff5df78d655ddffbb8 SHA512 4db0e63458fc7eb5ed1da80e1fa4bde4f874980e974eeca82653d5a2c4b6323db9ea665ec41854d8b8c62534d5f2f2f7ef774d2b9e4c4d8633f09831953832e6
 MISC metadata.xml 596 BLAKE2B f79116c2ed40f870c688d9843c6d54da4fa6d33313d2a42d2d6162e1f2b5a6e93f119354a7ad97c67d66be6ba2437ffc0e91d6a9077fbc5b02b19420155375ca SHA512 bc5a6081ed4c2c6b7c7e4de5ef0ada5a4692e1e0833a01d8e596b7891cb2f612418350643ce6b764d8170b5632afc78143dd50bb4a34565384fd4b89ee34786b
diff --git a/app-arch/lz4/lz4-1.9.2.ebuild b/app-arch/lz4/lz4-1.9.2.ebuild
index 71a846a1ac70..ea03c23e33ed 100644
--- a/app-arch/lz4/lz4-1.9.2.ebuild
+++ b/app-arch/lz4/lz4-1.9.2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 if [[ ${PV} == 9999 ]]; then
@@ -29,5 +30,5 @@ multilib_src_configure() {
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/app-arch/lz4/lz4-9999.ebuild b/app-arch/lz4/lz4-9999.ebuild
index d1ea0341d333..944d7e883618 100644
--- a/app-arch/lz4/lz4-9999.ebuild
+++ b/app-arch/lz4/lz4-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 if [[ ${PV} == 9999 ]]; then
@@ -29,5 +30,5 @@ multilib_src_configure() {
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 76296f11c614..96e7fea2a8a7 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 970 BLAKE2B 5288f515e3806394b540bd5187cc277467b462526fac35dc2112fde0529f952083a02dc3bdd349e8fd6d24598f1021904861dec683a03bf9c98d9bfc60bb0aa7 SHA512 070e4bb4c2e4f67d6c22743d82660506478fee8c6fd936508a2beb687a57fbb7325283fa2e9b3f6cdac599a5bc19519b35236752d1926554047444322ac7689f
 DIST snappy-1.1.8.tar.gz 1096137 BLAKE2B e21f2ea23727f118920b7f67981354194f12d1d61eaa18eb1cb2f4285fabafdd221b88cf1e3b3261634f65469a714d3efe6b218c0b1e9d41639cdeb21097d75e SHA512 efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c
-EBUILD snappy-1.1.8.ebuild 1804 BLAKE2B e8e9caaa8e080c6c56eebedfbf11e9d294ecdeda48e42cd24029f10138d5fcce0397f3607de64e176f17eade8a4d3c3a34046ac3c1406c5fcf4385c13b935402 SHA512 fefb29548ce8674cd7d11ceba5768fae44fe4908ca5106205fcda86cde178da3ca174a38693e1f4e63650bb62a5f5fbb28851bfdb2625a45fe969eb61327a0b8
+EBUILD snappy-1.1.8.ebuild 1812 BLAKE2B caa25d000cdeb3386393238af579fe73f8fa8fe34cc51d669aa3c1354c827063dd24df8cdb9ba4f471c75f1b70af94027a9043ee9e9edfb3250a636521c9b064 SHA512 28229c15989275bda0bf84c3cbc0a6958c644ef49ba559e1c456e8418c9425801e0e977d75107348f3a5a7f96923481b1e6d53213268dd8f2454f8fe4d348128
 MISC metadata.xml 584 BLAKE2B 9972ee3948809ca45ea18129bde88c5a93fbe73d24c6e125cd13a45bb381099110dc0e006cf76a57d0baf7d18001bf261dd1d6db1025750b114903725e2e3aa4 SHA512 5897170c6fb84f520d879b5df295608b92376150ed2535b578ff04c5cfb5a0ba334a7aee3ad1ef41a8ed45b3fb36425e1dc0e54c0fb880e0c2bf72803a2da552
diff --git a/app-arch/snappy/snappy-1.1.8.ebuild b/app-arch/snappy/snappy-1.1.8.ebuild
index 73dbbab511f0..9f4dd1f9c58e 100644
--- a/app-arch/snappy/snappy-1.1.8.ebuild
+++ b/app-arch/snappy/snappy-1.1.8.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="A high-speed compression/decompression library by Google"
@@ -33,7 +35,7 @@ src_prepare() {
 	# it off
 	sed -i -e '/run_microbenchmarks/s:true:false:' snappy-test.cc || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 multilib_src_configure() {
@@ -52,7 +54,7 @@ multilib_src_configure() {
 		-DHAVE_LIBZ=NO
 		-DHAVE_LIBLZO2=NO
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_test() {
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index 7fbc8299d28c..69a82c5388b2 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,3 +1,5 @@
 DIST xarchiver-0.5.4.14.tar.gz 1081542 BLAKE2B 591d93dfbaa98164bc169105462155b09ed87dab8ad5adff6653e77673095a29d7f00cdaeed1b928039fe3cc5f668f8da46885905ae73d03f5b4c71dd279a7b4 SHA512 b38881e6cdfb402499efbd18ab25cac3869cd48ef96941a4bb3cb8b6b130a2317abe3b1d11bfc3d60e81eef7cafa34515fefc11e469443d96d139c2f09cf4498
+DIST xarchiver-0.5.4.15.tar.gz 1072943 BLAKE2B 6f80c8dba510bf5c05dfe5c8f12aafbd4f563861878c73b7da78562836ef4b85f9bc8e4ed7cda5d98c5e33a211a2677d163c2912f1bb605e0085627ca4ee5cbb SHA512 e5174241dd45dd6186d91b15a15b207a8b356480d9ce1a7b9ac2da167878cdb14316a3e7abf3f2aac8d41a02777df2131e205c7d5971a376ff7dd0ca70fbc82f
 EBUILD xarchiver-0.5.4.14.ebuild 1438 BLAKE2B 4a065c6d80da446dbcae9ffc46d6d4aebedeee9d18a089e304dc237dcbf0196165ca52044966bd99a453d09b3a80d23080a673066fc929c47a3401b82df98583 SHA512 7d2f73efd16745e0ad5670aac5f3c5ed81ba9184d0aa47ef9410ec5d8ec0d12c27698605491db8687f4f4936c72ecdb1f6b37ed84742df0e40227f3e722e96a9
+EBUILD xarchiver-0.5.4.15.ebuild 1440 BLAKE2B 7f739370dfb24d5dcb37fcc2decadb1145d4e8c7b50303cc75650ce6c78a257669aa0679106e5c78a572cdce4771b5d7733b93a7ca55d114e4d88030ff4ac812 SHA512 1206ef834af47ca298e6bf28fcffebf59e925f89027b4dc9861c4b60ca4ff9a5d586fc0ff09b4ec4cef3048b91987f019d2eb47fcc3ade3a1704e638713dcc30
 MISC metadata.xml 447 BLAKE2B 3ac670facb7c0034e1f079622c8c14e04a131e359e1cdbbc18b7cdd111a673651a97a7e35a430d13d80c1cf35e87f4aec0738836b60dd2837e4a77ff4e9485a3 SHA512 ccccc741a75658963153a71810ea9d8c25bfe49765f90a4aa5558ef8fef2abdd1e17d1c9ffb604a78deafeda1e5032b671c8f85a8189e6c89cf3f057dfec9a4a
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
new file mode 100644
index 000000000000..e83f8d245d44
--- /dev/null
+++ b/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg-utils
+
+DESCRIPTION="A GTK+ archive manager that can be used with Thunar"
+HOMEPAGE="https://github.com/ib/xarchiver"
+SRC_URI="https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+# older pigz versions have incompatible command-line processing
+# https://bugs.gentoo.org/661464
+RDEPEND=">=dev-libs/glib-2:=
+	x11-libs/gtk+:3=
+	!!<app-arch/pigz-2.4[symlink]"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)"
+
+src_prepare() {
+	sed -e '/COPYING/d' -e '/NEWS/d' -i doc/Makefile.am || die
+	default
+	mkdir m4 || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable doc)
+	)
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	elog "You need external programs for some formats, including:"
+	elog "7zip - app-arch/p7zip"
+	elog "arj - app-arch/unarj app-arch/arj"
+	elog "lha - app-arch/lha"
+	elog "lzop - app-arch/lzop"
+	elog "rar - app-arch/unrar app-arch/rar"
+	elog "zip - app-arch/unzip app-arch/zip"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}