gentoo resync : 24.12.2018

30 files changed, 385 insertions, 107 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 4459443dd813..09ea79a48791 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index 4d6673ca702c..4cf6d4529808 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -1,3 +1,5 @@
 DIST advancecomp-2.0.tar.gz 1292164 BLAKE2B 16f24820ac8f6de517edc91237b743935673894fd784271ab7ef7c1b5e7ff11fb4087dffa4e99b0b5b5ef550514f7267962cfcc7dde2976db69a28c68398c8ac SHA512 e324cdf1687d3a92d3416d07269b3d03087ccece9cf636cd4cd0075fbededcd27da5c84a2d77cc1265800f252fcd75a841459fcc55dd9d5eee3ea3fa48d9f906
-EBUILD advancecomp-2.0.ebuild 914 BLAKE2B 93d773556cd4ca17e0ccf8acc4c5cb789841168d7ea67740ac585e4560e8e51d68664af2b97b17858f090a7f8962c44bebb65753a8ec497f0b1c4d550852a0b8 SHA512 49fe538efb6bcf76c29ff4532a6d8059e546f592b62abe872b6558bbd9f5f0f433a480276edc18441b638fb2bf1da4ccba191e60cb56d197c04c40f9c5e9f3f7
-MISC metadata.xml 521 BLAKE2B 84acb45e5f88abc50bd2e45d1b03a98b62623c52a7ba5fe1a6b54cb6f481c6328418d23920b55fb570c633223a115a36b1c89992f95b9673c9986a449c1765be SHA512 48bd30d199f5dae792a18e564454c3bf6707767a15a752aaaa28e2f8507e0824ccc348a9478531d03db839176742f00beabc95f532540ded145b734d2f4b3c45
+DIST advancecomp-2.1.tar.gz 1292135 BLAKE2B 0ad0586298c396f64dda1db3dd5865159b0897d5ee1485809531cad4e11fc9ab634f77c50e70065cf9d827fe4fad4a9d99a5e2587d0f3a8aaa55fe82dff008c1 SHA512 62abc585b282483bf5994491db3965463f4a54db642e489460d678f95faefc5d62f80bcd9e5a2a2ba3cd708d5cda7457a2b773be1a65385ef5528324e2d2949b
+EBUILD advancecomp-2.0.ebuild 933 BLAKE2B bbf30e3d04be41ad781a48a4ae63d317744d74b214e6a31eb76e4a7c5527d4e7c66a75794e38ee3f471b9039dde5bad6e27d9515c09fc34aafc3a23c7fcb06a8 SHA512 70a941e00ea917af6405208db3747d5939a4b7ecc65a7189f6ed34922309af480873c39a4bdf3e533cdf5297d27d4ea0fa0ad04f082fd378218f4bed714591db
+EBUILD advancecomp-2.1.ebuild 831 BLAKE2B 9ffb94c49e1846010b929613bf5ea7d015820948c648361ef83330074b40eb8d6e4f9e72840d7eb1c23091a80c2342fb895806d9e888f95ef224bcdddb3e31f0 SHA512 1d972f93e781077c3ca403c07d9a3130ac4282b3bdf8c79cab9702eb4c0c8919cb564c61f727032a3084de11ff1c205d33ed880cbc5570689387caa67601e8f3
+MISC metadata.xml 525 BLAKE2B 7b701e8291c27054417e28405eae6e285a384f80e96801fa7b088115a40abe3d35f2db1104a1b77a9a5e486327cdc91327427605172e4f00c61b515c91b0ef8c SHA512 4bde385cbadadb14a594602dddec98f079cf1f970138c63296ef1c634bdd9f352c9662b0064f3738017e9ee24bff5662e7e02df19797ae0276c7e889376857a7
diff --git a/app-arch/advancecomp/advancecomp-2.0.ebuild b/app-arch/advancecomp/advancecomp-2.0.ebuild
index 1e620391529f..4fb17e83d9b8 100644
--- a/app-arch/advancecomp/advancecomp-2.0.ebuild
+++ b/app-arch/advancecomp/advancecomp-2.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Recompress ZIP, PNG and MNG, considerably improving compression"
 HOMEPAGE="http://www.advancemame.it/comp-readme.html"
 SRC_URI="https://github.com/amadvance/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
-LICENSE="GPL-3 LGPL-2"
+LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="mng png test"
diff --git a/app-arch/advancecomp/advancecomp-2.1.ebuild b/app-arch/advancecomp/advancecomp-2.1.ebuild
new file mode 100644
index 000000000000..5c2d7fe463cf
--- /dev/null
+++ b/app-arch/advancecomp/advancecomp-2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Recompress ZIP, PNG and MNG, considerably improving compression"
+HOMEPAGE="http://www.advancemame.it/comp-readme.html"
+SRC_URI="https://github.com/amadvance/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="app-arch/bzip2:=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+
+# Tests seem to rely on exact output:
+# https://sourceforge.net/p/advancemame/bugs/270/
+RESTRICT="test"
+
+src_configure() {
+	local myconf=(
+		--enable-bzip2
+		# (--disable-* arguments are mishandled)
+		# --disable-debug
+		# --disable-valgrind
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dodoc HISTORY
+}
diff --git a/app-arch/advancecomp/metadata.xml b/app-arch/advancecomp/metadata.xml
index df2737613e88..559473ad2e25 100644
--- a/app-arch/advancecomp/metadata.xml
+++ b/app-arch/advancecomp/metadata.xml
@@ -1,9 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
 	</maintainer>
 	<longdescription lang="en">
 		AdvanceCOMP is a set of recompression utilities for .PNG, .MNG, .ZIP
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 26cd6f2a9e17..cb3a4ac3ef9c 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -10,7 +10,7 @@ EBUILD brotli-1.0.3-r1.ebuild 1421 BLAKE2B 51ff6f7042873b1ae54672c1727f5558005cc
 EBUILD brotli-1.0.3.ebuild 1398 BLAKE2B 7cce4fc14efb56d134eea51714e12c1dde687a5d57daa2d27a94d39358a26633dfb0a380872bc9a32e32c4d772fa8602eacd5f857c85f4dd5e096c4783b63e93 SHA512 8210643e246c6172946577112adb0bd721f2a4810461db192ec2b2e2bb7ca917b5dde061ce760aedfc7d908a5944ec4dc89ace253adf79b0337b0bb2b0f2cbef
 EBUILD brotli-1.0.4.ebuild 1421 BLAKE2B 51ff6f7042873b1ae54672c1727f5558005ccf84ab385c24bd3c036b4533d181dd0adbe59e8d2d0aeb37bced3cda7399ed447cbce8fe2f1370347a153c48095d SHA512 65d064cb8c1c99874ae66de10a2204d5506a5545c7af26839105d6dbbf6767b52630745d087ba46c9c12168ec329f79b2f8425fc165e8e2c4c41a0d1a9d8a86c
 EBUILD brotli-1.0.5.ebuild 1458 BLAKE2B 6f6ac8909b67f8aad7e25d99601bb1fc20b2e4878d7332f844ca85c93c8e0c0cb896becc9385832536e476302451b19c2ec8494004ccdcce6592ebf1e12ef668 SHA512 1e5263245c4db7d16c208258dae98aa648845845fb409e39784207782c8d5978a7a23549d36d7ac60ec704cbfc356257b73825839a26ae79eb9bc89684197f35
-EBUILD brotli-1.0.6-r1.ebuild 1691 BLAKE2B ac938a509d769927e26940b3609920e677b7ee28666c432a5c6bba3136c0d5079dd6851cf69ebb40706ec62a2999584b5640bd7796adf8a828ec1f1c294bcbd1 SHA512 7fbd54a327c2d8cbde9816f3dbd9f7545d5ff1bab76df2bb5f3c43cf1382e17f4b7bcae71384bb164d8ddea7e0272e062a7df8745a4e3eee3b9be7c2c1c06749
+EBUILD brotli-1.0.6-r1.ebuild 1681 BLAKE2B 538d5a4646c76801cc70b4ba508050936d8f16376471ffe3d6d560946b9e7ff0e3dd9694a1f81e28fa99e2e7fb0e1e7b37fa05b4aad2b2c9d2f7a6b274401743 SHA512 688006d1cdf25a31c8d39b3b338224c91ec141903172dbfa1b38cb691744682ba18e974c469f1da7e8e1c31783ea9c61ee2b1ffe1acda5d4526a7293caacbd60
 EBUILD brotli-1.0.6.ebuild 1458 BLAKE2B 6f6ac8909b67f8aad7e25d99601bb1fc20b2e4878d7332f844ca85c93c8e0c0cb896becc9385832536e476302451b19c2ec8494004ccdcce6592ebf1e12ef668 SHA512 1e5263245c4db7d16c208258dae98aa648845845fb409e39784207782c8d5978a7a23549d36d7ac60ec704cbfc356257b73825839a26ae79eb9bc89684197f35
 EBUILD brotli-1.0.7.ebuild 1691 BLAKE2B ac938a509d769927e26940b3609920e677b7ee28666c432a5c6bba3136c0d5079dd6851cf69ebb40706ec62a2999584b5640bd7796adf8a828ec1f1c294bcbd1 SHA512 7fbd54a327c2d8cbde9816f3dbd9f7545d5ff1bab76df2bb5f3c43cf1382e17f4b7bcae71384bb164d8ddea7e0272e062a7df8745a4e3eee3b9be7c2c1c06749
 EBUILD brotli-9999.ebuild 1691 BLAKE2B ac938a509d769927e26940b3609920e677b7ee28666c432a5c6bba3136c0d5079dd6851cf69ebb40706ec62a2999584b5640bd7796adf8a828ec1f1c294bcbd1 SHA512 7fbd54a327c2d8cbde9816f3dbd9f7545d5ff1bab76df2bb5f3c43cf1382e17f4b7bcae71384bb164d8ddea7e0272e062a7df8745a4e3eee3b9be7c2c1c06749
diff --git a/app-arch/brotli/brotli-1.0.6-r1.ebuild b/app-arch/brotli/brotli-1.0.6-r1.ebuild
index 72733671f1db..ef4b40cda6e5 100644
--- a/app-arch/brotli/brotli-1.0.6-r1.ebuild
+++ b/app-arch/brotli/brotli-1.0.6-r1.ebuild
@@ -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
 
diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index a206a23b59df..eacef1721f28 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -1,3 +1,5 @@
+AUX cabextract-1.9-fix-bigendian.patch 424 BLAKE2B ce74e2a626705cc82a76852d97701329477d1956463a6c589a1f005462cfb5ca7cf61f86e651da793fdef8fbb6e17115d312da666d5168190967eb69f4633548 SHA512 70c07f4bdea2be135d7f24c7b24ab1f8a672b3772226e47bfa13b065cb73ec7f2fb3c1ad3ed1bda3f3a3d8ee6774ae90163b5702be300f058d9f028bd85f6b9e
+AUX cabextract-1.9-remove-spurious-test_files.patch 423 BLAKE2B 33c226d287ab77a3bf7388093149ebace4542112ce4fcdd6a2a8808858da44d1278a89ba5f415de84d2f4a1475af3f0f863c1401b2a091d5ce7192f6d52caddb SHA512 8f6bc900cb04d2177b6a179ef91046cf47fdada15118ad530d588ccab1ae4c7617d851a2cf36c73018f336c812564b0d6abdee1bd549330aa19ba9cbfc7d17d7
 DIST cabextract-1.6.tar.gz 241731 BLAKE2B 49a94b1b0d8a6c9f61cd51280a035e3fedb8d7a2d097b132bc56114c6003a558647a7f8c47b8d08fcac1999e68bea5303adb2b03c8e6dd010995e8b0c6dcd442 SHA512 d1c71c0292e3d73d8edbff5f5230b3127c63028f5aba1d0cad968bc945202fb9c0773327affce3d28466068377f029c80735adbabe0929d29b2204dea73738f8
 DIST cabextract-1.7.tar.gz 293760 BLAKE2B d5ab4783c944d5d8b1d9ed8a2fbbfd60aeeab9f12b836032f982efc5721055b2caa521147246b3b5274d9456b1dbd2d513455cfd57750cf6d7fdc18f109f96c9 SHA512 63789e485d57299f2a0a60dc6d9a94e83639eb59b73789eff52977d3d3bd37a1c00713c86a4c6289e35541d0b7240ea0545ba84013713c070b4324ae1f2865ce
 DIST cabextract-1.8.tar.gz 289256 BLAKE2B ba9fea0cd12859b0de97b13362eaf276066650eb7151e0115af7ed2586cfa7497f72be2f9287d3ccb5ce5256ec26ca69e729df5bb0a327bb9f32ded25391460c SHA512 f8d676d6b738b0b13ac1cac7716c2fb46db423ef30b05ee64f00fcb19596131fbd34341c8b417af3de04896e9b6a8abf0d5976ee4bf87d016806a71317246d7a
@@ -5,6 +7,6 @@ DIST cabextract-1.9.tar.gz 466334 BLAKE2B 1a82bddca826ee35ed13e1c0b50deca3ae1b7e
 EBUILD cabextract-1.6.ebuild 1115 BLAKE2B d6898fc1ef97920e8c7a54d3f79963a59f93b90b0c432f3cf088efaa202a4eb37b1385cdae1c2f91b97f3252938216f55192851291824c33c79ec02df6f7a08e SHA512 10c82fad424f0e5093816ebab945c37e88180618431be7b1068c847534ceb83e3e9ee0379862ec3dc312b65b01cfc2954d3300dd98d36455421d6814840df534
 EBUILD cabextract-1.7.ebuild 1155 BLAKE2B 0f93ea1453dae2141d540a11ca038cc8dec1443d93bb4b517735e3b2eab92ab5f56a94330cb442896808d500600fe78a19a83e32c2e167f49fed37eec9ae402c SHA512 d0503c4541eb6eaf93fb3dfa50a6a968b8355a17cdfe5d52af0ccf2187b886bd23e1db740fb0f3647b43c88f1537fc6d992fc0cb96eda675f4e45672a4856266
 EBUILD cabextract-1.8.ebuild 1152 BLAKE2B e4db9bd87b69f44a8be2e56462245531b639a6a4700ac087f8919319997dff2fc9c3267e21a763fa7607a678598b20bfdc6705eba76a19d268aa9e945460b5d2 SHA512 9da9c8b743b7eb5a091af81ffc9d010dbea4580e6b15a43c8e68c0638b14c397412b1f4c4d1fca8759cf3a18d033dccec351dafddf894cb888ee39948189a09b
-EBUILD cabextract-1.9.ebuild 1543 BLAKE2B 707fedbda86cab166376cbb6eeffa4129ce1721fda5166348ee44e2afdcca71f77eb5231f422a8742068df79dc24d965ff32953dc5eba88b713e58b940ded721 SHA512 47e0dcdb5b20b8eeb864617b7727d145f820ae4a655172e3b7da42b2aef3c73e69d6ecfe49e9fc84bc6b680310d44dfb0312322131d001ad06c512944a2d1e46
-EBUILD cabextract-9999.ebuild 1545 BLAKE2B 63e227bc1912b9b79227015436421a4732a56611dd8c95effbcff7f16a0a18cc5dd00f2c71a1d9129771c910c3fc35dd2fea8133a1d3c41ee34331652529ef26 SHA512 51f060bcf741c5e4be1d0926a846d664aa91db0f270833fc1345c6242d28d69e86c90ffd6462d60a9ec30209192f4cb7a4a64bf659b118d2eac338daa7c1173a
+EBUILD cabextract-1.9-r2.ebuild 1666 BLAKE2B a9f8833387531ead5fae84b54f3f7ada7bb2cca091ed3e6fca4b92aa19a3f5ecd96ebac828b57102b26810fe431284e53776537f5d3403cbc978040c5ec685c4 SHA512 a5ce8046364fe81c2af042e49bfd3e93cf2a0e7316ecc9415f0ae7cc3d11a9a9cb208b32e7e68863d8fa1f1d268e553693981c4efb3dc3b05d56d822ffb64c14
+EBUILD cabextract-9999.ebuild 1566 BLAKE2B 79681bf62a5e3a14c21c7491e47e650b21e2fb518dd8a7df870da3afce17a74f79089c5b25981bc20e64a9044376b9bd77425d75c065acfdd0d03d2771d6d1bc SHA512 d6f9ce211b4114a29084decd6f56e7675b31115bf507518e1f4d07547e5c2d40ea71408f275da12b8723d47a1ed6280b31019b07112af9960d9b583862ba4832
 MISC metadata.xml 497 BLAKE2B dc1c758e518500bcadecefb0a3ac5d6bcd62e97113ccf69ee034707c416e8d7e8282060609f24d2406ada0a443624600b2a9ef554c4adaa9b315a6712491213f SHA512 5e1dc4d999b091846720b303fa59358955610a73cfa15f33bd51488d32e099f1651939e903227814b90857751c1b6408280493d8a0ae3c0f94828c61db53b6e3
diff --git a/app-arch/cabextract/cabextract-1.9.ebuild b/app-arch/cabextract/cabextract-1.9-r2.ebuild
index 68a27ed3bc97..32c897bac175 100644
--- a/app-arch/cabextract/cabextract-1.9.ebuild
+++ b/app-arch/cabextract/cabextract-1.9-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 
 	LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
 else
-	KEYWORDS="amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~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"
@@ -29,7 +29,13 @@ IUSE="extras"
 
 DEPEND="${LIBMSPACK_DEPEND}
 	virtual/pkgconfig"
-RDEPEND="extras? ( dev-lang/perl )"
+RDEPEND="${LIBMSPACK_DEPEND}
+	extras? ( dev-lang/perl )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-bigendian.patch
+	"${FILESDIR}"/${P}-remove-spurious-test_files.patch
+)
 
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
diff --git a/app-arch/cabextract/cabextract-9999.ebuild b/app-arch/cabextract/cabextract-9999.ebuild
index 49070540a767..6f8a446e8da4 100644
--- a/app-arch/cabextract/cabextract-9999.ebuild
+++ b/app-arch/cabextract/cabextract-9999.ebuild
@@ -29,7 +29,8 @@ IUSE="extras"
 
 DEPEND="${LIBMSPACK_DEPEND}
 	virtual/pkgconfig"
-RDEPEND="extras? ( dev-lang/perl )"
+RDEPEND="${LIBMSPACK_DEPEND}
+	extras? ( dev-lang/perl )"
 
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
diff --git a/app-arch/cabextract/files/cabextract-1.9-fix-bigendian.patch b/app-arch/cabextract/files/cabextract-1.9-fix-bigendian.patch
new file mode 100644
index 000000000000..760dd9dbb013
--- /dev/null
+++ b/app-arch/cabextract/files/cabextract-1.9-fix-bigendian.patch
@@ -0,0 +1,17 @@
+https://github.com/kyz/libmspack/commit/c19e707936947b45cf05bc9aaee68517c6c2aca6
+
+---
+ configure.ac  | 1 +
+ 1 files changed, 1 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,6 +30,7 @@ AC_CHECK_HEADERS([inttypes.h])
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_C_INLINE
++AC_C_BIGENDIAN
+ AC_TYPE_MODE_T
+ AC_TYPE_OFF_T
+ AC_TYPE_SIZE_T
diff --git a/app-arch/cabextract/files/cabextract-1.9-remove-spurious-test_files.patch b/app-arch/cabextract/files/cabextract-1.9-remove-spurious-test_files.patch
new file mode 100644
index 000000000000..d80b8704834c
--- /dev/null
+++ b/app-arch/cabextract/files/cabextract-1.9-remove-spurious-test_files.patch
@@ -0,0 +1,17 @@
+https://github.com/kyz/libmspack/commit/2f78851e3927b05931574b380ca6dccaf91e3807
+
+---
+ test/bugs.test | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/test/bugs.test
++++ b/test/bugs.test
+@@ -2,7 +2,7 @@
+ # test that known crash bugs remain fixed
+ . test/testcase
+ 
+-$cabextract -t $test_files/bugs/*.cab
++$cabextract -t bugs/*.cab
+ 
+ # fail if exit code indicates a crash (SIGBUS, SIGSEGV, etc.)
+ test $? -le 1
diff --git a/app-arch/createrepo/Manifest b/app-arch/createrepo/Manifest
index 6d8ea5146883..dde6816a89a7 100644
--- a/app-arch/createrepo/Manifest
+++ b/app-arch/createrepo/Manifest
@@ -2,5 +2,4 @@ AUX createrepo-0.10.3-ten-changelog-limit.patch 525 BLAKE2B 6e79c87e8865bab43721
 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.ebuild b/app-arch/createrepo/createrepo-0.10.4.ebuild
deleted file mode 100644
index 5d4bb0877b1d..000000000000
--- a/app-arch/createrepo/createrepo-0.10.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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/pyliblzma[${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"
-)
-
-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/dpkg/Manifest b/app-arch/dpkg/Manifest
index 327d5c510917..d4e4e7937e6a 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -6,5 +6,5 @@ DIST dpkg_1.19.1.tar.xz 4600848 BLAKE2B daadc95f0f66312e6012a5c9ce053dba055d87f7
 DIST dpkg_1.19.2.tar.xz 4607868 BLAKE2B 4c191fb3dbe64bb3a515dadbb5f81bb32a0ae3b7267603978f7aee34f6baa02bacb818600759fe4bac0c3470ce2d6409c778a408833af796fe65f27fe910713f SHA512 244a6ef6aad935aee649503d6ce3238e34f4fae3f57ca79e99c1890140d913c29255bc9d0e90b50e96d2cf44ab0e44d6c3675a7bed306213fe5fe31710324cf7
 EBUILD dpkg-1.19.0.5.ebuild 1845 BLAKE2B b6320665601e48f808499ad616aec40b0c7be70673561120eb963065e87a05f1f2e8e0f1fccedcd80fdcc98ff7239a07e7f9ee75396288058521099af94189f6 SHA512 54b06dd32e8a95fffb89a3f8e160d4156002fa51d02fb8648966eadfdc9e43d999dfb6d42c4eabc68f4b8c64b73c171221c1de3154b06e1ce180739a35e66f13
 EBUILD dpkg-1.19.1.ebuild 1977 BLAKE2B 5c8762c2ed232b9d9a1e0a82094214076596b3e8df4dc1d95c5a75076e54afe04cbb620f7c60cb741ef20662458ab58492128830d23a711b9541ff6de5d0ad90 SHA512 1a9cf8c4b58e71e5308b1a7f407b08b32e9836d3b364f247ea805dc4b32bb3982a1fb79e2823346062a8aa35463b52303e82a52578d7faa3d9d2544b71f03412
-EBUILD dpkg-1.19.2.ebuild 1972 BLAKE2B 71a351df31f038300194ae18dec0f94e526fbd5a33efd0ba96fd1b56ae75dd5e5cf3df03e60ef82c1955e3f6d0f9907dae35e414ed4c1bbe4fab7dc89a3190dc SHA512 ca8a12976460a62d77d20bb6417e62f75ad4af7e9b4d4e7f919d1cb6147bfa45266b4899ddd1d3c1c79abae15eddd12c88220eda07179bd347786d1ddaa28204
+EBUILD dpkg-1.19.2.ebuild 1977 BLAKE2B 5c8762c2ed232b9d9a1e0a82094214076596b3e8df4dc1d95c5a75076e54afe04cbb620f7c60cb741ef20662458ab58492128830d23a711b9541ff6de5d0ad90 SHA512 1a9cf8c4b58e71e5308b1a7f407b08b32e9836d3b364f247ea805dc4b32bb3982a1fb79e2823346062a8aa35463b52303e82a52578d7faa3d9d2544b71f03412
 MISC metadata.xml 433 BLAKE2B bfddf84314750bbaf97250dc51916485e8226379d3d3aa925f7879ca456c3052e062b1516592c49b4b048a0fe76a55c6302b719747ba43a7a8d6fbd65c9eb8ec SHA512 da157c95d0dcf2086b37482bad4bd1c52da16c015e71411653f12e3f5e0f25d710e1819675a0d5b8e92a9e185dc61f602007e3a8875aa1b05b78f128de1b0ca1
diff --git a/app-arch/dpkg/dpkg-1.19.2.ebuild b/app-arch/dpkg/dpkg-1.19.2.ebuild
index c56f2a56df1e..32aaeb80ad78 100644
--- a/app-arch/dpkg/dpkg-1.19.2.ebuild
+++ b/app-arch/dpkg/dpkg-1.19.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
 
 RDEPEND="
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index dd416a17227e..f4c2da484da7 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,6 +1,6 @@
 AUX 3.22-packages.match 589 BLAKE2B b53cde8851c08d4f538397d72d5e904b6862a091ca1c6b82c255bd79f91917953b7a87b534ef71488f0a93e18a181f554a5477c606be7a429f7c574a62f8e198 SHA512 b96be2502b2ee56fb234af547a045cfed2c5e8bd7290876db641bb1f895ea6a796e50f2e2e066fc80b42fa58eab740a5519c0f2ad78f2787f55d1077b183ee62
-DIST file-roller-3.24.1.tar.xz 1428216 BLAKE2B 7a74ac56fba36a60ba1f7cc0fb905b92336a349f786963a65ea2442fb078704c6e00b46686334f56cf270c861abe7ca252e0ee39f66349f6a4cc3b769a9e7dde SHA512 bd8750b8ffe3e7d3c74492e2ffdde519e7879d46f16c559d06042bac60c8ee63f492aeeaa66b4aff7c997150f4f2955e02a3b0565edf4bd7641a089ed052f268
 DIST file-roller-3.26.2.tar.xz 1436760 BLAKE2B a563f77dcc8d61e90e4e42fa4f08aded657d677b319b39f4c9fd16670a2309e81f142b7b8528e52db0be3f454efca15ccd7e9e25754a95b45800a9ca02969e12 SHA512 3572446081f931ce7cfd7eccdc9450d798164426a68bc332f9340b7c06b79ce4f1589b817c27322a0c1681d7f2cb8cf93462cde1e3df13ad40789faec1decc9f
-EBUILD file-roller-3.24.1.ebuild 2230 BLAKE2B c0c185067dcd9ddfe7603008161fc8f0dadf5cc533858f6e487ed276cf369c47365fc5d69576d2a8af023aee754f020422a482e47aa8e5e33879c3798d773137 SHA512 23acd0e0fa8385230550b50ffc77b4e7185749840a1b49cedafa1ca9f7f5d8eabdb1d2c9fcd69459baa6465675e9fc7c1bfc6a2cbfe7805351d06589edd6f38e
-EBUILD file-roller-3.26.2.ebuild 2291 BLAKE2B 21dc85a2d9be514e7b1d52b84d04f62912d6a5c7dab426afefe8e18bcfb392db127793aaebda027a9d8d2fe2be04fef1aaabd6d8fae6e861da045b39cc19852b SHA512 fed4e28fdc8c328b519badc13d4beca3cb4c9103fc3dd1262d4175f4414431e777a8a9aff85f48e1d8f6dce3b35303c49e485b5ad1ef05992814fbe63733c690
+DIST file-roller-3.28.1.tar.xz 1367876 BLAKE2B 7a33b1d329e76beb2999d0a701aa182b83442471eeacdca61bf50d417f3748f4985642239faa3227ff6665ce7b0c56a802b4536cda794950524688607526bb1b SHA512 5418282a91771f6b7a95ceca986c780472341ca81a6fffa169a593709121c7d4694076bf074a00e3cb7bff6df0cf9f2904cf462cca5d0fbadf6e8aafbb344a03
+EBUILD file-roller-3.26.2.ebuild 2286 BLAKE2B f246648a91f0b1694eb64491b17b35d6f0408e5d8b0a5b25e75177b01ce6712eb687afafd2466b3e98cb5c37deff31c15d1dcd8d90be78e392b3a7004d1ae1eb SHA512 7757e72f407ecd43252505fbfc0d0b941444974ac114785c9262f01895875e5bc27563b370b9e9af6deb5102f7423b202586538a45627762dba9c15733bc8c61
+EBUILD file-roller-3.28.1.ebuild 2255 BLAKE2B dd14a89379e81b232c9bcb37db45a3536df1bca06e61c17b93ddd6527b05e093ca4b6d046ffe4c74cc682b1277070865636fe203aadea5a2f17cef660c2fb25e SHA512 332b1dc4b45d52702c09c78afa6ba06202e1b56deb51ce083cbd45038a51f9c6c4522320e0dfb835cba53c536e9b0514adcd9a285d258f90eb4ee7e5d28ee91f
 MISC metadata.xml 648 BLAKE2B 8fc7347f0812f1b899096670b3ed809dd577e8173f8d7dac8175fbc6eb2939157d1a6100bcc39f15d22e8058e1daba2b4ac7b678baa83f1d24c1f14d77d2e989 SHA512 ea1b782f93ef9397e798d7f6cdd1e650ae95dcad71f439ec518a9e79ebc83a176c9876e85b9930d691e818f5b1efa636f5165d690cfd63b4c7ff9700ba2f956f
diff --git a/app-arch/file-roller/file-roller-3.26.2.ebuild b/app-arch/file-roller/file-roller-3.26.2.ebuild
index b7717363afee..579af8c57e09 100644
--- a/app-arch/file-roller/file-roller-3.26.2.ebuild
+++ b/app-arch/file-roller/file-roller-3.26.2.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
@@ -12,7 +12,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/file-roller/file-roller-3.24.1.ebuild b/app-arch/file-roller/file-roller-3.28.1.ebuild
index e916e5b37d95..dc146d9e7396 100644
--- a/app-arch/file-roller/file-roller-3.24.1.ebuild
+++ b/app-arch/file-roller/file-roller-3.28.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 readme.gentoo-r1
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
 
 DESCRIPTION="Archive manager for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
@@ -12,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
@@ -30,14 +29,13 @@ RDEPEND="
 	nautilus? ( >=gnome-base/nautilus-2.22.2 )
 	packagekit? ( app-admin/packagekit-base )
 "
+# libxml2 required for glib-compile-resources
 DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1
+	dev-libs/libxml2:2
 	dev-util/itstool
-	sys-devel/gettext
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
-# eautoreconf needs:
-#	gnome-base/gnome-common
 
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="
@@ -61,29 +59,37 @@ zoo     - app-arch/zoo"
 
 src_prepare() {
 	# File providing Gentoo package names for various archivers
-	cp -f "${FILESDIR}"/3.22-packages.match data/packages.match || die
-	gnome2_src_prepare
+	cp -v "${FILESDIR}"/3.22-packages.match data/packages.match || die
+
+	xdg_src_prepare
 }
 
 src_configure() {
-	# --disable-debug because enabling it adds -O0 to CFLAGS
-	gnome2_src_configure \
-		--disable-run-in-place \
-		--disable-static \
-		--disable-debug \
-		--enable-magic \
-		--enable-libarchive \
-		$(use_enable libnotify notification) \
-		$(use_enable nautilus nautilus-actions) \
-		$(use_enable packagekit)
+	local emesonargs=(
+		-Drun-in-place=false
+		$(meson_use nautilus nautilus-actions)
+		$(meson_use libnotify notification)
+		$(meson_use packagekit)
+		-Dlibarchive=true
+		-Dmagic=true
+	)
+	meson_src_configure
 }
 
 src_install() {
-	gnome2_src_install
+	meson_src_install
 	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
-	gnome2_pkg_postinst
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
 	readme.gentoo_print_elog
 }
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index 3b67db47ba0a..e4342c3d52f9 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1,5 +1,5 @@
 DIST gcab-0.7.tar.xz 332248 BLAKE2B ef9c03b86c0e73b94286ff30dcc41c031a91dad0b124b601adda3ccaf5ae5924c4ea4408dcc52960b641e799e1c31e8ae882a205a3707c7a5dfa796036a00dbf SHA512 db8c0b4ee2bc75b8bb540b4fe0e9304782b9848b3ab0ba3077638d13cdec652f6178206ec6474af036fba90e952ef0052dd9d19be9eb72bae97d98f8f18a0c02
 DIST gcab-0.8.tar.xz 337016 BLAKE2B 6f9ccf6d33c4bd32b6cda09083c98ee9b24ffc3b42be9019493a864011a4d3f1e2d1fa766bbdd0a5de29eb04608d91a2ad5c17aa25302e3d94d2ef6ca659d764 SHA512 044b1cbe71b08946031161ca97379df8500be5569d6f4989b8fd8f1d8c48ba0fe757306955de9137958eb870cd4024e4c56f833ce847e5a972339883b39454f2
 EBUILD gcab-0.7.ebuild 941 BLAKE2B c84ecf6ad2a57bf19225046f239d0c185b80325476f6f55e68182bad2bd2b5f07c59ce0df83d959ff569da40fd5850b0d09375d6f082a88760794f79c4e6bb76 SHA512 e7cd50ae66c96e9d671ea9fe72074c7b0d0031efaa2819ec6629079de12abde02e12e13117f22d728cf642e653a5a4be974173fdff599c3aa7eb75442c32e729
-EBUILD gcab-0.8.ebuild 925 BLAKE2B ad3ddff0f2f53775305347a17622ff4f2375a2453903b4b908bf1b513f5436521b4f7e0cc7eeca81263a5e6e51e21a5ce27f38a361f20c5125bdaf0f66f17880 SHA512 d2b401d6597417b7e8b0beb93cfb72111add5abd8eed8333592e2889b8c9c34020de3add4622e6c9f0902f7279e1fb536fbec7133fab4dcd99347bbc962e1270
+EBUILD gcab-0.8.ebuild 920 BLAKE2B 9b7e2a2d57a3e1dd4a19e618df5160d57a9e0e157e0b58a51c135efba67974bd9bd634b34031a852173c29d7abe13370576feb3b05207cf055b50e26c5ec8768 SHA512 2eece540718d0b2ec76e68e698525b34078a7567ec870f4e26e65c2d9656634f40fb849b0dd8a86f06088fda5ca8aa948ed039af01f0640a408943347acf9f73
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/gcab-0.8.ebuild b/app-arch/gcab/gcab-0.8.ebuild
index b7d1e756bed8..87e5cb3da473 100644
--- a/app-arch/gcab/gcab-0.8.ebuild
+++ b/app-arch/gcab/gcab-0.8.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 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
 
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index 11816e78f473..1c41bf160b63 100644
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -1,6 +1,8 @@
 AUX lbzip2-2.3-s_isreg.patch 500 BLAKE2B 7839d78d204c0b88ee68d728d1279dc2bc2e6222046cb28c60001c194513de7f3343dfb93d6db91bc4424fb639e2a1cbe428db1ff6753ec2c5b3c004a2b8f321 SHA512 3158763b364e8ba41b0fea03529c6e4a0c6f3d17e7d0ce796fc9a6f6bc7e70fa7db759dc205026818619e137fb6343cf21534014b64dbf07c1cdb3bc1059cc04
+AUX lbzip2-2.5-glibc-2.28.patch 2142 BLAKE2B 408be3d126974d745e596a5a2f7b61246ed76bd8765f5875ca114a7d4adacc38831093f01149249f6335dcf3463827b96df669b42c8b5ec27d6b658cbe7c9458 SHA512 38990970edf8fb9a18aa808c42e4208ff9fc2901cc9f24ef3c4dfdd963f29338aff3712186ebdab78d3d4a7dedd91cae636bb079e3ed8bb3fee561e23ecb4839
 DIST lbzip2-2.3.tar.gz 630226 BLAKE2B c08a7257eff859c0b7fb66ae638a57f837f1a2380c500c42ea65dc36e5650b30865d3c4c9820d6fed62bdbc4e3bdf7bae9e8bfe519897d9aac7f0c77cceacfb2 SHA512 4f694445cc90377bf8dac5046b952ff174db571f390c2d7b0aa001f73c76f3d3f048ff8e7297c2055ed1f7b210174496dc31d6628e1cbeff63146a36a442ad4c
 DIST lbzip2-2.5.tar.gz 651399 BLAKE2B a53fc34084ed16c0e78a9f084f68fc0bd1217245e9470ee023f0a4f5a1e2ae4e5866086f9fbc3ff7ec5654c595b4388d9eff495bc0228edbe0322bf9d1fd1f23 SHA512 76e96cfa75b3ed515b2f891349dffc1403daab2dd0a2a614fa0c811cec6ca25faa395da08ad68a9b6ba4069332c4571f70fb7424f06ef3d800c3082c08d7d3d7
 EBUILD lbzip2-2.3-r1.ebuild 806 BLAKE2B e396324e0fde98a11c66232506c5beac4a5fc24c43ff5ba9550e5408cdd53efffee000b6f03ab70ea7f50a7982a3c20e9ff92fde74dabb1513a3ddb7c35f67b0 SHA512 ce7cb5acd3357e7ad80c782c90c6decd8a9ff6041064988ceb454d559058c1f531c92a903324a2b0e64560119fae3f03f54c6c8fb9b00345382220b5c52338b7
+EBUILD lbzip2-2.5-r1.ebuild 841 BLAKE2B cb333de84433fe31e583c57b420a4ac59fe567a8f1298ab4c6818b64f748bacb58b45fcd620e712dbafb7a486950899e29539d9d1a4c646052d00f90137b0c83 SHA512 47bf271bf2fadf45d9db0f93c79101858811db1684d9d96978956a1d3c7b35dee3ce765fe6eb87a19ab081fac702446a3d09af0df5749ea271b89e65d240b904
 EBUILD lbzip2-2.5.ebuild 826 BLAKE2B c002af26958aa3d8e0cf2d2e6721e24afabd7080ff6680376828ad05c27e267307114ed096d876f74573cdeb35d35f913fd84c3b1154661c5c0a29e05c341877 SHA512 f63095d9320ab1ba66a8142b13592c5444e79315e1d765da3e47631df79e3b98ff6ab325725ab1dd00990c92190e05c9cc3d098b2b79340568435bd6033b03fa
 MISC metadata.xml 534 BLAKE2B e09b3c70d05c66c9edffa19cc3e52be55ecade605c97da4e2f4f6c930dd1ebb548ddb873d31c50c995c0493fd3329978db661796c43ae029a5db79ac0e1974f0 SHA512 86b03f188fb14168b7d2d6956fa2df4941d94c95ff00e6bfd27451fe76b9318dac477bdb13b6443ae0186837335d66cf3e52ddc4ccc2f2979e60fe287f5ac2b2
diff --git a/app-arch/lbzip2/files/lbzip2-2.5-glibc-2.28.patch b/app-arch/lbzip2/files/lbzip2-2.5-glibc-2.28.patch
new file mode 100644
index 000000000000..bc3954934d93
--- /dev/null
+++ b/app-arch/lbzip2/files/lbzip2-2.5-glibc-2.28.patch
@@ -0,0 +1,50 @@
+diff --git a/lib/fseterr.c b/lib/fseterr.c
+index 1e212e4..81f51ed 100644
+--- a/lib/fseterr.c
++++ b/lib/fseterr.c
+@@ -1,5 +1,5 @@
+ /* Set the error indicator of a stream.
+-   Copyright (C) 2007-2014 Free Software Foundation, Inc.
++   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+ 
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -12,7 +12,7 @@
+    GNU General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License
+-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+ 
+ #include <config.h>
+ 
+@@ -23,21 +23,26 @@
+ 
+ #include "stdio-impl.h"
+ 
++/* This file is not used on systems that have the __fseterr function,
++   namely musl libc.  */
++
+ void
+ fseterr (FILE *fp)
+ {
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+   fp->_flags |= _IO_ERR_SEEN;
+-#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
++#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
++  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+   fp_->_flags |= __SERR;
+ #elif defined __EMX__               /* emx+gcc */
+   fp->_flags |= _IOERR;
+ #elif defined __minix               /* Minix */
+   fp->_flags |= _IOERR;
+-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
++#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
+   fp_->_flag |= _IOERR;
+ #elif defined __UCLIBC__            /* uClibc */
+   fp->__modeflags |= __FLAG_ERROR;
diff --git a/app-arch/lbzip2/lbzip2-2.5-r1.ebuild b/app-arch/lbzip2/lbzip2-2.5-r1.ebuild
new file mode 100644
index 000000000000..5700c094025d
--- /dev/null
+++ b/app-arch/lbzip2/lbzip2-2.5-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Parallel bzip2 utility"
+HOMEPAGE="https://github.com/kjn/lbzip2/"
+SRC_URI="http://archive.lbzip2.org/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug symlink"
+
+RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
+DEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3-s_isreg.patch
+	# bug 669594
+	"${FILESDIR}"/${PN}-2.5-glibc-2.28.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		--disable-silent-rules
+		$(use_enable debug tracing)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use symlink; then
+		dosym ${PN} /usr/bin/bzip2
+		dosym lbunzip2 /usr/bin/bunzip2
+	fi
+}
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index d68635b1eb16..7b7eecb8b1e9 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -2,6 +2,8 @@ AUX rpm-4.11.0-autotools.patch 503 BLAKE2B e95c7d3b550f24310dd21c6cfd78785017eba
 AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400f84f39775bd585931e786acf45ab7a1da617f0214dcba90c78511ca22fc556896ae1963ec9160787fdaab902 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005
 AUX rpm-4.9.1.2-libdir.patch 1056 BLAKE2B 5be54a8109c2c24fcd0c197c0a62e433047ac4f84c7239fed6ee9830611de98b7a0bf0e7675b861c27a436b73dad64dee674e2780644ad712164beafbfa2276e SHA512 505faa54ccf196891f1e2231c776f8eadf547bf2003a495c90a2e5e4c93e31aadae5bac70541d316643a8aca85a1b2a3dc6b0ae2601834534ccded06a4a5fabc
 DIST rpm-4.14.1.tar.bz2 4103880 BLAKE2B 3fa7579a251b02ec89943b5505ad9ca7303a444eb64b1018fc74bc6dfb1c19d4f30d96189172c4450925f3357174cde70b298116b53b9155223b52a593a67aea SHA512 29e95eaaf40a6ddf7f23446ea6cb8a1dcd12a45d4965595a705cb9130890d772a40ecfa475b189865da51248b3d2414e4f4b1a40cbfd7ca538c482d87c50a218
+DIST rpm-4.14.2.1.tar.bz2 4156574 BLAKE2B 2eb0cf621eecef7d8977d28d52be922156ceb64b14d2aefda0f5a927b90cf3d3e9c055d773e05ed52422254397153b79557dc94bdb43ca28a2ea126153a43c1f SHA512 0aad457f91918904c15649a1764ce7cbfaf38e083678031286e866f7997be0435a6b7b73596706d97e9263cff7b4df4a3150b142d81e6e3fddbfcf67bd83f990
 EBUILD rpm-4.14.1-r1.ebuild 3381 BLAKE2B 2879ce331def5838c70d1103afb61b3ed033f30b90538d0455f27e314d89627b9ac293aaddb1ccd29893118b18ed1eb7e23f8f1386cf8b408847388457e1f648 SHA512 bef11e5de295892100f8005739550960c73c2d6f31f56eaca404761c90f7bfb9eae675b0d97bc465548d049ecee6e241875b703940f43b1d02aa97d133b5ec8c
 EBUILD rpm-4.14.1.ebuild 3239 BLAKE2B c1067b0afa91bc5902c1f9b0390e5234fb2af252c31ee90a841cfd2cb6b498d7af7dfc438f963fdfb1d6b5fc8f516d7562fd0e3d6d2005edc723098268363a59 SHA512 8f9f4cf67e8b4a389cbe9d78b2a7fea004f96f8e1b15e0243df2d51a5a0c61ba0f356d0c36ea06c8e01e230a171f3e4efdb344253a80358d2a826bbc756b9408
+EBUILD rpm-4.14.2.1.ebuild 3434 BLAKE2B ff78e40955a55544325a4c9c9fa49cae5ff607534d3d32767b0de794628d7eb6936818d9549c7437b4241fa9571bb9e61ce1d5069e81f16aa36244285b56b52e SHA512 39e238ee2fae8d062c04e6fb02160681a200c767c9aac246c83eafa6ff65a4d7e9f3270f9f4e2b2270d3c8a3363532c7d9d44ae3808c8f85502d5533ec36f78f
 MISC metadata.xml 446 BLAKE2B 7d96be70d67580be8b2f1726dc905d9ff4a6d291c6fe72e52bd5c7a4614cc0b61bc3c6dfe12c715558a89554878b20a5df7cd02414275728be15e3bb6f0eec66 SHA512 9a426e6ce042ecd050c19adadfe10c53d72c1ecbf313673c8a5cd66096aa05bf54d0f67b9659ec07be2367f90f9b43028d3b3302fead2fe8f8f55764e17d9dc6
diff --git a/app-arch/rpm/rpm-4.14.2.1.ebuild b/app-arch/rpm/rpm-4.14.2.1.ebuild
new file mode 100644
index 000000000000..7d1e6c3e0568
--- /dev/null
+++ b/app-arch/rpm/rpm-4.14.2.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm.org
+	https://github.com/rpm-software-management/rpm"
+SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# Tests are broken. See bug 657500
+RESTRICT="test"
+
+IUSE="acl caps doc dbus lua nls python selinux test zstd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="!app-arch/rpm5
+	app-arch/libarchive
+	>=sys-libs/db-4.5:*
+	>=sys-libs/zlib-1.2.3-r1
+	>=app-arch/bzip2-1.0.1
+	>=dev-libs/popt-1.7
+	>=app-crypt/gnupg-1.2
+	dbus? ( sys-apps/dbus )
+	dev-libs/elfutils
+	virtual/libintl
+	>=dev-lang/perl-5.8.8
+	dev-libs/nss
+	python? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
+	acl? ( virtual/acl )
+	caps? ( >=sys-libs/libcap-2.0 )
+	zstd? ( app-arch/zstd )
+"
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+	test? ( sys-apps/fakechroot )
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-rpm )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-4.11.0-autotools.patch
+	eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch
+	eapply "${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
+
+	# fix #356769
+	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
+	# fix #492642
+	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
+
+	eapply_user
+
+	eautoreconf
+
+	# Prevent automake maintainer mode from kicking in (#450448).
+	touch -r Makefile.am preinstall.am
+}
+
+src_configure() {
+	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
+	econf \
+		--without-selinux \
+		--with-external-db \
+		--with-crypto=nss \
+		$(use_enable python) \
+		$(use_with doc hackingdocs) \
+		$(use_enable nls) \
+		$(use_with dbus) \
+		$(use_with lua) \
+		$(use_with caps cap) \
+		$(use_with acl) \
+		$(use_enable zstd zstd $(usex zstd yes no))
+}
+
+src_install() {
+	default
+
+	# remove la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# fix symlinks to /bin/rpm (#349840)
+	for binary in rpmquery rpmverify;do
+		ln -sf rpm "${ED}"/usr/bin/${binary} || die
+	done
+
+	if ! use nls; then
+		rm -rf "${ED}"/usr/share/man/?? || die
+	fi
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	dodoc CREDITS README*
+	if use doc; then
+		for docname in hacking librpm; do
+			docinto "html/${docname}"
+			dodoc -r "doc/${docname}/html/."
+		done
+	fi
+
+	# Fix perllocal.pod file collision
+	perl_delete_localpod
+}
+
+src_test() {
+	# Known to fail with FEATURES=usersandbox (bug #657500):
+	if has usersandbox $FEATURES ; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	emake check
+}
+
+pkg_postinst() {
+	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}" || die
+	else
+		einfo "No RPM database found... Creating database..."
+		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}" || die
+	fi
+}
diff --git a/app-arch/star/Manifest b/app-arch/star/Manifest
index af735dcccc39..bcd182c35211 100644
--- a/app-arch/star/Manifest
+++ b/app-arch/star/Manifest
@@ -1,3 +1,3 @@
 DIST star-1.5.3.tar.bz2 889881 BLAKE2B d5d21a99d78c877d422bb6326ec0833d11c35dbe591ba1b892b267f811ae7f6108d9e34c14925b873a53b0f12c703f7c646012010d79d841e0e7be04a5c9dfed SHA512 622032a0e87f3df06ab1091af0af99d0362f478f70351cfe3d47195eec0fcc96f458fb6e50cae3531183984b1d390b598176ce008bcc5f29764795f66436efef
-EBUILD star-1.5.3.ebuild 2699 BLAKE2B 5b5bec4befa27d2a87e13c4d1a4d61681281736695cd9e5af3ecbee194de6b50f1ad5d59bd5219c76a50137aa9d00d2a990f0f8c142cf3e3e5a8c0c8ab3d1ab0 SHA512 457ea7ff0caba696702e0d754598d9e368e374db959a264a50742fa483b6325c3eb250a6044736df0ccd3adf0f15f6a46f75ba8fdb40404ebed3386f7ae73e4f
+EBUILD star-1.5.3-r1.ebuild 2861 BLAKE2B 7d7965e7e3a668b5a430ea677c982f15be66e051061073bf06f0bf4efb4bc56425a1341ccf91c4bceedb928b3a2210b3b8241fa31251c71c52bb3dcaf0022f9b SHA512 968eaa9d7c840faf23ccd93b1449fb1388937ba9164db7c10a19d716fc8460e9bc8a46fe98070a152371b74a4323e433acde5b081d7357accb88bbf3dad25f53
 MISC metadata.xml 350 BLAKE2B 9ca6ab6c8bcb830e9635e148dfc550ae71d785bd4e7f3620bc4a81e27dce3f9a7cb3ad5b2321ca0bdb7dae5082725ea75dfb73ed36e2507129c6937c7f3ef06f SHA512 2e9d3fb7c591893162b2518657d39d6c0a53e80b666b5aa4b307cc80bdb47a5c2f9f300abb42e99b8216be8f09ee407571ca39d2b5ea2dbdf427ba350db457bf
diff --git a/app-arch/star/star-1.5.3.ebuild b/app-arch/star/star-1.5.3-r1.ebuild
index f841e026ddc1..480ce97a4327 100644
--- a/app-arch/star/star-1.5.3.ebuild
+++ b/app-arch/star/star-1.5.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="An enhanced (world's fastest) tar, as well as enhanced mt/rmt"
 HOMEPAGE="http://s-tar.sourceforge.net/"
@@ -15,13 +15,16 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linu
 IUSE="acl xattr"
 
 DEPEND="
+	sys-libs/libcap
 	acl? ( sys-apps/acl )
 	xattr? ( sys-apps/attr )"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${P/_alpha[0-9][0-9]}
+S="${WORKDIR}/${P/_alpha[0-9][0-9]}"
 
 src_prepare() {
+	default
+
 	find -type f -exec chmod -c u+w '{}' + || die
 	sed \
 		-e "s:/opt/schily:${EPREFIX}/usr:g" \
@@ -33,15 +36,21 @@ src_prepare() {
 	if use acl; then
 		sed \
 			-e 's:[$]ac_cv_header_sys_acl_h:disable acl:' \
-			-i "${S}/autoconf/configure" || die
+			-i autoconf/configure || die
 	fi
 
 	if use xattr; then
 		sed \
 			-e 's:[$]ac_cv_header_attr_xattr_h:disable xattr:' \
-			-i "${S}/autoconf/configure" || die
+			-i autoconf/configure || die
 	fi
 
+	# "echo -n" is not POSIX compliant
+	sed \
+		-e 's@echo $ac_n@printf@' \
+		-e '/printf/s@$ac_c@@g' \
+		-i autoconf/configure || die
+
 	# Create additional symlinks needed for some archs.
 	pushd "${S}/RULES" > /dev/null
 	local t
@@ -56,6 +65,7 @@ src_configure() { :; } #avoid ./configure run
 
 src_compile() {
 	emake \
+		GMAKE_NOWARN="true" \
 		CC="$(tc-getCC)" \
 		COPTX="${CFLAGS}" \
 		CPPOPTX="${CPPFLAGS}" \
diff --git a/app-arch/stuffit/Manifest b/app-arch/stuffit/Manifest
index 14f52665da9b..500a70a94ed4 100644
--- a/app-arch/stuffit/Manifest
+++ b/app-arch/stuffit/Manifest
@@ -1,3 +1,3 @@
 DIST stuffit520.611linux-i386.tar.gz 1955619 BLAKE2B fb80abef29d266c93747b3359c62840afa15a32786a82ee01cab22cf0eddad750817c87b767632df5bb2ef681c1c9dd6dfe136dae388f8390bcab0b137a2c0bc SHA512 a1d4631c2d238b49c710816cd5ed8a01dcf52c29b870297b8dfd76fb0cb6e725c5b0f9d4a6c155c7b6980005df52fc4597632f72e90f00bf93ad80a28972270a
-EBUILD stuffit-5.2.0.611.ebuild 1471 BLAKE2B 33b12391d0b2ee3a638b85f5010ad500032570d52a875ed72f36403f43fd238a6e47b9316f30be82966a78e6f602ff45b9db764d898f6894490e1eada29cacce SHA512 816b2b903025599753824cff5eed538c327b49ab146c26967e5246fdc0e2b2168f1531266970c1670d2cf2bcf1f45ab7eb3332b41294734c2214ad7e69b42cea
+EBUILD stuffit-5.2.0.611.ebuild 1483 BLAKE2B 78acbc361330b828415fe6334a62b0bd1048ad927fbf7927df23a01423d78256027e8982869216874517b6faeb93396c1028ff65b87aea527342316c6de19c7e SHA512 013048fca9cbf5ae86fb680c6bfa1de0afcbd1cc45f6143c35be7fb64d1dedc298ed1fa5f564ffcd6502dc8b803a50d6899f1592a49a3a117542a96ffc9f29d5
 MISC metadata.xml 302 BLAKE2B f1870466f061240593b130854dc1baaffbc351f573e2f8e7bd4e5d8dcb986a794d151bc6a41bb7929b34a5bea104f0f95efbedd3bd068af39896fd444997cf45 SHA512 cb8ca2c4b1b49221c5e2ef4d37a9f8faa4a03ec8e116dfe31185f0a09aeaadf1034f45f655d984658e8318f057ca9028edb4cd373abb0d5bfe05ff6dd83d00b3
diff --git a/app-arch/stuffit/stuffit-5.2.0.611.ebuild b/app-arch/stuffit/stuffit-5.2.0.611.ebuild
index 2e6528ed2126..f951829d1fe4 100644
--- a/app-arch/stuffit/stuffit-5.2.0.611.ebuild
+++ b/app-arch/stuffit/stuffit-5.2.0.611.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 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="http://my.smithmicro.com/downloads/files/${MY_P}.tar.gz"
 
 LICENSE="Stuffit"
 SLOT="0"
-KEYWORDS="-* x86 amd64"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 RESTRICT="fetch strip"
 
@@ -22,7 +22,7 @@ INSTALLDIR=/opt/stuffit
 pkg_nofetch() {
 	einfo "Please download stuffit from"
 	einfo "${SRC_URI}"
-	einfo "and put the file in ${DISTDIR}"
+	einfo "and place the file in your DISTDIR directory."
 	einfo
 	einfo "Note that StuffIt requires registration within 30 days,"
 	einfo "but StuffIt Expander is freeware."