gentoo resync : 19.01.2018

12 files changed, 218 insertions, 28 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index eb0212e5f900..129ed2682ba1 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 315e34708819..45d2f5355362 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -3,8 +3,11 @@ AUX conky-1.10.6-cpu-hotplug.patch 683 BLAKE2B 770cda24a35ea2e1e559805fcb6b4cfb6
 AUX conky-1.10.6-fix-text-shades.patch 401 BLAKE2B 2ea47d75e5b706f9af50fd0acbf56c59ffba95759c9ff76fb12a00a53874864d2af454ff13559e289433b5d0edfa752e3436cbd57e8a57114b2f7c0c4e0f4f94 SHA512 a18a0d8d523850ba5fb94f0de7eeff0764a8c73a7ca3e788c676f3a8c11836bc100bb39e85b58e6e8d501b6107dd2aa52bb404295d5bb8f951d668dadb7d73d5
 AUX conky-1.10.6-gcc-7.patch 279 BLAKE2B 139c76201d947c19a2fdde3e192611192475f7e2cd3d0501e6de00ff99cf12eb4a4d0f032540e05a5bd3815c384d45cd8059b27962ff373b1a97b24333696ed9 SHA512 a9a7b358af47cbb1366c29f2af669efec927ed61b3d0d5595ac95a8d316a98b1761ee0875cb06230d5e456aceefc7912438b0fad90b145fe07d6a71cfd13e592
 AUX conky-1.10.6-new_graph-oor.patch 1312 BLAKE2B 6afc8d2e72797155123d28081e7c8a1bea7b85a9cd22cc45f9dda802949de27c567db3afd4927d18ea45ea1fa1ad3e9a07bd2ac2a1a44ba9aa87fdd5d7ee4e8e SHA512 ef7e15601251b846766dacad6bf1ff6f8d66b6c8fec2c40222ea7f072679ecacbceac297d516f0764aa9b4e9caac7f1deeea0b4365e89ba5733f7c8412658ec1
+AUX conky-1.10.7-cpu-hotplug.patch 464 BLAKE2B 7a36582e08d919bf589a7f6ad83867636f1c58fc4472c3455e287a2bbbe34f1960632c6e3377e02091811c8fdaa36ad667396cded5b8d41d11973e21c8a668fa SHA512 abafa1ed19b5aa4855958d0bd204c36ec7bbb06f8f5d3303348e8beb437312137b94583613007b79259159f2fc3c4c42577bca3ccbb53340c44e11715b703f8f
 DIST conky-1.10.4.tar.gz 365145 BLAKE2B 60f6f53ef67a9958d4dd4c3f1ab53886235927ed457ad3e98d2f6f61568a14baa7cd2afa0d3ddde9ed5e16aae17891213d906f49c308269f678adf37ea627329 SHA512 665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c
 DIST conky-1.10.6.tar.gz 365669 BLAKE2B 4f072b950083a1352904e9fbc2de016dbb3af93291e308ad2db799381f14880da4e32fa1da5ea1dab568bb782352c249d6200d581916ef3174e222f7a8294cc1 SHA512 ddd0b087e89654f8dace7d9682935a802b3bb22b7e65acd25dcc0f06e90b46bee695502d78b6e40a409f8eaffcd65a78d5f861ee6dbcbff6e48f88c2f20319c9
+DIST conky-1.10.7.tar.gz 371881 BLAKE2B f1a1dd0d67efe1658d3a3da7ddb121c31ae34c347f7bce7fcecb57d7311ddcf80fb391055fefb92fd235b702c3e5b17362821565aba7a911931542ea714d8d76 SHA512 4da501c7c7613e8b9b26a691a1c0118c05cec818e944d4a30e250ecba26956d6f3103ec5731f082a095173dbfe0713137ded92043cc4c1eb3821c0943f1744f4
 EBUILD conky-1.10.4.ebuild 4850 BLAKE2B 4d7e00ca639cfc5eed0b80f2ddb473e2979014e2564c684a07e0d4647612ee53c0cee16e6d2806e25a70c0725521678a04d5e43cc3544d4612fee749bbf50510 SHA512 612694ed4db70e8198f6a5b4110f972ab09dff8e3f8619367db3e2697dce97d22fae09b971b3c7800b150f744e86a3268c0999f4e1f3ed3f3041bb32dbbb7663
 EBUILD conky-1.10.6-r6.ebuild 5075 BLAKE2B 2faac63d87f6c12e9077f2915b9d451b02b7f014de627d7a7881f837cfac9e3280bd1f0eb744437023c4247f3959ad87ec8cbc183736d68015d51842f298d492 SHA512 011b6142f50f1cd9addd30df888e7186ff370c6c5046091998af61e7aa1ddf8f7f18f1469c6f9ceb5795c803b26513cf01c0e8dfcd1637ab3a2ecc84ac37fa22
+EBUILD conky-1.10.7.ebuild 4962 BLAKE2B f73d4b96e9eb983194f599fcfa1e4b81b2bba17d5ec28d841df8b1c0b24b66bab768438b0328e57b16cb80bf83c154c735faffec7e750251d049fc0fed037b77 SHA512 bae107f0e3b506778dc16f0ed34aaddf9487210cd137f7a304ea9a8938a3a1bcffd74d6ea8d0eee288df32b9687553b3166ac63b86fd14f2e4997bbc6b3905a8
 MISC metadata.xml 2525 BLAKE2B 805fd872d69f00911fa599d87f2c638b1126c438fd0c8ccdda84ff5cbddecbca882b74fa1828e703c32a4035a4223606a1da75bb27cc63ac19b8dd61f5f90b42 SHA512 ccfe5718005f521aa00e7a66429493ea1301f7691acf0cca2faa5372c5f1349ba62d5046b85059f395fe51b30130a06f6867e0736b80cf4b76f9388b05fa76bb
diff --git a/app-admin/conky/conky-1.10.7.ebuild b/app-admin/conky/conky-1.10.7.ebuild
new file mode 100644
index 000000000000..dd9490808193
--- /dev/null
+++ b/app-admin/conky/conky-1.10.7.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils linux-info readme.gentoo-r1
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
+	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
+	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
+	weather-metar weather-xoap webserver wifi X xmms2"
+
+DEPEND_COMMON="
+	X? (
+		imlib? ( media-libs/imlib2[X] )
+		lua-cairo? (
+			>=dev-lua/toluapp-1.0.93
+			x11-libs/cairo[X] )
+		lua-imlib? (
+			>=dev-lua/toluapp-1.0.93
+			media-libs/imlib2[X] )
+		lua-rsvg? (
+			>=dev-lua/toluapp-1.0.93
+			gnome-base/librsvg )
+		nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+		x11-libs/libX11
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+		x11-libs/libXfixes
+		x11-libs/libXext
+		audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
+		xmms2? ( media-sound/xmms2 )
+	)
+	cmus? ( media-sound/cmus )
+	curl? ( net-misc/curl )
+	eve? ( net-misc/curl dev-libs/libxml2 )
+	ical? ( dev-libs/libical )
+	iconv? ( virtual/libiconv )
+	irc? ( net-libs/libircclient )
+	mysql? ( >=virtual/mysql-5.0 )
+	ncurses? ( sys-libs/ncurses:= )
+	pulseaudio? ( media-sound/pulseaudio )
+	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+	systemd? ( sys-apps/systemd )
+	wifi? ( net-wireless/wireless-tools )
+	weather-metar? ( net-misc/curl )
+	weather-xoap? ( dev-libs/libxml2 net-misc/curl )
+	webserver? ( net-libs/libmicrohttpd )
+	>=dev-lang/lua-5.1.4-r8:0
+	"
+RDEPEND="
+	${DEPEND_COMMON}
+	apcupsd? ( sys-power/apcupsd )
+	hddtemp? ( app-admin/hddtemp )
+	moc? ( media-sound/moc )
+	nano-syntax? ( app-editors/nano )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+DEPEND="
+	${DEPEND_COMMON}
+	app-text/docbook2X
+	"
+
+CONFIG_CHECK=~IPV6
+
+DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cpu-hotplug.patch
+)
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}.
+To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
+and edit it to your liking.
+
+There are pretty html docs available at the conky homepage
+or in ${ROOT%/}/usr/share/doc/${PF}/html.
+
+Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+
+pkg_setup() {
+	use ipv6 && linux-info_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
+		cmake/ConkyPlatformChecks.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs
+
+	if use X; then
+		mycmakeargs=(
+			-DBUILD_X11=ON
+			-DOWN_WINDOW=ON
+			-DBUILD_XDAMAGE=ON
+			-DBUILD_XINERAMA=ON
+			-DBUILD_XDBE=ON
+			-DBUILD_XFT=$(usex truetype)
+			-DBUILD_IMLIB2=$(usex imlib)
+			-DBUILD_XSHAPE=ON
+			-DBUILD_ARGB=ON
+			-DBUILD_LUA_CAIRO=$(usex lua-cairo)
+			-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+			-DBUILD_LUA_RSVG=$(usex lua-rsvg)
+			-DBUILD_NVIDIA=$(usex nvidia)
+			-DBUILD_AUDACIOUS=$(usex audacious)
+			-DBUILD_XMMS2=$(usex xmms2)
+		)
+	else
+		mycmakeargs=(
+			-DBUILD_X11=OFF
+			-DBUILD_NVIDIA=OFF
+			-DBUILD_LUA_CAIRO=OFF
+			-DBUILD_LUA_IMLIB2=OFF
+			-DBUILD_LUA_RSVG=OFF
+			-DBUILD_AUDACIOUS=OFF
+			-DBUILD_XMMS2=OFF
+		)
+	fi
+
+	mycmakeargs+=(
+		-DBUILD_APCUPSD=$(usex apcupsd)
+		-DBUILD_CMUS=$(usex cmus)
+		-DBUILD_CURL=$(usex curl)
+		-DBUILD_EVE=$(usex eve)
+		-DBUILD_HDDTEMP=$(usex hddtemp)
+		-DBUILD_IOSTATS=$(usex iostats)
+		-DBUILD_ICAL=$(usex ical)
+		-DBUILD_ICONV=$(usex iconv)
+		-DBUILD_IPV6=$(usex ipv6)
+		-DBUILD_IRC=$(usex irc)
+		-DBUILD_MATH=$(usex math)
+		-DBUILD_MOC=$(usex moc)
+		-DBUILD_MPD=$(usex mpd)
+		-DBUILD_MYSQL=$(usex mysql)
+		-DBUILD_NCURSES=$(usex ncurses)
+		-DBUILD_PORT_MONITORS=$(usex portmon)
+		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_RSS=$(usex rss)
+		-DBUILD_JOURNAL=$(usex systemd)
+		-DBUILD_IBM=$(usex thinkpad)
+		-DBUILD_WEATHER_METAR=$(usex weather-metar)
+		-DBUILD_WEATHER_XOAP=$(usex weather-xoap)
+		-DBUILD_HTTP=$(usex webserver)
+		-DBUILD_WLAN=$(usex wifi)
+		-DBUILD_BUILTIN_CONFIG=ON
+		-DBUILD_OLD_CONFIG=OFF
+		-DBUILD_I18N=ON
+		-DMAINTAINER_MODE=ON
+		-DRELEASE=ON
+		-DBUILD_BMPX=OFF
+		-DDOC_PATH=/usr/share/doc/${PF}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/conkyrc.vim
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano/
+		doins "${S}"/extras/nano/conky.nanorc
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-admin/conky/files/conky-1.10.7-cpu-hotplug.patch b/app-admin/conky/files/conky-1.10.7-cpu-hotplug.patch
new file mode 100644
index 000000000000..18394828105c
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.7-cpu-hotplug.patch
@@ -0,0 +1,13 @@
+diff -Naur conky-1.10.7_old/src/linux.cc conky-1.10.7/src/linux.cc
+--- conky-1.10.7_old/src/linux.cc	2018-01-19 16:59:14.158830825 +0100
++++ conky-1.10.7/src/linux.cc	2018-01-19 16:59:44.796144615 +0100
+@@ -923,6 +923,9 @@
+ 			} else {
+ 				idx = 0;
+ 			}
++			if (idx > info.cpu_count) {
++				continue;
++			}
+ 			sscanf(buf, stat_template, &(cpu[idx].cpu_user),
+ 				&(cpu[idx].cpu_nice), &(cpu[idx].cpu_system),
+ 				&(cpu[idx].cpu_idle), &(cpu[idx].cpu_iowait),
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index ef2fcf8a21d6..78b781856340 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -14,6 +14,6 @@ DIST logrotate-3.13.0.tar.gz 213726 BLAKE2B b9970a0fb49b9de9c83ee679fd4587b6a162
 DIST logrotate-3.9.1.tar.gz 79061 BLAKE2B b07f8fd8eb59cc4d6c80441a3b5a8aab090bc13eb8fa5e35b111feb2203fb2c3092daa469e6fec02a29b1d377bca33fbbf5859bcd351a1f4a0d82343c5f65d3d SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28
 EBUILD logrotate-3.12.3-r1.ebuild 2485 BLAKE2B 65dd96e9bc5a13840ad8b84dd193221783887c55e07de740a525a10310664b81588712e914373dcd0692cabead771efe74687783a3a2d5ece976a1744d5a64bf SHA512 46b79b611ba2e3533e1c068b3422b3507e2f505d5562810f91699f936be43b99a4456603e5c9298f30dc2eae5633e391319516babfd038520a0de58e03513ab4
 EBUILD logrotate-3.12.3-r2.ebuild 2552 BLAKE2B 9f4d04a6d303ad64f515c0f2b4f6a3dd2b60c8ed5c2216c76c1642a8205eada4db3316b81208bb42f4552378e25a871514f3126ee701215b37f25e65612ae772 SHA512 b3f3b5d0264bb75c717608be706eccf33d97996f38c5ca152e1797f9dfbdfc40add7065fa614a715d0a30d431dd484e34a8b48138b80d99bcdd546b597264436
-EBUILD logrotate-3.13.0.ebuild 2544 BLAKE2B a5dc63ed60860c2511b86a165a3fa93079f3ee1822edc35ec9f0bbd23fb1edcf256bf7b19058ce2d4e82aa898100cca8be7bf00992077063618f7a53e15afa9e SHA512 75267fb36c030ecfa59772a28d5353787a9c9f624ee49970b4378a51c044506d55fb8995bbcccd2e2e102d6a27525fe0a101881aef912ad28d9b2f3debca31d7
+EBUILD logrotate-3.13.0.ebuild 2543 BLAKE2B d79fec2304b6b52ec1cc064fc40aed2054edecf4abeb8dbd0d5df7f8bbb27e1a17a384cf4d44042197eac0c8ac7d5e6e888ef689fe2794ae206d946661b6196a SHA512 2f6b6caef77088ff1aee15f8a289f1b3559180034b5f2bfa5520b2c3627bb0f92e0f5555cbe914f4877b50729f84e3ca3f0353c6e1b63442e156b530819294a4
 EBUILD logrotate-3.9.1.ebuild 1767 BLAKE2B a59f23a8a0a24b416f23a087c60fe046260cc24521f68f2551bb2a2821d12e94307e2d620ec4b625cd1b6be21cafa3d2c0f044468dbc2760897e5bb7854ac7af SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03
 MISC metadata.xml 1119 BLAKE2B ddb2266925506c260c4b3f67e4dd906d9446a17a54b5a0ffce547d3c942750ead45dd1cfdcbae548a096d87ee1e247fcda9bcb81e83b829f0526d4bfd7b4a01d SHA512 99725d54d1cf68b257446ef8afc43d4bfe05cc789c818222d603012ae1e636624962c23a845f8858f4fc7aaf5a7e7f8085a7b173185ba66d7e390012dbceef79
diff --git a/app-admin/logrotate/logrotate-3.13.0.ebuild b/app-admin/logrotate/logrotate-3.13.0.ebuild
index bd3fbe4b720c..3e708af36c72 100644
--- a/app-admin/logrotate/logrotate-3.13.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.13.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl +cron selinux"
 
 CDEPEND="
diff --git a/app-admin/packagekit-base/Manifest b/app-admin/packagekit-base/Manifest
index 611dadeab7b4..f63ffd6a2085 100644
--- a/app-admin/packagekit-base/Manifest
+++ b/app-admin/packagekit-base/Manifest
@@ -10,5 +10,5 @@ EBUILD packagekit-base-1.0.11.ebuild 2897 BLAKE2B 273c57376ea2e7a4ac18b78e1b3a22
 EBUILD packagekit-base-1.1.1.ebuild 3338 BLAKE2B 82a68620c4e6e9ff616dfce5b579eb3742e609e169b2cd3a133a8079f791e55efb85391a2b3e7af43ca12200d0a963fb3ef1701a3c6dc25f00ae064559172606 SHA512 95e673821d137a33e1622e1cad241bf9649ad1368ac4c27178643d40f39f3bc8408546f5f545dc325ca72be0586ee5dadc7f33af0c1d98acc7ec748eb305fc22
 EBUILD packagekit-base-1.1.4.ebuild 3372 BLAKE2B bac2e0a5ff37132fbf315e0958fec7237f0059191f0074169e1eaa53cda2338f408dff543325e859e6f20e0d8d900cf470e563196506fbc99af7cbcb2e4dcb36 SHA512 44ccfdf2114a4d2d0d90ce39e7b18ce8adebac5f423fda4661c0e848d39efd7a9dba12a54022e77e6171aa44037cb65b6a6c584346d1181c0ddfe18212354046
 EBUILD packagekit-base-1.1.5-r2.ebuild 3769 BLAKE2B 0f492fd80c02c3e057d862061f39b058ea403d56c6f453f4d824b5df7b884a3c4996113419fee66c2fcaffd1403e4d86dc05e4bdafdf4ac7ea9483344daad4c9 SHA512 a750ec8210a7b052452b5f8cae6f5a21fd2123225a92ad610b757368123235c048f8022f0609971b092b038493538a078db0f00655dd159e830383a49bad7c90
-EBUILD packagekit-base-1.1.7.ebuild 3602 BLAKE2B 239db1c618891fdafda012b28715891f345a88ab90067af7f633e92b63aa42cc4098bd19f2d7a89c2661c0e249f7e6edc316352ded11f0f449c69102a876f770 SHA512 4404fdc19654085863ce153ad7abd1ecc7f6507a6c0cf02bc355942cce69f421a3079c4386334b13d0dba1f45f8843ae7483dfce2bef8485fc03e827d42b24eb
+EBUILD packagekit-base-1.1.7.ebuild 3601 BLAKE2B a0a2cf69859fe0f5642d04c5d4c2b6916877964bd3d6701cc29d6c1cf71cb59bafce3a95f86bb12d19e392bae683742cba6f39a4a5e2c755999ede4f877bfe8d SHA512 5af3df06412386f8d89c2dee5c2039d248b3c262afdec1806edf265c2682acdb448d44be838c556445f336811f0034975609c33797d6c100bb672fc3ae575525
 MISC metadata.xml 860 BLAKE2B 03ddffc3bdd260e7ad8a2e47ccba37b9e381d543e7a0736d00deff87db86e2718af2b00e00092ef98b38b28456c995e1c70a8d190ff38c868a732dcd37300fe4 SHA512 db5ce7f7b361c9e742413bbb222fc3dfdd2747716e5d59a71dba5c14073a6bb18e1949d0247478a0652e6011af338e74ac790503773a2bc1d60693856b6f8650
diff --git a/app-admin/packagekit-base/packagekit-base-1.1.7.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.7.ebuild
index 1dae7f2a4bdd..4a61ad552f37 100644
--- a/app-admin/packagekit-base/packagekit-base-1.1.7.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-1.1.7.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"
@@ -19,7 +19,7 @@ SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/18"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="cron command-not-found elogind +introspection entropy systemd test vala"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 4fc32fb746d8..515fa35018cb 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -11,6 +11,6 @@ DIST puppet-agent_5.3.3-1stretch_i386.deb 16544078 BLAKE2B 38e8d2608b48d54387e87
 DIST puppet-agent_5.3.3-1xenial_amd64.deb 15647308 BLAKE2B 461532d697b645c6e36f0abaf6c366a6bbd6caeabb1f7f1fc9357e92b252555b1ab05ba433a2f3319008ba59eaa892dc9b8642070ae4322f9826e9f758937cfe SHA512 29c826d891a3930e18ed71a1c788819fe421b6a398d77ab21900feba457a386bad34ecb210d63054372af19de81eb31b13ea729adc3cb1fdd2fa09b0783b1e7d
 DIST puppet-agent_5.3.3-1xenial_i386.deb 16329408 BLAKE2B 7d024c3c39bd2ef495c2864f69aaba599cb26e8fc9bc924211780552436c275b5ef4a89db756cad77d1c1d30b5dec0b7561c871c97c9acdcedac550db212f972 SHA512 418c5f0a289d9c7335b49961dd6ad28340ed66cddbd476ca4f2fe6edbc3933c1d4841783d3a0f1f0ea1fab748c6f14f90ebc82fd02cf4046cde95c87b7b94548
 EBUILD puppet-agent-1.10.9.ebuild 3499 BLAKE2B 5a8599c231a5836f20092a787738b6637b400858b99e3332b6d1e5a34697d3036abbacab65e086221ea025be246be278eada08984e5d5734302014fcba3aeccf SHA512 22bd5df84895605e506ce0b9ee000bf72208b1e24c3907834c744613d341430336ee8abc0125f94af8accbf22057e739612a939e18b4206fbd122848d1446366
-EBUILD puppet-agent-5.3.3-r2.ebuild 3295 BLAKE2B 871f9831d01ebafd2c9464e0897e2e149a69e5cbc8d01e5182edffd1e0ed69ee74558c8ae8d36d44a70271feb3c14c62700e616500c528cf9e1adb7a41c91af4 SHA512 e7a3c01bf515a83d053d0b884a45c5f1171810a17ed8dfcdb8141a49da11279337936b4637a86d842f0656a7bbf0aa0004661773aece42fd98ba1a6813733188
+EBUILD puppet-agent-5.3.3-r2.ebuild 2518 BLAKE2B ddd8588910d8dbdfb811334149835b98a63891af846d086e1f2b3f2d3b9e73c10559c20c0ee739d4cfc621f1daea4eb14004f49cd8f67f345e02dd0e73d0a322 SHA512 f59d9b5674313893ece281ad6b5ef678235fad81bda383a9616edec4dd9264bc37d6171fa037a77553f234af3d515cdbf27fbaa2637b50fd3d719d7fbc0afcae
 EBUILD puppet-agent-5.3.3.ebuild 3290 BLAKE2B be765f86f89267d5cb2a2e6da357671edf3329d3b8e73d201e55970f650aa5c36f9327a73d93581756da302852f3218b2767921958c4dae8a82122e39d1409bf SHA512 9babb71d75b321e7d795ffbdcf8f6c3986bbbc302e6f70331f145eaa72dd7192d39e50587f9604927db08bdd2b705d89b8caff49bf914e35b3e5dbb58de5d22c
 MISC metadata.xml 502 BLAKE2B 9eaaec32ba54988999831d4d873dff6c525b42ede2da3cc9a5b67359299233f2ffdafa04a949df6aa58d764e36beaf8ce64c053a306f6e055a245b207e8f2aaa SHA512 aedf4322173910c202b105d904e4528c6b6bb949fc05ed95c4a8d9a74133f5c7391ae30d7675bfa36a3f85880c971aff6e4a57ffdcde57b3b63c02dbed083a95
diff --git a/app-admin/puppet-agent/puppet-agent-5.3.3-r2.ebuild b/app-admin/puppet-agent/puppet-agent-5.3.3-r2.ebuild
index 45e9783e9bc4..a638b7af8a01 100644
--- a/app-admin/puppet-agent/puppet-agent-5.3.3-r2.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-5.3.3-r2.ebuild
@@ -9,8 +9,7 @@ HOMEPAGE="https://puppetlabs.com/"
 SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
 SRC_URI="
 	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )
-"
+	x86?   ( ${SRC_BASE}_i386.deb )"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -41,23 +40,6 @@ RDEPEND="${CDEPEND}
 
 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
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 4ed4b776196e..ff04f3d2ad8d 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,8 @@
 DIST sudo-1.8.20p2.tar.gz 2930769 BLAKE2B 90338e7d436683f94a9e13e9f0da668f2bbbf2184530feb63166186309881b737b783d2be80f935e5d64fd2a4264928423d2b754121be5caf07acbacbe2a6d42 SHA512 8bf67e687f7a84605fdef8d547b5cd661141b6c8fd25820c33c7e37e97ca7f21f564c3bae691f8a8cd08df7d80338e36a8f06bb5086cc104509d71d6ab1bceda
 DIST sudo-1.8.21p2.tar.gz 2976081 BLAKE2B c0b555879ddb6832c6396b557793f5d4783481fca5d721901c7ef81c1856c1cf7630fddd09bbb42207c27d51892a79c2bf5c653b5b5091ebc84f2d59981207b7 SHA512 f04bbff54ad74ba73c078e15c75d2f41332d4912078ed66157ba7346b7fff914bd0747460cb4cd0c472af2d3b344fa72f5c62c95169df68a9cac74d7245c720c
-DIST sudo-1.8.22rc1.tar.gz 3028312 BLAKE2B 8ead08be7c5d5314f0567e2683fdffb67e05783edb38a4619c4ed9c50d7abb500589742c91e82e077e2ade88be9371457fce026752ab6eeb02af91c818453b9b SHA512 819425f7e9da66088e7a942f3610660ce139dfba9a1db808d84b2b31c066942cbfa7ac3795df38c2c2061bbe1d9531cc214117239c71f190f41efcde9a744025
+DIST sudo-1.8.22.tar.gz 3029051 BLAKE2B c77e05b6e9cee738902d6289327fb5d34d19833d96597f983d8af01434d224dd698f9257b0965a0e480e8d19eb38eef0c8216942ca5217c3fe7516cdf397f7b7 SHA512 5ce10a9302d25bb726e347499d26a0b3697446cfcdf0fd9094ee35198db7b023d5250a53fdcb4184d1a09f5fd2a78fc645bc8e80f265666b05a91f62f49b0695
 EBUILD sudo-1.8.20_p2.ebuild 5749 BLAKE2B 123169c823e490ae3a5f1dbf43521bc3603cf34488e4a5bd87ed02a2e816de3555a8c58aa3ec52fb83230ab3e32f4da8220a0c8cdba4ff81bd149e64f5b2b7f9 SHA512 89c82af30974c8f44abb6a01a01ce31309c9c0d5d8d47ce67160e91d05e4bdda7fdc3d82c5171fe994f00faff3c51f65f7909972e8017a403adf0451f3d935a3
 EBUILD sudo-1.8.21_p2.ebuild 5819 BLAKE2B f41a745952896b5b3a6b1cd07808af308402db5cc7405fa040f205755e333fdddd0f6195b664c4db630fad8d011e9e613bae08c3bb955a819a5ba454c5d29612 SHA512 a49951e2e639839c0e95f99c6091c1e02f25e5d072337dab9ebacb491f556f60e0ac3552eba482c33c0c3737ac50efd8c12f6326c14357bff9a37a8fafdba2b0
-EBUILD sudo-1.8.22_rc1.ebuild 5819 BLAKE2B 424998594187730de2794a8d8bf3468b754281e6b15ec61c4610a29a22339624dc5419949506c7f608c43c6a17e0b6bbe007e4d8ea42d9e3ddedf1fbc8c98d8d SHA512 2415707df16bd21e491ecbacc53cb914caecffcc9ad109188a1309b9294018006f70d6d2b2a55a8ff249eb7db51bac852fceda22c2476c0cc4365958b6e7ca73
+EBUILD sudo-1.8.22.ebuild 5819 BLAKE2B 424998594187730de2794a8d8bf3468b754281e6b15ec61c4610a29a22339624dc5419949506c7f608c43c6a17e0b6bbe007e4d8ea42d9e3ddedf1fbc8c98d8d SHA512 2415707df16bd21e491ecbacc53cb914caecffcc9ad109188a1309b9294018006f70d6d2b2a55a8ff249eb7db51bac852fceda22c2476c0cc4365958b6e7ca73
 EBUILD sudo-9999.ebuild 5959 BLAKE2B 5b11f68280f6ce261b9579101726164a38c9bf68e67a1df47562ea356dbe68a80e10d30af1332092731c59e7f33bb0df6ac8731970dff2b200e080c0904ab98c SHA512 ea1939a94dda5eb85ba5bcb963c76c54da6ca0f5eb8785964cfcf700391049b57d18a6397556d9213f988d3d7292dd9a6c76d2531fef2c6e319c63e2b26cc33c
 MISC metadata.xml 989 BLAKE2B c7f7d49fda7750b172dd4b2e5c3fc5f1f3dd602b6347479834bf6444c9311738bcd10fbbba100cee45c97bb899e53f3c113abc61ee89b3353b50876c30966589 SHA512 bc9addd017e474acbc753d6d2cce5d77281a3c1f0857de538168eb1a7b80e0d0b313ad2b03cc710b483cc9588dcaf0208a5b8aaccea18e2ca51b567020bea9ec
diff --git a/app-admin/sudo/sudo-1.8.22_rc1.ebuild b/app-admin/sudo/sudo-1.8.22.ebuild
index 2e08b4eb383c..2e08b4eb383c 100644
--- a/app-admin/sudo/sudo-1.8.22_rc1.ebuild
+++ b/app-admin/sudo/sudo-1.8.22.ebuild