gentoo resync : 07.10.2018

23 files changed, 319 insertions, 378 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index b99612c35595..900cfa70e78c 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/createrepo/Manifest b/app-arch/createrepo/Manifest
index 5e0944d67048..6d8ea5146883 100644
--- a/app-arch/createrepo/Manifest
+++ b/app-arch/createrepo/Manifest
@@ -1,4 +1,6 @@
 AUX createrepo-0.10.3-ten-changelog-limit.patch 525 BLAKE2B 6e79c87e8865bab43721fd4cb79b79b5549642cc33f83dc245eeff5dbbba79f5244ab20f7e88903a7bad35d96a3c976999e0e69b57e19f90411685d6da4c0f6d SHA512 3ff54907d22680c5e617fa43b3954f533d66cf6f00a67e628ee4e6828871fce71cf200a562e8557a33e66cba09e9b76c12aec4c1dc7e7bc31589add9c71a1516
+AUX createrepo-0.10.4-lzma.patch 406 BLAKE2B effb1ad86dce44a95a66b93c653accfd0231c224a2884d85727463788667e359a386cb7d838ca5031ea10ce548c385c6cd038bf1fc3fa18c8980abc25eb0b15e SHA512 122cd697c497a70abec140275e273de7976d4afee059e0dee4329aa10d149b9e2e622598fdede900bcf1404f983129d9ef5ac3d3381180e4694b695a938366d0
 DIST createrepo-0.10.4.tar.gz 71186 BLAKE2B ddd15305c6861e9872bf55683035c311a22aea062d27ba4e06bbe4e09598c85fbbaf4b874cbbd1e4c521610a7faa4097a7062ac52752ab2916c14ffca70a817d SHA512 28858d7d886e1132d001bb1bd847657502eb132133e39a4d19a4c8a080728c6b6f344283bc6ee21ce8def5b7980cbca7ed78299adeb71ce1012751268f6740ec
+EBUILD createrepo-0.10.4-r1.ebuild 1201 BLAKE2B 76236e720e015c9446ff1eac9b7126b673cba98cafcfea1eb9047041e74c86eb892a84ecaf2f1f02c8634ae1341772c1622d52fc4b98fc5a4c241273e3fc71ea SHA512 fa626175152a80e96717c62ba41965e853b13fea792ec3b47d3670a7632798f870a66d4bc53ba6e80df01d2d90ee9ed85c2db39d90b24fab33c5b1ff1f97b8b6
 EBUILD createrepo-0.10.4.ebuild 1165 BLAKE2B 3446ad3d1fe82c4bdacf58f163b0ea9c6044ca9d2390450fc6b9216729dfdafb25a7e67815d879e14af0d0ea614f5555a6ad990943cc65e89f20d163b5c6f1fd SHA512 848e9e4eeaee11a93602aa7742e1246f6a7f390cb0712192bb9ca2d32efedacd9669d89f868cf05d736991b530ff5a53246c6054cc408d861f01bd2a077e25d4
 MISC metadata.xml 241 BLAKE2B da02aaf50e60432544b6c8832b7711764b2aa8b5d296dd64f19208832042de36daabc30c8310468cc604013b69c0cc3817f4a14aadd0dad4142c6bf68d4cb767 SHA512 d0c9844a236b2be2bb08d8aecf429dca028b0199db4c5c26c5a9cc2d9e13e21214ae110deb2b0d56e1caeae4ba0367effacbb542890e599bf4ebc6ffb4a369d8
diff --git a/app-arch/createrepo/createrepo-0.10.4-r1.ebuild b/app-arch/createrepo/createrepo-0.10.4-r1.ebuild
new file mode 100644
index 000000000000..39a64af2e0b2
--- /dev/null
+++ b/app-arch/createrepo/createrepo-0.10.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml'
+
+inherit python-single-r1 bash-completion-r1
+
+DESCRIPTION="Creates a common rpm-metadata repository"
+HOMEPAGE="http://createrepo.baseurl.org/"
+SRC_URI="http://createrepo.baseurl.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/urlgrabber-2.9.0[${PYTHON_USEDEP}]
+	>=app-arch/rpm-4.1.1[python,${PYTHON_USEDEP}]
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	>=app-arch/deltarpm-3.6_pre20110223[python,${PYTHON_USEDEP}]
+	dev-python/backports-lzma[${PYTHON_USEDEP}]
+	>=sys-apps/yum-3.4.3
+	${PYTHON_DEPS}"
+DEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10.3-ten-changelog-limit.patch"
+	"${FILESDIR}/${P}-lzma.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	python_export PYTHON_SITEDIR
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${ED}" \
+		PYTHON=true \
+		compdir="$(get_bashcompdir)" \
+		PKGDIR="${PYTHON_SITEDIR}/${PN}"
+	einstalldocs
+	python_fix_shebang "${ED}"
+	python_optimize
+	python_optimize "${ED}/usr/share/createrepo"
+}
diff --git a/app-arch/createrepo/files/createrepo-0.10.4-lzma.patch b/app-arch/createrepo/files/createrepo-0.10.4-lzma.patch
new file mode 100644
index 000000000000..2bae50c0a8a6
--- /dev/null
+++ b/app-arch/createrepo/files/createrepo-0.10.4-lzma.patch
@@ -0,0 +1,14 @@
+diff --git a/createrepo/utils.py b/createrepo/utils.py
+index b0d92ec..1220c7c 100644
+--- a/createrepo/utils.py
++++ b/createrepo/utils.py
+@@ -25,7 +25,8 @@ from gzip import write32u, FNAME
+ from yum import misc
+ _available_compression = ['gz', 'bz2']
+ try:
+-    import lzma
++    import backports.lzma
++    lzma = backports.lzma
+     _available_compression.append('xz')
+ except ImportError:
+     lzma = None
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index f604ed8f80ea..fd95b1f8c549 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,12 +1,3 @@
-AUX engrampa-1.10.2-p7zip-15.09-compat.patch 851 BLAKE2B 50734ebd04df0f3a277408a9051612b7691e4b52a82d1851fb3cbda23b9308ae1868d15d7ce2b9b4ea9576bbd11bd0b7c71852bef5165a8dc09504ffbb674a40 SHA512 a6c11311b15647713a93ec20c52d228cb828ac15767b7dbc2ae1cffef50b73d06ff5e36891763f715a67a8b06dc1d3a6e2bf30b27abc3376baebe390e7a54c27
-AUX engrampa-1.10.2-p7zip-15.14-compat.patch 1225 BLAKE2B b1aa1546aeed6bc3116d8a7ccd8bb2e8a101a5df4fd902d748fbc2afc909db2f0071248107d8dc0f6d2bb2b3c6a2382955e6fab30a3f0ab3430b80c4e1d72104 SHA512 e396976cfce32b4ac48205c0c72a342d713c8798926a2c56855f4083e3f7598b6ce1e3df3fb03ee8b08c0bf18657a2c750389b465a142f4261eb03f12f4a8a3a
-DIST engrampa-1.12.0.tar.xz 1380144 BLAKE2B 87c8a69d3706489f7f2dfc704212714976ba3bb24954d02b798700be4f5c98bada0eec0e22402f85e3ea4d7852ab6bbb523deeef411887c68f5b998871c72069 SHA512 8c694b1f1baab099316f6e5d5ec67ae95171df3a988aee11b0527ae797717e7b3e57fa1ec53cb78e9aa397b1758f768736231ad1bd91c1bb8b2ba2f8f755cfec
-DIST engrampa-1.14.1.tar.xz 1417444 BLAKE2B 95dd08ba2264fb2ba937be61522cf56da8363fdc4af21c18bd3d8a22609ab0c9a606bda5f16b2795ad6b0b7bd017bf1150a2e31f6c29d9c111362ca93ff0ed65 SHA512 fea510d95fe483f676f66490706aa919b6a62bc20af9e22893304235ce0a38ff006c66494d548a3207dc4cd241cb785abe77652693d1b600e4ca6c8a0a60d763
-DIST engrampa-1.16.1.tar.xz 1432272 BLAKE2B 6181da44c6a80030c1ac856c017ba190bf91527e51c9d2eba38e267632360ad5497ee02d0a3ea00d73df4e6f507311e839e0d8d999b6d6561e298d784c3251ec SHA512 d61ee877b5e7ce0aacc46a8b786b1d074bc4d6870f453edf238d9b8fe3eecab750ce14f668c94bbceedec4a9b5bf16a828fff24edef227ae0108351adcfc73f6
 DIST engrampa-1.18.3.tar.xz 1427036 BLAKE2B 816155b7e2a0583263959d77bb5079a3d69ade087cac39e8e9c2c77901d0bfcbdb63a87ec9ed7cf92d2e580ae810d3e46641d690d87c1af7db6f6dca6627dfbc SHA512 6a3872ed9ec1e9d2779842d30c352c5068608913f9261a875b707951a45ff3122df2f4a4ed4da10c4f8a4617cc1d7aae4635b3f1234052793c4a6baa765d80f8
-EBUILD engrampa-1.12.0-r1.ebuild 1943 BLAKE2B 98c5255e301058a3aa09fa54fbd93bfb6c1c70f9f468608eca2cd6cf0b1838bc52ea708b8de3f7347e1d3b970be8a30e7f28803f13678908372cefaede528a75 SHA512 624884bbbc2a2a7c9eaa9f84c4ab7189ed70079f26535c5945eb2c5a96543fdf249599805ac538f304e316ed882645a1b3592b5752b1ba05f6142b356b60eb8d
-EBUILD engrampa-1.12.0-r2.ebuild 1948 BLAKE2B 7563e099ccf74cb69a5bce96804750f8edbb293207910ee652b8cd80a40a0f603c42e128a90f11ea0b737e371ad39dc23106336671846851dac5ee22e22492dc SHA512 0de7123927b4b41fd04606a1b11649ae2ed1f9250bfe6dad32cb8138fcaed7c5271eb9aa30fc921c8134ebbb7f867b36d0b867520a3defa63d1d31e36bd20d44
-EBUILD engrampa-1.14.1-r1.ebuild 1934 BLAKE2B 0d3565cc92cfa229671efd0b8ebdcfa32db2f74b3e2282f2da1969483dd16645dd2e1c6446ad3388ff9d9b502373c25d94719af56a07dd4d48e20e44d5c81fa2 SHA512 48a85e45c15b8d21f9e11e992efcf0fe24f8b6fc3934e26fba77221a8bf568a1f185eb584171d3a16500ab35ba0bd15d4a7d83e2d4dc9030c0a76166ed2643ec
-EBUILD engrampa-1.16.1.ebuild 1774 BLAKE2B b239d80ccc155e40d733b9de4997e689c9a0650eebf58f4c0615c4bd19ea71e51944bf9312135e5cf87ebf45bcc7ef6d8063f8f03c1ccef169b0a392c2efd787 SHA512 975831c6e938ccf8ad5547639a10d7224d01fc4d0b7870878b48cf8cf3051c9dcf779f72aea393c1a2798fb6e818f5e0bd5d8408a773e8b2c64dfeea30534056
 EBUILD engrampa-1.18.3.ebuild 1753 BLAKE2B 11e3876e0ea2061f7a4608ffe8795264594d4c2bafb14c430dc404cade3a15fa2c7f839be2acccfc8bd41f3325111b6bb6241570222c0a3048b6ea674c9f66ad SHA512 6ac876b38c305d108ac369231ae0cf1eed5e9d05e188a9be566fa014596b865781fd3953aac4ca3dd05adb4a552a5d9810a180ef073851990b437852e7ba1b1e
-MISC metadata.xml 763 BLAKE2B 7efc42df178dd52843a8f9c165d2c7a717fb05d24309dfcec6d7dbf61e8943b65f4a8febf2d58bfe29a81e0be37165f1b7345155d75e3e3d7676f625d679aea6 SHA512 fc5a05da5bf07067fc598b9849b068b497d3b9d107eddbe8d38bc15afb9b3df0e1071fae57e9c0a05b9813c03873581e66b0212cd126f14ccaddaccd85a57a96
+MISC metadata.xml 702 BLAKE2B de15449aa20cc44e6068bd8047630353f3389845a3332b57631bacdc9b9c4b188f8152678240e0142142db322af7058b09060f74413ff55fd1980fe697f32d0d SHA512 b465ea239cabf4ad1cd6b1f5ba7f87151e637595191c1a88cf17059f96ca1b03ce57d4200fc793d56be2b6ddb2ded20be460a4e1ac1727180e9662f9baba4522
diff --git a/app-arch/engrampa/engrampa-1.12.0-r1.ebuild b/app-arch/engrampa/engrampa-1.12.0-r1.ebuild
deleted file mode 100644
index 0448f8a0511f..000000000000
--- a/app-arch/engrampa/engrampa-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# 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 x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja gtk3 magic packagekit"
-
-RDEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/json-glib-0.14:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango:0
-	virtual/libintl:0
-	caja? ( >=mate-base/caja-1.8[gtk3(-)=] )
-	!gtk3? ( >=x11-libs/gtk+-2.24.0:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	magic? ( sys-apps/file )
-	packagekit? ( app-admin/packagekit-base )
-	!!app-arch/mate-file-archiver"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.10.2-p7zip-15.09-compat.patch"
-	"${FILESDIR}/${PN}-1.10.2-p7zip-15.14-compat.patch"
-)
-
-src_configure() {
-	mate_src_configure \
-		--disable-run-in-place \
-		--disable-deprecations \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(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/engrampa/engrampa-1.12.0-r2.ebuild b/app-arch/engrampa/engrampa-1.12.0-r2.ebuild
deleted file mode 100644
index 0d3575820196..000000000000
--- a/app-arch/engrampa/engrampa-1.12.0-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 ~x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja gtk3 magic packagekit"
-
-RDEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/json-glib-0.14:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango:0
-	virtual/libintl:0
-	caja? ( >=mate-base/caja-1.8[gtk3(-)=] )
-	!gtk3? ( >=x11-libs/gtk+-2.24.0:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[X] )
-	magic? ( sys-apps/file )
-	packagekit? ( app-admin/packagekit-base )
-	!!app-arch/mate-file-archiver"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.10.2-p7zip-15.09-compat.patch"
-	"${FILESDIR}/${PN}-1.10.2-p7zip-15.14-compat.patch"
-)
-
-src_configure() {
-	mate_src_configure \
-		--disable-run-in-place \
-		--disable-deprecations \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(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/engrampa/engrampa-1.14.1-r1.ebuild b/app-arch/engrampa/engrampa-1.14.1-r1.ebuild
deleted file mode 100644
index 3af21bd02be2..000000000000
--- a/app-arch/engrampa/engrampa-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 ~x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja gtk3 magic packagekit"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/json-glib-0.14:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango:0
-	virtual/libintl:0
-	caja? ( >=mate-base/caja-1.8[gtk3(-)=] )
-	!gtk3? ( >=x11-libs/gtk+-2.24.0:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[X] )
-	magic? ( sys-apps/file )
-	packagekit? ( app-admin/packagekit-base )
-	!!app-arch/mate-file-archiver"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${PN}-1.10.2-p7zip-15.14-compat.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--disable-run-in-place \
-		--disable-deprecations \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(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/engrampa/engrampa-1.16.1.ebuild b/app-arch/engrampa/engrampa-1.16.1.ebuild
deleted file mode 100644
index 6f37d339de9f..000000000000
--- a/app-arch/engrampa/engrampa-1.16.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 ~x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja magic packagekit"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/json-glib-0.14:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango:0
-	virtual/libintl:0
-	caja? ( >=mate-base/caja-1.1.0 )
-	>=x11-libs/gtk+-3.14:3[X]
-	magic? ( sys-apps/file )
-	packagekit? ( app-admin/packagekit-base )
-	!!app-arch/mate-file-archiver"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--disable-run-in-place \
-		--disable-deprecations \
-		$(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/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch
deleted file mode 100644
index d0937a8959c5..000000000000
--- a/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.09-compat.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4f65bde8fc4d4efe747d4e7fbeba1211469ed79a Mon Sep 17 00:00:00 2001
-From: monsta <monsta@inbox.ru>
-Date: Thu, 24 Dec 2015 17:11:19 +0300
-Subject: [PATCH] 7z: correct checking for p7zip 15.09+
-
-from https://github.com/GNOME/file-roller/commit/ed9c3fd2
-
-fixes https://github.com/mate-desktop/engrampa/issues/114
----
- src/fr-command-7z.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
-index 297ba1b..0b784f7 100644
---- a/src/fr-command-7z.c
-+++ b/src/fr-command-7z.c
-@@ -106,7 +106,7 @@ list__process_line (char     *line,
- 			strncpy (version, ver_start, ver_len);
- 			version[ver_len] = 0;
- 
--			if (strcmp (version, "4.55") < 0)
-+			if ((strcmp (version, "4.55") < 0) && (ver_len > 1) && (version[1] == '.'))
- 				p7z_comm->old_style = TRUE;
- 			else
- 				p7z_comm->old_style = FALSE;
diff --git a/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch b/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch
deleted file mode 100644
index 4e25898949f0..000000000000
--- a/app-arch/engrampa/files/engrampa-1.10.2-p7zip-15.14-compat.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a2a537eb4c263a5b33851572a189fe89476b212e Mon Sep 17 00:00:00 2001
-From: sc0w <scow@riseup.net>
-Date: Wed, 25 May 2016 02:29:21 +0200
-Subject: [PATCH] p7zip-rar 15.14 supported
-
-since 15.14, p7zip-rar uses the plugin Rar.so to handle archives
-
-It can find on /usr/lib/ or /usr/libexec/
-
-If someone has it in another folder, we can add it
-
-Fixes #136
----
- src/fr-command-7z.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
-index 20cfa2c..a7d032e 100644
---- a/src/fr-command-7z.c
-+++ b/src/fr-command-7z.c
-@@ -599,7 +599,8 @@ fr_command_7z_get_capabilities (FrCommand  *comm,
- 		if (is_mime_type (mime_type, "application/x-rar")
- 		    || is_mime_type (mime_type, "application/x-cbr"))
- 		{
--			if (! check_command || g_file_test ("/usr/lib/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS))
-+			if (! check_command || g_file_test ("/usr/lib/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS) || g_file_test ("/usr/lib/p7zip/Codecs/Rar.so", G_FILE_TEST_EXISTS)
-+			    || g_file_test ("/usr/libexec/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS) || g_file_test ("/usr/libexec/p7zip/Codecs/Rar.so", G_FILE_TEST_EXISTS))
- 				capabilities |= FR_COMMAND_CAN_READ;
- 		}
- 		else
diff --git a/app-arch/engrampa/metadata.xml b/app-arch/engrampa/metadata.xml
index cea4bb4fa4a4..ff7ba4c5fb87 100644
--- a/app-arch/engrampa/metadata.xml
+++ b/app-arch/engrampa/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="caja">Enable engrampa to integrate with
 			<pkg>mate-base/caja</pkg> by providing entries in its context 
 			menu</flag>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 		<flag name="magic">Enable filetype auto-detection via
 			<pkg>sys-apps/file</pkg></flag>
 		<flag name="packagekit">Enable support for installing via <pkg>app-admin/packagekit</pkg>
diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest
index f1e70b19c4d3..98491e3a6f6d 100644
--- a/app-arch/lha/Manifest
+++ b/app-arch/lha/Manifest
@@ -1,6 +1,7 @@
-AUX lha-114i-file-list-from-stdin.patch 991 BLAKE2B eab4a7c196a1e99bff97dee124d47af0870c01660fd96da3835797e0e14d9b2c271e69d8522278819f97f6787c050016a76916af28e2b949f880003f2f9b6426 SHA512 fb3e112ef592b7542cab4cd34759407b5bace3ebc83af0aad52daf9d8584ec897e26ef1e0d4cc3656c1b0bfbd5eb242dedc6fb0a8fedce765ae30735a95b79a2
-AUX lha-114i-fix-getopt_long-declaration.patch 267 BLAKE2B c87ac7e0842b9b637b5f9201ad0f596a2ee3bdb44447428d2f7e28c61c7da30f397c7dcacee86bdf6e1166f10d0b4962056ea77e443885487eae0eb3bcbb0f2d SHA512 c0e23d742a4e37b86f69e7096eba95e0c41619e2a459d526f5ede31ec73d2cfc14b3660fd1741c68e40d2ddb9bfd7c4250f275edea3965e1077b1a482a788f10
+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
 EBUILD lha-114i-r7.ebuild 991 BLAKE2B af079ce8bcb696d6f7486c14e4faae0d4767e81556c85dd0c8ecf96e33d4d979b696af26c27abb7598e4410355193e2cd550d0342c555214f71fced05e86b674 SHA512 58af6daefe2f32f9479496811c78e0b224196da43f798d9734ee2bb4e78fcefd143bd2b01b409c8aeb1a736e6eae3548ef483e4a829b0a5a8d52dd226426a1e5
 EBUILD lha-114i-r8.ebuild 1147 BLAKE2B d8d4589cd5130d531750633b00553f98a59da7c7cbdb77750478a3bb3b6fb5f87a477f1bb524c972cd81c34189006d2371117df5c96b75be799e3f06079daee3 SHA512 fc3be81aba9e9f7d9a27c753ea187790956dcec389a890e6d06e939c0aafdc88a0b7e579f05f57809950f88bc32777b10ad3948b95fe27a41cecfd149ef08544
+EBUILD lha-114i-r9.ebuild 1145 BLAKE2B 3782520dd549dd9e8acef29baa3c9c6dd7913fbaa979388525d76e6e96dc40a0d810510c6b72764346de8ab1be7224095f73f84a5cc81039183c7eca6b91a3dd SHA512 15b7be4b3feb1d850f6e3c7d95f889cdc236d448bc76f7a663a4ccaf99e0a48dc8992c2cb7827b2b39d75c8c4e9a8f036c41dd73eaf6315e800b17d12f4af43f
 MISC metadata.xml 534 BLAKE2B 861f00b0b2b6c547ba122d9dbc9da0d9b84bd49b553a2c8f2d2fa5dd7ef7dcd86caca75292a825dccb74becd7ad8c34a4f9cbe71cd5096ba7617953c4f612c7c SHA512 499669685613b31d118c1878fda13c25551d13eedb1532507d2952a490725b1083dd16aaf4d6927bb2cc8ca859c2d29e1a064d15f9d4e099108ad7ea80fc040f
diff --git a/app-arch/lha/files/lha-114i-file-list-from-stdin.patch b/app-arch/lha/files/lha-114i-file-list-from-stdin.patch
index 4bd0d17d7527..d29f8d20bc8d 100644
--- a/app-arch/lha/files/lha-114i-file-list-from-stdin.patch
+++ b/app-arch/lha/files/lha-114i-file-list-from-stdin.patch
@@ -1,7 +1,7 @@
 Index: src/lharc.c
 ===================================================================
---- src/lharc.c	(revision 773)
-+++ src/lharc.c	(working copy)
+--- a/src/lharc.c	(revision 773)
++++ b/src/lharc.c	(working copy)
 @@ -561,7 +561,7 @@
          if (!isatty(1) && cmd == CMD_ADD)
              quiet = TRUE;
@@ -13,8 +13,8 @@ Index: src/lharc.c
              /* Bug(?) on MinGW, isatty() return 0 on Cygwin console.
 Index: configure.ac
 ===================================================================
---- configure.ac	(revision 773)
-+++ configure.ac	(working copy)
+--- a/configure.ac	(revision 773)
++++ b/configure.ac	(working copy)
 @@ -289,6 +289,11 @@
  	    [Define to 1 if you want to ignore dot files with -X command line switch])
  fi
diff --git a/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch b/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch
index b57a1c9c6158..3c3b7dfd94c5 100644
--- a/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch
+++ b/app-arch/lha/files/lha-114i-fix-getopt_long-declaration.patch
@@ -1,5 +1,5 @@
---- src/getopt_long.c.orig      2013-12-18 16:05:59.789413528 -0600
-+++ src/getopt_long.c   2013-12-18 16:06:01.200420472 -0600
+--- a/src/getopt_long.c   2013-12-18 16:05:59.789413528 -0600
++++ b/src/getopt_long.c   2013-12-18 16:06:01.200420472 -0600
 @@ -64,7 +64,7 @@
  
  #ifndef USE_GNU
diff --git a/app-arch/lha/lha-114i-r9.ebuild b/app-arch/lha/lha-114i-r9.ebuild
new file mode 100644
index 000000000000..fc3cd93847f4
--- /dev/null
+++ b/app-arch/lha/lha-114i-r9.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+MY_P="${PN}-1.14i-ac20050924p1"
+
+DESCRIPTION="Utility for creating and opening lzh archives"
+HOMEPAGE="https://lha.osdn.jp https://github.com/jca02266/lha"
+SRC_URI="mirror://sourceforge.jp/${PN}/22231/${MY_P}.tar.gz"
+
+LICENSE="lha"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-file-list-from-stdin.patch
+	"${FILESDIR}"/${P}-fix-getopt_long-declaration.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e '/^AM_C_PROTOTYPES/d' \
+		-e 's/^AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
+		-i configure.ac || die #423125, 467544
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DPROTOTYPES #423125
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		export ac_cv_header_inttypes_h=no
+		export ac_cv_func_iconv=no
+	fi
+
+	econf
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		mandir="${EPREFIX}"/usr/share/man/ja \
+		install
+
+	dodoc ChangeLog Hacking_of_LHa
+}
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index 7f47e2c9caab..67d57dbd0f85 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,9 +1,13 @@
 DIST rarlinux-5.6.0_p20180624.tar.gz 552245 BLAKE2B 9988b67d545df89bb7087c2bbec5a6fc47d99f6fd8a97e3581f135dc829a43e5c044248e95f60f7cd29370a0955a3c4c8a6667bfcead17301dc0f45ddae0057f SHA512 a0baba489c9268bc25c814c94747c117de66599f91da875b0e0b8233c24910f0e831f8b407f7a9bd8d709da6bdea4ef50306ce456ea5089f893619b8ee5b780f
 DIST rarlinux-5.6.1_beta1_p20180903.tar.gz 552295 BLAKE2B 45a709780bfbcfbaf0182a02a0c6bdea71ca4162b5e8bd223105fe01219e6053559b983e1aebf859480a62c18d6aa7cf689369b4bb5bedebd87eeb6812a31561 SHA512 daa7ed17f1c5418fd47e285c1cc06d833f2182fd3de89aefafd83a86935f52c61dc067d19521d3154ff07d891b69ace03d43940ae824adabfff82ffee1bda379
+DIST rarlinux-5.6.1_p20180930.tar.gz 552418 BLAKE2B 7a162a9e63336296e67064fe64d5bdefa4f0027bc23f27a419f14e5302fed7ed45bb78541ff7f3a417ed9f6e88700f4306d4ab3dbfb160a27dbf612df67f0c44 SHA512 b566d8d05068557987b69aa3b9610597c7226f7ff96ab935be33f3437b78d02dd539366b3a8499dc4c1d953a640a8a27f21b3f979969b71c6e3bde51a1118b00
 DIST rarlinux-x64-5.6.0_p20180624.tar.gz 541604 BLAKE2B 2fd865af38db47c556341bb2482ee9af83857bc196e08f9b47d5a0f8ccae708931c09dcca2115866d37c03b77f7548da87cf2e778f003e9a432634b9ae378aae SHA512 e8427d12016d4298d1e3ca3dc32f367e2b7a407572e48c665eaec796c3538d50349760b5691bc6d58256a5470dc0c6637740fcdc6e8a9bd420193fae16e209eb
 DIST rarlinux-x64-5.6.1_beta1_p20180903.tar.gz 541723 BLAKE2B fc70196124621d729530de31b7a213cf4e63326f7db11d65fe2941ae78dfd6bedcc4884b7f21454bd624a6565d679e95699aec9ee489672c3346198c2aa53c13 SHA512 b91388fd78ee45f7f7e3c1750e739ce28c325dcc3b11d8c507b022ade510d6bf012b00092238c3348933176d783d2ef9b1ce6269779a095b4a2320f27f035903
+DIST rarlinux-x64-5.6.1_p20180930.tar.gz 541765 BLAKE2B c3c115fe168df801ce81fbb31de810893539c2f3bcfb176e65ab0db9994fba0d2e3aa848cf073068651e301c1b36cf3d885d80841e6cf63ddb22d3210c14ab64 SHA512 b873397cc44ffe722248638f0315a445e7f8b39ce310d45b79e27d8c2662bf7bc8a095a3e7c4a8fa92e24551328530955f6f18a8553a1612ea00bec8ccaf2e37
 DIST winrar-x64-5.6.0_p20180624.exe 3180248 BLAKE2B 3ddbef82e2ecee7960c5d282de905a2d4d279c3ebae9ceb9e5b72a822d352a80d189a76514a414840ea5ad8002d718435757c860a0935134b6eba01b70e0f444 SHA512 61896901b580476d4c12d40d42eef725de270beb0b01526e7d5d4e02847a7b67b0380f0a365e92eafe2a2303d60945146457d43430aace51c9a443a8b1ceef48
 DIST winrar-x64-5.6.1_beta1_p20180903.exe 3187440 BLAKE2B c8f008ec746ab941dd41553d7f8004aab3d6a00771278eea76cb2b6c6a92394c93c6bd816e212950b99cdd28184237479eb301c0adc3d11712ebc9ab83b44656 SHA512 98da58d411d2d7c6cc49c62cbed3e3850eeccfee3bb7338777b734cbee14396c765b6c62a1d236e89458559d18b6871c3f97d2d9e600fc88655fa2c11e3eba27
+DIST winrar-x64-5.6.1_p20180930.exe 3190008 BLAKE2B c1411bd15b62ce63a5adc078ef2f7b2941ead91c683b8ade713b1e0a76075281f3c188d46de7d9f1da1caf37c4a4989bf9b35009401f8efa172fa0a4fddefdca SHA512 38c057b765a9a0ed51229018c9ececf94b8b6360a820e73db1af96412b6437614357f885c4c81ce89bc261bb3221d19cfb20284f16881eada0c46debe84f11b1
 EBUILD rar-5.6.0_p20180624.ebuild 2277 BLAKE2B 5b0b46e69ad6087789f311667a5168c31ca9eedf5acd889ee5a1b21a91f4932d259af6607ef3a03a871d55066bf6dc5562320f848e2ff344123b9497d3bfc423 SHA512 ef72607d08f840a8f0f4ac72e5a6e22733c49757afc25a4b9fbee049fee25e7fcefa70eae44df5f1a1e9293bfa60c51899bea2ff06892d09cd275878fd18b87a
 EBUILD rar-5.6.1_beta1_p20180903.ebuild 2279 BLAKE2B ad6b6a2875119d5125fd8b59be5a2c6bb839938542f2cb8c8e7f5544678964e45bd81b9ecf7399a9593e8c3daa54e3f19d6b073bbea3f5ca3ccaef9b5820984f SHA512 393e1805fb47027e6f12b41a435984288816001ec6ef03a71ac482bdf816106bbea89e4dcfe81c529cb3ad17b4db9dc39f14d95e2968c654a15294d14bc337b6
+EBUILD rar-5.6.1_p20180930.ebuild 2276 BLAKE2B 528284083b7f49c94778b81792bc63a41afe877a05863c685bb4fa64307c5f652dc41fc6fc2a766ad5b0dc723384cf6fc078dea08a2e9b40ff9ed05e1053c280 SHA512 8eac8419507f08932cc6caa3b9bb34d9f3c00a7bbd31c113c603d13f1b58d239144d32f78af6a98327f0eb737a5195d30aadd75627e0a2c7cf5999fb6fc1c6e2
 MISC metadata.xml 436 BLAKE2B 772b97d33730af0ec24c126f46634735b661470d99fe1c2fc90d36653d0143014cf45f84686f3621b3b276c70b859f6551ffe764089d0fb646f99cd04b7d0def SHA512 9748890b95ef59d0fc815cc71757c10e77914ea73d254770a8669d8b766d95c65a90eb941a360b361d4e0c28f1abde6ba15a84a77609820aea7eaa25d2e913a1
diff --git a/app-arch/rar/rar-5.6.1_p20180930.ebuild b/app-arch/rar/rar-5.6.1_p20180930.ebuild
new file mode 100644
index 000000000000..56fef413d7c4
--- /dev/null
+++ b/app-arch/rar/rar-5.6.1_p20180930.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="RAR compressor/uncompressor"
+HOMEPAGE="https://rarlab.com/"
+URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
+URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
+URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
+SRC_URI="x86? ( ${URI_x86} )
+	amd64? ( ${URI_amd64} )
+	all_sfx? (
+		${URI_x86}
+		${URI_amd64}
+		${URI_w64}
+	)"
+
+LICENSE="RAR BSD BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="all_sfx"
+RESTRICT="mirror bindist"
+
+DEPEND="all_sfx? ( app-arch/unrar )"
+RDEPEND="sys-libs/glibc"
+
+S="${WORKDIR}/${PN}"
+
+QA_FLAGS_IGNORED="opt/rar/default.sfx
+	opt/rar/default-elf32.sfx
+	opt/rar/default-elf64.sfx
+	opt/rar/default-win32.sfx
+	opt/rar/default-win64.sfx
+	opt/rar/WinCon.SFX
+	opt/rar/WinCon64.SFX
+	opt/rar/Zip.SFX
+	opt/rar/Zip64.SFX
+	opt/rar/unrar
+	opt/rar/rar"
+QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
+
+src_unpack() {
+	local _file
+
+	for _file in ${A}; do
+		if [[ "${_file}" == rarli* ]]; then
+			if [[ "${_file}" =~ x64 ]]; then
+				if ! use amd64; then
+					continue
+				fi
+
+				unpack "${_file}"
+			elif [[ ! "${_file}" =~ x64 ]]; then
+				if ! use x86; then
+					continue
+				fi
+
+				unpack "${_file}"
+			else
+				die "Unknown SRC file '${_file}'!"
+			fi
+		fi
+	done
+
+	rm -f "${S}"/license.txt
+
+	if use all_sfx ; then
+		mkdir sfx
+		cd sfx
+		for _file in ${A}; do
+			if [[ "${_file}" == rarli* ]]; then
+				unpack "${_file}"
+				if [[ "${_file}" =~ x64 ]]; then
+					mv rar/default.sfx default-elf64.sfx || die
+				else
+					mv rar/default.sfx default-elf32.sfx || die
+				fi
+			elif [[ "${_file}" == winrar* ]]; then
+				ln -s "${DISTDIR}"/${_file} w64.rar || die
+				unpack ./w64.rar
+				mv Default.SFX default-win32.sfx || die
+				mv Default64.SFX default-win64.sfx || die
+			else
+				die "Unknown SFX file '${_file}'!"
+			fi
+		done
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	exeinto /opt/rar
+	doexe rar unrar || die
+
+	dodir /opt/bin
+	dosym ../rar/rar /opt/bin/rar || die
+	dosym ../rar/unrar /opt/bin/unrar || die
+
+	insinto /opt/rar
+	if use all_sfx ; then
+		doins "${WORKDIR}"/sfx/*.{sfx,SFX} || die
+	else
+		doins default.sfx || die
+	fi
+	doins rarfiles.lst || die
+	dodoc *.txt
+}
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index addfa3e9c424..dd4f18f221f0 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -3,7 +3,9 @@ AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40
 DIST unrar-5.5.8.tar.gz 222285 BLAKE2B ec6317fc95674a3f282f92762ee89d2fd21d162a96b7b1ea29de9f4ab0ebf0bdb9c3e7141c7146d4bd2e570620db7d7850bc9a8c45a42ef745af1d75d4df5a71 SHA512 9eac83707fa47a03925e5f3e8adf47889064d748304b732d12a2d379ab525b441f1aa33216377d4ef445f45c4e8ad73d2cd0b560601ceac344c60571b77fd6aa
 DIST unrar-5.6.5.tar.gz 226296 BLAKE2B c35dfdc10976ee2a7827f9386021f79af6712ae3a6641e83934ef7223e1202c46c59e12d2b78abe230c3f929f2228fe8c0664f05275b905ea06806a02cd685aa SHA512 984340935671913b4d2a765db5c4edc0d08d859fc43f3ae0e97e681c4ea302a51808fefa8c11c3aeecad1c2681541f363c5051813d978b5b14959c2e55f71281
 DIST unrar-5.6.6.tar.gz 226484 BLAKE2B f5facddd5c326c039c02b31ac28ba86d5417a51d00a463da1c6fbb714856ffb275defbe400a0d56a21850c754f06eda615fcab983a206f335422503d76f11427 SHA512 1e1e9dc2ed104ab7819d11ad2249780a4320cb30f3c427ea1669c3769fa3a8369841711a2d46d918049659bc67b2cd7dc7560a12127d810a57614293c24fe25a
+DIST unrar-5.6.7.tar.gz 226579 BLAKE2B 32b6e70539e4ba0a09bac5eaf880ce555a1012516ba6f439060e6604b5274b17e3f5c8dfa721999243eda64fa9b1b53eda95f7b9df11320ade1873bf665ee3c0 SHA512 2c102fdc2f1a924a57c5492b966b0e1d0035bc3de2a78a46733f300d412ff9983fc5c717856faeb21e71c4bd090296e57e5b87888190867eb3c41f62550647e9
 EBUILD unrar-5.5.8.ebuild 1851 BLAKE2B 68be65e1df26e7a21690e7f2fae539cb2314fec884ea62be47e8f7008cfdddc47e8ef097b41017e8c68c2a7fbc385bbada86715b3bc06a61e5635d3201fe0627 SHA512 dee6fd8a3d7dc51a1162aab23d9031b5524b74aa9fa1b50275a8b4a5b0524439277daffbfa062bec4c6622356232882eca023542da766db4af57789a853a4e4d
 EBUILD unrar-5.6.5.ebuild 1860 BLAKE2B f88156419bf1bdd826b64d9e3f7bfaf0adb8eaf740d056e1a8019fa000dbab6511eaa4d24480601f9c2f1c1d6bb88c5fc6e63669ade5104bb61b2b493f10d8a9 SHA512 6df34351e21f462a334b27d361ea3e6baf9a736ec29e9b21baa98d503761b508626ff18e8e28f81da1d1cd08ac807360f792dab428b3e9920d8cb500e73c5543
-EBUILD unrar-5.6.6.ebuild 1851 BLAKE2B d4ab091a3e942be9c5fbc6eab230fad46e7a9576d1acce95f23f61b18ac9ba6fe4999803f25e7ae028807a9d65f6f97db5fd2b913d088e2efd41e814cc1711cb SHA512 2c5fa5fe23538fb0f775145817ba34cb730c4ab102079f410f212efabb80025632279a18b6aaa727e052de9c4bd680a7a6cb39aade3290979d0418892ce6717a
+EBUILD unrar-5.6.6.ebuild 1845 BLAKE2B 54766c25151e25f7e0c5e8c671b98ca9a2e6a420b40489bbb9ca392a75bdd3724bb4dd3e803364c6cd7885497175875f45bef7bdc953eccda7e7774ac6271c16 SHA512 25299b8fcbe59cea8f6ac92376412da2497f4e515d62f716714aa2ebd1e36ab4a20a1eb0f0e676ab0b7326dc2e8d8fcd399467ca713e555453ab271645620dee
+EBUILD unrar-5.6.7.ebuild 1852 BLAKE2B 70e7e9f58a06b2c726b2d227dd32045e10a5a36ff6a7a74550d8697472d9cf78913f2539f7c114b718367aa79053d75565f3906f81cf08c5096847b5fc38e5ac SHA512 d82cc2a9e8f3b46df705ebe5a897cd005ebfeb814b2dd095c8abe5485a6e3c0f6ff9f2a1da3cf6773f94099b1af7768ddcb2129553187fb2441d98be5bfc811b
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.6.6.ebuild b/app-arch/unrar/unrar-5.6.6.ebuild
index ce463cfa5935..3b12004604d2 100644
--- a/app-arch/unrar/unrar-5.6.6.ebuild
+++ b/app-arch/unrar/unrar-5.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/unrar/unrar-5.6.7.ebuild b/app-arch/unrar/unrar-5.6.7.ebuild
new file mode 100644
index 000000000000..384033090666
--- /dev/null
+++ b/app-arch/unrar/unrar-5.6.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic multilib toolchain-funcs
+
+MY_PN="${PN}src"
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="unRAR"
+# subslot = soname version
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.5.5-build.patch
+	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin}
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+}
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 2e006a279f08..8f7145abf1f3 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -5,6 +5,6 @@ DIST zstd-1.3.4.tar.gz 2059958 BLAKE2B b1d332a35066fb00e32c6dccebd5ad1065bcc3c7d
 EBUILD zstd-1.1.3.ebuild 899 BLAKE2B 52b755114cb16adc89afd50fa1fdca48829170815b1ecdb1b26d2adb5e519d4af6e906b29dd282d67e7066792d4addf544a13c23f5c2effbd6d4aafcd08f41a1 SHA512 25065f6b5901c110b149b11b74d9b2249d241d74dd779ec7aff392db4163cf8276ced3c31d9c09afbac08588e5a560f467905b24f7ed1b418d8431938daf80dd
 EBUILD zstd-1.3.2.ebuild 1265 BLAKE2B f714674c9fec5168e389afd1733421bd91408f58ad7765bbdc5a461fe1ae3b584b452333d768031354d6f5b64f4fd7ed75df259c305cdad439f8f912083d4bde SHA512 4527e9019464671a27df4d76f77371e770a14d2e0420a433e63f77688146e5d2647cd95bbc38a5b0c05316c759f016eabef2a8b6338b406d83ee637b4497eea6
 EBUILD zstd-1.3.3.ebuild 1272 BLAKE2B 5a5a930bede273a258d4413768a991fa79e8507883b82d3c55b2272f16e66d7a623a6bf393f64a6893bc87492b899ff9cbec611be525e1c5e1a909782def50bc SHA512 2cff16cc9d1bc77fb51fa216b2d4aff9a686de512e3980627d03900ec3f154fee138045680325edba779e2e0886dfc644c107307a47d6b061ef616afc18f4106
-EBUILD zstd-1.3.4-r1.ebuild 1328 BLAKE2B 52b37b7e23da5923675b7b13c5b1b14729a2430952dbe24c46903e0553a3a1aeda7d11671671711a1fb54f79c43206536c3b187ca77fccde3bf15b8575355697 SHA512 a5f53bdfd97426587fdd53fbe1b16e28662f037a51f95b9b15f3a453a3da7fb5fb5e0b413200870950e0c89a047a215ae2578b8b266d99c9f1b5d75045105956
+EBUILD zstd-1.3.4-r1.ebuild 1327 BLAKE2B dc51deac27f4c5e89675ca519d9c268f187e46b0768db36c209975e6ce2eb1ff85be4e33105a12aefdb7522fc3259b945037972c72f8910e1fda842aecbbae06 SHA512 c24c65fbb57fd46bfcba186bee269ad628f87258a0c6e40df2c8b9eb15fcaa3979922f93c86f2597876b3131ea5e73a8c08d672b27e46f6004a5bdcb5a7a30af
 EBUILD zstd-1.3.4.ebuild 1272 BLAKE2B 5a5a930bede273a258d4413768a991fa79e8507883b82d3c55b2272f16e66d7a623a6bf393f64a6893bc87492b899ff9cbec611be525e1c5e1a909782def50bc SHA512 2cff16cc9d1bc77fb51fa216b2d4aff9a686de512e3980627d03900ec3f154fee138045680325edba779e2e0886dfc644c107307a47d6b061ef616afc18f4106
 MISC metadata.xml 457 BLAKE2B d8251ae19e395d977bd88e72fc3c666e6d6a462a7a65db0f62fe3ba9831189f0f48e9457e04028b03dadbd4d099d0b051b313b626a3aaaeb1845cee636558b8a SHA512 801938d4394220ffe8df4d8198308b0d5651ebc198711a4af48d1e6dd9aaffdd7da030a8075bcbc7c3182403aea86e56a9ddc999dcfb2556496679d835a16058
diff --git a/app-arch/zstd/zstd-1.3.4-r1.ebuild b/app-arch/zstd/zstd-1.3.4-r1.ebuild
index b5e953cdda71..535cb737c525 100644
--- a/app-arch/zstd/zstd-1.3.4-r1.ebuild
+++ b/app-arch/zstd/zstd-1.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="lz4 static-libs"
 
 RDEPEND="app-arch/xz-utils