Sync with portage [Sun Apr 22 00:12:55 MSK 2018].

7 years ago · e6f9c21048
parent 81b6466fb8
commit e6f9c21048
1193 changed files with 12509 additions and 7026 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 28968 BLAKE2B 679f2cd3b8b531bf8d2fb03d7203b6def3959a92a22066fc6dfdb001e6310ace304a25e81315644a6dbc34cc35590bcb6ad8ec1a4905f5cc3e2db711325e5d87 SHA512 83b1f8fdace336165c60b2e5ab24e0b3f432fb99f9a4962b7ca7e05309e4fb35b3782cedb144a03eb1cf57cac8a899967357585e542ff948176ef9973105e010
-TIMESTAMP 2018-04-20T14:38:22Z
+MANIFEST Manifest.files.gz 28966 BLAKE2B a2be690f067b8b484af6590855bd5015d63efdeedcde260b5f68b1592f78160b7c56654ac5bea62e673dac747b93f386ad1fc107bd09f1e6b1e6d64b16fe2e1a SHA512 e0adf1be8ea9497cab3731dbf9665fdccd8930de4962b077d319ff2bf165b88c44e99d05fbbd22563aa8291c76e73a34f7bde0ce69dd664b812ff2be4e7c9262
+TIMESTAMP 2018-04-21T20:38:26Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrZ+15fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrboUJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDPdBAAiBj02o94XpheFsmkZm8DLVNPi5zBabf+2NbQZaJCkQ1RUrIXM0/sd1Xz
-HN6PA5tu0lfznBdqjay/5SwmSB62CCbTeHNp3Wc5e/KyJ0hKcu7JYe3RFjLhk+3B
-i2Y3WWSz0lf9LHn57NxIddKRhsQAqwpaNtM0qjhrmfO29RaTe2xtBuB/8WFBy5/g
-yEVNcZ2A2R6IXCayw/KZxyo2U2mynZuKbF0Vyclo52tCW7+8rF7xgmDuEXs6+wEJ
-++Jj9xEntMSD2P1pdj1WeZnle9qRYOwNmby/kVehchZTMPC7Ol2UgvguAVY8SCq4
-fD+fbJCkU1jzJNyIOj0nU+4vFlGHqcG8TKEnMhc/3ky4ADxSUBk97SGgcsNi9OBH
-RmW2ivuJ7S6FtjsbaeJis02fJ742dyjDk10AU5kmRhhNid8P2Da68UXpYBe/9XL0
-mnTG81DwBsmf0VYezWF6rNODAMSwvI87SzoVY82wCmwmjd+4nUMYB4sosD/c2C6Y
-trfPghzJ1MkyyoLV6u4YpRaZAeOkIw1OEG+eh2MlRaA58q26KY2LOivKLZcOn5wg
-Ib388LukCpC3ARbyq4YqtytMD4fA8BBWgdpyfP+B4lvfqRJUoCtxiqQOggCpKCeK
-O1jj6ydt0n3TiP085nuZBnHkZjxty8qmJScSjYPbl+39g+AN9a8=
-=NzJK
+klCa1A//a9BxwL0/QYb5T/1mjCtRK+pmUy83abbsgCiNpOZa9cWgNsZd01IRTeMu
+iHZYQHdM/BslyZBcw6zfhUmnoPj3YvudsUwAErnGYr7GgrgESAVxEL2ZaLupGroU
+1xt+tt0oxcNebdUjCOCvsI6puVIGzu2Wqiv3JdGfQg/5Ir0nBFIUIKO2+VIXG+55
+gXX+1Oxu9aR+QHgwXY9jCLVuVvfKUYSj4FFfdz/LxtLAWUr11sx6kJwLxrdLqbJo
+vXR5tn4ePe4W8gfgIWCwf9xGpRX4zTm3uJAdX8MPoGsP83eyD5vRzrrI9CRzXcGX
+R6Bh4lYstYs/klbqjP+KofakKY4/q4WLX6U4O39g2fL78uVMFtJ/qBp6CDS7RwSQ
+qextuIeXQGZyflkeFgjyqcFYVm7iUfxQNfCM0gSrba/bTJaTEonMoH1X7lH+ElkB
+supNeQF3wZPq0o5stlXPKA8AuBM7qLH9WbXW+H+ZKvS+qv1ECILrhoD5199WvwKP
+r3Yspui89Ybzn3LQux2yLLVfJuc4yyUDaMWY6lyBcV92fq8I5M4JQ15qEELNWLNe
+ONrB/LsCrk/5ozmOSV4WVlXP0/t54h0kFzppLC7su4B5i2bEfJ+UF0mJ3PJZXCFn
+ZF7rZxA4fdYk6vQrrDZZVL08wCoiRFtVX5X7pLRc0ZbK+9n8jzk=
+=h6Gb
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@ -6,6 +6,6 @@ DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0e
 DIST httpd-2.4.33.tar.bz2 6934765 BLAKE2B 4ff266b85358e3100c8064c84c89db0235e6f46bb4b308e6b3bf642a9c0815eb6a731ee12e3d8ea2bf31a5d5e6621152452f1e8a9625755689f552f2473b1955 SHA512 e74b2b3346d67be45a8bc8a7cbb8eabf5c403a5cfe5797a976f94a539529843fbcdf03b9ca0548816b2cf37f4ce0eb301f8d5af25b1270fdf8dd9f5bf0585269
 EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
 EBUILD apache-tools-2.4.27.ebuild 2653 BLAKE2B 00b1b5e96e7eab66981fc339faf6db5e40d05af2d819c92a5faff3ad2f60c566d0235cbf60ded1d5daa79cec7815534b96b53b8e8f00333d1a814058752dd011 SHA512 e23b494555f6685f482fcecc59b5e81147780bf399de740b91bc19de9197a3d6f9d32a701472ba6551a3039214adc2e0bfd4436e0b82edb388f26d4dc88bd110
-EBUILD apache-tools-2.4.29.ebuild 2656 BLAKE2B 575d33fc6ad9d95ec105f4318af317759f02135370ce8ffbead49cdb8ed9c61803f3652a50736ed9a1696ce902af9426002da2ead7ff8de7a3b783c5b76d340b SHA512 ef4f840c6f8fe5ac3bc12836b31a73a5c5038a58ee60259ebc9c52ac353803deacf78f56be837b30706ccd00c65aa9fd5e861fdd88bc86f758fbab390c63efb2
+EBUILD apache-tools-2.4.29.ebuild 2655 BLAKE2B 4132c82619471dd8d7ea7da20e780bfe848a571934944c9b209f4e17b6c133d7930ddac23af68ddc60ec93f39abff6075141c214b724e84dd0052ec99303e1f7 SHA512 5a8a2605aa5b46d35dfc14e3c6f39cf6164d310f594bf31d7980d1e9d0a313d22478a7df119759059aa76d0e396801f57ebbbf977247efba4f833e853a1ecae5
 EBUILD apache-tools-2.4.33.ebuild 2584 BLAKE2B 753da88acf51594057d803cdf7d30c47cea49bc9dde0bc95101b7188f13b59db91b3b7db84422f828efb8871fd95926c58ef9902823fb8d63ee18df12bf37bbc SHA512 d3c4a5bf85c81901e18bd7649d9ee368a478a2bd4b55ad2ce4820db68a576a26ea0aedcfd98dad0d2c6c3a63bb5f177d2a40a68ca5e1cef6bac7c830b41ed258
 MISC metadata.xml 466 BLAKE2B 06dbc2df528810dc0aa7335271c987c6310ceb7d8b0db3dc74c6727c27d280e499ddd9ee75580dba63e0f33e24ce63ecfa40059a46ebdec80005769608cae82c SHA512 2820a1f104fbdc752196f600def1e0c56eed6025fa3e66b297077be7a6eb735a2009f1a57cc320e2cf0c2d6cebf9db8c338cf2c6cc9c746766ab99a0b49c63fe
--- a/app-admin/apache-tools/apache-tools-2.4.29.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.29.ebuild
@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"

--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@ -1,8 +1,6 @@
 DIST eselect-1.4.11.tar.xz 177444 BLAKE2B e6f758e2acd17cea3ae37af48e4b4327a9c9d74784aa0723b003f2e1d84ec4c13167de33c311b785fddf7b045b3312955c4d84cf6e35ef7ec9265ef5de503670 SHA512 eec3091c5e386e8b7a52cb263e3c5ce6f41e285d2ae7974f4876e2ffa93b00f9f939055d978c6b9032ee1be2561992015560cdfa93a1ff2b1720ea0100fcf96d
 DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
-DIST eselect-1.4.8.tar.xz 176692 BLAKE2B d24f87ecd7fed1f23a26f9017ecaecaf5b69c02ffbcf9cf7d7b93fa8cad6364d934de8196aff1af955076c167ac4fa8911be03473c757f6a623c63820f3b8255 SHA512 13faa3b21d352975498eb2ea62dfb8d371f30afd6e283c30ff4e89cef035598a8cfe8fafbc6763f39081c547f6743c7f4731d21170625781b89d64eb46c22194
-EBUILD eselect-1.4.11.ebuild 1638 BLAKE2B f1876347a7cc6f59eb1bb7ff727145c59177b95ea6d9525db9dab37819336954770b399134e6d38a90e3b98266a611eb9476f13ecf7c58dc4bc3a8de68ec6abc SHA512 5b4482d9d693f62250e9d1ce69744dfb13a08cc588ca1d555e0e12bae5dc84bb25fbd83824864d6c34ca6403f281ba5eed670a0fc2a78251c73ffc230a94c74f
+EBUILD eselect-1.4.11.ebuild 1634 BLAKE2B e28298f0caa8e8751385c546d23bebbcf6839481a43a3752c5b1e35e7d62822dbf961c58f8c81b5d7eab01cfbb0ddecf88697670c2c6003ab73906078270b3d9 SHA512 22e4238d5ed8f6229236bdcd3cb6186a1fe80bbf5b51a356392d382fbe83839a5287bf212603214dbd2f40e155dc647c3a4fd366676a707339b4550c0223d8a9
 EBUILD eselect-1.4.12.ebuild 1647 BLAKE2B d8dece0d1f857c5282ce3cbe97239881fbfd7762a0903e1bed9b2dae72cb9c5c7f06cb9cd84cd6b6b0ce337649759605dfb90db12fb83c9031b5968ceb3a8173 SHA512 2f39fe3845cee90e304591ade02b935118be3840fa07f1913741e28914fc0f99b7e41d240afe87006c7c8c65440c9759fe22aef0458b856f7beeb05fcd481e53
-EBUILD eselect-1.4.8.ebuild 1641 BLAKE2B 3bef4d6f93da92e36d99ae5fdcae1fb121cdbd41e1fb1b6a1d0c616a04e5919247872d3164867daa2b16f6f18d128fcdca72fbdf51fa81e4df6bb064ae58bac6 SHA512 3b45491ae813cf8cc99c9103392b2c4ab9e84b4f22f3035affac93e8bf08f3b9e130927333c5cb3bc8874ea90d8a089b542013f86c36c68a09b8a03eb0bdc8d6
 EBUILD eselect-9999.ebuild 1437 BLAKE2B a390e3198a7f7f52f48ef56bdb73a8075d5c4c1560c0df7971d32798f1296114053b16a8faeee2982b8e106be835e3b61c3655dc2de270b488259f185e8a8980 SHA512 06a5eb4f7bed5a17f9cd56fe497a7cadb7a153580fac6aeefd6f0762ed029c78c79e4f4a50301177eff4e50ac3ac5ddfae342eb0eb4b5c64aa6a840493fa5868
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
--- a/app-admin/eselect/eselect-1.4.11.ebuild
+++ b/app-admin/eselect/eselect-1.4.11.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"

 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"

 RDEPEND="sys-apps/sed
--- a/app-admin/eselect/eselect-1.4.8.ebuild
+++ b/app-admin/eselect/eselect-1.4.8.ebuild
@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
-SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
-
-LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs vim-syntax"
-
-RDEPEND="sys-apps/sed
-	|| (
-		sys-apps/coreutils
-		sys-freebsd/freebsd-bin
-		app-misc/realpath
-	)"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils )"
-RDEPEND="${RDEPEND}
-	sys-apps/file
-	sys-libs/ncurses:0"
-
-PDEPEND="emacs? ( app-emacs/eselect-mode )
-	vim-syntax? ( app-vim/eselect-syntax )"
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newbashcomp misc/${PN}.bashcomp ${PN}
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	if use doc; then
-		docinto html
-		dodoc *.html doc/*.html doc/*.css
-	fi
-
-	# needed by news module
-	keepdir /var/lib/gentoo/news
-	if ! use prefix; then
-		fowners root:portage /var/lib/gentoo/news
-		fperms g+w /var/lib/gentoo/news
-	fi
-}
-
-pkg_postinst() {
-	# fowners in src_install doesn't work for the portage group:
-	# merging changes the group back to root
-	if ! use prefix; then
-		chgrp portage "${EROOT}/var/lib/gentoo/news" \
-			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
-	fi
-}
--- a/app-admin/paxtest/Manifest
+++ b/app-admin/paxtest/Manifest
@ -1,4 +1,4 @@
-AUX paxtest-0.9.13-Makefile.patch 675 BLAKE2B 1ed7f94daaf1823aa50b83f5b1565fb5929e04b01cadc9d7f232a688040d45c6864093e45cd5592c0dc558b893ea23cab84c1297d2ba922c74e595847c7aaf44 SHA512 91447e797fcb320abade16bd8c0bd9ec53a112fe157165407790eddac15f02338e59244fb56715b5ada1d1ed526093bba600ec8b7c2a0f330315b7a821c7c276
+AUX paxtest-0.9.13-Makefile.patch 508 BLAKE2B dddbe4e9c2cf761c4abcff5f2d708a90750a0f11dc685cd99d162ef4a90a3beaa9a3c12f01994ff34202ba33b8a04554c59213d4bbcb48491528ca957c443c10 SHA512 ed28fc2d852ef0f4da5268c8f66e9a5c5f2b75509cb67627ab1afbd9c3b89609a0e88686cb317f3e6e48874e02d5593b7a7661160ef849859cb9e77be375a6fc
 DIST paxtest-0.9.15.tar.gz 37929 BLAKE2B 0b0290212fa27b8f27bea62c209423b6ea57e9c3e7d972fd069f0213b3963eb7a65921c669ac402b5d83f6556ba9ede90375b58f0f7ec6daf6cc3a293372edf5 SHA512 e152f5ada943f69b3745b51ac6d80f35a4c1aff777e93360287ef18b117d07861216d9d0d2075d2511d33e2cb4ea07168bb9ff2f00e79de6060e546b6806c487
-EBUILD paxtest-0.9.15-r1.ebuild 958 BLAKE2B 53dd0dbcfcf101d81245e611a3cbed2327c4af34fe6abda213a87105ec67bddf8077da01db1cb22727b84c0e9fe80a100428bd531cac07e93d63ccd1d7ba9f15 SHA512 04480944defd3d5a2322ada44b7ecfabcd6bfcb6ea2b7266d0f3cb06e66f987f2fdbd670735d157fd8b16799060d3996f2c090852ab8ecc1fc057d88e96dcac0
+EBUILD paxtest-0.9.15-r1.ebuild 942 BLAKE2B 87d557f82a0e54ddc70f1505c3b693f31beb307afb8603c67f70cf2bbfed2d788180f84358ef430a083faa8e2a76c98d77166316cd6f29962442e5aa628d1775 SHA512 c9bf34adbd5935fd323bc20fbf8e53a0c3fa436b0fe38cb1d347de9612a1b7019f26ce99afb12a4e66c9562e123f78fe52e68068d9f9c9b4893826c841d05199
 MISC metadata.xml 1140 BLAKE2B 4ba22a2a46b61986421373ff6a401f6c056bdb47b89b38552faa0e7b761b1bc171f253f238b59659183678590632d1f414f1108df2ad6ece17ffdb8eb32d45c1 SHA512 8abd1878f49a3e0fb560c0547555140f369d419b07ac05def097deaf386a162a4ce9fc7263dcf417e2909985900a8e01f517fcc3282c93c156c3339fe6a9f6ed
--- a/app-admin/paxtest/files/paxtest-0.9.13-Makefile.patch
+++ b/app-admin/paxtest/files/paxtest-0.9.13-Makefile.patch
@ -1,6 +1,5 @@
-diff -Naur paxtest-0.9.13.orig/Makefile paxtest-0.9.13/Makefile
--- paxtest-0.9.13.orig/Makefile	2014-12-09 19:53:48.000000000 -0500
-+++ paxtest-0.9.13/Makefile	2014-12-12 13:07:55.715099100 -0500
+--- a/Makefile
+++ b/Makefile
@@ -52,12 +52,14 @@
 endif
 
--- a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
+++ b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI="6"
+EAPI=6

-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs

 DESCRIPTION="PaX regression test suite"
 HOMEPAGE="https://pax.grsecurity.net"
@ -21,12 +21,15 @@ DEPEND="${RDEPEND}
 # EI_PAX flags are not strip safe.
 RESTRICT="strip"

+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.13-Makefile.patch"
+)
+
 src_prepare() {
 	mv Makefile.psm Makefile
-	epatch "${FILESDIR}/${PN}-0.9.13-Makefile.patch"
+	default
 	sed -i "s/^CC := gcc/CC := $(tc-getCC)/" Makefile
 	sed -i "s/^LD := ld/LD := $(tc-getLD)/" Makefile
-	eapply_user
 }

 src_compile() {
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@ -6,11 +6,14 @@ AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
 DIST puppet-agent_1.10.10-1stretch_amd64.deb 15422814 BLAKE2B 77d23e6b66620ab9718316f9c273cef86ed2c194cb234ab55765fd28178bbdbff963f9117a5fe904ebea4ffdb901f7e5386e1b75781fe497217e261d087bb57e SHA512 49d391f63197122f2d9e1505091e09d167873255172edb6843e4e6ce28d257ca1d99ca2ec72647c349eb8367c43ef1d4390bbaa0d1aa46cab9b8bd4474c12376
 DIST puppet-agent_1.10.10-1stretch_i386.deb 16281012 BLAKE2B f03f59649724797b1f2366ce95ed1684dcfa5fa765840a7107d6b1803def4c4925a6913e44e10b72d4eac5235efb1565dadd995ac1a865c2a21e0d791d9e29d5 SHA512 2e6115b8fe16f888d315a940bed77b4a310528c5cba3d21a2d52013a6d5081f38f1120c5d5e5e19bdcab69c2836920687ac259320a1ca45d9e56210c86061e63
-DIST puppet-agent_5.3.4-1stretch_amd64.deb 16013766 BLAKE2B 6461011e05d4ea55b95e02a73b195a9aaea46e769f289a856f97df0c0e0809da9c31973b2ac19dc9aeb1911c5cc1379ffb5479c6b1acdc209e123edd1d532eba SHA512 d89014cf597709a0614576f3f8c60d4f76099ec23053e56fbff0d9bec4ebbc24414d1cca1aac1ae0842a8ce59842618845f2c01e6233fc7be033e36d8b5e5389
-DIST puppet-agent_5.3.4-1stretch_i386.deb 16609070 BLAKE2B c4902e8d57c2b522ab8085c0e10e94110fdc44af54790e9c0855c90877504f11a1fe12bb02b9df99f95d6736195000bc41bf4bb8cddd4e2d283da45c31ea8798 SHA512 1f5812f688cbaed4ec64f78a3417d4c83e3d013f908ffa60c33f3adab50ed157558976bdc3564433a7f4595894b1c4f27ef38e0a3f83239234fe68556a1a9e51
+DIST puppet-agent_1.10.12-1stretch_amd64.deb 15443166 BLAKE2B 74c8465fd8cc98ca114acdc600c3f259072d64765cdd8308092b7177233d44656f429407520ead2e02494951f57f1c79b5dfe8c76b2dd7bba7c1316426746df8 SHA512 1391530be340ad0439260f7bd3df8ad251ffaa02fc2f358e4ff2189b8c64a0b2d0caab9f84b84b26ebe2176decef2a39d3114f6433ba6eacd962ff45e1e04c43
+DIST puppet-agent_1.10.12-1stretch_i386.deb 16308082 BLAKE2B 6606c15aac51b28e9e8011168563dff9069b6b065f861c01f4fc768064fe266f83211fbc8fefebfe4bdf81c6220b5daa19f66a9214bd1f2ff53a3b1a2e87128a SHA512 fce0a3ac12afcc293fbdf3cc990407b82592228ed8ed609f4b98c17cea35c8e5ff5f47287880601fa80ac2f7fa608dfe00b3594a906d52bc2bd2e04117ccb856
 DIST puppet-agent_5.5.0-1stretch_amd64.deb 16911686 BLAKE2B c80fdd9aa00a060abb8a6ff5def8cba23e61766701bbded1290f559328a5f097742f47c2ed14ac18121002de3599ef50606b1cde82085148ea17836fdac98e35 SHA512 3fe56f65c01ca23e110d9f1e4ebeefd5fec00ad248c3e1ae663fa04918272f5e4077dde819b3343ab4142233b4e3f7c5b589bc5d52c409b78c5d00ab3aa21646
 DIST puppet-agent_5.5.0-1stretch_i386.deb 17631262 BLAKE2B bc67729d4222933f7f589e3ca1db2f0e8cddcf6cecb92293070db545a95b6c1552ce2b6b3365ea19ec87565e8cbff0112f801d217eb335644454f5eb01199362 SHA512 8daa15c589726c391f34908b7e6543ef7dd2e86724d40ae6a1a38803247e2cc41775211378dcdc04dbd5b43af50ac350b9b209a969488fae3c679056763b28c2
+DIST puppet-agent_5.5.1-1stretch_amd64.deb 17325604 BLAKE2B 1fab815d5d238cb6a05da91a4a9645644915493b2117ff29b8ba258edab18084394c8054f37c5bcbee9bf903dabce5741d7ef4be0a94a0ec8c13ac4b825b8bca SHA512 c4c7ce50cf576a6b12ecee8b9a6c7969512b3625e7ea0f16cc4cd367cebee5271cdaf7cc084fe4d344b42ab6e200664fe7b167acd9cd0da23d2ff3cd9028d6f7
+DIST puppet-agent_5.5.1-1stretch_i386.deb 18063690 BLAKE2B ea7c7068e57da1249c1b1c7232e1af673840b0c8c7e5795574ffcb1861c68683ac9f21f8f4216272130b12a61bb8b324e49d6bf7f0c3d314857fd2591a7ad6ff SHA512 1a64616191a5143b150fe1d145ea786233ab763e87d5fe86bd1b3306fa73bab60d2f3d5c0bb7fcb6fe7c700a47a4c94c72eef1509732b18a5caf0fcd7f060602
 EBUILD puppet-agent-1.10.10.ebuild 3501 BLAKE2B 6b18e594c1769f47944a469d44a5f033c5cfd5b4c6cc45905b838c50ab0b3c8586f723f7b12639b29dc299ec08cd7efbb0843150371ef7cdb292ace77a81c1d6 SHA512 55dd791106fb8b79442185a26eb0c8aa58307e837c634cb0b94f58634ef9e9243d0236cc5fc68b09c157a6232141276bb78f818db385bf2f5f70c893b1f000a1
-EBUILD puppet-agent-5.3.4.ebuild 2516 BLAKE2B 06148b9a47075b3833544cd3e5affbe2e445ca31ad5ccce81bc1c6714ac7a74316bdf33155803876401b1bae6ded1c0793aa65c1ed48c887090e6efa25917ff4 SHA512 f09cf5b9bdcf694fee0227ba055b7368ac1ad1701eaf372e9e669d3480a24560dcf6ea423f95f0fda51f43774a036dce1a6ec4fa08482cebdbdacedff21a0427
-EBUILD puppet-agent-5.5.0.ebuild 2518 BLAKE2B ddd8588910d8dbdfb811334149835b98a63891af846d086e1f2b3f2d3b9e73c10559c20c0ee739d4cfc621f1daea4eb14004f49cd8f67f345e02dd0e73d0a322 SHA512 f59d9b5674313893ece281ad6b5ef678235fad81bda383a9616edec4dd9264bc37d6171fa037a77553f234af3d515cdbf27fbaa2637b50fd3d719d7fbc0afcae
+EBUILD puppet-agent-1.10.12.ebuild 3503 BLAKE2B af093dfa7ef8b54f6e82f6047a0fc6d908b9341cabb273388856284a26c57e141dce71ca59e1ecc5764191a04cd0616d31a3458667eaf30e0ff698015645fc6f SHA512 8f54b9257f935fa3ed49b29cd4c78949e24bbe52ac31a072b3d83fc982f372eae62f5dabe7bfcd9968ca9c7eb59320113e5eca7d2894997aa811963d7f2b931f
+EBUILD puppet-agent-5.5.0.ebuild 2516 BLAKE2B 06148b9a47075b3833544cd3e5affbe2e445ca31ad5ccce81bc1c6714ac7a74316bdf33155803876401b1bae6ded1c0793aa65c1ed48c887090e6efa25917ff4 SHA512 f09cf5b9bdcf694fee0227ba055b7368ac1ad1701eaf372e9e669d3480a24560dcf6ea423f95f0fda51f43774a036dce1a6ec4fa08482cebdbdacedff21a0427
+EBUILD puppet-agent-5.5.1.ebuild 2518 BLAKE2B ddd8588910d8dbdfb811334149835b98a63891af846d086e1f2b3f2d3b9e73c10559c20c0ee739d4cfc621f1daea4eb14004f49cd8f67f345e02dd0e73d0a322 SHA512 f59d9b5674313893ece281ad6b5ef678235fad81bda383a9616edec4dd9264bc37d6171fa037a77553f234af3d515cdbf27fbaa2637b50fd3d719d7fbc0afcae
 MISC metadata.xml 502 BLAKE2B 9eaaec32ba54988999831d4d873dff6c525b42ede2da3cc9a5b67359299233f2ffdafa04a949df6aa58d764e36beaf8ce64c053a306f6e055a245b207e8f2aaa SHA512 aedf4322173910c202b105d904e4528c6b6bb949fc05ed95c4a8d9a74133f5c7391ae30d7675bfa36a3f85880c971aff6e4a57ffdcde57b3b63c02dbed083a95
--- a/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild
@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/stretch/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+	!app-admin/mcollective
+	!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what"
+
+DEPEND="
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/glibc
+	>=sys-libs/readline-6.0
+	<sys-libs/readline-7.0
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="
+	/opt/puppetlabs/puppet
+	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/engines/*
+	/opt/puppetlabs/puppet/lib/virt-what/*
+	/opt/puppetlabs/puppet/lib/*
+	/opt/puppetlabs/puppet/bin/*"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_prepare() {
+	if use experimental; then
+		epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
+	fi
+}
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/mcollective
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/mcollective
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	dodir var/log/puppetlabs/puppet/
+	fperms 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd" puppet
+	newinitd "${FILESDIR}/mcollective.initd" mcollective
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/mcollective.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+	dosym ../../opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
+}
--- a/app-admin/puppet-agent/puppet-agent-5.5.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-5.5.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"

--- a/app-admin/puppet-agent/puppet-agent-5.5.1.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-5.5.1.ebuild
@ -13,7 +13,7 @@ SRC_URI="

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"

--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@ -10,15 +10,17 @@ AUX puppetmaster.init 1090 BLAKE2B 367b678860b955003ff8d79e69cd8c4a6d652ae738bec
 AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-4.10.10.tar.gz 2995864 BLAKE2B c01e6a7529d70a4481e64b4119cfd9d05e79d655ef17495a98e2ab800ea527ef09f234782e7362b25bf1b1ed11d7c2a48e40815ac6dccc5a2d460886beb604e7 SHA512 e517ee349ead56932c9ff54f910d10842c1cd6b6f28673223a65fb72334662d4eabeccc1c7c7603e17aa712c356edbc27fe53d6e7dd7ba042cc0616d0076d755
+DIST puppet-4.10.11.tar.gz 3022878 BLAKE2B d3eec840bb1c46e0dfbbc9dad598b362049a76c7ee60b4ff314e7ba2ce19613f834baced94afbbf499b513391107c4229be5f40c275d0724b200358722db0e96 SHA512 5eaac8bd973d0013e7774c9bda81524332f2b3b0177c04e78554bfb0815697b4b296d5dd11a04f7fad782ad975b350b149b1cd97fc5f06974952314f163f1b40
 DIST puppet-4.10.8.tar.gz 2979824 BLAKE2B 802b65d48ff7d8303e3cc847a9f753a5e19c0ada6ee02dc1fc9c748da8d69462c34bdfeddeedf0057179ff1133665439c41e970c41ca1728463292ef26e996ab SHA512 9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d
 DIST puppet-5.3.4.tar.gz 2889645 BLAKE2B f1f4e2d9dfe457f89aa7d99724eaa9368ea50027747e2506b5cbfa176c1a9060bf87ce8c037b78f3c86c2e2974087f9ab4fc76cb7374f1a348ff410e9cfa83e1 SHA512 f24008651be15cf5c915f7a03dc0319eb2d076ddfb06c44fd846421fe29baba27ea43b29134077e1dc7c14a48b44104dcaaefe73bfdb00d7667c1c25a1b871fd
 DIST puppet-5.3.5.tar.gz 2890869 BLAKE2B 1baeddbaa47803811e14bfdbbf5624b617ced2ec6ec6b8072d51a556455838bf0934b1e0c578ef6b4d5df763260c0fa0f027295e3c8403c172a25fcc72179283 SHA512 d48b836a9c7db451c73048917e091a1dd3e1c259f4dde7a8867fe9931d9dbab46219f4b4dfa739669bb8d713a9defe13eae0d5b2dd26a6930b589f4cb0ab1361
 DIST puppet-5.4.0.tar.gz 2958138 BLAKE2B 2cb7e890774abde7183a7b3ac33771fe8006f526b7780a566788591cba20c1ff7540429a4ead13830700fc07105fdaec4317de69f4efa44c4b245b31164b6048 SHA512 6b6955416e4f14ba45318c1afce7db77226da2d14f8dbfeca059780caf188f9687bf31dff4a4c57f8172468e09c35e021721a8b8caf99050d72f90b290fbdb71
-DIST puppet-5.5.0.tar.gz 3033293 BLAKE2B c8131e023b09bccc9228caae711654534a1cc5a6f290e3ece8cc1614de4374e0c440fd02826b5425576c4d61181a5e3218fa73bf9a277dee392a93193761a596 SHA512 96da65373153a0687f4823e66f7ee1f25b8e157be1840ed8ddfa9d18c030f2964211736b280b9a95dc651a2591bbd1b32d1a65376461f392ebd9104c633f3f3d
+DIST puppet-5.5.1.tar.gz 3035639 BLAKE2B 2930ca9eb928d7c6a69ea76673fc4d002e230bf6dbcd28764e8d5bd504ae11326dc856ed64480e13c9eb1d683ad5e8ef64fc9e217942b59d90c6a0bc98e0197c SHA512 20bf7094193f30cfc7a91244275fc79eef0296036ffbc6bbe405e9ca75123b722be6855c746ef8cd35f80bd7a7308408a9205d064f0f910e11877e4db0ebdabc
 EBUILD puppet-4.10.10-r1.ebuild 5635 BLAKE2B 42c4009603b09985df1574ca66ea4821a337e2859b31c3d923e4784003c486fb648e27cfbc42e638477913659720883cb5ed09fc51f5e895f03eff867738a9a9 SHA512 6f2d6b3ae4a7bcd053eca8dc599cba96b8043797c0ebf7689f660207d777514a01caa98985d426cbb05811dc7ad2d45f9927e098927a5cb34292ecdae376cb02
+EBUILD puppet-4.10.11.ebuild 5635 BLAKE2B 42c4009603b09985df1574ca66ea4821a337e2859b31c3d923e4784003c486fb648e27cfbc42e638477913659720883cb5ed09fc51f5e895f03eff867738a9a9 SHA512 6f2d6b3ae4a7bcd053eca8dc599cba96b8043797c0ebf7689f660207d777514a01caa98985d426cbb05811dc7ad2d45f9927e098927a5cb34292ecdae376cb02
 EBUILD puppet-4.10.8.ebuild 5564 BLAKE2B 51164a6bd2fb31c08d9a1f0f08fa67861f11c1b6de316322f9596defbc3df05b980d897bad8b13f0c7fc3d3344eae0fdf81574555f6736969f797d6d91306424 SHA512 c9a64796ff31f9416606ee37e019d400294a1bbcbbfe1603577e47bf64ee95d0afd307711c06cde3a6bbc01fecae7c2b755ab16700ff697aa01f6cff5e510c74
 EBUILD puppet-5.3.4.ebuild 3935 BLAKE2B bfcc3982749c77abba4558e62fc0b65c6ab7bbfb862f33668bd69d83faf5a8cd9353c03b0ed335ad77fe67d46dc804b30052f7e60d2c8ce2f3f3724c3b4e7c09 SHA512 104948c503ced42c82aee51368cee51a8324d970419d57dd8039a123ce1a6d37ec782e976729acab20ded722e7e2372c6c23d32c88466de1cc5375cf95acef2b
 EBUILD puppet-5.3.5.ebuild 3935 BLAKE2B bfcc3982749c77abba4558e62fc0b65c6ab7bbfb862f33668bd69d83faf5a8cd9353c03b0ed335ad77fe67d46dc804b30052f7e60d2c8ce2f3f3724c3b4e7c09 SHA512 104948c503ced42c82aee51368cee51a8324d970419d57dd8039a123ce1a6d37ec782e976729acab20ded722e7e2372c6c23d32c88466de1cc5375cf95acef2b
 EBUILD puppet-5.4.0-r1.ebuild 3835 BLAKE2B 48de92cbd4ad755641c7d06af9ee0d1019b50677ba9aae2ba813ef203a4d2aed399fd6d5dfb66795cd32259cd0eea0a6a10a00e136158779016e063fe458b066 SHA512 5edcc10fdd53fe7725c7f352d3dd4343032763ede042730173d46e9e62ebc0f553a363cf66bffc3f6d433a714115153532dbc5fba88334d8e248064704f8fd86
-EBUILD puppet-5.5.0.ebuild 3835 BLAKE2B 48de92cbd4ad755641c7d06af9ee0d1019b50677ba9aae2ba813ef203a4d2aed399fd6d5dfb66795cd32259cd0eea0a6a10a00e136158779016e063fe458b066 SHA512 5edcc10fdd53fe7725c7f352d3dd4343032763ede042730173d46e9e62ebc0f553a363cf66bffc3f6d433a714115153532dbc5fba88334d8e248064704f8fd86
+EBUILD puppet-5.5.1.ebuild 3835 BLAKE2B 48de92cbd4ad755641c7d06af9ee0d1019b50677ba9aae2ba813ef203a4d2aed399fd6d5dfb66795cd32259cd0eea0a6a10a00e136158779016e063fe458b066 SHA512 5edcc10fdd53fe7725c7f352d3dd4343032763ede042730173d46e9e62ebc0f553a363cf66bffc3f6d433a714115153532dbc5fba88334d8e248064704f8fd86
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
--- a/app-admin/puppet/puppet-4.10.11.ebuild
+++ b/app-admin/puppet/puppet-4.10.11.ebuild
@ -0,0 +1,196 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/gettext-setup-0.10:0
+	>=dev-ruby/hiera-2.0
+	>=dev-ruby/locale-2.1
+	>=dev-ruby/rgen-0.6.5
+	dev-ruby/json:=
+	>=dev-ruby/facter-3.0.0
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl"
+
+# ruby_add_bdepend "
+# 	test? (
+# 		dev-ruby/mocha:0.14
+# 		=dev-ruby/rack-1*
+# 		dev-ruby/rspec-its
+# 		dev-ruby/rspec-collection_matchers
+# 		>=dev-ruby/vcr-2.9:2
+# 		>=dev-ruby/webmock-1.24:0
+# 	)"
+
+DEPEND+=" ${DEPEND}
+	xemacs? ( app-editors/xemacs )"
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# can't be run within portage.
+	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	if use experimental; then
+		epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
+	fi
+
+	# Use working version of mocha
+	sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.rb || die
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing specs that need further investigation.
+	sed -i -e '/should resolve external facts/,/^    end/ s:^:#:' \
+		spec/integration/indirector/facts/facter_spec.rb || die
+	sed -i -e "/describe 'cfacter'/,/^  end/ s:^:#:" spec/unit/defaults_spec.rb || die
+	rm -f spec/unit/indirector/ldap_spec.rb \
+		spec/unit/parser/functions/create_resources_spec.rb || die
+
+	# Avoid specs that rely on tools from other OSs
+	rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \
+	   spec/unit/provider/user/directoryservice_spec.rb || die
+
+	# Avoid specs that depend on hiera-eyaml to avoid circular
+	# dependencies
+	rm -f spec/unit/functions/lookup_spec.rb || die
+
+	# Avoid specs that fail due to an unpackaged file
+	sed -i -e '/when loading pp resource types using auto loading/,/^  end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die
+}
+
+all_ruby_compile() {
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs
+		cp ext/emacs/* ext/xemacs/
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el
+	fi
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use xemacs ; then
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(get_major_version $v)" = "3" ]; then
+			elog
+			elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+			elog "/etc/puppetlabs/puppet"
+			elog "Also, puppet now uses config directories for modules and manifests."
+			elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+			elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+			elog "for more information."
+			elog
+		fi
+	done
+
+	use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+	use xemacs && xemacs-elisp-site-regen
+}
--- a/app-admin/puppet/puppet-5.5.1.ebuild
+++ b/app-admin/puppet/puppet-5.5.1.ebuild
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@ -1,8 +1,6 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
-DIST puppetdb-5.1.3.tar.gz 24157962 BLAKE2B 750159e8c83cfdc820040bb6837c83309d96da519a84fdf6aadd394473993f128edbd76b7a5b0e2591f75d52c9fdf942e84545ff97b8a7d29ac3ae3520d04ea1 SHA512 153e6cba59fb824fd9bca802ea4f0e05e6c6d69d6ef47566079bdf1ac26f7bc13fa893b633f9506494d2189ef160b6b3c23fcb340e76df41089228c047c566e0
-DIST puppetdb-5.1.4.tar.gz 25425088 BLAKE2B daa4788676d85d3a51d2b572aa9bf88b50fa1a35c92d175b44c532e7d82c3f19b734d885411174a8929a772b25a405738a08dca009a1369bfcb69a456e819f96 SHA512 2a34a6188bc474742e6b9cba5f0df1d5bcecd176f2874e12dbbf9c2fa8706b2d9276baece09f7a593eb6ab7cccd6b8804e15d67cb99cedcf7f6226fd59e82308
 DIST puppetdb-5.2.1.tar.gz 25435195 BLAKE2B aed0e6175df0a603ea0aaf792c31b4933d408a4f7a037b557a8acb4b237e4c639a06f954232e049efe4b486d780a3af129c8a6a48833019168cd70f38e5bf403 SHA512 6d0b06f083093394f74e952112c6b388fd6c94452cf2954172dafc5dc42c7a0b45f6a9a7afcb6196f12316e15653943c3faed8a06ba7a7bd75a31db8515e0103
-EBUILD puppetdb-5.1.3.ebuild 2763 BLAKE2B 4f7058feec44cc0b681cb7d83b494c8e024a923fb84dc173f013ffed64103ed46f6725278e2039bc6c33bc79798f1e3e03f481959a8a08f05d3b820af36ff993 SHA512 032e3f021880cd77a83d5841e130af2eb2e831f54d3760542ee7c3a97a98e5f92e7abe2697d83e896881fd285c7af826854030faade413bba66f0642cd6d7fcf
-EBUILD puppetdb-5.1.4.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
-EBUILD puppetdb-5.2.1.ebuild 2765 BLAKE2B 9a316933c8e8d0e28eb674c4b5aaa6830a7f1db5aad515d6fd7ac1c649c067d482b367a9fff7e6de0c31bd06b35e915a165a50f9af192ae5440a5cd9cf3207f7 SHA512 19a3c9de354f5c9a88cfe8d6b350878a63b9c0bdc262cf66c9ca2655df3f88a269c78afef7cd89d6f28689989e593ada7221c842e6be1e041a329e37192b57cf
+DIST puppetdb-5.2.2.tar.gz 25436396 BLAKE2B e30d80b7da29c8cf3b00c9cda3d6e0a4c5635b3bb3a4e6d3e2bf284531509828df6d845a0d30b2a7a454ec35ab4879019fc4c68fc3aa8b6a72c3d0896b9e75f7 SHA512 cc598539801bedd4ef0052f50013320be5dc1eaf8098db8898a0759609d6d4e26aa094550bc1a45c041f9fe65ee99b0c00c00586d3cc93003836f1415bd92456
+EBUILD puppetdb-5.2.1.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
+EBUILD puppetdb-5.2.2.ebuild 2765 BLAKE2B 9a316933c8e8d0e28eb674c4b5aaa6830a7f1db5aad515d6fd7ac1c649c067d482b367a9fff7e6de0c31bd06b35e915a165a50f9af192ae5440a5cd9cf3207f7 SHA512 19a3c9de354f5c9a88cfe8d6b350878a63b9c0bdc262cf66c9ca2655df3f88a269c78afef7cd89d6f28689989e593ada7221c842e6be1e041a329e37192b57cf
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
--- a/app-admin/puppetdb/puppetdb-5.1.3.ebuild
+++ b/app-admin/puppetdb/puppetdb-5.1.3.ebuild
@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib systemd user
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.7.0"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppetdb
-	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
-
-src_prepare() {
-	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-	sed -i 's/sysconfig/conf\.d/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	dodir /opt/puppetlabs/server/data/puppetdb
-	insinto /opt/puppetlabs/server/apps/puppetdb
-	insopts -m0744
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppetdb.jar
-	insinto /etc/puppetlabs/puppetdb
-	doins ext/config/logback.xml
-	doins ext/config/bootstrap.cfg
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetdb/conf.d
-	doins ext/config/conf.d/jetty.ini
-	doins ext/config/conf.d/repl.ini
-	doins ext/config/conf.d/database.ini
-	doins ext/config/conf.d/config.ini
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-	doins ext/cli/foreground
-	doins ext/cli/ssl-setup
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetdb/bin
-	doins ext/bin/puppetdb
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-	# init type tasks
-	newconfd ext/default puppetdb
-	systemd_dounit ext/redhat/puppetdb.service
-	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd" puppetdb
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetdb.logrotate.conf puppetdb
-	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-	elog
-	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
--- a/app-admin/puppetdb/puppetdb-5.2.1.ebuild
+++ b/app-admin/puppetdb/puppetdb-5.2.1.ebuild
@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

 RDEPEND+=">=virtual/jdk-1.7.0"
 DEPEND+=""
--- a/app-admin/puppetdb/puppetdb-5.2.2.ebuild
+++ b/app-admin/puppetdb/puppetdb-5.2.2.ebuild
@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"

 RDEPEND+=">=virtual/jdk-1.7.0"
 DEPEND+=""
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@ -1,8 +1,6 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
-DIST puppetserver-5.1.4.tar.gz 66628031 BLAKE2B 815f0eb1508589855556ae0f82a2f595a22fd3e13a8168c7c2d8add0f7c18981bb220feee9573d29a94a06e13ac801797e6d96a9ef378c4a743889c938e4238f SHA512 4444880041e36aaee8834476dacdbd5fb166326f054b8beca55f644d1c97318bc2dd0d3d3ae8bfbc1b072e61efcde87c31e763c48a77b05c3af5f873e969d820
-DIST puppetserver-5.1.5.tar.gz 66639947 BLAKE2B 897b340711facada214e68d6ae571e5eca1d6f966a72509fb6d862f89a9e1befa388d1766ee8332edbd8a3a61ba320888525e265b93953a3c6e2931c760c44fc SHA512 7451ae86b5bce59aad502e344bdc60fe4fb3a2351ff1737bc249051e0628bbdf5d6b5fd3e2764c15783945d4604dc7c1efbeb2fd9faedd36d870cc3669d7af53
 DIST puppetserver-5.3.0.tar.gz 66913938 BLAKE2B ed24e0c5a8ad14c2c63f7a88deca6a020121fa53890a68b83f3608081c6480540056d483a00df5c1b0d5a008216f27b5d72efa54d885c55f09b1f40441469b39 SHA512 5f08f0adba257947ec61eae91b7a417e9055510e278e444ce7c88358163b9bb00f2bf02580ace6064e508c43f8b60ca21d12aa3d1525814754e6259791b34bc5
-EBUILD puppetserver-5.1.4.ebuild 4888 BLAKE2B 530aec65438466346b7f8a3499164ebb0c8b70b4c58d583fb6e97d8a1d3d841e278dd82d2089aef15bf4a45b412ec580052d9dd10bba47271394df934422ed2c SHA512 093de3334a5fab1e58a3f3202ed4f194af1441910e0282f9c5b58055a190f74605bd49c982f72851268086775212e63cfa79442997ec94b79fd45b9a9ed76dd5
-EBUILD puppetserver-5.1.5.ebuild 4888 BLAKE2B 24f004c85c5726d79a4d8ad3563b03560d59f4b36380d9ade3954860cc36eb2d3070d4a491d7f6a01e9a5c09ff4d77c5220117b8c9b5119192db3a657dabcdd7 SHA512 281a4673302b36b1073df542be68a8dccd6bf682a9cd68aecfe63d185d9c7eda17ec79d627fb1790ebf0d85a93d92132f6eb5a850aee28995ddaf7c851c81609
-EBUILD puppetserver-5.3.0.ebuild 4890 BLAKE2B 53593fd7c160edd1ec9d8802cdd93dcb00b050721071ab09e41c385f791a3f5a59652e6336d41ef58b0a2a63dada18cd7fa85389a3b7a662f87a7e8c7e3635c3 SHA512 8f6e778ab9e799dc7b1211b4639e32d95e1d693938446a203e1824132e3132788a5d60e884f7a3851cdeb062e3bd0de84f7e8c9ba1fb377bec682e214bffac2e
+DIST puppetserver-5.3.1.tar.gz 67239406 BLAKE2B 0aca973ad039d51877926459f935e48cb9ee6ed60792ca67af3a65800fc8fd9de8e6cadd3edc83ac83385f8dfba4f0cd83c9a6db665578f3d1d235ccc00e6547 SHA512 3d618c351299f4cc038682ab43eb4686bd1baf8f88390c8ac41eb3be9fdf8a7a3a501f0ab8713e45bee0ed02d7a9fd1ed1b7252ebb640ee52aa5da638f0b2ce2
+EBUILD puppetserver-5.3.0.ebuild 4888 BLAKE2B 24f004c85c5726d79a4d8ad3563b03560d59f4b36380d9ade3954860cc36eb2d3070d4a491d7f6a01e9a5c09ff4d77c5220117b8c9b5119192db3a657dabcdd7 SHA512 281a4673302b36b1073df542be68a8dccd6bf682a9cd68aecfe63d185d9c7eda17ec79d627fb1790ebf0d85a93d92132f6eb5a850aee28995ddaf7c851c81609
+EBUILD puppetserver-5.3.1.ebuild 4890 BLAKE2B 53593fd7c160edd1ec9d8802cdd93dcb00b050721071ab09e41c385f791a3f5a59652e6336d41ef58b0a2a63dada18cd7fa85389a3b7a662f87a7e8c7e3635c3 SHA512 8f6e778ab9e799dc7b1211b4639e32d95e1d693938446a203e1824132e3132788a5d60e884f7a3851cdeb062e3bd0de84f7e8c9ba1fb377bec682e214bffac2e
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
--- a/app-admin/puppetserver/puppetserver-5.1.4.ebuild
+++ b/app-admin/puppetserver/puppetserver-5.1.4.ebuild
@ -1,130 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib systemd tmpfiles user
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
-}
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	doins jruby-9k.jar
-	doins jruby-1_7.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	dodir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	newins ext/build-scripts/gem-list.txt puppetserver-gem-list.txt
-	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf"
-	elog "while read LINE"
-	elog "do"
-	elog "	java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt"
-}
--- a/app-admin/puppetserver/puppetserver-5.3.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-5.3.0.ebuild
@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

 RDEPEND+="
 		>=virtual/jdk-1.8.0
--- a/app-admin/puppetserver/puppetserver-5.3.1.ebuild
+++ b/app-admin/puppetserver/puppetserver-5.3.1.ebuild
@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"

 RDEPEND+="
 		>=virtual/jdk-1.8.0
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@ -4,7 +4,7 @@ DIST sudo-1.8.22.tar.gz 3029051 BLAKE2B c77e05b6e9cee738902d6289327fb5d34d19833d
 DIST sudo-1.8.23rc1.tar.gz 3137550 BLAKE2B 4ed50b54db643a04c77332f052e109045782cae34c60a53b1d4e29f64cb02561cb3a6ef70eeafeedbcfefd91e5e6a04ce9a9302c291babe8328ea33bfcc5081c SHA512 7d88e0a29c222fb759d951fc770434af217f3b56b90a196553882e9b6e680134da2a4b0e323a4cf6d38d71cc1ed6797ebcd8e5230e74fcc88d19d98a4d1438e2
 EBUILD sudo-1.8.20_p2.ebuild 5739 BLAKE2B bd58250f5cf45c9a6480152ac0ceb11b628c5c6e05ba663b9c277c8f082b48de4be179a437e43de2f8c81d191a98840757387e655b0c2a04d4aec2827188be0e SHA512 cce6c399221a53baba5ab12c83c833c3a350ded0ca0a7144fb46b34bccaf323368408f6b4c05b3b1d7cf01563d0f53ff241f15fd553f0cb64c3164bdea052ac6
 EBUILD sudo-1.8.21_p2.ebuild 5809 BLAKE2B 06a01d30fb9642371be1a050d768eb42b011e1eb4f86238a96bfa7187025413badde2d92294411b6622ea55406f3d9aaa1492883706abbd999f42ae8a666ebdf SHA512 2847d70298fae4993128794f4b47dc093f3571f01ba5b1c60d221031b16385ab070b44c7c81dcea862e046bc5f390cda1f9af933c6ec196f7b198a4e7c36fe07
-EBUILD sudo-1.8.22-r2.ebuild 5995 BLAKE2B f4e4fd4ea2136155ca38bbe0fcd402769bb5bc436baaa219acf2d488365a2439fc219197b9ace76a97fd21b81f702118d840a287dd0a284d6ebce3f01d2e58af SHA512 87365c19d5fb4499636d0990e08b8edd73112748f57bd6caf9d100edaa38646ffc03ea590304a05dd3aad27dd221d41cc82b98c91a1a785068a26c5ec6ec4e99
+EBUILD sudo-1.8.22-r2.ebuild 5994 BLAKE2B 897934e6c3ef7b49fd1a8707bb0330aeddea171907432ef613d93f81fe3c725106e62f6e8b1d894fcc23c61cb977c7779afdbeb5466afce064add8a32bdaa94e SHA512 c8f77365cc995fdc4e0ec5c394de57f5dbe7eaa144c9a667350c4632eda294a0d4f4521477e50909ebcaba4d9a7212f68013f5cb301ccafe4cb90e4652f5194e
 EBUILD sudo-1.8.23_rc1.ebuild 6000 BLAKE2B 0f271466e3199849d365e2136700e3c2570008fa72054d60a27f84e515596359ccda07683c32defd0091fa7f41fcdfd5dde5f345f8b2cc73a418ac217b29bad3 SHA512 9f5b277fcbbbe9921d8e18b45b9935436e47021ee796a0fb65f3afea980b2d8da47e9ee247acd9da4434403c9d1ef2b39ceb678bf6f82c557328381d5d59bc33
 EBUILD sudo-9999.ebuild 6141 BLAKE2B 3fde1d106dc229a8bcf8c3231de2fac5695a61c2a87382bb22a5ef3a2959c7777b5c332d79ce22a5e8e82c7a15a71b688c42a08142ad2d564ae0e8654b4b3459 SHA512 4a8c1406ff43a6b32d24d277b4741deeeb075e68fb3ecf93afbf6a8c15d505595780daabef93f01d9b40ea599ac05a846f01e5736208592ee8c7db55398ae2f1
 MISC metadata.xml 989 BLAKE2B c7f7d49fda7750b172dd4b2e5c3fc5f1f3dd602b6347479834bf6444c9311738bcd10fbbba100cee45c97bb899e53f3c113abc61ee89b3353b50876c30966589 SHA512 bc9addd017e474acbc753d6d2cce5d77281a3c1f0857de538168eb1a7b80e0d0b313ad2b03cc710b483cc9588dcaf0208a5b8aaccea18e2ca51b567020bea9ec
--- a/app-admin/sudo/sudo-1.8.22-r2.ebuild
+++ b/app-admin/sudo/sudo-1.8.22-r2.ebuild
@ -23,7 +23,7 @@ SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 LICENSE="ISC BSD"
 SLOT="0"
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
 fi
 IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"

--- a/app-admin/verynice/Manifest
+++ b/app-admin/verynice/Manifest
@ -1,7 +1,7 @@
 AUX verynice 372 BLAKE2B 995a40cf67092736685e16b9a5429467972db32debebd64915e233e4be57862496b96c8a70bb57786e3770af3552f747359c534e4bfd62c91271a1ee974946b1 SHA512 b65b2f826b29ce19a237eace78518d0b31af0138caae0342c5354341dccd93cb13ffbf8d82acd1a52d0d710e62ae9d4a18a84e479c01c8931f78051daeab7e02
-AUX verynice-1.1-build.patch 2525 BLAKE2B 76eff33ad7ac3af2b12b8a25becc4aeecea8de7462e314f84da8df5889ac9a1c8fd5f84e92c39e0eac18fa1a0016783e2901332f8c071dec2d6e7e7312d27614 SHA512 8421776550e74a0d409cc3a02e65e96a047571abf0a7d5f0f1c97217978a150711bb7dd68b77abac044b4b7844970bed969151b166f91da20cd36c2c491bdee6
+AUX verynice-1.1-build.patch 2529 BLAKE2B 5ec0b3c4b4c1a91d3f7076068bfd3a39128d896682a8b356100240f7daf1b885d2606ec8c2dc1afdd29add09649f8642158f6dad373aeb7ba349e46997aa1a0a SHA512 d532a4a80b8d0719c07a5171403b90eba6562b6645703e4b7c79368cc71eca546cd0033796def0d3016c6ab2a62db85e266ef67ffdff5a6268f403213bf2ab70
 AUX verynice.service 158 BLAKE2B b71905d327904eb6a524e5d6b2dbc1606ffd0b5bbfad659c9d336ea41edbe8e6510966886cf814888bf8ec55cdd033299b1c91b7e7e3c3f455fa0f8a6ab8ddd3 SHA512 03a88cc405c8d6fa18f1e523e6987b1455011cf17ff38f1e937d523b33d88cae839f256811b487ec3141d8b396a15b8af778998d53bf55dd69f6a6a6dbc6a148
 DIST verynice-1.1.tar.gz 37576 BLAKE2B ac499b298858ada109f298bb2d37dc5fc7ecd17386994749a5a8a3612038eaa98d1f122ed990d9c8bd9e17a428b0a3b4c0c7f0df4a9f1c0441e3fe22fbeb1d07 SHA512 731fa22162bb4f48b943839ccf8ccdc769587e323da11e4a77ad14539a724ffbb89e5f4122e1ab36df3306c507afc958d1125160d34d9cbf55df4dc69e4a0139
-EBUILD verynice-1.1-r2.ebuild 775 BLAKE2B 1eeda57b9658a2e5fe65852674d268a4f24961cfd036083b37c016f0087a7a03f1ce421ab059ccc777eef2bd0fd1b6f7cdbdf979e6cb6dbdb5de9b912924123d SHA512 775d4f86677f8d9fdf8015d2b5ba4376dd5d3c8ed0dab91165c8cf099b06409bb4c666e8891b340dd0a8490d4cdb48b2a90357c4a285e15949ca99fccc94a16f
-EBUILD verynice-1.1-r3.ebuild 753 BLAKE2B e7129dac8aa5fe8f53e899a8bd981e7a8180572fbde6735814ce2bc2abd9e050301597179bcbe4a71fc53be4468b81f6a218f23e1ce9d4709b93d32f049d266f SHA512 3b69f7b7ed2b35cc9dc407dd5ea736328b7f9bc1eb3ae3df3f4644c969df4fdd3135a5c3f7ef4f5e0068a178a40ba402200e35e5fce40fc2c06a3a65c7ff4590
+EBUILD verynice-1.1-r2.ebuild 780 BLAKE2B ead43a3cb913646f7269b253f0f5c37951411aec437408c446d47018966d8f313fb5402244a174ef4ffce2819350d4b9fe1c55bacebed6cc828b3937399c9db7 SHA512 72074cefa72a8f125a9669ad35a7b1c240ed8dd4e05110c957a4b7733cc521897714a7d0035639664eb63af52f9ffc96df0160498f75133a5e9e88ab650c7aac
+EBUILD verynice-1.1-r3.ebuild 729 BLAKE2B 0b519f289c07ccda9c48765b88bf37bc184355ece6698a859dfd8e2fd9e2ab643dcbc9d6e255b9a7cb830fd1f19de080aa82d913e21d2c9f08999bab53f0549f SHA512 98a2149b7d39117b58f0fe6fee1b11808666390234b0f3e02b5944be1eb785991cc874b960861e168b92f3cb75ecc4d7687d43905bd170d5e9be20475546568f
 MISC metadata.xml 318 BLAKE2B 1786ed2568f2f60dcaa875da07b616c2c77a1d4fe0151463db5542db66caef11931259da6bca4b437e125849caa3a3505ee607eca6c57b35ecfa75f45c82f370 SHA512 04cee3becd3a20c8f455969ea4c38d7a0843283bafded1af5310fe090159ad2ae0c804fc4893fa88138ad98aa3feda6991624c8a4942b245b64db5eebb3dcf46
--- a/app-admin/verynice/files/verynice-1.1-build.patch
+++ b/app-admin/verynice/files/verynice-1.1-build.patch
@ -5,8 +5,8 @@ Subject: build system
 respect flags, add LDFLAGS to linker line
 fix install rules

--- Makefile
-+++ Makefile
+--- a/Makefile
+++ b/Makefile
@@ -15,13 +15,15 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--- a/app-admin/verynice/verynice-1.1-r2.ebuild
+++ b/app-admin/verynice/verynice-1.1-r2.ebuild
@ -3,7 +3,7 @@

 EAPI=5

-inherit eutils systemd toolchain-funcs
+inherit epatch systemd toolchain-funcs

 DESCRIPTION="A tool for dynamically adjusting the nice-level of processes"
 HOMEPAGE="https://web.archive.org/web/2010033109/http://thermal.cnde.iastate.edu/~sdh4/verynice/"
@ -17,7 +17,7 @@ IUSE=""
 S=${WORKDIR}/${PN}

 src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${PN}-1.1-build.patch
 }

 src_compile() {
--- a/app-admin/verynice/verynice-1.1-r3.ebuild
+++ b/app-admin/verynice/verynice-1.1-r3.ebuild
@ -3,7 +3,7 @@

 EAPI=6

-inherit eutils systemd toolchain-funcs
+inherit systemd toolchain-funcs

 DESCRIPTION="A tool for dynamically adjusting the nice-level of processes"
 HOMEPAGE="https://web.archive.org/web/20130621090315/http://thermal.cnde.iastate.edu/~sdh4/verynice/"
@ -16,10 +16,9 @@ IUSE=""

 S=${WORKDIR}/${PN}

-src_prepare() {
-	default
-	epatch "${FILESDIR}"/${P}-build.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-build.patch
+)

 src_compile() {
 	tc-export CC
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@ -4,7 +4,7 @@ DIST lz4-1.8.1.2.tar.gz 228640 BLAKE2B e5e7176dcce5319e2dcb1f6d69c47749976fd7e8c
 DIST lz4-r131.tar.gz 133784 BLAKE2B f072d1f97ac6f804140c3896dfa95c16eb3c2c2208cfeb35a07535bb345fa100e4169ea91b2aa05655fb61f6f2d64a7c25444778b99841d3e3d0f09b10f570d8 SHA512 60bd95d529691ffee2c43f0d8a62484c3cff74c0154094f073192606806ac8182dced61e0534ffa7e0ccf5f18e9a8cfd2738883a83814c0711a6d7f1d1b252e5
 EBUILD lz4-0_p131.ebuild 1521 BLAKE2B 5748445c1b995930382c846a6ffdca206f008a447b63660f07b6817f9710f0c434c29e775f635e1928d781053dc16142546f5c9d9606df3ee4465eaa85f4d799 SHA512 466cf8f24471af82f9789dc02ff9b93d69a450f7ec768e3d5c4f2a374ae36a46209d39859701cbd7856b7600dc1d33fbf993d1651cc56338601390f72f78e61c
 EBUILD lz4-1.7.5-r1.ebuild 1033 BLAKE2B 1e6724ddeb18f9e4ffe78a84e96d0593b2501e96bad632db32e10082559c1ea77c38686ec77b953dc0c981796a14bbabf38985ed953617e02ea0d704cdebe59e SHA512 763b64264b063b7066052ead680c262ce1019ddd41dd627dc76d38eb72b2ba9e1da23df7356188901fc92984822563179df9e06df975976c988e7bfd86c7b9ee
-EBUILD lz4-1.8.0.ebuild 1059 BLAKE2B c5614523bdaf07125aaa18b2c1e38b0087e656ad32584bbcc1e8f0de903be311c14088764d0fe8621144ac2c50cdc11030c095e07df52219ec969fce87085b0a SHA512 3cf414d69580e6210e44645b5ab7537dde0ee992f079110cba6dd10a82665b041a33c42a76f4c48ecf38f1f38a875150b7fc45e7788065db303de39c6c4d7629
+EBUILD lz4-1.8.0.ebuild 1058 BLAKE2B 3a3c63fd72df58c8e69c4e9981fe7e06f6dbdefd939b4638536898a407bb508ca7873ffa9d8b34bdea23523b52af3bd14571f4ae1b48e3c115f92465e4674f9b SHA512 ae91981fc93118aa57d261292412aac4141d04974e5358819b27dbeaca8902bb995e4439373d35b625e5c19b5f3cf50073e4c22c2293ab8c2390ad7ddaf3ccf7
 EBUILD lz4-1.8.1.2.ebuild 1068 BLAKE2B c29f13447c24f824d19816f9c8bd97e5be475a39ca4fc94c3dbabcf476779d1ce7177ebdf3cf97ec7ff899b7bb27b6867793ec5852b95b57093bafbad07d9a56 SHA512 e300a60ac5575a1fc16577efec351f886d98e7ecfa389098e72f4ec393fecf6b675caea554647eddf91edae1c0e01f2784602f4e94ac7fed5285a28801ef7cb6
 EBUILD lz4-9999.ebuild 824 BLAKE2B dbc4eeaf3f65d527eaafd48a1083c43b76fd564b9dec1e6393c93445be4a0d9b56e540a4dd24df5438ea9b2ffeeb8a53a113a69b40f9b1ded3af4567b00122d8 SHA512 f28250733aa50bab0d908f5288d69d3d78af865433864716474d6d8fc639a44de61fb25dff06614bee003b9fee1d1a71528f9b96d2347c3562a5eb5736a340a9
 MISC metadata.xml 516 BLAKE2B 89b858097e6409d3b6f9855c0eb82ef02ee9c705516a1c32d1eb81730b03733e7abca122e59e43c193367429bb277dc1f044d09276f7b3db37f79d6f5c3a8054 SHA512 b559b65a4eebe71824ad3cd46c1ef3aabcc1c43f4312cb2e1072f0e7ab4396890696ef7450d7a41a2e03498db9da9e6823f9d8de4d413a0244607b85192efaa8
--- a/app-arch/lz4/lz4-1.8.0.ebuild
+++ b/app-arch/lz4/lz4-1.8.0.ebuild
@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH=dev
 else
 	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi

 DESCRIPTION="Extremely Fast Compression algorithm"
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@ -1,13 +1,13 @@
 DIST rarlinux-5.5.0_p20170811.tar.gz 546839 BLAKE2B d90bda3092fb636fee1db4f222632cf3d45c99f330298521b2a0957cd7bd4845f4518cf394e03a4e302d45cf73a37f5da5ac0cd7eba08a4859fd221697656c20 SHA512 c437d0be55ea90ae1dd9d657517d17d9edbba07cd77325785d8d503883847edeece2cc3993d3beec3a5b36b6830383b7026fbfc53b18f490288395994bc532cb
-DIST rarlinux-5.6.0_beta1_p20180311.tar.gz 551336 BLAKE2B d56bc53f729641cbf5cbc7b4abf9b3260e164e7cbf37e1faa227736456fff00d418699d05d628c5dfa0bf8517aa2c181a231e520e7c66c37288707808526d3d2 SHA512 9061ad96f8c933f942eb9e7d383a38b7056895ff542fdc26980f4d1140180f7a5c21ed288d4068edd0b25898645ff7977aad4b646882f5f8f57bbb8b89a40bd2
 DIST rarlinux-5.6.0_beta2_p20180331.tar.gz 551421 BLAKE2B 150b3a46b3230d6be39d25ed7d26894402abf879c45160e2003cb678cabf42f89dd58e4e61cdde27d5c4c2e14d2d83c30d1d9614be2a7ab6e2f86661057940fc SHA512 d07824c3604122451e7482960a48f7ff50cdc6450b223c5ff5b22880f909215d7842ef538138156bc19d64e93b0cc74521ab8b6d97573d9e44cc754267ee3949
+DIST rarlinux-5.6.0_beta3_p20180421.tar.gz 551736 BLAKE2B d35e6b377e7e31963361f132d1e424ef17f706f21e780a4a66083e487ec837a83d25cc3830572fd397958b05d595fd7f7cf23db99d3160d78a4efb0392a03c3c SHA512 71d23b3d8627eb1d67edee2c1c647d832861567443145a34f374b57ce283d6777b2ffebd13f7282f9a22df796e2c6590bd5a8afb98894284a30ab7bba18a1086
 DIST rarlinux-x64-5.5.0_p20170811.tar.gz 536028 BLAKE2B be453cab6720abc4b01f5aef6c5874b0ff328656f8452b2a671b1b5305427dbb0de2af4084e25e972c69fe4ca4072b10f21d66f7fee23a3e205b0b4f533c8b7f SHA512 1ca8cf7fbe526b43bdc9aeeccb6a0d86efd3bbaeee554e807d58ab62857294abc89662bb42b17b2cfe7e6739876c6345455cd027abbc4cb84312c58314278a66
-DIST rarlinux-x64-5.6.0_beta1_p20180311.tar.gz 540817 BLAKE2B 4ea8121df7dc57880cb148a8bf81c69b596011d3bfe462c90aaf9da4ce26d3fac1eb16324c55aaf79380f604493b9ecba1a1ed5ada76f76df1d9a1b97d522af3 SHA512 ca6624bdf55fe732a3aac18733b3ea35a519567474a49f549c27272a0107b60fa93ee16e0e49d5822d4fa33b11c355f67b047c42ed0393ef3a9d840eb8b4c783
 DIST rarlinux-x64-5.6.0_beta2_p20180331.tar.gz 540942 BLAKE2B b52dda0a52442c8aca930d800f4c3e6d69356a3265cc64f0b1e974fe61c463aeffbbc0fe2ae455426f2727dd71c12df473e78b42200ef2f25cd683e1259e8554 SHA512 117cdc30b8c1aef8784773160bd641cd3e6698a35f7c83c13cfe9a23784cef67fdf62f2f828101bb04cae58beb00ad0851ed89a73e0a77d703220d3f44d12bd5
+DIST rarlinux-x64-5.6.0_beta3_p20180421.tar.gz 541021 BLAKE2B 9feabd97f42beeca5cf23aeac52723477ed0047e42abb14112f953e66843d15b2104c3a8d96e61d3a3cd3f577e0f1dcc663813ffe21edd33b5e4697b546936c2 SHA512 22b51e8d6afa16dd7231c292c9496c0e167798d042654c44a4cedd13daddd5efa463ba62e473983cac57667802689240c621c8099d74af8a892ce2bd4d05a5ee
 DIST winrar-x64-5.5.0_p20170811.exe 2220872 BLAKE2B a37783f427440a5166021475f024ca6e281b4f0d39926e55c00588e51d371bdd1bd16bd04ed65c363f7aeef6d7e2b0ba796325f7f290e45cfd8c09048ae25489 SHA512 f2aa40bb875be7f88cd618b1f5e02cfe0c5fb584f4e27d06531aaee018e613a70be7b7d3e8b92448381dc83605db6bf044cbecc52f63b6045193fef07601be66
-DIST winrar-x64-5.6.0_beta1_p20180311.exe 3186432 BLAKE2B 13063c52488f3a1e1d6a9f0b85761194d14feb549aede1c8653351cce8527794c88a37b177988328ac2293cf993848e1b0b4865a6f0adeef7c49a33a71f2f366 SHA512 2af5dabd88a0a70bdc2ffdbb1488e6b0b1c4cbe52d91bef86991c40b31fd8ef7482f47c134a13197798366eceee7ae6f8d39e0ef3660245ee89265cb65d43ffe
 DIST winrar-x64-5.6.0_beta2_p20180331.exe 3185320 BLAKE2B a3a859d57a72d92df8c752358184dd41fb59303b52c2d47f155d727b6555bba24a67b1a801a7b5e3653d27b6f72b4c1f05cd03cf02af6432845551f3052be753 SHA512 8b4cfa1db475edbb71464ae890c1f23b699637a17a0abd40145e396097888b8fe3e057b05a6fd20dd287494985f291ee3f717acb6fd9478752859221694ab6f7
+DIST winrar-x64-5.6.0_beta3_p20180421.exe 3179544 BLAKE2B e08ec6e628fc1b3dd03e5cdc68a3d07195bfd0367a24c8bc1a6f325672c5f0309e8045191918473b209ff1ace41c7741c3bf992bafea5f2f9ca0c13d216c7369 SHA512 3996eb0188d906356bcf8aa4d60fc7a303141bbb88886cdedc7bc5f08e545266a0a5d066bdd618ad50b31b3a77b7499318ea04d5ccfe11560a5d0f7fe768303d
 EBUILD rar-5.5.0_p20170811.ebuild 2281 BLAKE2B 936018068fa7ea883561da7ce0a3919b54c6ee8ab3d67522cf072be3627baa01bd2872b84f3a8b25100a4e76a165270e81281cc93730969d9688d61b97f64347 SHA512 aa68c6bc07bca69dc599dfd7553bdcd23f884fcf353ea6ceecd1c0822f799016d2958eb75bcbe937c10352bf1aab7d60bd8b6f6934244fd842d01da749f6dd28
-EBUILD rar-5.6.0_beta1_p20180311.ebuild 2283 BLAKE2B 96451364b5c7c2ab8ee26471fc60a4cec3a7a82e6ec82a5c41f45ac4620dc61c4c52a58ca3fac594f823ff1e5c344b033070b8ad3c6504ce3687a6c29a7bffc5 SHA512 61497692253b6f099c52b3d52e02e42e8c41de1ba4be34a22d95c2ba1c9b303238fdae4770d893da5343ae0e7147f2902c2fc1301cf6c4ddf3fff58fa46c20ba
 EBUILD rar-5.6.0_beta2_p20180331.ebuild 2283 BLAKE2B 96451364b5c7c2ab8ee26471fc60a4cec3a7a82e6ec82a5c41f45ac4620dc61c4c52a58ca3fac594f823ff1e5c344b033070b8ad3c6504ce3687a6c29a7bffc5 SHA512 61497692253b6f099c52b3d52e02e42e8c41de1ba4be34a22d95c2ba1c9b303238fdae4770d893da5343ae0e7147f2902c2fc1301cf6c4ddf3fff58fa46c20ba
+EBUILD rar-5.6.0_beta3_p20180421.ebuild 2283 BLAKE2B 96451364b5c7c2ab8ee26471fc60a4cec3a7a82e6ec82a5c41f45ac4620dc61c4c52a58ca3fac594f823ff1e5c344b033070b8ad3c6504ce3687a6c29a7bffc5 SHA512 61497692253b6f099c52b3d52e02e42e8c41de1ba4be34a22d95c2ba1c9b303238fdae4770d893da5343ae0e7147f2902c2fc1301cf6c4ddf3fff58fa46c20ba
 MISC metadata.xml 436 BLAKE2B 772b97d33730af0ec24c126f46634735b661470d99fe1c2fc90d36653d0143014cf45f84686f3621b3b276c70b859f6551ffe764089d0fb646f99cd04b7d0def SHA512 9748890b95ef59d0fc815cc71757c10e77914ea73d254770a8669d8b766d95c65a90eb941a360b361d4e0c28f1abde6ba15a84a77609820aea7eaa25d2e913a1
--- a/app-arch/rar/rar-5.6.0_beta3_p20180421.ebuild
+++ b/app-arch/rar/rar-5.6.0_beta3_p20180421.ebuild
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@ -5,6 +5,6 @@ DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a04
 DIST unzip_6.0-20.debian.tar.xz 16680 BLAKE2B 17ce9234ac485eab4e5188b555af31dcb0db577b199e0c58991ba7211c4c80edce52b72e89cc4d82b000b70bed1ac90262c0972507f28f054af2cebd0ca33b48 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe
 DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36
 EBUILD unzip-6.0_p20.ebuild 2557 BLAKE2B 55203420f8676c64899a6e8572ea31ce3318018402e7f02790f7510d955d69fd3371e08ffa50bcb2867025e8542e6d745f20a0ba60562b2f8f7e7b42c25f53b8 SHA512 72014935da1e7acec784f189568fbec2756968811d348594d98e5a4f440579471b9e6348aa57877a18e0e34b6434aa144cd7015a88c5b999805428d4192dd212
-EBUILD unzip-6.0_p21-r2.ebuild 2604 BLAKE2B 5a8b2b331d5febdb8c109fb62516b9aab2fd3fc7a2fdd0d67be545c7402a96f9b1195952eb901b9f03b2fdf654ff95b7252ebdf72c07c4ca039aa2cfb4a5c1f6 SHA512 dc167f83ddc92dcf06625c14c91f6a99f178f1a4b30b22faddd0a87a267ee26e9b4ec1e43e2aa303ffb794e05d4c9a358e66f330cff4b533e3c26be6a2075f38
+EBUILD unzip-6.0_p21-r2.ebuild 2603 BLAKE2B 3048169f536561dbefb24bdf58a6d6bd9cd765debea8a96d29af7583313a73d20de06c18301df70205bec6c4829aa6dc54340413a758a5aeb249b4ee5f567f9f SHA512 66197722dae7909378d5b7f66c81924ca1a6d04947549460708bf63aaf19e833fb958b0d5b0e90e07900c25cdb14530983fc98132f8509f779a254e0434d2e61
 EBUILD unzip-6.0_p21.ebuild 2539 BLAKE2B 10ad8ccadfbd15b18449b61c3e3ed2c73d428ed85595e0065f2e397a4821221fd6dcb20be3c6d41b13c99f6b20de57fda263eabab2b842204e09ecde1f729d56 SHA512 df4efaf0e18777f9ffacc1e72100b33c60a35f535f15934fd9b1a5c5d287a3dd1fe9ab0442ca03fb316b7a792ab737bc130cae75116cb5b8adf7d825fceebdd5
 MISC metadata.xml 476 BLAKE2B 4cd0cc36008b6ec9ee618ef2e8a9c48e7fc6228e051a5c24e922faace6645de951a6836cc5d49a6041102944bf5b1901a5febcd6db86b67eb4182cad46a2a100 SHA512 0b82799f21ec8d57451ce8f231d24eabb02f637ee6fd2c32af12f9806f104ea53dc4d848b29950c1d5e848ea81f04a58422fa37f39287937dfb54e186f30b653
--- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild
+++ b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz

 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="bzip2 natspec unicode"

 DEPEND="bzip2? ( app-arch/bzip2 )
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/kbackup/Manifest
+++ b/app-backup/kbackup/Manifest
@ -1,3 +0,0 @@
-DIST kbackup-1.0.1.tar.xz 471784 BLAKE2B b700df053423d820ee545953b5303b1223c446185b80cbbd19fecb287316cb29156625490166d005231ceae9a068bf2da5b9a599ca8795d16cdcf90454cc8c2e SHA512 1b398a88ce0d109733ad9efd73b3e5770278203a751612749d747352fb05d278a92faeb713fdc82b5cafe9ca1532896a57065b75a9aad1596a34caf4426a18fb
-EBUILD kbackup-1.0.1.ebuild 994 BLAKE2B c279512ccc7550582ef5bccd351d83aa05514e07bb9e4e44475bf845c60ccf7428f2b4dabbf2fae1fd9d4e46554b796c065bb4f61624f590ddfd228ff3a9be63 SHA512 ef976357cf4c7b93c3b1d0422962479e0fa851dd38a2ed2464ef55f375283e6ee56f897415717e52c6a900fcfa4cc8d526dab128c2e82963d0ae06ff62d873a4
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
--- a/app-backup/kbackup/metadata.xml
+++ b/app-backup/kbackup/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@ -2,5 +2,5 @@ AUX cdrtools-fix-clone-uclibc.patch 2582 BLAKE2B dfa564f67e15dfcdab9e654572c95f8
 DIST cdrtools-3.02a07.tar.bz2 2127058 BLAKE2B 5307a012a0d4a593d7e0fc879e2ac0dab8ddcca573772194b3a5bbb3be74fc8109d9af720dd12369b4ef5c51ddc70ebad9e8c5a672d6dee62e7462dc67407ab4 SHA512 7f9835dd32ccca119d2ab77de1cdbd8cfbacc8e9923ca42175a15a5b1f45a8aa238fa3b0917ff67697b54905edc78a142f7106af9127854f944adead4a0d826d
 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
 EBUILD cdrtools-3.02_alpha07-r1.ebuild 8266 BLAKE2B 0ca2f4a823bd5f74f3fc0dd991a75b74c28e22d8fa6f2ad543bcfeac2ac2a9175b1bb821f79d6c9a9b315d50eea44e4ee3521f8e3badbcfce52cb7a525e4048c SHA512 b53f2141f7a7f83445b09a745425fcce2c5225ea0870b525b7698dbc3f9958eb07913913e23a1273b400e867c5a0e12416236840a1ef01e27dc53b2b5adde7a2
-EBUILD cdrtools-3.02_alpha09.ebuild 8276 BLAKE2B 0117783e30ffa2875b56bbd2d7a26a895c41c0be60ac81266d6b42ac454c5c4b9d17e0216cf23fd2e2a8b30f84ad14a9bbe0a2dc941bba389e963597e17c4488 SHA512 cadb033f176fe74f98febb566a503f483249da124ad9621692b5a7d3b8260aa9a27a0987019700371bf991537ab2180981b75248293ec419b248d5c5df036059
+EBUILD cdrtools-3.02_alpha09.ebuild 8274 BLAKE2B 0209212619fafcd9070574b99f690dc1112f07fa8b1e56d7fbf01da95f997f60f789733efb6bd00a7d079621564b79de9a8f2eb0c1a18dde84353123d32095e0 SHA512 6c1263bbf335c8601a45122dc2696a57fc397a64539add5f7eb51e95bea6b9854232ff7570b43c46c172ca8c9fb06cadc039d8bc0cdf1e5e579463cfac64f5e3
 MISC metadata.xml 533 BLAKE2B 13eeaf0e3fd17234f44138fc6b6fe1b0ef5e369b823a1adb9063743702b9afe86f1d939bb451df1cc6337c2e3790e38b1f890e68c46eeed9210ccc6d96e0944e SHA512 ddf004043b6d96ef6ec697f2452df1df68b234e4b899c047743a8cdd971167607f91c05435bc0a7978f65e13895fecec31a20a2b2f659a696fa3e4e704e18818
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$

 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode"

 RDEPEND="acl? ( virtual/acl )
--- a/app-cdr/isomaster/Manifest
+++ b/app-cdr/isomaster/Manifest
@ -1,6 +1,6 @@
 AUX isomaster-1.3.9-iniparser-3.0.0.patch 780 BLAKE2B bd7f3cff83b01bb241e005ce200016dd7ee30ac8798a9c250924f20da55f1f774558b64d37bf0a4e30dc44f18ed06f585bda4e3c2c0edf31b203ce5554d7cc50 SHA512 0681ab5b4578f67b1eb9e8180fde951d4a34dbf40452ee29a6f09992afed6da5084791d86778296964cb39d59d2eaf51b97972e02582a5d6ff3698655bf09134
 DIST isomaster-1.3.13.tar.bz2 245085 BLAKE2B ae2333f5511aae8deed76e556cf6055f7ad257d613dcf5c85274946f31f0da879b5fb7953d065046371c6f20faa15663ecb3c5d976c4dff404140cd09d23207c SHA512 dbc6a77fabf8d454bbde25a7540e68820bf773bc991176e5684e87aeb6044ad1bbbcf1c4f537148c18ec8847572949a52d6578a14f68b8ad3f21d542685859ba
 DIST isomaster-1.3.14.tar.bz2 257674 BLAKE2B 7b7abeb586eb8c6964d7959222195c1999f81275dea305e7c4efec1fef6dd9d9d4969552e6a6a4a882a9fe227ea072c6639879896e50799db9e67732e1331ad4 SHA512 5454baa4ce4e09df8ec4331718df3e1d81c0647867a21cfc4c4b15d90e509371a636e8fada7e624c0cf6d1b03b564bf89a2a26e13b5ec1b4cca91407bbc518f5
-EBUILD isomaster-1.3.13.ebuild 1507 BLAKE2B c3e40379dfa8b44d84228af0fad6b6f0225b40a730ad05e698c1dcb225fc91575b36c19a0637a8e568e2f249dfd6b8650abb2f5a7a78a1fa2e762951f9009f20 SHA512 03567d3fb41abdeb969d334f2742b1596c12ba78e5ac4ec8148027fc4fa062a66af8b88d020c2ea081d441ff5808105448ec447ca8731d7b3edaf787d9374857
-EBUILD isomaster-1.3.14.ebuild 1473 BLAKE2B 12789fd1bc0365ac1025ff9a65c8584451e96eec11085c55ea65f1399629da86bd82683127bc28d0bcdd7341fab5ec0c4cb3bf827c509e14396ac83bf4f900db SHA512 fd23d77b5846a30e5eba2db43e78d13cef3bca824d9427fd3874578611aad9bdf6a68194c4b2493273b8914f9293dcd87c81f75a4b8ab8da9975b008af977488
+EBUILD isomaster-1.3.13.ebuild 1507 BLAKE2B 7376caeaac6a4cafafe18935bde267b56b09bbc30255598c0d66a1bb7f67b22bb5e23abfc94dac2d9a7db4947144e293c3046331093ac7ba786d9f2942a1774d SHA512 7504b26b144abf3c32e9fbceaa0768db744d4934df495c9c40dcea003c7f5edc3ff5abcde9c5f5c9fa1e857b72e9d3a251bade719859776168848f8ed3e1444b
+EBUILD isomaster-1.3.14.ebuild 1463 BLAKE2B 94b41867d4993b287787ec280f8c0547ec0aba5dc44a44a820fae1a96eb1e78dcb562412d3ec8d6ecdeaffe5e598990957e820598af15bdf0528bcc960f1467d SHA512 d4d890cb728f0a3169c3f404010b03b23981913756717d991278325e4aee788258e039b2bf4be1b8c5eed9cd59e63ad74c9b7348d22383cebf9eeea30091e927
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
--- a/app-cdr/isomaster/isomaster-1.3.13.ebuild
+++ b/app-cdr/isomaster/isomaster-1.3.13.ebuild
@ -1,8 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=4
-inherit eutils fdo-mime toolchain-funcs
+EAPI=6
+
+inherit toolchain-funcs xdg-utils

 DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
 HOMEPAGE="http://littlesvr.ca/isomaster"
@ -19,6 +20,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( >=sys-devel/gettext-0.19.1 )"  # bug 512448

+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.9-iniparser-3.0.0.patch #399629
+)
+
 pkg_setup() {
 	myisoconf=(
 		DEFAULT_EDITOR=leafpad
@ -31,12 +36,11 @@ pkg_setup() {
 }

 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3.9-iniparser-3.0.0.patch #399629
+	default
+	rm -f configure || die #274361
 	rm -R iniparser-2.17 || die
 }

-src_configure() { :; } #274361
-
 src_compile() {
 	tc-export CC
 	emake "${myisoconf[@]}"
@ -60,9 +64,9 @@ src_install() {
 }

 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }

 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
--- a/app-cdr/isomaster/isomaster-1.3.14.ebuild
+++ b/app-cdr/isomaster/isomaster-1.3.14.ebuild
@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
-inherit eutils xdg-utils toolchain-funcs
+
+inherit toolchain-funcs xdg-utils

 DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
 HOMEPAGE="http://littlesvr.ca/isomaster"
@ -32,12 +33,11 @@ pkg_setup() {
 }

 src_prepare() {
+	default
+	rm -f configure || die #274361
 	rm -R iniparser-4.1 || die
-	eapply_user
 }

-src_configure() { :; } #274361
-
 src_compile() {
 	tc-export CC
 	emake "${myisoconf[@]}"
--- a/app-cdr/nero/Manifest
+++ b/app-cdr/nero/Manifest
@ -1,5 +1,5 @@
 AUX nero-4.0.0.0b-qa-desktop-files.patch 1072 BLAKE2B dbf4c8fdd85a6f08bacc7f78b318869b23ebf3c4b5728e7f35f22bc71f4bd2fd9ad2cf45256ae3c87da2302e367384794d20ddf287ddd1ce2c74444b2a18d2cb SHA512 4193e7fd12daac29e99928fd1e117fa5cb110a6ced2c2b294779d8b74b5c9c3bd1c971bd80e6a42d24e818d54cbcf44f827ef8ae22d54795e5e34e732e589afa
 DIST nerolinux-4.0.0.0b-x86.rpm 17391650 BLAKE2B 4d78b4fa09ba45709af0ff87dea28cf24e1d04f8dee2fab1432215ee0707e398f9564c05f5f6999da912ff1e163d08687c8db99498a0c90e469a524684543759 SHA512 2168f87d329054803b6ac33f671aeaee59f5b9e22fb07c23347ae519d63fc4547db9d6e535f58468f2fba4ac274399f934a34d828892ae93e75cf2c2b46d44c7
 DIST nerolinux-4.0.0.0b-x86_64.rpm 17559298 BLAKE2B 5e7cc99c4710bcafbc9b6eebfa7b5670534a4f6b4011d3ff756fc936375b7ef6a466c474f3065516a09455b8bf35b8f3db145aedca497293e2915a53ef2dbae5 SHA512 0e5d6c1c9f99b6c149a72f544c6ec7608e9ded4c0d31a7754785a0d16fb3ad77d9d82cc210617104ac6dc2470b3df778cdf132be86a0591813e7a867d3c75a51
-EBUILD nero-4.0.0.0b-r2.ebuild 2473 BLAKE2B a3754034ebd62ec2fc3bb8be95f9f263ea3aa6a99e107a070a47ddc67b063d54c7b1178a8ae12b67595a9e1ba5e28b285ea6643a68ed9ef1af1220e83cb3d6f0 SHA512 8bdfac22773c3aff2fec5a5e19998738d30b4acbfc4b63e4ebadaed4b6fca59f3f06385b350b198cbb3c756478d170941b1b5650a73cb86a8c88115f8894a06b
+EBUILD nero-4.0.0.0b-r2.ebuild 2462 BLAKE2B 9d7138ce92315a9cd9e78f53eefee54f90a8a088e653c82d3975b01303adb37e3cbabce0a333215e72e3f46a8f0f3f604c33e4664796733c52341a7ca6995a41 SHA512 bdcfa17d8a53711e390dd43ecf61b968b5c3d62a854635829928dd360e032b614b7463151fb0f1c5e07722cdb77a700a4261d94cc37219da00276b7279ccd239
 MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
--- a/app-cdr/nero/nero-4.0.0.0b-r2.ebuild
+++ b/app-cdr/nero/nero-4.0.0.0b-r2.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

-inherit eutils fdo-mime gnome2-utils linux-info rpm
+inherit eutils gnome2-utils linux-info rpm xdg-utils

 DESCRIPTION="Nero Burning ROM for Linux"
 HOMEPAGE="http://nerolinux.nero.com"
@ -92,15 +92,15 @@ pkg_preinst() {
 }

 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update

 	nero --perform-post-installation || die
 }

 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@ -1,6 +1,8 @@
 AUX 92_pcscd_ccid-2.rules 2275 BLAKE2B a72b8d2bb8cf56f621a0762dac95500f93afa224228f403395c9590758c8fa986b3e8d0d1b12353ec7fed5a40f6af900fcd57eaaa7b339018fe42c2b509c0c5d SHA512 f327eee35ca6009069389f935ca89feea4e693e8f0c73f8f218d2639faee4ce35df85832a71e3fe98ce24aae31861aa8bd290833e59ada75c1e1a2df9ff0a477
 DIST ccid-1.4.26.tar.bz2 628038 BLAKE2B ba0cc8aa92a7b960d12e0ebfba79910c84eff11815495bda76287bacb7638093270eb2b5bc502c67b1a789a6bef19deac338312b044d74f6f7348adebd2a621e SHA512 4a2e5e9412f2aa4870e14114e54da96fd8b3418ea6d3a236b83e19d6349adb20a94ef7f48628c108f8459f008c10b0606bbf4d797ae4be9183e1acde032c618c
 DIST ccid-1.4.27.tar.bz2 632817 BLAKE2B a18de0594c9535c4564bc27886fc69a0edc54343941d77b9558f331a932d12d2b58303ae3994337e380f16648f7bb2a8aa90c00aae4c7cffe242e000003c5dcd SHA512 14fb5d9878ed36de912d860d8537758170781f225957a99d5fed447dcfba0cba3133f78d2cc4bc7db60d3527399f70e4a7d1d1f8348fb50d1bcfc75820a23522
-EBUILD ccid-1.4.26.ebuild 1566 BLAKE2B 426f6c4d8b553c7c2540acd02e504788aa9fa0f4acd653773e1a2e74a4e0d2ba7609b6346c6b9e2c1b7d4b758a187309f61dfbe9c68ace244481d6fdd3c7dd87 SHA512 e3f1b727f9889c9f41e15fb9f7da382dd8b83039634f24a22fb09171bf4690f51e9ca004dd885d2e2031a42ba47c7b090a178fbebd7c2c08d04c17bdcf4c24d2
-EBUILD ccid-1.4.27.ebuild 1567 BLAKE2B 38b5967e8a5bf05adbd7d828f7318bdd25794f514228be5e84ca62627351bdbd8023f7ed1b644de24aa817c5b8b352f080365787ae63c7dfed0e12a4e4919536 SHA512 548d6227755ec9f741be3c5e8707bcf0ae16f25e32e4d22f383bc06c9f8abb762921d7a423fed542b5e6766cfccdd3a9a51658377cdda252242241b80af96e5c
+DIST ccid-1.4.29.tar.bz2 635761 BLAKE2B ff14bc6e181a6d44b8ef463a2255d0362842f6e1e7c79e0a01caaba0a88892f7b0f2bd9d2dadae7be8b0655d2502e5471cff29e582928d62235fa070f2eb1ba8 SHA512 9ff37acad086e959f660069b245fe06ecada140623025a19dfbff55edec71e1e72bce09ac4fc506ad985dd0831dafc6b12f5a5b109b38bf9ba7583856eb19418
+EBUILD ccid-1.4.26.ebuild 1491 BLAKE2B 2cd423da96b5435911add36396df823c711505988a9203ef7e8d3be6d0e86cf9e0e59a0d37f2032e7c57b5af582603cbf4f7dac8dfdb6419add9b3ba35292833 SHA512 70c1a4cadcf082935f3591e16a4e926ac2435f4f6c26744f3b1ec4d081425e395a588636c4e7000d1131f2865d61a8f4d080004c1320fe584c3af7c8aac2d81a
+EBUILD ccid-1.4.27.ebuild 1492 BLAKE2B 23f38ec767ff61b9da25eb292439956069b64ad2d162ada3454eeb2fe4db4d2436458a85e7f1858719d268a64e0d9db4bfc4c4062a5dea853e6075876dd4c16d SHA512 37a42df7ba9eeb766ad42f3e79d1bd85b80a753f11f7a4ebb0b088a95498212ea0d6fd98d541e28da0a39698d3446c6429416cc9fabedd9bf176bb0f9ea5add3
+EBUILD ccid-1.4.29.ebuild 1497 BLAKE2B e01d89f17e0f2d4932d92aa80f23143a5bc6bfd02566dfbbdc7730f8a2fd96f39064f898d6732c0f071be65ad9bf588e52bc01e0e2f447c5fce68940ee6eb74f SHA512 946b90228ee7f78abc5a825bb89df3c1d626bbff046e7833bd89eefc6b80b17b881606984b66dbb1fdeeeadb27cc19a5535102253fd5122bfa2e4b2928ca0c3b
 MISC metadata.xml 397 BLAKE2B 0b62fc531114bb9221d17ee3524db0858f4ff373b71a1b7beda520035eaf5679a63a420381dc52e40942a519bf15f95fae97b531267df133cf68687c49dad565 SHA512 8e8643f46728232ffffe25fe9906948c6a8bb94733dbdeaf2700afd0cf4a7567a27698c1832edf858c2a433187cac9d847dc7ad709d6398133b40b639e37cb4b
--- a/app-crypt/ccid/ccid-1.4.26.ebuild
+++ b/app-crypt/ccid/ccid-1.4.26.ebuild
@ -1,15 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

-STUPID_NUM="4205"
-
 inherit toolchain-funcs udev

 DESCRIPTION="CCID free software driver"
-HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
-SRC_URI="http://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${P}.tar.bz2"
+HOMEPAGE="https://ccid.apdu.fr/"
+SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
--- a/app-crypt/ccid/ccid-1.4.27.ebuild
+++ b/app-crypt/ccid/ccid-1.4.27.ebuild
@ -3,13 +3,11 @@

 EAPI=6

-STUPID_NUM="4218"
-
 inherit toolchain-funcs udev

 DESCRIPTION="CCID free software driver"
-HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
-SRC_URI="http://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${P}.tar.bz2"
+HOMEPAGE="https://ccid.apdu.fr/"
+SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
--- a/app-crypt/ccid/ccid-1.4.29.ebuild
+++ b/app-crypt/ccid/ccid-1.4.29.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="CCID free software driver"
+HOMEPAGE="https://ccid.apdu.fr/"
+SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="twinserial kobil-midentity +usb"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.8.3
+	usb? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}
+	kernel_linux? ( virtual/pkgconfig )"
+
+DOCS=( README AUTHORS )
+
+src_configure() {
+	econf \
+		LEX=: \
+		$(use_enable twinserial) \
+		$(use_enable usb libusb)
+}
+
+src_compile() {
+	default
+	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
+}
+
+src_install() {
+	default
+
+	if use kobil-midentity; then
+		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
+		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
+	fi
+
+	if use kernel_linux; then
+		# note: for eudev support, rules probably will always need to be
+		# installed to /usr
+
+		# ccid >=1.4.11 version changed the rules drastically in a minor
+		# release to no longer use the pcscd group. Using the old ones in
+		# the mean time.
+		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
+
+		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
+		if ! use kobil-midentity; then
+			sed \
+				-e '/Kobil_mIDentity_switch/s/^/#/' \
+				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
+		fi
+
+	fi
+}
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@ -22,6 +22,6 @@ DIST krb5-1.16.tar.gz 9474479 BLAKE2B 0c5caa0a0d2308a447d47ab94d7b8dc92a67ad78b3
 EBUILD mit-krb5-1.15.2-r1.ebuild 3783 BLAKE2B 159b71b8d361cdd970ead9c9aab178d0f2b8c892d0fc03c8ead5fabeac0a4b9b672033654af6bd42cb9aac42109cf6ebaf2d1bf7c78e194e0e6b2bb94a998a2b SHA512 6f47bb8fffdfcc356de32b7f7b80d14b2643492a6b72da63b8ddb4dd357ba7fc2362d1943b98ff2e353fc6a922c45489007799e397f88d393b7377a2a0ace8ab
 EBUILD mit-krb5-1.15.2.ebuild 3726 BLAKE2B 866f73ca347e333ba75383ed43552621adb018d2352f2b22b8ac343375b45365a0374fdfb8339376c2ba6826e8399dd46e7c7dc548bbb06d41c5c9a5197ddaed SHA512 6dbd81a886c77afaf389a151e2d681897581a521a7d0141af402c6149a03c5be149bc304ade71f2f30d94a37a90a9171432d3d902b92be3ba5297232bb03f166
 EBUILD mit-krb5-1.16-r1.ebuild 4125 BLAKE2B 59e0014116ffdb9eb53ea720f3cbd7f71e994122ded056db738c1048d5c341ed3d67215417de38be6ab63cf1f5e186c616083cf361bbae08a77e808a0e70cfa6 SHA512 33fbd340575089a810e4fd361fa1680da97d296d8aa27450c237ca0aaade3cde530720910394fef5a35539ac77b9143dc0ee0898173d54c38c1d1ef7d30f8bbb
-EBUILD mit-krb5-1.16-r2.ebuild 4219 BLAKE2B d9674c311a9e2a4f719276f212dd2f61ad7deee0bd7001ff872b3bffb78aeb8e6760ba01edf853611f7d14e344867df43f2b260bd21067560f246e93683bc159 SHA512 8ef3ff057239d5ffe7877da1b8f495afde3670955b1552cfb87822de5eb813c6dc95e6cbdecb7e1f408618e540249433b7ef3d75cb6589a0520e0f8115917782
+EBUILD mit-krb5-1.16-r2.ebuild 4218 BLAKE2B e84eb5fdbb298d97c72715bbbbbe2e7be9b2f347391339baa5375b0a26fc1a7214599769389c413487592e7e85aee5e121d1b6ce28de2ce8b310bb7863989f03 SHA512 f7a695a34a09197775fe56de13adccbf41bdcf481ae326201ab833d05e3f10c3b53265c2a8bfda37fc3cf12be0db456557e57922646a7fba9c57bcc307e51448
 EBUILD mit-krb5-1.16.ebuild 4060 BLAKE2B c271a048c52a7e940737827bf6c6639b333520be6f631edab5a6a7c901ed4a7378a994f247418c5bb131141b75de71c8d42dc9ab0135cbdab5ad68c6e51006fe SHA512 95d2149d2861b5c7ef3f6e9d026100c37814c7b87bb9e2879985c5ee50847bc894b4f73ec0ee9de8d3b2cd717b30541c382d011aa7408618ccd23a3d7556719f
 MISC metadata.xml 828 BLAKE2B f317440eac9d164e0640cb059dee0c3bdcfeaeb2d0e346d962f09b7152224efc10084611768663b84c67fdf73c9d89481370fe0b70ffe14aa10a360f60bd00f6 SHA512 c0f45699280d49b91eab24de6cbb28900170c3c4526b8c6ef0f6a996d3e53abd49911ce4f6ce7b28c69d37e86cc9e5b830977b9640809734e7fccf078886685c
--- a/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"

 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"

 # Test suite require network access
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@ -1,5 +1,5 @@
 DIST p11-kit-0.23.2.tar.gz 1022733 BLAKE2B 09d1e1c9c9cc9bd330923f6aa37026b6f3b67fd728e4fdf2c692f0eaa1a27b1a045c263ba66d57063b8a03f8dc1ccd4d20bf5f255fc6e21d8ea600696f45d9ea SHA512 b665d89f0d752a41b01ec53e29c801c4fdcaf3f21fce524984b10acef0477ad5dbac085edd35ffb747423d0e1e09660b8d29501c979cf54937d3b9d2561cf18f
 DIST p11-kit-0.23.9.tar.gz 1091561 BLAKE2B 9ad061e703f8a7bcf677d974316adc3c96c34765bcee9834e65850b16fd7afa6ab2ffade18a65b99b85ec1af877d74938cf9369797f914d622c15e218801351a SHA512 6a8a569483763d3ffacadf669b8ba9b9be38a77dd8dc366ca0cb91c44753517fa1879d4422e4e8dfbcac594565727839a619566a170c0f94f8e112f18b0086ed
 EBUILD p11-kit-0.23.2.ebuild 1311 BLAKE2B 6f255091c7997b46f069719d8b9c20258ea36cd44bd06907d2620686714c6b8a5e4f68d9bfd5487ea5f6b0a5166af1bcdd3c9b4d3cbbb23641954cc882208491 SHA512 f953eb10926bdee9eb715cfa4333eea30e238f46795caec23cf495f573fd33fd464705de86c9ab9af55eb98d4652c6204dfce578abc854af44343ece85f3c70c
-EBUILD p11-kit-0.23.9.ebuild 1989 BLAKE2B be14761b90406011e109a67997abcde0c9988b122fabd6ca217328dfd70a1e2547240c79dec5dcaf1b77a6203475081cf567f8c6322723b1e56c0b7de019133e SHA512 0898f78ddce7bbfc3139d257b9ce27710184cc60c8ae1848ed7e56ebc39e4a0e6ef5a66af1ad2184785fbe0559b1d2874c05ec5dd8f9725f4d71672496b69613
+EBUILD p11-kit-0.23.9.ebuild 1988 BLAKE2B 5bebce8f4114410a30286b759b9a36996293fe0a88e9a53b6747cedcd57627867e1d98aec51969c8752e4d80b6865f812d68958ae35f4f55831c4cd800040c3d SHA512 c2cd176f911c25e916de7d09ac1afea0709d928b5b067fe10b3ed9ea9065957d690faac44e8b1c3c111f8f74c4bb70d8fac671eb2b6f5cd3eab23dff656d6c5c
 MISC metadata.xml 454 BLAKE2B 82db424896936d17b167806a47d54674d1d6eebe192ad1f8b4e985b00f74f10aa5f18ea587b866906571a91dcfda83626f6b25ebdbd6a6e02da65b34511b2b0e SHA512 24042c945cc3ab622b74c30eaa08819ebce4af9320b083ceb1f3f4db110fba6539121b4dbf0d245afdc395a9854bec022575861f7ae4e9418018d6bddbd4a888
--- a/app-crypt/p11-kit/p11-kit-0.23.9.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.9.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asn1 debug +libffi +trust"
 REQUIRED_USE="trust? ( asn1 )"

--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@ -4,7 +4,7 @@ AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc6079
 DIST doxygen-1.8.13.src.tar.gz 4893912 BLAKE2B 3eb7eb6e7d122f681a9af8caf8a33789d323d52a5c205a3c44a7953eec78f4b227062da3e71c09de443aa6ac5c780937218c3a8c9ddf06d3eb23200a33b7406f SHA512 85da5bd28ad9f33a8e50fa92796817d31e59c024127cb647cb967e4321dd51378feaacdf099d578b7e6020fd646a3c63e99c77420e49e3894fc18ca89ba3e0a2
 DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c
 DIST doxywizard.png 4231 BLAKE2B c71e30fee273c7410bc6b65e171a864066e088d474785f5e24b5500806af1217a6e12e93c5b81a488e2d216bfa59aeed332a092515dbbf8b640d8f7320dda50a SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5
-EBUILD doxygen-1.8.13-r1.ebuild 3754 BLAKE2B bc59c29243c1c5677e13a444dd66938a193629732e339da07f820edba720dd44621740c014ae5185008f8db97d7b32fc5bffc31472a1eea757e331ea9146e021 SHA512 dfc1ec29c888f396c6df7d9c1cc51eb221f76501e6a42ee7f4df2e2579ad7dd195ca432e150aeb534d5331f72b29effccf79bc693b271a4eaadd619780cb688d
+EBUILD doxygen-1.8.13-r1.ebuild 3745 BLAKE2B a8f018ce906fd6c99a4b9868983cf1aeee827ca8bda4c0e2176dd885d6a553976ad64086dc6e9f5be3dfc73638d018485b8f6fdb17cbba1f44686732bed3d9f9 SHA512 493ca4e94a81753cbdf38144d11fc6c102218fd808cce7fb189482845e095fce13973513da338da552891a2db23b4edd3da8e45fb9b46c879f488eab0f55a4ab
 EBUILD doxygen-1.8.13-r2.ebuild 3094 BLAKE2B 4e77532c8bf21831d310af27e1d0025ac6b6530fc4da374a36fa1d7cc061326b36c73805454dd8b2389acea09446a534ad8eae891adcae81c0cefb671241c114 SHA512 ee8eb067c38f8fa24ff5bd4b2fd6da04e4d5b60779ae2eb44d96333e35e18e594b17d81fee700bed68fbb3b125d5d59e8449600c023b3abefc8de9e01ea133f0
 EBUILD doxygen-1.8.14.ebuild 3051 BLAKE2B 1ae3e1b7519fbb144437162c57acef7e8dfa7a1de494ec79f35642316f4952e9e22ad1f708ea9acb17201f6e922abb496b85cb1e2e52affb05e4c72edf273298 SHA512 e8ccf14e86847880252d6384160a5f52fc2acde041daf2da116ec94c2b7a1828c25f2ed312976fd4df6a46a177842d11efaf4a60f35db0de6db5df6c6d255995
 EBUILD doxygen-9999.ebuild 3072 BLAKE2B 3c1ee0ed71e60b85f1f754c61adb91c013edfed7d66a1f45993003df30d4c6073feb540d4c78cc988bd7517583b22ffc773870baf1f108a107c372edea077bbf SHA512 5a046846eb2f7cc163f33b350c6bb1b26c8bf81109d015d9fb9deb32717f6e1ab94ca73488a99d0075f130bc4f91ea66e9b9ae82f6ecd8cccb505a0ad0b27be3
--- a/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )

-inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1
+inherit cmake-utils eutils flag-o-matic python-any-r1 xdg-utils
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
@ -132,7 +132,7 @@ src_install() {
 }

 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update

 	elog
 	elog "For examples and other goodies, see the source tarball. For some"
@ -147,5 +147,5 @@ pkg_postinst() {
 }

 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
--- a/app-doc/linux-kernel-in-a-nutshell/Manifest
+++ b/app-doc/linux-kernel-in-a-nutshell/Manifest
@ -1,5 +1,4 @@
 DIST lkn_pdf.tar.bz2 3533339 BLAKE2B d67708c7b100707b6a74f1a983bc396f1068e60d74c63eb2ed99830f0ea4b37b4260504d45f27ceae70e9c01b92b65d9e5076476466eade84f9dbe8d1b384fbf SHA512 5a0815148b379347675e2c8f71476e8e950a8028fd625044457773c4e7b62fb886edc7151a46a9dd0cba47729c99317f779974e395149d87c4c9483c7404ede0
 DIST lkn_xml.tar.bz2 1058278 BLAKE2B f85cc277e7f313e00d26f53218d315c6b741b584a597b2b0adf3a9bf3dc13ddaa2203b1d6976e4189aa8dbeb167709f7ed3522a7c9cf8111e62b6f8d0425de2e SHA512 831b19f67b50f897f93720c19b7bbf90673c420c2b1ce257de3c656a01cb12ebee8499dc86c673cba9c14fb6fc50e644fbf84156d9d2580127affeabda87a83c
-EBUILD linux-kernel-in-a-nutshell-1-r1.ebuild 663 BLAKE2B 8aff176a9164daaf568327a48feed7ff38e5b551bfc3c6111d4d0f963a5cad05d6e161c2297c986aaf10fb1db6e61d32c1f6fcd9fb7253e4d528a9e5175ade4b SHA512 802e77c2bd54c6653f9af2714d4367cf89fdac26b903d573efdbf6a74f6924c2a3ec9741ee39d8807ed5eccd414de6b94c002c734d4ec82c93a920447495f652
-EBUILD linux-kernel-in-a-nutshell-1.ebuild 644 BLAKE2B 228bce01ce5ecf7c8bc8c441e5b1a9722c056d6e02004c6de56dd597c058d4baf7885b321e82c320a25eae14e2c78801b273eee7f17e8e202c03ee900e8daeac SHA512 de7e025ebefe5fbfd920411948524ad3261f7460c6f0eb1ef7f6bdb07f9f04f3383692de514a09ed6858f273ce5156eab51a5f90a98319a36f6103c11814e1b6
+EBUILD linux-kernel-in-a-nutshell-1-r1.ebuild 661 BLAKE2B f4afc066c13b87e6f5e75e411dbd46e0151a99fe5527153b89cb99e39ef80681091080481883c124aa2a4a9c4b580cfdee2b0de3117ca1ebb4e3cbfeaaa2778f SHA512 2ef9f31316523e96f23544cb152c8df5dd4d3cc0c11234aa03f6e214200d673bf2f563ce1ecc3a130ec8cfbd6ba811d87ff84ff113d79040b352e121bc8480a3
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
--- a/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
+++ b/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/kernel/people/gregkh/lkn/lkn_pdf.tar.bz2

 LICENSE="CC-BY-SA-2.5"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""

 RDEPEND=""
--- a/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1.ebuild
+++ b/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-DESCRIPTION="Linux Kernel in a Nutshell: A Desktop Quick Reference"
-HOMEPAGE="http://www.kroah.com/lkn/"
-SRC_URI="mirror://kernel/linux/kernel/people/gregkh/lkn/lkn_pdf.tar.bz2
-	mirror://kernel/linux/kernel/people/gregkh/lkn/lkn_xml.tar.bz2"
-
-LICENSE="CC-BY-SA-2.5"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/doc/${PN}/pdf
-	doins -r lkn_pdf/* || die
-	insinto /usr/share/doc/${PN}/xml
-	doins -r lkn_xml/* || die
-}
--- a/app-doc/zeal/Manifest
+++ b/app-doc/zeal/Manifest
@ -1,7 +1,7 @@
 DIST zeal-0.2.1.tar.gz 914998 BLAKE2B da76e50e3285b0e60f4fe55b563da0e8c2b3ac9aac8cea1f03ed678f2e5c7c00b376e4d87571e4048286c2858a4e42ffa9d06d8bf7af505a49933b6c354ed286 SHA512 f17b7ef59649a5c57ef3461aa84dbb2636deed13646d5f73fe05adf1bb9519d317366a18c61d6716417044d6248fd6111cacb8341393fa194567769fd2048c3f
 DIST zeal-0.3.1.tar.gz 920814 BLAKE2B 907ae67ef8e25558c017e637f44b0ccec197a8812e642a3fe6e0e3f99f8e791a65155cd1f0a35d598faa7eb97789ecc3e4d8afd460aba4d952e0738935baf3fb SHA512 9d95d9d3a1966c823f4eebe2a389f046df84d27262863dead558e309ac4c0ac8ee5ab1fd8f3559e9745e0ee9248df36aa66de8ca242a5d4662c6bb1d5b722280
 DIST zeal-0.4.0.tar.gz 1049326 BLAKE2B b3007dad0ed280954b05464bc107fa51c603d79607acd42ab85bc745d0590bdaed740edac75dac91e0d0da34b5966eb96815e8250a3b68041cb5a8e0389676fc SHA512 fd1e7cd71469e40914b713c10057b3f3d1d2ae9808d296ca01ceb43941b6e7d6754a4f21edf43a594b1c3ebcab20728812db1bdffda6bc78ee49a1d4faaf9627
-EBUILD zeal-0.2.1.ebuild 1008 BLAKE2B 451b126bf6642518fa871ec0d2a73d7489d0b6b2abbe80f1331c4fce92ce8e3299fcd2d34992b49ef637d36df27f5bc2ebbb75308f2267553d289288b24851bf SHA512 0f690f211e36dab382618f1ed277d482f529d93fdeba89c5a0d1b3daedb48135c786b57518182c441c491b1d6ccbceaedefe8938d7a234312346d6a34229f61a
-EBUILD zeal-0.3.1.ebuild 981 BLAKE2B 3e3714c010450945f12e03e68f5ea5273e95f129a86a9ba0a8549acb2ffc47b1336a52aba22dab69ecdab445db814dd4ffe38c5bcc4db3d489850425015b6cde SHA512 85114b7d8732d829e06b16ec84b77e8a0a5704a16b91da06592a0634e8cb10e0839d1211a350cd6f5a39e7817bb549c71c394dea84bbfaf747229d55b7dec9e6
-EBUILD zeal-0.4.0.ebuild 981 BLAKE2B 74e282bbe749e6208c682c598ca3c1df3e065765f94a8bd27d37379e9fe3f4ccfe4be633c69fa06237caa282c1dcb93d4b2cb9d7058e1a6f416d1f987c493c9e SHA512 1d7e16ff6c6ce7ddecc1ea210a3ef1f500c25366e10c65bb33af9a9b7592f3e751e35cd4887006787c541beeef5e15370dc5d987e95efa5818231c2896575d29
+EBUILD zeal-0.2.1.ebuild 999 BLAKE2B bfa39d6a8db121b146e1bdd5396b4aac937608e607d8c617590c04f7fb6075bdf70b505d3c236c2fa41034c2104ac68048c68e41d256e633a3b783621c63f0bb SHA512 bb26cb4c52f2c869f93bb36e47db6255174af3034322c78c027acc9d4fe2572b526a808bac9b980dd21baaff36845d72c1cc7e46e9c56c304ec58ad9b1b2a0eb
+EBUILD zeal-0.3.1.ebuild 972 BLAKE2B a0b722a1b8363dc232f391a1668296ae1eacd2a16fd2c71b2b7bb8d7a132761154df6db50ec5f8584ff625fde4e13b7e115ec85964e1fa18e6f1d2ec0b2897af SHA512 eb7359929d6cb99447648798a1c9173f5f8f542fb6dd34d625eba37183e9abdbcf275a73eec8f6ad9d6e2451cdbc68de9928f67150646e82edad13cc608df6da
+EBUILD zeal-0.4.0.ebuild 972 BLAKE2B a0b722a1b8363dc232f391a1668296ae1eacd2a16fd2c71b2b7bb8d7a132761154df6db50ec5f8584ff625fde4e13b7e115ec85964e1fa18e6f1d2ec0b2897af SHA512 eb7359929d6cb99447648798a1c9173f5f8f542fb6dd34d625eba37183e9abdbcf275a73eec8f6ad9d6e2451cdbc68de9928f67150646e82edad13cc608df6da
 MISC metadata.xml 343 BLAKE2B eb010ce88edcf15d87348b5170ca84d46d96d975ff459b4467428af5b75a95bc9e6c6d1245119907b5833f9a2ad2060adf41ba9aa884a5b846c1441241eaf8ba SHA512 a51b0043a255567189cb7ba1247cd6e9427292e7dbb3bc4f33d6c00acb3bf158bce6a7db1262275899b2b55806cfcb71e53a365aa25f05e259d497d5f028074f
--- a/app-doc/zeal/zeal-0.2.1.ebuild
+++ b/app-doc/zeal/zeal-0.2.1.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5

-inherit qmake-utils gnome2-utils fdo-mime
+inherit gnome2-utils qmake-utils xdg-utils

 DESCRIPTION="Offline documentation browser inspired by Dash"
 HOMEPAGE="https://zealdocs.org/"
@ -47,10 +47,10 @@ pkg_preinst() {

 pkg_postinst() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }

 pkg_postrm() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
--- a/app-doc/zeal/zeal-0.3.1.ebuild
+++ b/app-doc/zeal/zeal-0.3.1.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

-inherit qmake-utils gnome2-utils fdo-mime
+inherit gnome2-utils qmake-utils xdg-utils

 DESCRIPTION="Offline documentation browser inspired by Dash"
 HOMEPAGE="https://zealdocs.org/"
@ -44,10 +44,10 @@ pkg_preinst() {

 pkg_postinst() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }

 pkg_postrm() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
--- a/app-doc/zeal/zeal-0.4.0.ebuild
+++ b/app-doc/zeal/zeal-0.4.0.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

-inherit qmake-utils gnome2-utils fdo-mime
+inherit gnome2-utils qmake-utils xdg-utils

 DESCRIPTION="Offline documentation browser inspired by Dash"
 HOMEPAGE="https://zealdocs.org/"
@ -44,10 +44,10 @@ pkg_preinst() {

 pkg_postinst() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }

 pkg_postrm() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/eselect-mode/Manifest
+++ b/app-emacs/eselect-mode/Manifest
@ -1,7 +1,7 @@
 AUX 50eselect-mode-gentoo.el 178 BLAKE2B 50fea27e7add6d31f37801593430154636bb58ac6e3f7cc44c68a16d49c9156cf37285778a38bf97a1f4805a22d6d5cf9d597acdcdedfd77c62a5825a0d1d88f SHA512 200da398adf72241112bcda74b432a8a313cf29018c9f6fbdf6021674b23a201ada6ba884d4c9c3a4ee4c042d6c8fc7c3ba59702c8ddb6ea20b652f9ded9d32f
-DIST eselect-1.4.10.tar.xz 177212 BLAKE2B 25f548d56ecfdc5ccf18167ebdeb50cccc77fbdc65ab8683e293242de0083e6036714ae9d173f507da0404dbad0e48f2ac09d542dbdf92d8a5d7e9868b31fa07 SHA512 09e4196959cfb42e0fe4536939ad8e0d1a49d500e3d42634cd959c544f2ed5beaa006100fffaf10eaba121901d36a42721da42504d496de8d157690b7ab7f9fb
+DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
 DIST eselect-1.4.4.tar.xz 177536 BLAKE2B 9991d69a0589be0a7df881fe5d6c0021c99fd7fd5b561ad7a9423edc46b25528b499a3e839dfe974d5d53e8e8a5b3a798cd7f5f1eeb78e531fff16680babce96 SHA512 1ed01cf00e3f13aad3e5f844c7086c3dd48398efd76e68cd91cf13b9939f4b48eef8915c5f3926954d158023115ad66ee67c0bc8fc4c9570900a37207674fc8f
-EBUILD eselect-mode-1.4.10.ebuild 579 BLAKE2B e54fd92d5edfd9fc5879f2299cc8693ea77b901208b669c879da57fa3c4607ba852e5d40187c268a821f2443f40aa233317435cc25051e84b68a490aff2af0b0 SHA512 39c1a786812771cecc76c137dbaaa1f87e1f342e8951e94e1739eceab326d794efc82b5fb7c9f25992c2a23fa08fba7b8e2c1bd40e6cf25b55d497204509a2c3
+EBUILD eselect-mode-1.4.12.ebuild 579 BLAKE2B d3e4c8c46e7e54d44fe26c8d5965a11589606c025686f95131089f9a0a47934174b30a54648444d3b9d72990c1412600b8ddc6bf97c32e79ae3fc6fd0130f3ac SHA512 58942957c4f7e278dfeee8b474987011205313c91038ab2151aab4b6999147225e72d48894165d75c8f67b072bd1e6dc0bb750cc40d8c93ce5b9e57f46125b0f
 EBUILD eselect-mode-1.4.4.ebuild 570 BLAKE2B fb18e59ec9ba157d1a8f6b55e9e416b4332c9cc7cf561b782361ff4c840881696cf0e91b2f63f9da223fb2a3d06dae3fe3f6d46678b7139ddca745d676e718f0 SHA512 14ab8292c91ab1da794cfd4b33b09dec3f382c1e7fbf3ed3f9fc0f26438ae255b314f993963cc867e37f6cfcba37d8da0f64e6094cb42fb13ca8f11b9ed1675e
 EBUILD eselect-mode-9999.ebuild 458 BLAKE2B 0a5b748fc09dbfe532ec9b40adbbb939bd5150ecac9ee610ad0dc5b37e7b6ccdcb8c183337d6f0ce04ee5bfad4f1ede0c13cc4dc55c828474b07265fd91ffba3 SHA512 5d11532145273d6956274ce05d732352593a20daa1d86f900b1fa9927aa536131e5ec922996f4e3939803253e5649f6c2a3ec9a81dabd6dac0475422cf0a4ceb
 MISC metadata.xml 426 BLAKE2B 85331f7b7beb7a72e8151728884637e255f783856cabaf1a6bf58938b4a3f565eaa047dad4032089c416381c52d66f4341805cb43f152f99c83d0c27900f8963 SHA512 18468ec99892972ddfd973e3efc4869abc9848906773556b6ae5bf9bc48780c790beb77da548c98f9fc07771068dc219d1af2f3dc29f1bb36f12dddd2432a675
--- a/app-emacs/eselect-mode/eselect-mode-1.4.12.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.12.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@ -1,5 +1,5 @@
 DIST poedit-1.8.5.tar.gz 2404829 BLAKE2B f39a7e2e14dab9c0ed0b761a3feb271c8eb0e3b1fdc09c77c6a3dfaaa499e3419881e0959f5a53b07754810adc1518efd4c56a1bb4fd490c1e2a405a7d44ef1c SHA512 87eae2bcedc07eefb097edf263db10b3947956cfa504eddb259e3c3cfed6215ad0da4517fe5132b61041c39a7fbabd298ca42582570295bacbbd62d5ffc6f6a7
 DIST poedit-2.0.6.tar.gz 2511777 BLAKE2B f28e8940310e80ee15fc70f10492e061097f88b62938f8a85194170fd107100c739dbfd1c1cf12516e6fe3d2a9b282986a4368615cf8fcb2ac889075fe64cc6b SHA512 e7beceeb4cd9e4e0269666d634e48622f175a7788219288ba6349a5b15f8360a929018480372e3eecb664d7d2e3093d6788640651696323d6dda0f0780aa5cd2
-EBUILD poedit-1.8.5.ebuild 1741 BLAKE2B 6f3f15d5e07b619144f319903b12ac8d4bf2ce318f6599fc10088431e3a045682cfbf38b46c534a2a4f9c04b5eef2ec62f7124a69f5c440ef3e50406ba8819d9 SHA512 79bec02a50afea9f1086080d532f02f788e50aea668d8e699b94d92343e45d901e368b59de7de43729e89dbbc26a9845aaff8d492441d0446ba04c4b9e643f06
+EBUILD poedit-1.8.5.ebuild 1732 BLAKE2B 98d5b0b8664ea95cc643f4c730a9a463b120f025f96d89d5b7f70a60008535805563f9a5354abb73169e507bd9dd4989b8c77312b4d6433e1619d31eea170115 SHA512 e2faeb9fbfa6a61171119d3b5adbfcc1df218c5d982ee4f930d48811a2c1810a641205937c0d882c627ffaf1b71d81fc029c9f77ee0ab5d8547caa747ee67497
 EBUILD poedit-2.0.6.ebuild 1273 BLAKE2B 9f2a627317290fb4ac7acb8b80f29297ec20c2a8c31b8f38bf995f461e7518bc767d49fed66c5953d2dbe4ffbe5dd1c981189601aaed8516ce7059aa372f9f7c SHA512 97cbb993e0b2583277d2ba88accf36e4bcf4b113d95b87140d80b3c07b705a0f38eb85721b81e1aced2b27e24ec6905308a916d3caa6b2ab7ad494957adcc0a5
 MISC metadata.xml 391 BLAKE2B 9ad2108cfd16183f871c18a04008364439226a905d824253b50e0f4d91ea437a915d2d83164bfcd6a7a2733fbd5db1291b9ef59f86736e5716509ea8b3575c02 SHA512 703b2a9a442d99d59f033561093bc9027cd52c0a98eb1e0cc253c3fcfbcf1987fac8c244061edfe87ea84dde192fe098ed02c6b1cdc3bb6754f42a72ac2ddd3f
--- a/app-i18n/poedit/poedit-1.8.5.ebuild
+++ b/app-i18n/poedit/poedit-1.8.5.ebuild
@ -6,7 +6,7 @@ WX_GTK_VER=3.0

 PLOCALES="af am an ar ast az be@latin be bg bn br bs ca ca@valencia ckb co cs da de el en_GB eo es et eu fa fi fr fur fy_NL ga gl he hi hr hu hy id is it ja kab ka kk ko ku ky lt lv mk mn mr ms nb ne nl nn oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv ta tg th tr tt ug uk ur uz vi wa zh_CN zh_TW"

-inherit eutils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets
+inherit eutils flag-o-matic gnome2-utils l10n wxwidgets xdg-utils

 DESCRIPTION="GUI editor for gettext translations files"
 HOMEPAGE="https://poedit.net"
@ -62,11 +62,11 @@ pkg_preinst() {
 }

 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }

 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
--- a/app-metrics/buildbot-prometheus/Manifest
+++ b/app-metrics/buildbot-prometheus/Manifest
@ -1,4 +1,4 @@
-AUX buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch 2407 BLAKE2B 90bfa4d0892a2bcafaace817ddc1076ca02ae7fa12aefa67cd622f902b1e21b0c23b2112a9a522cb7076d414dd98d665271b9adf41ceaa6f1567151bfa23a67a SHA512 d08ba36d3a28d14f15b1cd3f0545855e15d6d3345166ca0c27aa4470c14663ce7b3ab154ffbdbc80efc8f8225afabb0bd336e623108483be4d6c2760a11c0114
+AUX buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch 2430 BLAKE2B 1c7cc11d95301cf119b3cf0a1d9b1c0af9e48fd486a03350138d97c625abcb72e0f13b0eb4c826341f4e9a6938a708f0afee4c1cd36750a99580a34b23aa290b SHA512 ef63fbfabe5bef28eae222dca2509e24f5f1ec3aa71aa3af3c0092cf78cb9efe58296d54e46760c43ecd38c3d9ab741d1c83c79f2eee7f96572a82f125a389b6
 DIST buildbot-prometheus-17.7.2.tar.gz 10101 BLAKE2B 25c060b5368aa1dea6145b6d380db8001f3cd1fb49f9b3bb1e4ecccdb771591abc269d5aee9d022a9b182b19650a0c398b580004f20def0675b86ca9f3a1e2db SHA512 8a0ecaf57eade3d69fabc57a19a1c02af8e398c3bc4732e40f39e8904a16c9b751d4f6f8ace0dd7893b380d1ffc8a51360279aeb7b4059a6cd9438145344e74b
 EBUILD buildbot-prometheus-17.7.2-r2.ebuild 1122 BLAKE2B 4ed47d8f6f252be8866c997639f7380d0ecf33f7813c1c08b7f6fd83837b216dac116cc78bdd3e5d892ba8a8952f65564919b59286d1375b2b09f42b36065f51 SHA512 b72291f2d007542bd510e3f2f2b0bd42439d3c70583909a742a02a209e9f8507850597512222acfb99f355b4dcedb51777b7f1c67177fccd5bd2a1373b9e3d2e
 MISC metadata.xml 498 BLAKE2B e2cfffddc7ee5bcf879529fea9c97b2c5f93134c16b57dcac5a9f445cba4097f001f973668d82a9a619a524e03da6d79f8910a76637ed1070beb742ad25599c1 SHA512 6a99e044eef36810ef2dee8b090e852ec9518fb8cc8a019257543e77200aae69faf0e0e89f54d562be701dd8f5ebae9d90af860e3bdc3c54fa079e669af16202
--- a/app-metrics/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch
+++ b/app-metrics/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch
@ -1,5 +1,5 @@
 From ceddea3f55773e104c628ef6316ce74785d235f3 Mon Sep 17 00:00:00 2001
-From: °RÓ¨ < _â>
+From: Brian Dolbec <brian.dolbec@sony.com>
 Date: Tue, 6 Mar 2018 02:30:56 +0000
 Subject: [PATCH] Migrate duration calculations to >=buildbot-0.9

--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/dtach/Manifest
+++ b/app-misc/dtach/Manifest
@ -2,5 +2,5 @@ AUX dtach-0.8-CVE-2012-3368.patch 1040 BLAKE2B ded617740765ca7aa814cc98acb46a368
 DIST dtach-0.8.tar.gz 55472 BLAKE2B 9627075763f02787d7071658d1ae040d0c18dfe91f2954546398431e677b7c90cf67c23af0cc20182b354656d50b579c378f54d9f691853b7707a5761bc69b4f SHA512 ad0a788d10a5e1e1be4c353b64e1e4a0dc8c888492a638b2442d7c59ef31d67975357116435a1059141bfc2c82a3a6e9e490faa87cf81e5fc3bc7457a99c1193
 DIST dtach-0.9.tar.gz 60608 BLAKE2B 915b3a13cfd86a2e72505c9f8778ebbc9f25db761815e1352c0bc1281aaddcc95a837a880999379c19912fd3980bb77a20711796ef71b06282f1a27a6cc3572d SHA512 28c13dc8c96c16b9c6153a3a11fdeb4a4bc72e84e1f2575043b047cd8e600a47232f29544ffd87d82e2575623ec2e999a26e23e9eac25ec81c7722bdf98cfb18
 EBUILD dtach-0.8-r1.ebuild 472 BLAKE2B fe7f93c1bb254d2d1115f0cc96ead198ab266712fab96a4dc55bf93e04311cbbeea74b1f25b2bdb16e70520c3f3b70d2c3f4dd167271d1d4ba0c54cb46a28d4e SHA512 cddc92673cb9ab6153c477c2a77f95584edcb4a7140c5e275ddb9ad64773c56084e9609d06c9a00cb226ac3cbe71842114b6fd3522e0db6b624f4adb1fdd216a
-EBUILD dtach-0.9.ebuild 462 BLAKE2B 641a1f7877ed7e58a08c37e1a724db3b21d4ed2ab4433e05ef33b892411f175b2af312448a398d4d0ce730f5d97ff792acb9fd47cad47497b5f28e72db73cddc SHA512 c0b93995aa05efa1b5b5c5fb5dedfef775ac8f15ef260a9d6afe2d2a09b191077bc26aa6c5323f39a985575f2ed97ee33310629a8834f4244da036843761d76d
+EBUILD dtach-0.9.ebuild 461 BLAKE2B 6c5c280f23ff5505d6c4b2c59f42ecf78a1e464b7e1652433667dd5e350c4b52f43402a377caf8fe5762353b312d2b15c1adf3a78a345cae739921d14fa239be SHA512 b71d0ca7f719e32094a4d511aa828ad9ed115a1cc0a0b48173b198810fb42a58d70bcfbcd1a7a3c8745ae5f928c8f55954a7c3336bf5e835ec180e0b91dd71df
 MISC metadata.xml 393 BLAKE2B 0a07b0eac6407190f07439b29f3cfbe185450ba5dfe0c4d3988c6d6abfe12c728029bda874cfaef61c48abe6182288e70ceee27d5db22b8eec03b20476db2991 SHA512 39071ddc8ee3913fb6898bbf5ce5488c76f6a7fa5f3f3905359a228d432cc76fe0336c0640d0fcd26c1be97abc220626c4258c5cd1de280a50d033b57d84aaa7
--- a/app-misc/dtach/dtach-0.9.ebuild
+++ b/app-misc/dtach/dtach-0.9.ebuild
@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""

 src_install() {
--- a/app-misc/dvtm/Manifest
+++ b/app-misc/dvtm/Manifest
@ -5,6 +5,6 @@ DIST dvtm-0.14.tar.gz 35893 BLAKE2B 3fc98614f4a8d3013a98a0e2766c2827a5d9f1046fb3
 DIST dvtm-0.15.tar.gz 40511 BLAKE2B cc5075b5337a66b3eb5a3845f18aaadc6be36804e1a0e217e6bfe640893ec5af7553aa69578f8bda6c3b11b28c02ba5398e19f9cad9844bfcb1bd32ca4f24c12 SHA512 48a0c8fd6a50fe5d43414d0223c9f4b9920a31d42fe3bfc428ce1ae7d0e41a41ebe2597eae0824c7c76bfb0e32a13e440c8d5fcdb1886d55d6791fa3fe3fd77b
 EBUILD dvtm-0.14-r1.ebuild 1527 BLAKE2B 43ab1e43a55d399c801e328368b11c31f99111d2573c723150b0afffd94ebf477e5d17b470eb915dae374ff208e99fed8be85613224657567d136472503f08d5 SHA512 5909230c679470ed169370fdec465f07965934df68446dee6c3bd8312c6cd36ad38fb5a728a3396853abe48e191a8e081db38a3707878958517f82e83d19f45d
 EBUILD dvtm-0.15-r2.ebuild 1280 BLAKE2B d97bac0c3363f068dbb02a464db283cb543e326320615b8062f52e265cf9e738dcbae80a60d40901424f23be18b4b4e832bb9f113ddbd77b5523f5fc301f1383 SHA512 5057a1e1d31f940e71abc9befe7bccf5ea913a1679566524d7bb88ec6aa1a5df27fd01299a47b57c610c87875f94535a37b78f85a650ec4a2f8539d7ba04e374
-EBUILD dvtm-0.15-r3.ebuild 1276 BLAKE2B d29b99b61ea839c75886df1ec7db7049b9784680b78f8d697a2ff47e6b76c2deb1297275db285272414af7d4d72902d0b1ce0ccb134f86d1474fe8da5cb5605b SHA512 df47430d1acd215cebc6b94154783eb0b96aa15f77dd92aeb9bfb4b87d169af29f641a077087d46b9b2313cdcc81c9adfeade6f8b2cdfd505b236df9bd8a7a9a
+EBUILD dvtm-0.15-r3.ebuild 1275 BLAKE2B f498d1be6683e96a8357942b624d204f1794d409f7229b3dbdad4fa1a1ca96c042c33f14d9520accaf88aa717910b58e88304654a1a23a07757211d4e13a309e SHA512 f9f15c4ea40a662437f39a5728ff9d2e90814afd6e96aaebc08b4922dfadc59308242fe50d9d67e0aaf7c2915c39e90538cefd64dc12c0ceb62e0051691cc1a2
 EBUILD dvtm-9999.ebuild 1279 BLAKE2B 3bfb84aa483fc756132d4a51d1662365cb059393c365781c62ff5e4a462f731b6984dbd1a6f8112132c7738e3e13e596d3a141d9641ee5150538ee15efccdcab SHA512 8511e37e945f0fffacfbacb5a6bb0e850a2e72a06365e1fc4f8ca627d80788ce646212f13abc9bc782cec844d599302249f78cccd50c3e9ac74f0169388466f0
 MISC metadata.xml 266 BLAKE2B dcea8fa0295f75ca11474aafd9d1b56cf5c6d01fdb4444a82a0b93e818cf8e692076a1f5dc30a5098779afdff5190e2f877836b3ee87cbc1f8a529c32149ea94 SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5
--- a/app-misc/dvtm/dvtm-0.15-r3.ebuild
+++ b/app-misc/dvtm/dvtm-0.15-r3.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
 else
 	SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 arm x86"
 fi

 LICENSE="MIT"
--- a/app-misc/inputlircd/Manifest
+++ b/app-misc/inputlircd/Manifest
@ -5,5 +5,5 @@ AUX inputlircd.init.2 297 BLAKE2B bf8676b94101dcc9e4ed5480ac5a0f0c3654188892d904
 DIST inputlircd-0.0.1_pre11.tar.bz2 4370 BLAKE2B 9fd957a2558d1d81cefc6f40dfe0c9a8939be0a2ebb1c04e6d13759fc94a28f0c958947e36c4cacd05e0e1c8b995a6877730381d1ee06a75fdeb5142a55af5f9 SHA512 e09546340843f4df01f22c2e5347bcbae7078c521c7e4d5216d061beb93f7ae660e96d1942e6e931e0f72c930b8383cf6f83c70f1f242587da82edc4a04b6d76
 DIST inputlircd-0.0.1_pre15.tar.gz 5226 BLAKE2B 92339021451b2575de5adbf6123f1083e93bfbd8cdd3233389301032678160bb622cf4b92837470151494ec87bcbde5462c557e5cef9fa601ad6da71607dbb78 SHA512 6f7dd15875eeccac1f666af82dabba243707c9b3c3b2e39070032fb3d4a40c1c0ae6fbca2e7be02ce7061d289d9ad07b9ee38c5f5b0f33d5a6c413df5bfd6365
 EBUILD inputlircd-0.0.1_pre11.ebuild 586 BLAKE2B abe1411ab4f1e339b4c4ae6737e3c8f644d15c1b704d6dcdad3ebf0b3754b1bdfbd03d2d9b0a2c0e22cd27e08a86b331a8a2b62809b31b7532b0eccdcd5de281 SHA512 62ca7270bbcc7d621d936753ed7f5fa3f6b572de4313b52ea3d8318f06e1ebb316259b78111aae9a8240ade4523a05b11ce6a286d837d7981f53f18d8d2c48bc
-EBUILD inputlircd-0.0.1_pre15-r2.ebuild 913 BLAKE2B 4bd8653a9bbd3767c7e8b94c0b83e67ac1aaf4c095cd83cfd1899da30a666cf82ce17d5b136d2b72568255eb726a6d2e4417e6ebb73e00d200acc69d5a34ff49 SHA512 440037b3c1800ee581627e0f6100826db38067fcb14bd110c7b47ee62b7e02b5722885fb90c6b81aee14afd4e9b7be2e678e41b9b66ebb19ec335ed15aba1094
+EBUILD inputlircd-0.0.1_pre15-r2.ebuild 907 BLAKE2B 70f9697226ba3a58e6ed1de74bf034dd29814f13fd569524f8e7a5983d1c632446f624e9a4807e5ff6882fcfa0a0305f12b572e64d50a92f8d0bdd91db8801aa SHA512 393bb7e94cfdfab9b037f94476d1f62ee3c1cb38bedf09c22049558f4eb068bcb14d39c9233344091ebfe9d6a1188e60815416d9f95f8433252849007a3cc4e8
 MISC metadata.xml 258 BLAKE2B 1878517d827956dbd45c2d86e97fc066cd4293c3cc94d6d4beaff553462c1badb68aa38b3082c01fe6e21ca1519fc482e2670931d007382b8b2c38af715fe02d SHA512 33d52c9b472999f5722ba6a13598524745093ff45394dd1c9f560b051c9d28be465f72db260a148831b1ff8bc175f41d0c1e4b2d038afc0afdd230b039c67c2b
--- a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
+++ b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
-inherit toolchain-funcs eutils versionator
+
+inherit toolchain-funcs versionator

 DESCRIPTION="Inputlirc daemon to utilize /dev/input/event*"
 HOMEPAGE="https://github.com/ferdinandhuebner/inputlirc"
@ -16,7 +17,7 @@ src_prepare() {
 	local ver="$(best_version sys-kernel/linux-headers)"
 	ver=${ver#sys-kernel/linux-headers-}
 	if version_is_at_least 4.4 ${ver} ; then
-		epatch "${FILESDIR}/inputlircd-linux-4.4-fix.patch"
+		eapply "${FILESDIR}/inputlircd-linux-4.4-fix.patch"
 	fi

 	sed -e 's:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' -i Makefile || die
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@ -3,6 +3,6 @@ DIST bash-completion-2.4.tar.xz 276148 BLAKE2B 1ca38db1d1ad9f0bf7d1aa4e49cba1c82
 DIST bash-completion-2.7.tar.xz 280048 BLAKE2B 88b09f451fd4e14daf8e139951a4b65aaa9d9b1d86dceade388a726ac7f3caff2546597695c3f0cbd5dd64e20472d0cf3e98e0f367898b81d696d4ccb8f2fb73 SHA512 514709ad2e5f6bd4e20027c7049a1144c1854a37b653d5c11fad1cdf7a46d0e1afca725d6ce75d49691149e0de57be85747f704ac1c429ef4cea114bfbff8fcd
 DIST bashcomp-2.0.2.tar.gz 3625 BLAKE2B ebd835e23634e8a7491467ad66c53941763cea43bad75fe24982d3885be2d2ba132e5273a655fec34705224315d7a3f0248c030fb7685fc613ac4f489cde5bf5 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce
 EBUILD bash-completion-2.4-r1.ebuild 3161 BLAKE2B 0c3b185bb625c951f47fb9571695ac67900d67868a0bab27d1a80cb15a31e997422fa8e43677f4d68c6644e10f502c25fad166e1ad1257696c9795bcdc2967c0 SHA512 2d6366a7609d3fab9a423fac06e2c78957f079c37a9c69d9694dac6f70ed50d4234b14f4fb54dda303ef916ec6f92402179b6bb2830208d83e6c5e98bacfb693
-EBUILD bash-completion-2.7-r3.ebuild 4114 BLAKE2B 2978e07d40d6d086ba82ba56c378f9d76712c4b7e11e1e1c06070339eaad4637934559f46c3985b9ce69d9c4c5711ce3e683206a15a04e36bead0551a5b0735c SHA512 2fd88f03e5680629b9bf8d770cbe4348cb3824d54d18c57577a865535e740f8d502a0e18f9f564ffa0e677fc0f6ec783adfa59906fe8659cd13dd98336de6a6e
+EBUILD bash-completion-2.7-r3.ebuild 4113 BLAKE2B 9e1e3042e9826c73ef943622e272bf649acbbdfe1cca8ee8d5f928f3906abb2a3934abbce8b2a25bd6dbb787bf4a85f88780e29e2bf3e5ee313fbca88fa4b38e SHA512 5674159724bb9f5c863cea2d5af6322c5bd8c08d6c0a05e323bf7193b52be949b692964be6009d1c04524c7ca65c1a860f67267418c7b83a215ec57c0824e54e
 EBUILD bash-completion-9999.ebuild 3966 BLAKE2B fb35f3822108eabcd36264cdc2eb0c386f99bfcd6df5a4bddeb5a0e7a110f7ca598507169adff6aadeee3ea678547ef974792d97091ac99e666cd5783a0d8ca3 SHA512 f4db656cac0725c95e1acca37b2ce0fda2bd49d1bc07249f0204c9434a1fee517761f6d00ff0863e608ad070d1f7a6a93882f2663b5ae24ad87e902460a4d159
 MISC metadata.xml 1309 BLAKE2B db08060cd74841bd7220e688e251225ddaf59e4da737c08785e7c6ce83c2d40600fbe38e9b9449fb559ccb2d03b8c2368295b647ec2a52191429fe1d3d1c7470 SHA512 3ee23fb6cbee1e80a0c8fab13f7bb67bdad3292fa8ec187e306b00804a7bf709358c8c08eda4101a5f5baa408e0892aa94c07ae466b5beae4edc18055b1192ee
--- a/app-shells/bash-completion/bash-completion-2.7-r3.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.7-r3.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.ta

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE="test"
 # Multiple test failures, need to investigate the exact problem
 RESTRICT="test"
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@ -8,5 +8,5 @@ DIST dash_0.5.8-2.diff.gz 41715 BLAKE2B d396eab85bd86b18cc532da192c8034da990e9e4
 EBUILD dash-0.5.8.2.ebuild 1696 BLAKE2B a5c998a035ceff8fe02e2c1a9898d2fc2a54c702718cc36e06e5ef2e90569809785a8e2bcbecc7bf17d406db9ab227a46e48569bd7040c54b10f0e12bbf6e31f SHA512 66d84df096ffdce607a3f4bc4e857d807955d945245f96db6e9a33640306ccd3418c79691f2f7e08efef7a877c3e79902c39340ec68d5bab9b0cc657554fbbd7
 EBUILD dash-0.5.9.1-r1.ebuild 1949 BLAKE2B b79feb6f265498cdf75993bc976092ed9687e67e3d653b800b45de4be45ffc52b290200e260ab0ef44cb67e4838a7c7830c0d220ce9b1060918e573b6fd1243a SHA512 37324ad3e7fdb9f23924191ab0ae841e6f1948e7b9a9149af55314ee13b1577965c1f3fa5b464536928adb5045a2b5573eb8785316dd60f5008aeae8efe7e199
 EBUILD dash-0.5.9.1-r2.ebuild 2048 BLAKE2B 55bef5c38c04b070e6e6f3df022fbd240abdf1ef16e91b82c5defa92bf28f54af6ec350d9d15f3750fc561d0e204d7d649f1c26868a8e61a72bd514eeba7e523 SHA512 59341ffefbc51e667f45412a518ae5264b2192657d201a2852e446445e243e8da2f1ddc0ade395616ec5359037ee38bbaa6804b68e809e30f106796964b8bc5d
-EBUILD dash-0.5.9.1-r3.ebuild 2103 BLAKE2B 08a6842e54dd595cb1fe4832f7df501af83933384a7b2a069dd89361222809fbf7ce0b16cb880c41bcaaf31f5ef1f9a255b34902c0efe17fa9914becf682ca68 SHA512 2feae6ef50dde2b0ba75a493982340bcdcc901db4812e777dac11bc8e3c474e365159df4c08df3c2b1d87eec201cdccaf36be46ca3d52dd4de7d6c09754ce2f3
+EBUILD dash-0.5.9.1-r3.ebuild 2102 BLAKE2B 4afafb3ed350dead0d0383877b612b8891d4241f742fbf7bac0f28f7c42bf0e29a59f5f512fbdc9914197cc930241b789e74239a33757f4383527cfe6b563b98 SHA512 9145720f7d1e33a8c6c60f265ba7574bed868893bb8190726afdd9ffb09a18f4c624f761ffe08746f2ec9f68f69611f8751684a04827bd480bb783056a9928ef
 MISC metadata.xml 598 BLAKE2B 0ec9bc56758f158bfce29ffcbbb84c45abe17cd477014fa428240a9af5a4a9f8740c5a66f4aa4828795135d7464426c65410702e81aea81befec5e11a07ec3fa SHA512 a477ff729919625c910ef9a0b95ea85e683122383c4026c1c51f163d8faca06749ec05eef8b4f01ed9eede68b49e637f24f94202b8a00e67bb01bc21294610e6
--- a/app-shells/dash/dash-0.5.9.1-r3.ebuild
+++ b/app-shells/dash/dash-0.5.9.1-r3.ebuild
@ -19,7 +19,7 @@ fi

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit static vanilla"

 RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@ -14,6 +14,6 @@ DIST zsh-5.5.tar.gz 4576506 BLAKE2B 4f5923d519b0c96475f4832cf0e5cabc1432e765d201
 EBUILD zsh-5.3.1.ebuild 5981 BLAKE2B 7bb0e3b81104e115c0ffc9ac593440b9ab61cf89cc33842a3df467ace612573c1f069a9032a8cc1d58f92f47b64900ce042b23a4273a435ab96cf0cc3ad46c1d SHA512 b1173c76320d9c615793c65fa214320f6ef02cac834233e69d242e01834012ab1b32a886666955bc49720874557cdaf14ac5734bd29c04578bc74e87526e2afa
 EBUILD zsh-5.4.2-r1.ebuild 5819 BLAKE2B 1f45243236f22a943a2a2e3fd3d3b3080a96f62c20198a07c48260a5c777648678413258f4376af37697b5fdc2787d13fea1b0554722c5ec01c0053667121e09 SHA512 67330d6e88556b94bef686eff830e8cac169d472a2352ff5486d81f69b7ca3285f1502d5f38f1c8047b01d2ebfded7b166dcce3be318577e9578657f9d8c5a58
 EBUILD zsh-5.5.1.ebuild 5819 BLAKE2B 1f45243236f22a943a2a2e3fd3d3b3080a96f62c20198a07c48260a5c777648678413258f4376af37697b5fdc2787d13fea1b0554722c5ec01c0053667121e09 SHA512 67330d6e88556b94bef686eff830e8cac169d472a2352ff5486d81f69b7ca3285f1502d5f38f1c8047b01d2ebfded7b166dcce3be318577e9578657f9d8c5a58
-EBUILD zsh-5.5.ebuild 5811 BLAKE2B bce8c5edfb0fc64da587d093d1f514bdcde845ea564f989fee98112f675f52a6b5b19b5dcf7843ff0be9e9d444dcd356fdde30c7cb1a780db6c724a69f99ab47 SHA512 c10fd7820fbb2fb5fcc4f94672fa2cdad6a600fbd274a9dda25a317054c4a2b8aedb2da2f7a40d892f43fd0ec2de44ea7831d636b6ed6c2f6328af778bd784b1
+EBUILD zsh-5.5.ebuild 5810 BLAKE2B 4f53f7819cfaf730092c06b7520e780643684de17fdf57b3201111e9138f3ccf598d132ac05a5b9596c7d4a256fe50f9bec11ae18bbf40b6089de3416aa52944 SHA512 1ea8e5c45fc4c3ca30b1c0b69b7be0195ccb8b1001bb844ae3ee3d850947eacee85dc5df5576eaac5862ce9201836b94f35664f868d73a7353cdb7611db030eb
 EBUILD zsh-9999.ebuild 5998 BLAKE2B 265d73cf7284891a347f6ad353d6b1f71fd95b74e0b3234562dc713bbb759efb81862abc68b448338cac6ae76cb3bcfe1d9a2bf16392841f24fd63b617245204 SHA512 8476d8741eae45dd02cb03d6c633d5025aa05ebbf342d2650b21664d23447cf7ff18d15e3dca666553f0e885c33108718cc3859195e5a67bd22087a2e40b25f2
 MISC metadata.xml 627 BLAKE2B 075ca50a779af22aa7664943a0ec270d99869d615d73aa65f5483d4ae30821ca535f18e8841c43f2359ae83650f32931a6f91e8b0eab63ceee7ec4754db55f3c SHA512 489307b83b15893965874824d59bf9d54a6f82aa13c62e1e7a12ada87d10b8e5d3ab63c6e1dc327b087f7403c871ce3cb766423e3513ed0c3b2304342775fbb1
--- a/app-shells/zsh/zsh-5.5.ebuild
+++ b/app-shells/zsh/zsh-5.5.ebuild
@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
 else
-	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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://www.zsh.org/pub/${P}.tar.gz
 		doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
 fi
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/bibus/Manifest
+++ b/app-text/bibus/Manifest
@ -3,5 +3,5 @@ AUX bibus-1.5.2-install.patch 5630 BLAKE2B 8f0da2eb8fcfde331b1008650f3ae0156a82f
 AUX bibus-1.5.2-wx30.patch 7623 BLAKE2B 644d97804c8e43f63df0090026e0e757dc9a80eee521ac3f07630912619cb26ab9f9893351e56c7b1b1aa3024e3c15f71504392362404cf37d92b6c73182e2af SHA512 48915b9dedbaddc6fc1f7adc6f197e1e5df01942a897c6aab664fa36c980a0978d111deb29e05d2b282f9ec17e01ff2117f11d86cd53600a0fa6ebfc4c6de049
 DIST bibus-1.5.2-lo-4.patch.xz 13196 BLAKE2B 1dfef94699eee77537fea3d3b93aeb1613fc93b68df1deb43c4af6fae0bf5aeb2282bb823f4824272acdef53a5edcd9b30a52415e82da00952971fa65ec0d9dc SHA512 68b90574e9dd0bb3e2cc89c539ff35febdf4ac37dfb65c06709d21b62fdda0108c93f05d37ab96bf52c4f99bbe20caa361d562c297b05dc7ea37404eea659fd1
 DIST bibus_1.5.2.orig.tar.gz 5411889 BLAKE2B db95ea4b1e0ba22fd85cb36d945864741a2f40890499018698c679c9f7d4b77b2299d2aa941664b2e4011c41ea62a31463b39c392eb3678633de17482f928474 SHA512 33d091dacc707859a11010fcba57691a3e2726ae7579d601720b4398f7be29b580be978da8cd058fab491ec5b52dd3ce33c964a8d5077f8e80d8f0f387ffa2c4
-EBUILD bibus-1.5.2-r3.ebuild 2065 BLAKE2B ee6b21cf2e1f65a18625da80576e227bc48781e46c8960d82b3492d0c0d9f401d2d469cbf1a04fcad5f04ede8cfc766d82cbb6d756adeaca515b09d0aed9d823 SHA512 c0a3d1b9367a36898e8ec88e46c32f0339f417633fcfce8ccad95806826be75590b08430fc65f462371e28c7900df83947e28588b8502ccdfbbcdcca27869794
+EBUILD bibus-1.5.2-r3.ebuild 2054 BLAKE2B 97ae9c2e3f09fe2e64f06a2518fa3f457c03bfec3e91b0f329626874abc3645b551a8ebe074173cb46e6f53254249792b2234303a02a82171424a8fe22021b2a SHA512 206cc042585499f922b1b50cb7d8bf8a34ac400e40da13e6de57c37e122c33360252ada918c6a3e1e011523788fd532439abe117aa3b496c8b51fb33932bea3e
 MISC metadata.xml 335 BLAKE2B 1bf81d23e26f3990b58cf0ae16ffb46f7b70d5e9a632c1a787145bf143a30e6721f872f077716d8abbd7c572659329a6927524ee9b17276839e04421cbbd80f8 SHA512 fe16c696e26755549539bce6b16f8370df11af5bf69c774a103ea608e99525e83a8e2b355efcff51a42f8296bc0146e66d4d4e49004e1a54dbbaba98dcdc867f
--- a/app-text/bibus/bibus-1.5.2-r3.ebuild
+++ b/app-text/bibus/bibus-1.5.2-r3.ebuild
@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"

-inherit fdo-mime python-r1 versionator
+inherit python-r1 versionator xdg-utils

 DESCRIPTION="Bibliographic and reference management software, integrates with LO and MS Word"
 HOMEPAGE="http://bibus-biblio.sourceforge.net/"
@ -76,11 +76,11 @@ src_install() {
 }

 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }

 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@ -3,5 +3,5 @@ DIST build-docbook-catalog-1.20.tar.xz 4620 BLAKE2B d927e451e5cdc3635ec85f3d283b
 DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
 EBUILD build-docbook-catalog-1.19.1.ebuild 761 BLAKE2B 56ddbfc1f8cdd9d6531452671b1bc92b3a81eb9ab4af31980af6a82207b23c260c09ea26f4f2f9d535e78159f7868838b10d69b96207ff067e55582d0ab659b5 SHA512 32814eae6c8dd46b00d1567922631e38d000930bbd4b7aecd7c97c9d404439938e70f27dfbfbfbf0d138d119026b9eb239ce0877f24f37fbc179beca71cd718b
 EBUILD build-docbook-catalog-1.20.ebuild 1140 BLAKE2B b7c3f81d3a899d34ff27dad7e726f288fdbe781e8d359918abf726eafdcfc67f9565df9a7f0ef92c7a226036c42069f5c6c1cf56de6a571770759968f7c97626 SHA512 0330a064028c41aa8d2386118e7eb27a7a0c5e24f76cb3f619bd704244a058315692a7452694f8f3d4dc942f1be86bc65e3901654b7a7073d4b9116d081cd5a0
-EBUILD build-docbook-catalog-1.21.ebuild 1097 BLAKE2B f28b94ffa307f806c068c69a0d7798fb59da42af7f07d30858f1cfc80dfc7e4d2baca352380092a9431f220d27bc98becbc29329d88a0ee51b5d05ac7e21285b SHA512 ad584449fe76557175fa16ce2b947149bee33b6830daea14d237e801e71f0429c6209e327cab6b68d75ba38c24ff1fb6bff9deecbaa7e58304fc7cfd741d0483
+EBUILD build-docbook-catalog-1.21.ebuild 1096 BLAKE2B 0281585bdfa2ff391ddf0f8eaff67e3a2b3a854ed897ec35e395c846d9e599b56e8754f3435f6041a27b12fc7bf40f3e5cf8a40d7598a516659fbcd5b8c5726e SHA512 66cded20f6ae0229bfca44147321ab33175963235d30032cccb39cfdc1cd40575626c5e4ae5cd8fd98dbb90a48e7ad2b3aa5e42ce7968a9ee24ac06af645fbf9
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@ -1,6 +1,6 @@
 AUX djvu-3.5.24-gcc46.patch 859 BLAKE2B c11a240b930df4ddbf45272c2c2ba262b545d440cb6553107bac51894853b1ae28ca97620bef74bdde6ac674eee237cf14c63fa9313f9acf2afb70c8e6045f6e SHA512 8e27341bb994dca8ea27cf6da1141f06b5c96f1b853e7d4215214893c32a17fe3adc821c98ff8793d23cde458420f944b7f4d51e794fda9a061fea6f1eac08ca
 DIST djvulibre-3.5.25.3.tar.gz 2543949 BLAKE2B 8ae6004e74a7db0fa666a3cf15f5a3b335690984838e8d674ccd7fa7dda0728771f6fab5f61747b505646e3bb206effd0bbaf9c6035fb27993d587693ad1fa43 SHA512 0e38f56d77915ee6707dd19a36a8ca9167608c39449a5c73de9cd784d712852c07c068b79a794e25f6d3ded0f927d083413dde197c9fc8f7b68c03cffe68035b
 DIST djvulibre-3.5.27.tar.gz 3648522 BLAKE2B e1907b4b64c48304ceb24360cfd451e4690d38803f22231d4e136dbe754715527fa0300c623bb709fa05bba206348257137b2a755651bb51ca26259680e142d0 SHA512 62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252e4769e6534582b826e49bcfb490513179580fab9c3afa84aa92053ccebee
-EBUILD djvu-3.5.25.3.ebuild 1769 BLAKE2B 115fa97ab60cf2ba0489193b7e5489b3ff786c0e37ffc8aa724028851e5bc57c81212fdf80423e1a011c1aef7669325080abf497d55792d4d5bdaea830117d85 SHA512 51e5ed5fb1c2f3deff3e989c5bbabeb43177ac7ba0174f5ecc6916bb1734d88fcc6f6a9585183a30688ee70dae214c27b047b9f762e9b9eaafc3b5f77af86d53
-EBUILD djvu-3.5.27.ebuild 1462 BLAKE2B 2cff14c8cb8652ff7a1ba2b59196c6117712d4149fafb4cbe3991c6393865feb237915f8fc5364161ba1205d20d34961fb2ffdde77dfc113e5a7e3bb05562cfe SHA512 f896577a7d11670e56b9cd3dffa63d45770577ec5134eb83087834b7fc026ce3471df975f7376a3e49829d7bcc9c3b7512501d063ff052ab854a66e48f4143c6
+EBUILD djvu-3.5.25.3.ebuild 1768 BLAKE2B 9e2806c9af331c5ec9f86a6908ba985d64cee22d64848bff5f80a0cf8163fad0ee2f5736d28260c15c672970b05f20fb1b5ed5f82feb193550186059d548adff SHA512 08d9199c719032df599b8e18022411adbc0ee6f9f5e09e0a8e73b62b13e5e3dc4be6b8baad13dfb4bed973423042c9c464ac714a614af2e771dae7955bf5f453
+EBUILD djvu-3.5.27.ebuild 1461 BLAKE2B 2d8e41aa8552fef138db4660b83ec949892c3254dc902d47d3555592becfbeeaa76cd8d7a5b48ac183a66f9c4a2c351edfe3dd2b2d30a8893bde24936a5a9c7c SHA512 532db3244d98404e095a0521e6ee09724bfe887f374a0b132efd0bae94ad063177562c3c81c0206979f38736a77a392e82ea96e9d0eb2abb62445807eec259cd
 MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
--- a/app-text/djvu/djvu-3.5.25.3.ebuild
+++ b/app-text/djvu/djvu-3.5.25.3.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5

-inherit autotools eutils fdo-mime flag-o-matic
+inherit autotools eutils flag-o-matic xdg-utils

 MY_P="${PN}libre-${PV#*_p}"

@ -62,11 +62,11 @@ src_install() {
 }

 pkg_postinst() {
-	fdo-mime_mime_database_update
+	xdg_mimeinfo_database_update
 	has_version app-text/djview || \
 		optfeature "For djviewer or browser plugin" app-text/djview
 }

 pkg_postrm() {
-	fdo-mime_mime_database_update
+	xdg_mimeinfo_database_update
 }
--- a/app-text/djvu/djvu-3.5.27.ebuild
+++ b/app-text/djvu/djvu-3.5.27.ebuild
@ -3,7 +3,7 @@

 EAPI=5

-inherit eutils fdo-mime flag-o-matic
+inherit eutils flag-o-matic xdg-utils

 MY_P="${PN}libre-${PV#*_p}"

@ -53,11 +53,11 @@ src_install() {
 }

 pkg_postinst() {
-	fdo-mime_mime_database_update
+	xdg_mimeinfo_database_update
 	has_version app-text/djview || \
 		optfeature "For djviewer or browser plugin" app-text/djview
 }

 pkg_postrm() {
-	fdo-mime_mime_database_update
+	xdg_mimeinfo_database_update
 }
--- a/Show More
+++ b/Show More