gentoo resync : 28.12.2017

18 files changed, 222 insertions, 122 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index ffee01bd80da..3c11da37ec87 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index d488ff489542..87f3bd83b559 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -1,7 +1,5 @@
 AUX accountsservice-0.6.35-gentoo-system-users.patch 1122 BLAKE2B f6196cc7136581ede5437aad909a5c2baa6cda36a27d7e4ceebd0aee2b40a66ef83324b3dde92a77ca0dfca96a47ac342f4a580f38ad6e3a042384dd9e742282 SHA512 e8ac404aed1da3ab4bb092b476cbb18f2ae7d209bcbe6a30cb9058f50dce0f70d64a3de593108ef5588132389d522d19975384eb1b8414119cb622bc7d738931
 AUX accountsservice-0.6.43-elogind.patch 3677 BLAKE2B 39a2bc501103815bfd3b9e81f3841d0bd986f463a52cf846ed82aa080adde2a519dc4f1a32ff8da8288486e24d642dbbb66b102df24043d837380c07d8013307 SHA512 bbdbc77918de27d17c3c0effd1a1f0319f338f312408136563aab5633f5e7f9b705d3348462b3dfb88996d2f40ff382ed6faeecd25b717a2d25d72c44087f7c0
-DIST accountsservice-0.6.43.tar.xz 381008 BLAKE2B 62b29bbb04eef0503c29cb9d81056776f7cb3840145231f049f8b335dfc11bfd60f2ec717e3543b0af73c597da2e4c2d4139c0c535b1716923695355f06e7e4e SHA512 0673430b7e5fd726397a9358d60d5c34542afaa786b795d3c8b544dc2bdab151c74f9a3daa4bcd94dc7669400a78cd4cddc453cad78ee8e431bf7c1f417138e2
 DIST accountsservice-0.6.45.tar.xz 382740 BLAKE2B ce88e53c7d0187f53ed0a2758f81c8e2d1083ab1c95ec6cddebb2167b36706b1537ecf74b7904a9002c6179cfdf811a3268451af9443727ba9793a9af06cf8aa SHA512 09975f9fa03a3177d923de6d6f6e6acfffeb2ff4924c45eaac78c994c16974427c8e936a87034747ba494d2bb3df6e8a92ff44db387761b06e06e311d7cf105a
-EBUILD accountsservice-0.6.43-r1.ebuild 1536 BLAKE2B bb93638f7cb78c118339b04c322fc36e743cd0efa553d9588c3b360807c2c5bdc68fc611b15b3c4117fa82e189e61861a0de83117dd2ae4a1493e28e0044830e SHA512 3150d720a6452bc8edbbb79fa7cc9d4aed6fe28f1e80aca1eaedf6d699c16226cc72ad6ffa2e75793356dad667d70dc7213808d95c1c01b36c889dd317cdad71
-EBUILD accountsservice-0.6.45.ebuild 1544 BLAKE2B feba686b41fcaa7eb070a1c85f4aca8bb9a16552a9ef216b73eb04561ac4169f9c593e7f2ea3bef7a899121bac575fd23a4594eb6801b206a17c75308bcb068c SHA512 f585e8ba9aaa9c8d4c141e0deec27d04b0c5444ffb0e92cae60fe0853322af58e6324456efc541b44a02edd215af4f46220c4b18dbf3267eb6ac353181520c22
+EBUILD accountsservice-0.6.45.ebuild 1543 BLAKE2B 187f75fa6dc5883ba6f27ce72cfe47cf32a841651b7df7c3375d0e88ee087036e375f7475379bce6d3db9daa186320d110b0f9e1f84e8018cf0e6eadebe484bc SHA512 cafc7f6cff3c5e569d7093a8a5a43fbd83794c3e4b15e507ea7486265ca95bc63f5f6cfb98bc543d19600e9bf69ef6d6efe88a1d8085737f7cde99fad20080f5
 MISC metadata.xml 524 BLAKE2B a48a629a81d6502b8c54c466c6d901fe02e0fbe14ddbfd3294501560a19e33c3915c1305ea981fe41c572689def2d0a8f00de4b3131a19297f4ef3db9d6b5b06 SHA512 a0c662b3c0c45df43780f160b6db6db67561a1b2c84ce60929707d94cd9f1bf76588420189b91e0eafe58001a61d8a313f2a4b421b980a7c7f988c95e782ee07
diff --git a/sys-apps/accountsservice/accountsservice-0.6.43-r1.ebuild b/sys-apps/accountsservice/accountsservice-0.6.43-r1.ebuild
deleted file mode 100644
index 67204e4eb6e7..000000000000
--- a/sys-apps/accountsservice/accountsservice-0.6.43-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_EAUTORECONF="yes"
-inherit gnome2 systemd
-
-DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/AccountsService/"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
-
-IUSE="doc elogind +introspection selinux systemd"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-CDEPEND="
-	>=dev-libs/glib-2.37.3:2
-	sys-auth/polkit
-	elogind? ( >=sys-auth/elogind-229.4 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	systemd? ( >=sys-apps/systemd-186:0= )
-	!systemd? ( !elogind? ( sys-auth/consolekit ) )
-"
-DEPEND="${CDEPEND}
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.15
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto )
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-accountsd )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.35-gentoo-system-users.patch"
-	"${FILESDIR}/${P}-elogind.patch"
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-more-warnings \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-admin-group="wheel" \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(use_enable doc docbook-docs) \
-		$(use_enable elogind) \
-		$(use_enable introspection) \
-		$(use_enable systemd)
-}
diff --git a/sys-apps/accountsservice/accountsservice-0.6.45.ebuild b/sys-apps/accountsservice/accountsservice-0.6.45.ebuild
index 35db98215ea6..c4ae0a848d79 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.45.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.45.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 IUSE="doc elogind +introspection selinux systemd"
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index dff298a0b112..abfac87dee4b 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -11,9 +11,12 @@ DIST coreutils-8.28-man.tar.xz 43832 BLAKE2B 18ea22a89daac64444da8b91c82c62e4c6d
 DIST coreutils-8.28-patches-1.0.tar.xz 7264 BLAKE2B c86ec707aaaef7f65867af96d69251542f007fe0f644908b4567890f8ee2ca31222be7c208b76cfcd3e4c1364d27ef09427674f3f6eff3335d5fe822fdf5fd99 SHA512 b358b827eaff789ea8a3838f53f81efb08a6caa5318ac93dab112ec90052174c05d219e1c0170106bb1ed65bd4e37ffc36b742bf3661cc64ee4b166db741bbbc
 DIST coreutils-8.28-patches-1.1.tar.xz 7336 BLAKE2B 9cd5db3e1d5545da5cb38f919ae5528d8642efb7f7e11994c6603f49b097f0f804cf1553dfce65682f9d725964cd6a3d142916cbc018f707cc617ad8c9b9f471 SHA512 af47aaa614550e5cd82b2386fafd9f90beb0564b8bbedfe92238906e7c6f040fb7468c1929f0951d4f98038b6e1df7da2408204be78219e6a041658507385957
 DIST coreutils-8.28.tar.xz 5252336 BLAKE2B 30e3c05311834b19a941ddaa6a405cb0033b0e3518211dd0d33e9a1aa91c60f4d597fca9419b467ade2b54e3bf81ba5149cebfc93a02fa1e546c1b0f71ee91c9 SHA512 1e592d0dd03b9227bf92af9a82bed6dc3bcbee46e984c7fb09833dea0962e86b309aa34d5e43823b73d4522c066bfa5cdc8ec694aa190910fb246ff32ceb63a1
+DIST coreutils-8.29-patches-1.0.tar.xz 5772 BLAKE2B 8f05185404d527ad524684231f0b8bef3b65e7752527b6bf55371f474035b8a92cdcaa8349a321784d14c6700a0d49e9d10ee2e3a96b78e8f6423ee8c5b9ec02 SHA512 0f7db6744a6a6bad8d582bb2d32e1a0ad0ab5f48a53b54c371d27494967832ddec2570e45dbf7e66c7091496bcecd66aab21644f603d2c8878a87f51a1a9b1a2
+DIST coreutils-8.29.tar.xz 5286588 BLAKE2B cbb66d9054bdd2db5b9a6010876484b16d178f8f4d935836b1e42830178647fac4e0a75052a6e7e2fbc50e74e4e7ff6f8da43f1137b96d0c2d027c4ebac28a98 SHA512 546bbcd5741beae7a68e7c4ca14d6d634f7c8be87feecdeddd00e226f4865bb89d503437c3a95622ba7bb0cb70addbb5bdf3767fa18d0b7410ab90ee53b29dfd
 EBUILD coreutils-8.25.ebuild 5839 BLAKE2B 118fc33f8b2ce4dcb1b797af0630e3aa6ba45f491d220a700841f53201578afabb3088ad06552080a42137db7ff9d930c25d232d4c71b082c0e1e16f5d732348 SHA512 86a917921cfd7c20755c2570c58438f7bfe923f8838e91508300a745a4417038cc81112a50972f288a02ff3acbb0405ac01784170fbebd62c9ac4c1e40294816
 EBUILD coreutils-8.26.ebuild 5858 BLAKE2B 9247499208fc8e9155b0b107dea5cd99b7e1da3ebc55c2cac9c25c4939d7a522afb8de33398169635c678fae8a0f58ee981d9542074e47aa0a6fe56041ae478e SHA512 fc8a6d01fb2e3885b876756dbc0c4a78e0300d470ca2e845de5045f6dc79f8d004b7069ca5df40bfee05662bbc01d05107ad793c868e2b6451b757fb2e149e14
 EBUILD coreutils-8.27.ebuild 5901 BLAKE2B e15c043848f33eb817f0237b1428928feb5063b2b2e553667aff0b7ed5b81062fcb8e078d4419da2c6196de56d5dfeab7a849ee25afa4bdc80109f90d43c508a SHA512 a230b81b5913e0b98efe30f2876587178539c9dd462424c4eb71f5572fd496e4b0224f76cef92be973601f022f439ee36da393fabf4b70c2bfec71785321e8cd
 EBUILD coreutils-8.28-r1.ebuild 6520 BLAKE2B 463623c05335243d7b35ec6b4c7642079a453cb0b72b836698c68ee45f4b62fe414b03fff36e22b95edd98c9a66c4884bf2a2f1d2e7087ba1cfab7b2e169e4d1 SHA512 de62d39fc94f065075072cdd4ddf1f953742779699bb3568d3b52d45d82460cd8aa859befecf788024258ad6cf8598265421960ccb7e1a42cbae82e81e3464e2
 EBUILD coreutils-8.28.ebuild 5871 BLAKE2B de4df961f1615d7acec165054e2118b81eb091d09ba7bdb773bb6592234643312713d78d09ad9def4cea37e0f41618426b089e4b5f4e9f14f95d751f1f90cc4b SHA512 e3f725bf850b21e6881465b29dca4984dc61a6cf0efc24f7c5ae970142cee83cdfd3fd1a8a8ab8801a66d99e40acffe655c6739c4c026c5c2deebdc19abd58bf
+EBUILD coreutils-8.29.ebuild 6063 BLAKE2B 3582ae6e941fa7d6dc47729939ebec016d6d682d616069cac70c58dc34ecf13820820191be18c353f0fc4d86bb6af7becd888024fa5cf21c718c005c26bebd90 SHA512 095b2958618e972ae9f6d04f7868acc97996a3fbd8bede850d6f215d392736cfe046ee5afb99919e10f34b1dfbcbdd501ef37880f9d6ab0a697d68e342231196
 MISC metadata.xml 869 BLAKE2B 397aa866d67eb1d6ff5f604194cf071be0f75606092d78e1cf7f0ced85cf4474d67677307e7e8566ba402c1f94ae2f3e3906ef5006a50e73d6673edb25d517fa SHA512 19e07c93cbe1cfe087eb7fdc8647aa4c264f1e6a193a0ed4e1ceb302bda92565aa76966b6ef2efa15d7535082ef0e6a1454fee20eca4797466f5de5e37ac4957
diff --git a/sys-apps/coreutils/coreutils-8.29.ebuild b/sys-apps/coreutils/coreutils-8.29.ebuild
new file mode 100644
index 000000000000..92f88849d772
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-8.29.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2017 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 eutils flag-o-matic python-any-r1 toolchain-funcs
+
+PATCH_VER="1.0"
+DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
+HOMEPAGE="https://www.gnu.org/software/coreutils/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
+	https://dev.gentoo.org/~whissi/dist/${PN}/${P}-patches-${PATCH_VER}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
+IUSE="acl caps gmp hostname kill multicall nls selinux static test userland_BSD vanilla xattr"
+
+LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
+	caps? ( sys-libs/libcap )
+	gmp? ( dev-libs/gmp:=[static-libs] )
+	xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
+	selinux? ( sys-libs/libselinux )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	app-arch/xz-utils
+	test? (
+		dev-lang/perl
+		dev-perl/Expect
+		!userland_BSD? (
+			dev-util/strace
+		)
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]')
+	)"
+RDEPEND+="
+	hostname? ( !sys-apps/net-tools[hostname] )
+	kill? (
+		!sys-apps/util-linux[kill]
+		!sys-process/procps[kill]
+	)
+	!app-misc/realpath
+	!<sys-apps/util-linux-2.13
+	!<sys-apps/sandbox-2.10-r4
+	!sys-apps/stat
+	!net-mail/base64
+	!sys-apps/mktemp
+	!<app-forensics/tct-1.18-r1
+	!<net-fs/netatalk-2.0.3-r4"
+
+pkg_setup() {
+	if use test ; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	if ! use vanilla ; then
+		eapply "${WORKDIR}"/patch/*.patch
+	fi
+
+	eapply_user
+
+	# Since we've patched many .c files, the make process will try to
+	# re-build the manpages by running `./bin --help`.  When doing a
+	# cross-compile, we can't do that since 'bin' isn't a native bin.
+	# Also, it's not like we changed the usage on any of these things,
+	# so let's just update the timestamps and skip the help2man step.
+	set -- man/*.x
+	touch ${@/%x/1}
+
+	# Avoid perl dep for compiled in dircolors default #348642
+	if ! has_version dev-lang/perl ; then
+		touch src/dircolors.h
+		touch ${@/%x/1}
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		--enable-install-program="arch,$(usev hostname),$(usev kill)"
+		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
+		--enable-largefile
+		$(use caps || echo --disable-libcap)
+		$(use_enable nls)
+		$(use_enable acl)
+		$(use_enable multicall single-binary)
+		$(use_enable xattr)
+		$(use_with gmp)
+	)
+	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
+		export fu_cv_sys_stat_statfs2_bsize=yes #311569
+		export gl_cv_func_realpath_works=yes #416629
+	fi
+
+	export gl_cv_func_mknod_works=yes #409919
+	use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
+	use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
+	use userland_BSD && myconf+=( -program-prefix=g --program-transform-name=s/stat/nustat/ )
+	# kill/uptime - procps
+	# groups/su   - shadow
+	# hostname    - net-tools
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# Known to fail with FEATURES=usersandbox (bug #439574):
+	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
+	#   -  tests/rm/deep-2.sh (bug #413621)
+	#   -  tests/dd/no-allocate.sh (bug #629660)
+	if has usersandbox $FEATURES ; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	# Non-root tests will fail if the full path isn't
+	# accessible to non-root users
+	chmod -R go-w "${WORKDIR}"
+	chmod a+rx "${WORKDIR}"
+
+	# coreutils tests like to do `mount` and such with temp dirs
+	# so make sure /etc/mtab is writable #265725
+	# make sure /dev/loop* can be mounted #269758
+	mkdir -p "${T}"/mount-wrappers
+	mkwrap() {
+		local w ww
+		for w in "$@" ; do
+			ww="${T}/mount-wrappers/${w}"
+			cat <<-EOF > "${ww}"
+				#!${EPREFIX}/bin/sh
+				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@"
+			EOF
+			chmod a+rx "${ww}"
+		done
+	}
+	mkwrap mount umount
+
+	addwrite /dev/full
+	#export RUN_EXPENSIVE_TESTS="yes"
+	#export FETISH_GROUPS="portage wheel"
+	env PATH="${T}/mount-wrappers:${PATH}" \
+	emake -j1 -k check
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	newins src/dircolors.hin DIR_COLORS
+
+	if [[ ${USERLAND} == "GNU" ]] ; then
+		cd "${ED%/}"/usr/bin || die
+		dodir /bin
+		# move critical binaries into /bin (required by FHS)
+		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
+		           mkdir mknod mv pwd rm rmdir stty sync true uname"
+		mv ${fhs} ../../bin/ || die "could not move fhs bins"
+		if use kill; then
+			mv kill ../../bin/ || die
+		fi
+		# move critical binaries into /bin (common scripts)
+		local com="basename chroot cut dir dirname du env expr head mkfifo
+		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
+		mv ${com} ../../bin/ || die "could not move common bins"
+		# create a symlink for uname in /usr/bin/ since autotools require it
+		local x
+		for x in ${com} uname ; do
+			dosym ../../bin/${x} /usr/bin/${x}
+		done
+	else
+		# For now, drop the man pages, collides with the ones of the system.
+		rm -rf "${ED%/}"/usr/share/man
+	fi
+
+}
+
+pkg_postinst() {
+	ewarn "Make sure you run 'hash -r' in your active shells."
+	ewarn "You should also re-source your shell settings for LS_COLORS"
+	ewarn "  changes, such as: source /etc/profile"
+
+	# Help out users using experimental filesystems
+	if grep -qs btrfs "${EROOT%/}"/etc/fstab /proc/mounts ; then
+		case $(uname -r) in
+		2.6.[12][0-9]|2.6.3[0-7]*)
+			ewarn "You are running a system with a buggy btrfs driver."
+			ewarn "Please upgrade your kernel to avoid silent corruption."
+			ewarn "See: https://bugs.gentoo.org/353907"
+			;;
+		esac
+	fi
+}
diff --git a/sys-apps/iotools/Manifest b/sys-apps/iotools/Manifest
index 712cfdc16ae4..0864a5871147 100644
--- a/sys-apps/iotools/Manifest
+++ b/sys-apps/iotools/Manifest
@@ -1,5 +1,3 @@
-AUX iotools-1.4-cpuid-pic.patch 617 BLAKE2B 535b1d1e9f012fbc7800af8480e95659cfe777debcb9995a2ede15e5cccf011c701e6625cac15669018bab9e9487bcc25f199233a8745c3d7ab756e603fcb375 SHA512 81c9f1d20fa87b847e5c49909639d35b604a991f7a87077a1b8e5fe36707d9e24289f861d6ce9468de5621e84adedc60f76086cacafc67aa2d1b9aa5f52ba364
-AUX iotools-1.4-ldflags.patch 302 BLAKE2B 73878bce4f26010b3c09bdf57c253edd032536d4baab86590d50fd8ac2741a3b2a31fd8eb4ffc76882f666039c6ebc7acc93b55df0e09486d02134b1d3892d00 SHA512 bc20c64b46f5e6fd6526e4a3fb9ce4e6817b6f4c66330d5c5ea721a5be55410603c16898162b9be41ed607cd4287e6bc187deadb83aeb1a813aeceaf88258ce0
 DIST iotools-1.5.tar.gz 23422 BLAKE2B 7d647a32e0289e6b85055252eb6ccf9bdb71b99ebdec7e0c1de0d60157c7401e462a07422e0dd25fb3aec42744be981cd927a4c359b577a764acef331bd42bbe SHA512 d298343ee814c8b7d8404bc6af4050df730e89963a7c53798b3d251e94fd2b13e04c36e6da7ec5fd4126ea3a961be26a937910f791844e1b1d5b7dc5aa638c44
 EBUILD iotools-1.5.ebuild 1896 BLAKE2B 74f6f32431484f95a5fcb3647f16bdd472d22cd124fa18838bfa3a66c0b3b9972bbc0a916760088c4ccf33273e3ae7f150dfdeac47dcfa832e28136c83acaf18 SHA512 befe48aa95a4d6d177d0fd2ea8a3e967bb37ae1f39bf4f46d5977304119ea35e3346d79c73ee1a475b48089b71e6b43d96e33eb78c79ab17921cef913657bdef
 MISC metadata.xml 296 BLAKE2B dd62d3a71a69f58d9c971d17dcc8f3859665b2ad03a6adcb2242c7c58ecd39924478d40f86c8727aa617d2a7957fb5991679d585c4f3ed24278925116789ef91 SHA512 97eee413fc6356dd0c9a7f0eb32bd9a6c9593a0632dc9975ee70b0ef903dfbc2f75538144c0914b70f2a74bcf1ab6ecfd08fb505403a9c5745c243feaf831c73
diff --git a/sys-apps/iotools/files/iotools-1.4-cpuid-pic.patch b/sys-apps/iotools/files/iotools-1.4-cpuid-pic.patch
deleted file mode 100644
index 3fde16c6ca01..000000000000
--- a/sys-apps/iotools/files/iotools-1.4-cpuid-pic.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://code.google.com/p/iotools/issues/detail?id=2
-
---- a/misc.c
-+++ b/misc.c
-@@ -149,8 +149,16 @@ cpuid_inline(int cpu, int function, int index, uint32_t *data)
- 	}
- 
- 	asm volatile (
-+#ifdef __i386__
-+	      "xchg %%ebx, %%esi;" /* save ebx (for PIC) */
-+	      "cpuid;"
-+	      "xchg %%esi, %%ebx;" /* restore ebx & pass to caller */
-+	      : "=S" (data[1]),
-+#else
- 	      "cpuid\n\t"
--	      : "=a" (data[0]), "=b" (data[1]), "=c" (data[2]), "=d" (data[3])
-+	      : "=b" (data[1]),
-+#endif
-+	        "=a" (data[0]), "=c" (data[2]), "=d" (data[3])
- 	      : "0" (function), "2" (index)
- 	      : "memory"
- 	);
diff --git a/sys-apps/iotools/files/iotools-1.4-ldflags.patch b/sys-apps/iotools/files/iotools-1.4-ldflags.patch
deleted file mode 100644
index 242f6912b69a..000000000000
--- a/sys-apps/iotools/files/iotools-1.4-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://code.google.com/p/iotools/issues/detail?id=3
-
---- a/Makefile
-+++ b/Makefile
-@@ -44,7 +44,7 @@ OBJS=$(OBJS_TO_BUILD)
- all: $(BINARY)
- 
- $(BINARY): $(OBJS) iotools.o Makefile
--	$(CC) $(CFLAGS) -o $@ iotools.o $(OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ iotools.o $(OBJS)
- 
- RUSER ?= root
- RHOST ?=
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 3b14f8de703a..aaa35463cdc2 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -22,7 +22,7 @@ EBUILD iproute2-4.12.0.ebuild 4212 BLAKE2B 8b40329be710f3d8461429dd94a5a4d4d29cf
 EBUILD iproute2-4.13.0.ebuild 4213 BLAKE2B 4a238544e35502f785f0916ec5bd255787b01fe5368d169d380778a5d514bd39784968073bcfaf2a2a7abaaf14c0fe85ec46f5374b204b46be887f750c823d62 SHA512 9e3d7ac9347a9e92ece5f6d737b688bd76136600264c888e449e0738c53a58de45a3459b1bd94f150bf2147f5232a8fefe571985bc2227f0d29322f8657d1039
 EBUILD iproute2-4.14.0.ebuild 4150 BLAKE2B 2c218117921dbae1ac920bd3eaede84faf2e6983fdc26c158b4e8405ee0cc9620eb1fdba31aeae169a813e080edbba57fae958bd9429fd0e804a8245cdcfe195 SHA512 1a1c39f742febf5b064bd471e0ea3ed018f81018895833962e110c60d00b3f85351dbb9db5557ad43b3f1988dff0e5bbad69d307ccc6fe1ea637a24e171dc690
 EBUILD iproute2-4.14.1-r1.ebuild 3922 BLAKE2B c0fcd01bd73a71e460c4f760c5497d1db14997c31c5f6a0a8ea939acba001135861387486d67221fcc131126e02416f4dfee4ae0fbdbbcf6e0f240de21573c3e SHA512 a78d8387e2c67518136d19c982bd20c521b36c76b963a9e7565488648cc8ba18135e298b1252827af1a7c97ea553a33d66144f977d52ed50e1cafaf2ac64efe7
-EBUILD iproute2-4.14.1-r2.ebuild 4104 BLAKE2B 4c841a623d3ac2cd4bb21a0b37416dff190837b6ddcefd0c0fad5b354debdd9cf95e5bf36f46e9a1e820302b7f38d48c4550c86a4906d5c9b01eeb043aa92793 SHA512 da060462bf193df61f8c1d7fc79d1ce4a70331e5baf33c3e4fdf2a8fc34c82adcd63daef19caff568d3ea3ac8f1a6b40b0ba09947ebeadb0d6c7b1dfa631dc16
+EBUILD iproute2-4.14.1-r2.ebuild 4099 BLAKE2B 4d82ea179fe7bd99e908f72c4394e891455c3fb5ebf54c2b83e0f0b87563a454d28b076729f3a28c9dabe84c2cfdeb6f967aa068f90966b0bf644bfba6142d00 SHA512 8cd2335b4db64932238443cbd5e1dd7ecc216f8837360a5ae07066210e30263c4c6a6f17de961c346533fc9e121f1e3af39b70f1199b9e507f33ef2f9cc061a7
 EBUILD iproute2-4.14.1.ebuild 3928 BLAKE2B 62ebf9cb809f16249dc923faa766c4ee5e907ae12f056184fb6e125a681ce20a644f6d59a2c3d0391fc2eae8c1e5da0de5bf36ba140994ad569297f0659400dd SHA512 1ea1ae406f9c86e119abcba8e4d0109643dea7c26c710531710234dd36babd862b5d6db9c4cb47fabebca5d3683bacc9e68f3fd40b37b45968965130a6084c59
 EBUILD iproute2-4.4.0.ebuild 3874 BLAKE2B 38518bb4f4610a04231e03a0068b0cd232477202c2efeeab9c42883a155707d74535e7398347316bff6d4c7833ebe6893fcac246fc756780febd6e4b61f0a486 SHA512 d21f5f77a404fc3ecd70728c64af64a24080044a4634cb68078699e628120c1cba2c2b508cd34ad92e9202ccdac01596a6e988635b5c1a1e0113815d893a217a
 EBUILD iproute2-4.5.0.ebuild 3887 BLAKE2B 6788057f29e49ba641f790c571035d2a489a238a2821b3b5fe12c0973fa4c2aeef703826379944defe3b9997b889c071ce51f7ffe0ab5eeff68b644ced49faeb SHA512 a5d957f6660e3d1444a46511f8040f0bc7eb7a489a087e49e90a4e1d356f5346cb39a5dfdc98411d5e3eb1d6aca9e6d88f815ea133d501e5a640e099ef8e9ecc
diff --git a/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild
index 1b9bf2d0e839..4a536c37e65e 100644
--- a/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/isapnptools/Manifest b/sys-apps/isapnptools/Manifest
index c87a0ef7129c..25a28c729a6c 100644
--- a/sys-apps/isapnptools/Manifest
+++ b/sys-apps/isapnptools/Manifest
@@ -1,5 +1,5 @@
 AUX isapnp.rc 545 BLAKE2B 45a2d468943fce175e1c2ff2a6666b31844493cf9dd00df8fc0b2c28d83f3e8cbe59984ae6c66853bce8b6ea1e84534e8db7ba28abef9a166b0add174bd67266 SHA512 9844f1d7a959e96750a8adb906f9c85d7ab693421d7ac51af08380ed6690c017d3f9a74694f2c5d7c7a3da8266f18f1f574095435aa6e9ec2ab9f7604ea470a7
-AUX isapnptools-1.27-include.patch 313 BLAKE2B 72cad30960e579c9f183532d2cf41e030ab68e9c378bffb83cd52a2cde86cd2e8dc0f75b6d566fa17d8d4e2bf27dac65959bc6f5ff034624625272a26101b0d7 SHA512 cebe7e8cbda5c1e9fbf1d2c7f8d2e955571a72842cbb7556f584e6cb6aada678345a908d737b293ef4cf222a0e9e83ff6b7350baffc02b27961b555c5bf74216
+AUX isapnptools-1.27-include.patch 241 BLAKE2B 838759903a4bf42b48da7dbd900f9fa360e3916068cfcc67d7803111d1c50358ec9bb1c9a20916064ecb05e347e026be5e97a8400bd6021a30bbc00e55d0b085 SHA512 8533282a59f4860fd16e9f76a2d7e55db0629ce754e94a17c9339e08b777253e936a4fe242db5d38f99283e474969c03726560b0f27243c898fd4881ad1920b7
 DIST isapnptools-1.27.tgz 499639 BLAKE2B 9da8968abeaf1fe2f39e3003cad32aecb546016d72489a9b4c84b8427acee7a54c2580d6536e2c39aa06a44cf363705af06968b71100c51663e928ffdbfa7353 SHA512 ccd1c8f7b66ba7f26d50fcfa64d0397dd1a09866c7c74226acbcb4e08be77717aaa4dde7eabcad5bac4e5f92774c40bca48dbf97069c62cc71355b768eca4d34
-EBUILD isapnptools-1.27.ebuild 693 BLAKE2B d67eed340bb980d6dd65c2dfbdc9adf533d7830a807494346e1cc9f22a47e6407156a5fba1bf847bec95554fcef29f0ef07b2830fd15f5f96d7082ae11a444f1 SHA512 f911d0f219bcc66cce4a09c062887a8908f9482260792b3c7785a66e98f7cd876959a58e7f0b11e99222edb48dacb251e9dee6330808a0f369f177fbce428ecf
+EBUILD isapnptools-1.27.ebuild 592 BLAKE2B d8cd80fcb77e3f1502e26246ceb267147cabad79e6488138499934d1507158df7a46f9f860d6f9beacac0124e7d941089f4654bd101382b265a2503b9acae416 SHA512 3d5271332b39ccdc4bc356cc1ec2cfe62f0e4d5220af69d053e9678a48ac9754e17c0af49a81bb67a9a6d9361db6805444c407193bf59e77d76e58a717c3f0b6
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/isapnptools/files/isapnptools-1.27-include.patch b/sys-apps/isapnptools/files/isapnptools-1.27-include.patch
index a736ccc1eb9d..016490eba449 100644
--- a/sys-apps/isapnptools/files/isapnptools-1.27-include.patch
+++ b/sys-apps/isapnptools/files/isapnptools-1.27-include.patch
@@ -1,5 +1,5 @@
---- src/callbacks.c.org	2001-05-15 22:37:04.000000000 +0200
-+++ src/callbacks.c	2011-06-15 05:21:32.292819557 +0200
+--- a/src/callbacks.c
++++ b/src/callbacks.c
 @@ -51,6 +51,7 @@
  #include <stdio.h>
  #include <errno.h>
diff --git a/sys-apps/isapnptools/isapnptools-1.27.ebuild b/sys-apps/isapnptools/isapnptools-1.27.ebuild
index 47812b883bf9..c95092405332 100644
--- a/sys-apps/isapnptools/isapnptools-1.27.ebuild
+++ b/sys-apps/isapnptools/isapnptools-1.27.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
-
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Tools for configuring ISA PnP devices"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -14,18 +12,16 @@ SLOT="0"
 KEYWORDS="-* amd64 x86"
 IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-include.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-include.patch )
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
+
 	dodir /sbin
-	mv "${D}"/usr/sbin/isapnp "${D}"/sbin/ || die
+	mv "${ED%/}"/{usr/sbin/isapnp,sbin/} || die
 
-	dodoc AUTHORS ChangeLog README NEWS
 	docinto txt
-	dodoc doc/README*  doc/*.txt test/*.txt
+	dodoc doc/{README*,*.txt} test/*.txt
 	dodoc etc/isapnp.*
 
 	newinitd "${FILESDIR}"/isapnp.rc isapnp
diff --git a/sys-apps/miscfiles/Manifest b/sys-apps/miscfiles/Manifest
index c5667c615636..ad339dd2dbf7 100644
--- a/sys-apps/miscfiles/Manifest
+++ b/sys-apps/miscfiles/Manifest
@@ -3,5 +3,5 @@ DIST UnicodeData-6.1.0.txt.xz 129972 BLAKE2B 52836b9db627cbc8608a148eb179f982679
 DIST miscfiles-1.5.tar.gz 1585293 BLAKE2B 816197e72192e8b41839eb29d501a148f95496a7f3e7be469184e9396cc34fc95c161207edb60a5b7f8d43fe50c58202f0b16b2e4b1ce188527718e4f85e24bb SHA512 d7ab23a709539278cce59e0c32bfcb3a0f11dc52ef537e3823e72382962af7f4fedb8b957f39ff1da51a93a00e3c4f6ec29f7332d7879c77fd7f4ec0ee4f82aa
 EBUILD miscfiles-1.5-r1.ebuild 1683 BLAKE2B 72bbc5e04b22a712ad54a9d8015ea679d805924684250ad253b7a5e457599afe9804b1e963ea50e70336eda9ef7c035afdc7c538f6b2f896656e579c37cdb24f SHA512 f3d4498d846974f4a7afb0fc09ac4755ccaa0c4dcba7f5ff7184942ebd0b45c786a58525e12d0c8d3b38890c263511432f78f699ac7768a398abfa8eb6e6bf95
 EBUILD miscfiles-1.5-r2.ebuild 1847 BLAKE2B f6671e00682d3d4f37d95e14805df13f0bdba76ae062c3aa8bc9c44c1095cd08c1b7605396820d778750b8a109e9fc26f2d843e988abac0a0615af546b649e2a SHA512 a5bd1e9d5df82ad02d567a2b73e8ba71bffc73c8ab1406222f19ecdc09bb81c9aadf906fae02af4b749a095dc62e1fa515d8754873c6fe03bd46f8057794324b
-EBUILD miscfiles-1.5-r3.ebuild 1860 BLAKE2B d69f255ea622c976bf309f55b20c8d78ba308f853eaacce45d3aec2e59ebf35c9dde7d6edabb4a871c3fc39ea79d953c32a22776c23522ea981b8ebd29629e17 SHA512 c73622ebc223f6afb1d47ea06e4fac714b54860daf74ababe34ae70fe93e13cbece78c4083c8bcbca0a6efc422923c7aad21214261338abc57373676b7b23ab2
+EBUILD miscfiles-1.5-r3.ebuild 1859 BLAKE2B 1b4019d20ff82b1e1f95ffef65984f7248aaeab98411780123db383c037473bdc74dd9c9ba57158b71534795007860a877f08a3231bb1cb07147dc2976ca590b SHA512 901d0b1c1766df36166a8182dda2ea375871b2ebf0b056387eb3db7e6ddf001221b9d3af23984b94e5676101f6c29c338c42aa04739c4e0e23f4953fa3ec9115
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
index 8589cbb2b83c..6ace16972edc 100644
--- a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz
 
 LICENSE="GPL-2 unicode"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="minimal"
 
 # Collides with older versions/revisions
diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index 38b75a2041d4..7ca8b4101e5f 100644
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -7,5 +7,5 @@ AUX watchdog.service 146 BLAKE2B 9a0a28cbc4509590c98850bf31355e991fd298e52a1fce0
 DIST watchdog-5.14.tar.gz 216384 BLAKE2B e27f6cb3595c54a2128d828434fcbde7a42be3a31a8c837153950f360146526a809d55dbe68fa248e2efcd7063a888f563eb36075d7334e5b7307fb02da67c29 SHA512 ccfaca7a68a47cff42dbeae047dfa691e1cfc23851f9ca0634ea6315ff55a13cdbb0020bde7df38b702c82c0535ad41f520617dd639037e171701a6b0f8991aa
 DIST watchdog-5.15.tar.gz 228132 BLAKE2B 040badcf66f048e2873c335a4dd1b5dad6716c61534322c0c92dad2238049555af40e92612a260507fddd4c284d7ccb5d362dc1660084fd0a7db2c522b1ea323 SHA512 a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75
 EBUILD watchdog-5.14.ebuild 869 BLAKE2B 0d159a185ac60a8f911547e42d13f594d9c54e54f0bd49b375b975c9321eeb6ef13e89f748dea0947a01e7d48d4783e11838ae26c856372aed4d06b627260cd5 SHA512 7223acbd16f44a78cab8af57d283453f1e72fe49bab38100a2f3dfdfcdc9cc02caf3c07f75b77b06bdae6d14cd7c31069709d1f4374dcb852fa059cd4e57089a
-EBUILD watchdog-5.15.ebuild 978 BLAKE2B 1787bcd24671234371b31da46dc0797e7a40f55a452fb28bf2280e05b34fbc4c57180f361a6b8ea0187807fee1998cd8baeaaa71608b7ace1829aa5ae0aca8fe SHA512 d29d004d6cf5dc3614ad0d6fed51a2b3206f96fde8f316ded2fc2fc23d61eaedcfccfbf663971a8a76b239040bcfd856904a6cee33c13efe624b2b8404acc49c
+EBUILD watchdog-5.15.ebuild 977 BLAKE2B b806fb1999854c30adf4b9c13aa02a25ee0a80180850b7b4797873dae42cc3c35fc20fcfe755e9a95c1fd5e98e36502f0702cc4c7cd2ba1dfbce5faacd516904 SHA512 cc865a662a5f19d4e1c4c5ade4a47f3561ae29088a8ea33a73fa71fe7b53dd52e37bd95f0604a1455693a4c91002ac7c667bd4ba397340445944dc212f7a620e
 MISC metadata.xml 405 BLAKE2B 47880df93bf397e1a7d905a0ade7c385eb7f97ca4e99fd5687f15147adb093da1312f518b6179d7ab9095a355d73147091787a0d3dc90200cef3e8cf7320a8c8 SHA512 36da0e0199b41608190b0e39de2b82bea5516890208c57744b93e527904501de01b1bfd4e20fc74450bd7b9ac4d152e0d57e31a35deca0b1edddc9ce60846d0b
diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild b/sys-apps/watchdog/watchdog-5.15.ebuild
index 0f79bd4cb7fd..3c3b6f51e119 100644
--- a/sys-apps/watchdog/watchdog-5.15.ebuild
+++ b/sys-apps/watchdog/watchdog-5.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="nfs"
 
 RDEPEND="nfs? ( net-libs/libtirpc )"