gentoo resync : 13.05.2018

14 files changed, 255 insertions, 15 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 15fd748adc5b..aedbc48f2f57 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index b4c07002842f..4e97864226dd 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -2,7 +2,7 @@ DIST ethtool-4.13.tar.xz 217472 BLAKE2B be60c4763a06dba4b246c17b76dd10bf956e69d1
 DIST ethtool-4.15.tar.xz 219408 BLAKE2B 7667f3e24f62c6dbaeb2590e79b59198d15ee44a46440c9af917154a5e5b6fde5f29b88ada03fdc195a642c2585c16ae503cf04b1be941d98413a596e4396ee4 SHA512 7ffd76b17b56de4182a14c2a77bf3026715f4af4c60809aed192f5631cb72173ed3c5d451e54711a73b65fee8339d58c857e83ddf60b85057bfed20863476527
 DIST ethtool-4.16.tar.xz 220676 BLAKE2B 12eb2e69493bb83b3789747a8019e3f8b7d6d39dbff7b1fc5fa6352943334881dd47c35d355d53a07ba517e91663aa623afb5ecdc1a1f57137dd44f20f492954 SHA512 c0cd28ca34e7fdc9af3335fd0b666b4b879ecbaf0c0bccf032aa36fdd66cbb01b6ddf16c6b60823d46a81f9b5f377047422ac88cc7cd0a869e239a3171966c66
 DIST ethtool-4.8.tar.xz 214932 BLAKE2B bbfbc7eb23a7fe057e28f22fad962bc8b46c581e4c6fc35612c345863b300478232b95569a2e35fd26f76eb48f824bdf7dcd0cdb8bdcc136e7494c5d39361f2b SHA512 ab1f13db57129fdef6018d8d8ee4ad9733041813aa0b7a29d46407e93d3c264a42aa24e2f1892084d523ed9946c62c6b9d2ae886629aeb013a58a0946fd6be96
-EBUILD ethtool-4.13.ebuild 455 BLAKE2B 805413f9f051289980d6ff5c904158e431b372829e1fba305173d4d8518976cbc846d01e68c8416aa65b8ec71df1fb67b430e16721cc19b6d3e679ee5e7d14a9 SHA512 7562c64f7f1778dc99ac1df55aa1e21370f920eecee84a2e6b3d96a9d7177a7059f8ca17c75122b94a9b91ff2015b079a82f72612f2bfaa5244c035c1a53a666
+EBUILD ethtool-4.13.ebuild 454 BLAKE2B d4f846c939b66d76fd5e5aed7db87002f9b179c8b518cd7054870b90707d6cadaf2c111b65c9117faecfcdf8bbe90d2487e694b31362ca963befa4c204db5fbd SHA512 e81e7813955e1cc795288209b27562177b4b4a04c381628bb1bb9295bdddf4af852d69dc911723d33a72588353df2d75a685197fb45f04413022d387e48d06f8
 EBUILD ethtool-4.15.ebuild 461 BLAKE2B 723e352428fe60e0a62a1f00a839061fe3c146b889336e16a9e8b4a58f64f06c9d16faba896dce89b363985f9aa3c2723e8d033123624f0060eb7c6cf4e01b18 SHA512 3d045feec342b69797788268656a4acf63f0ec35e8e8facfae70e6e930ad69352b3810c317b22bcd27151cf06692bed324ac5a08236431f1f899f512288640fc
 EBUILD ethtool-4.16.ebuild 461 BLAKE2B 723e352428fe60e0a62a1f00a839061fe3c146b889336e16a9e8b4a58f64f06c9d16faba896dce89b363985f9aa3c2723e8d033123624f0060eb7c6cf4e01b18 SHA512 3d045feec342b69797788268656a4acf63f0ec35e8e8facfae70e6e930ad69352b3810c317b22bcd27151cf06692bed324ac5a08236431f1f899f512288640fc
 EBUILD ethtool-4.8.ebuild 453 BLAKE2B 46fd2c76b13b3ac09bf91980870c7eb70a2600ea46d3146b006b54d1b21dd72bd50cd01f29504ae9329db8be393fce2cf1bd540a006278e0d2530278b3a84ca7 SHA512 f5ebf39536df9e46be717e5e42334472c7f30d02a3dd9f8b1fbab8e2242cb0c67e573fb829fbf74f115d431b777a83ebc17005150751d83f8e681e5966e8fce2
diff --git a/sys-apps/ethtool/ethtool-4.13.ebuild b/sys-apps/ethtool/ethtool-4.13.ebuild
index 65560ddc7198..9ba26876c250 100644
--- a/sys-apps/ethtool/ethtool-4.13.ebuild
+++ b/sys-apps/ethtool/ethtool-4.13.ebuild
@@ -9,6 +9,6 @@ SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index c82a8c67be3e..ac36cc70453f 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -5,5 +5,5 @@ DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582d
 DIST openrc-0.35.5.tar.gz 241784 BLAKE2B 6f63dcf30c430949f25108b0ca808f2317b2e58440419fa5c2aac04ed614c5b22105bfa38d51d54ee0d293be8b11f15b756b00d805ab71f9a2e92f44b98ce6e1 SHA512 655a0a32650ed46998ae84473e8a82aadd9de09904c5173cd9b9e2500fc8935e96539672b513a883c077ae862ece12ab768d4f379dbeb4389a7067ce7121dc0d
 EBUILD openrc-0.34.11.ebuild 10145 BLAKE2B 44747f052ca54517722e08a8877b36bb12985ef703ccd7608faecc7b9f6727e6f9157aad51f563ccd1b9346945f56cb553e47fc77dd369c5e635a80da5f2a4dc SHA512 6f71094d74e5ea02e87427619a6b55883ef5de3e8d581447c9662a46f0c1b0a6f49cdb00737a7a0ed8ca9d3ce23418f1d0068832ab58a268398781d4aabccd15
 EBUILD openrc-0.35.5.ebuild 10049 BLAKE2B 20a347eb789266d9462c49509ba62b26963a982a4f586a91ff073cafdf4b0dbacaab9bcbe47a36a86b33228c34adc9117a42a9e4f4f2aa0226993e0b50da05b1 SHA512 8a54f2c6c96766d03d69a0460635fb29f064edda9a96baa27b9057f2e7406f87f397001169148fb874df0555826589c4aa23d5f78d58df1861872ce8762548e9
-EBUILD openrc-9999.ebuild 9963 BLAKE2B e820565f8be3bbcf21ed330e3b1ea02f8590372614c7d6ac5a001636cc6d56708cae5ba181e1ecfa521deaed8996de0edee602579e28719d810e3830e9eb0d3b SHA512 da4193b443398edcf3f7da57e370127236b504078cdd685952d2aa65b0c4e60d82b130f5ecd0f1bcfb2d4eee89ba414b59f82c4ce5f5dbe9cfc7fbe9c5beda94
+EBUILD openrc-9999.ebuild 9921 BLAKE2B 9a0485f892bc56f65c4292846452da4ba4ec9d894a79f891e24cb1979f03dfc9747e4f77901cb79d0d0e9a6144c0258ebe91c0ff269e673a42d7cd52993fe293 SHA512 b71c20036a4d8b157e7b01e91750541af058ab888282cf438b810ed79bf990a166f2baaf7fae55249ead1bf1f7325413cb184ee3d304979f5b6eca72fd78a9d1
 MISC metadata.xml 497 BLAKE2B a65de1314b8d3c0a01bde15654be667a5a59d4e569e2516fa17496143cf232e3f05ca43e48c7f0c4cdff5c610edaded48039888a6e67ccb7b0cb0a811b253541 SHA512 c93291d7caeb45ad2aaebc778795d65fe20666ef125c2382dd07c0d71aace5380f5cc5dd5eb1e3a80b883084f1c91d3635540d5d0451a030ae5649ba74de10fb
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 3420adf2a4c3..18aa6cade207 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -61,9 +61,6 @@ PDEPEND="netifrc? ( net-misc/netifrc )"
 
 src_prepare() {
 	default
-
-	sed -i 's:0444:0644:' mk/sys.mk || die
-
 	if [[ ${PV} == "9999" ]] ; then
 		local ver="git-${EGIT_VERSION:0:6}"
 		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
diff --git a/sys-apps/portage-mgorny/Manifest b/sys-apps/portage-mgorny/Manifest
index 1362e86e8714..e3a63d9c762c 100644
--- a/sys-apps/portage-mgorny/Manifest
+++ b/sys-apps/portage-mgorny/Manifest
@@ -1,8 +1,10 @@
 DIST portage-mgorny-2.3.26.1.tar.gz 1237698 BLAKE2B 73dcce2f57930bd074f6de5103a31ba3730537196438302ea7b25b21ee32d6ab8b3292b42825eac2e912639be1dd0a1b15c049c5cb22f54525c476b96f4817f4 SHA512 38c5ca6a1fee7125942fca10921f3c2ae201c6c06b4f69ee7b0b90b44486aca7b8e4f5817efad99c1ef5ad3f558cd9da144d2c3c26242a1a05bca9e17921b173
 DIST portage-mgorny-2.3.31.1.tar.gz 1245744 BLAKE2B f9085fd7b66c2e018736cd1b5740d03cd61ab50d18113d651289521c3cb7786bd7963b24fe9a8d55e9dd107a01bc77c5ca2e8f343e4728a844fc17fd608a3680 SHA512 d2f6188f78c94341c97ca71915bd1428b49d26ea2d22f34b71029128dbd9ec0c9673b2835af730f17d81aba96927bcf05e46ef82ba1e94c3ae7249b6ac8ee235
 DIST portage-mgorny-2.3.33.1.tar.gz 1246760 BLAKE2B 5502b60a889d224008d9cdd3befce80bc831ab15bf1a9dd43599e6da307d108939fe21ba272f19b785e2e927c582bef55dd2baa2186f0dcb882a5ea9b37accc4 SHA512 1fcc239abbb4288dc8863e3d5aea84fe59dcb1ecd989616cfabc477dc8516722d174021e96105ded26952d7e900c83dd32da27c35fd1e429af6431ee32dfa877
+DIST portage-mgorny-2.3.36.1.tar.gz 1247357 BLAKE2B e3adcb48a2261d55956e9d5da291936aa581f485a88b815097f93bec4b0300f98677064207a60b2d98c10c1c6082e6f58221f7bea87b689a920c0c50a81bd583 SHA512 16284e06531cdad65f8ea3efd8f4fb9e4f3ff5c127c7d24f5a3fc3d0ba1a3cebe18e32b89ed85759f6b3df3841eaf618390c5b401a7e621a02cfce1da71c4ea4
 EBUILD portage-mgorny-2.3.26.1.ebuild 7148 BLAKE2B 6560b50e0e55106e2415c3ebe7ace10d0b62ab4f8183d90566bf172b9d819ec2e816e6bfc241e7208bd4a24444a6e8b337f9b7a328ec6d05a246e6168af2f789 SHA512 9745458840e04187caa20076f939d83a325e0bdbb58e36eda4572b1ec1d989fa343389a8dda730f90c12ca3e308a0a5bacb1d3d5d443625293abe48eaea5cb8b
 EBUILD portage-mgorny-2.3.31.1.ebuild 7148 BLAKE2B 6560b50e0e55106e2415c3ebe7ace10d0b62ab4f8183d90566bf172b9d819ec2e816e6bfc241e7208bd4a24444a6e8b337f9b7a328ec6d05a246e6168af2f789 SHA512 9745458840e04187caa20076f939d83a325e0bdbb58e36eda4572b1ec1d989fa343389a8dda730f90c12ca3e308a0a5bacb1d3d5d443625293abe48eaea5cb8b
 EBUILD portage-mgorny-2.3.33.1.ebuild 7148 BLAKE2B 6560b50e0e55106e2415c3ebe7ace10d0b62ab4f8183d90566bf172b9d819ec2e816e6bfc241e7208bd4a24444a6e8b337f9b7a328ec6d05a246e6168af2f789 SHA512 9745458840e04187caa20076f939d83a325e0bdbb58e36eda4572b1ec1d989fa343389a8dda730f90c12ca3e308a0a5bacb1d3d5d443625293abe48eaea5cb8b
+EBUILD portage-mgorny-2.3.36.1.ebuild 7148 BLAKE2B 6560b50e0e55106e2415c3ebe7ace10d0b62ab4f8183d90566bf172b9d819ec2e816e6bfc241e7208bd4a24444a6e8b337f9b7a328ec6d05a246e6168af2f789 SHA512 9745458840e04187caa20076f939d83a325e0bdbb58e36eda4572b1ec1d989fa343389a8dda730f90c12ca3e308a0a5bacb1d3d5d443625293abe48eaea5cb8b
 EBUILD portage-mgorny-9999.ebuild 7060 BLAKE2B 283fe989708567de926d6a7d227193a6f8761caec6a485cd80d95c60f2efb018b9b6df48362cdfebeefbaaedddcd9df9066bc3a42d4c913a4b2f5c4f505b9382 SHA512 a2a77e0a75ea9169e28f7c886a41b11368196e6f27980c33406804b40deea275ce58d1564de4c6dcd3c5e44caabd640d3c576fb415ac12bcc2fb34ec2f934e76
 MISC metadata.xml 817 BLAKE2B 8792bea6f73e3d72c747a11a0946c119abd9a24e3a1f40c457563536a9a1ce304c8c2ff0682fad3f94913d171806a262cf73de7437b5f250215810d8ffb32447 SHA512 e3498363b89e349d37b13dd40c7b3225f8c445b1ea2db9f70f2a1d718b7576103296d52581aa5ae0edc4ddd3fa8123161425c2732753f88e997b1cca818572b2
diff --git a/sys-apps/portage-mgorny/portage-mgorny-2.3.36.1.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.36.1.ebuild
new file mode 100644
index 000000000000..d6c166badf4d
--- /dev/null
+++ b/sys-apps/portage-mgorny/portage-mgorny-2.3.36.1.ebuild
@@ -0,0 +1,198 @@
+# 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,5,6}} pypy )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="Fork of Portage focused on cleaning up and useful features"
+HOMEPAGE="https://github.com/mgorny/portage-mgorny"
+SRC_URI="https://github.com/mgorny/portage-mgorny/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build +ipc +native-extensions selinux xattr kernel_linux"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	>=sys-apps/sed-4.0.5
+	sys-devel/patch"
+RDEPEND="
+	>=app-arch/tar-1.27
+	!build? (
+		>=app-admin/eselect-1.2
+		app-crypt/openpgp-keys-gentoo-release
+		>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		>=app-portage/gemato-10
+		app-shells/bash:0[readline]
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_4,3_5} pypy)
+		>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
+		>=sys-apps/sed-4.0.5
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!app-portage/repoman
+	!sys-apps/portage"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+	)"
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	if [[ -f ${EROOT%/}/etc/make.conf ]]; then
+		eerror "You seem to be using /etc/make.conf. Please migrate to the new"
+		eerror "/etc/portage/make.conf location before upgrading."
+		if [[ ! -f ${EROOT%/}/etc/portage/make.conf ]]; then
+			eerror
+			eerror "  mv ${EROOT%/}/etc/make.conf ${EROOT%/}/etc/portage/make.conf"
+		else
+			ewarn
+			ewarn "WARNING: You seem to have make.conf in both locations. Please take"
+			ewarn "care not to accientally overwrite one with the other."
+		fi
+		die "${EROOT%/}/etc/make.conf present"
+	fi
+
+	if [[ -f ${EROOT%/}/etc/portage/package.keywords ]]; then
+		eerror "You seem to be using /etc/portage/package.keywords. Please migrate"
+		eerror "to the new /etc/portage/package.accept_keywords location before"
+		eerror "upgrading."
+		eerror
+		if [[ -d ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
+			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords/99old"
+		else
+			if [[ -f ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
+				eerror "  cat ${EROOT%/}/etc/portage/package.accept_keywords >> ${EROOT%/}/etc/portage/package.keywords"
+			fi
+			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords"
+		fi
+		die "${EROOT%/}/etc/portage/package.keywords present"
+	fi
+
+	if has_version sys-apps/portage; then
+		ewarn "If you are migrating from sys-apps/portage to sys-apps/portage-mgorny,"
+		ewarn "please note that Portage will abort upon having to unmerge itself."
+		ewarn "However, sys-apps/portage-mgorny will already be installed at this"
+		ewarn "point, so you simply have to restart emerge and it will successfully"
+		ewarn "clean the old package afterwards."
+		ewarn
+		ewarn "If you did not use '--dynamic-deps n' in Portage, your VDB dependency"
+		ewarn "graph is probably broken. You may need to use '--changed-deps y'"
+		ewarn "for your first @world upgrade to resolve the conflicts. Afterwards,"
+		ewarn "--changed-deps should no longer be necessary and any conflicts"
+		ewarn "introduced afterwards should be reported to bugs.gentoo.org."
+	fi
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py ||
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py ||
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "${REPLY}")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${REPLY}" ||
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+			-i cnf/repos.conf || die "sed failed"
+		if prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [[ -f make.conf.example.${ARCH}.diff ]]; then
+		patch make.conf.example "make.conf.example.${ARCH}.diff" ||
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_configure_all() {
+	cat >> setup.cfg <<-EOF || die
+		[build_ext]
+		portage-ext-modules=$(usex native-extensions true false)
+	EOF
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+
+	keepdir /var/log/portage/elog
+}
+
+pkg_preinst() {
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED%/}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED%/}"/var/log/portage{,/elog}
+	fi
+}
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 9881bbfb084d..e293a8e3bce1 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -7,5 +7,5 @@ DIST shadow-4.5.tar.gz 3804933 BLAKE2B c4714b7fe9a1af5a5751d4274e70e7fb31994cc40
 DIST shadow-4.6.tar.gz 3804282 BLAKE2B 268c90e7daba138827aec6039f428f52cdcf7929743fa1f49f801cc669de7456ec5a69531194cdb29f051ce7d0b2f1e966fdf2513a9fc8f7fbdeb29d786a509f SHA512 36358333e7f03ef558772f3361bc5851a7d7fd3d85c993a6b732e37304b8068b2893d55607b9bfe8b8eed616a687264f947ff66cefc74ea1a48ba9396d464714
 EBUILD shadow-4.5-r1.ebuild 5405 BLAKE2B 7518b3700adf543a619413066415f64959a50efbbe669b28622e8d2d4cd749705b256c62e3ba73a88e6f3c0d6c195c87c377e7541e165ccbf4328ec5f4b1b0df SHA512 a50352c9b189d5265e921e977acff5c96dedef2634b046f66b376e6d6e2fdab40b629e453695a3153dd1edb13740e94d6d205daed544b3bba885fd35dbb7251e
 EBUILD shadow-4.5.ebuild 5324 BLAKE2B 7e31b15f14edc3434fa1acca45a5c4955f78e5794d342d09834a0f9dbccb16c1d71e83952fa971a71f03844f6868fa81b16da7b473383156f10cebb2432b0ea8 SHA512 baa289b709d84f9b056d2415ed147d0bf80bed3e3645ab7738617693d7b8ada235410cf95c1d944044125bbab79f9feb101bcb1cd2d74eb33fc709346711107d
-EBUILD shadow-4.6.ebuild 5356 BLAKE2B 13f3755fdc6fa44faf0886e076cf6399a051b53f085bd251108b209370721ca2876c689aab3593ca5d2868b13910b2d1da834135b53c53937d2d4583a51bd650 SHA512 a306487290175696de702ddd085e712211f718525fcaf683fe7355de4fb65ff8de4f25d2988ddce7f60c8503484a559ac2bdc36c7d682a28884ff8de5f38404e
+EBUILD shadow-4.6.ebuild 5355 BLAKE2B 4d5a033afd28deb0c705baa314d41ef83a5fa81e5df9c8adf842147afba4cca5d53391e586931466152a64975beb297a89ed113d2cdc8e6eafd236db3b8a0271 SHA512 95459990bfc11ee4f6ed0566b690d83c6e54f15a348689507a8ad702ef542f4aa9013fbc810ef2ec6976b6e6061f34ce2f8403616d2cb6f195d82cbb5cf7f7e6
 MISC metadata.xml 565 BLAKE2B bdd91116c16f590eabb6f18f05a4f72b55651383431c78fb07c27b23e7152b25816895e2ae3e2afd1ecd6e2b9fa9dd0005d198f2ab7ee2061583b586e4c44b01 SHA512 be29faf2eb981bdb0d643ca691d48b10ee702c3a32ca7fca1d00365aa1c4beb5b1b4bec8104be4352fed32f3fabc3108061b8eb8f0054e612c268b5c6f4b1469
diff --git a/sys-apps/shadow/shadow-4.6.ebuild b/sys-apps/shadow/shadow-4.6.ebuild
index 20e940f9c6c9..c59105cb1638 100644
--- a/sys-apps/shadow/shadow-4.6.ebuild
+++ b/sys-apps/shadow/shadow-4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD 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="acl audit +cracklib nls pam selinux skey xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index aed8e3b5a8ad..fb19d832692d 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -2,5 +2,5 @@ AUX usbutils-006-stdint.patch 701 BLAKE2B 511a0466d35f452c48bf6490415f1fdc3925fc
 DIST usbutils-008.tar.xz 287052 BLAKE2B eb9b998adb69938d004828585f782840e34f453327de54a32c563268db22a870fd7298cf839692e58ae42148e63037260e09bc2f1d5700ff96bcc451aff626ba SHA512 ab1ad36467ff79ff5ab0b924620001612cae44def58c05ade01a4e58d8a4d48df61c09faba49a20497b7d6314045bbaf137b51a9f4e6b65ed0ea3bb339bf1c45
 DIST usbutils-009.tar.xz 309608 BLAKE2B bb5d7f756241377e81aa8f5b074bb0ba36bc778698afaebf7054cdb153149e4f3808a7b172019434756cae8b33410643cd6a03a36277f80ead9b0f4446385fd9 SHA512 e5936a42615690c13e618655fc5eb4f414d9a84f85b860eaeb3bcf737258e05d299b09d1c5388d50c718626036ec8cac5d670ad567ceadfaab85f401f0744a8a
 EBUILD usbutils-008-r1.ebuild 1244 BLAKE2B 65d0f771202bf1e39d243c6f46d3f45d818033b7bd40ba198e834038416498a68e329c7182ec0ba756479ee6bd54aac11556e4513b44baa98c0dcee320b1801a SHA512 5384707b65c9801744ec1838e94396ee421ea007ec25c5afc1503134c2d7bf0231fdd1d9dce8b6af9892177b1dbe16b30303c810bb4e1d82b2082c2f32fe5964
-EBUILD usbutils-009.ebuild 1153 BLAKE2B fd5250014bdb4100c967d87046800ebc16085e17bb1fc905418fea5af55c6acbdecfb87ca22d27ce2ddb45009d7785fa58c5a2bcb8a86142290810120ab589c2 SHA512 7eb4c4b29b35da05ab5533eb202fd0c7d9e44ca8c8ce2c86e553dae97f8153306eb3101cde7873f46eb803224307463b734197da409741c426e12a0e85c1e7b0
+EBUILD usbutils-009.ebuild 1152 BLAKE2B cc7459375d513b95711458d9b85ff4795d44ac8df0ab69d2a7ae438024df8a921d7cff088f7605206948114755aba77ec975e803cc0deabfc7bef54217510a35 SHA512 368e9dd1dd676714e02c5642b432c02ea1001f9922e3f88b1a576ad84d3e8b226b0cc4b197091f09502f2b31b3c184feba86e40e4b7174b4c69861932cf29010
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/usbutils-009.ebuild b/sys-apps/usbutils/usbutils-009.ebuild
index 80d6bd97b9f0..346aad85a663 100644
--- a/sys-apps/usbutils/usbutils-009.ebuild
+++ b/sys-apps/usbutils/usbutils-009.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index 46a41f3703b8..9c4b4250ca44 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -2,8 +2,10 @@ DIST yarn-v1.1.0.tar.gz 874168 BLAKE2B 2c2e00237e4c1264ba3167f5fbeb40ef64d9ca42b
 DIST yarn-v1.2.1.tar.gz 885691 BLAKE2B ba7a291e4b071cd285e890fbd8af2a1adf78bc7a65ddaf7adcebee2b8bc15d4b98293eeae79be5ad664daa6a56d553ade1fd5e50aaafc7ed2f980ebfe4feac58 SHA512 cb61788e16cd3537073b3a8711ce6a29f7e14380cea20ca16144e97ed05ec62c685b805a18af9e70d16f7aedb4c460cad97027e37fb43596f97570386d596477
 DIST yarn-v1.3.2.tar.gz 886500 BLAKE2B 224503241b646bd6befe6571022e1081c4e9cce2371ce0c111704a6f0ceb7c4b4f0267c9c37d05feec60311cc7804706fb47d130ca64e6182590e88d8476b386 SHA512 d488ae56b60884bb42e5e2ac8a0359c6947e234ed8b5bba12a93f24abb4419b4a6fef708c35df8caa9e68edca3fe570d1dcda9295d29438e45a32ef5d029aedf
 DIST yarn-v1.5.1.tar.gz 936225 BLAKE2B b35631ba0fef692797c83431fb673c0286dbd29a5a3e5819111bcc189a136d7059afd7e1901a249204e1a14ff4c7a7321207d7fe1c057d4e585184424f9c26dc SHA512 b58b712ee395d4cfec5271e02e8cf77489438815aeebea1c6844866eb6161be9ae078f62f726e44eeb704d0195b94339d1e89991ce56de8690d613d4bab5f548
+DIST yarn-v1.6.0.tar.gz 941806 BLAKE2B c3f225dae625e6404cf2bc363e695adeb43c3738a4a501c88415bee20810085dbf63abbaa7ef64200cfbdfc8a1a21e463af2c035c37e21dae49d5bff18d2d5fe SHA512 073adcb75dff799ac68a5e0adbdc8f8343d3ada3e356dd0e5dad4254b21e0337bc76201163d037eb01e7c5365f15085ef38df171d77ee36cd58557a175e3f713
 EBUILD yarn-1.1.0.ebuild 841 BLAKE2B 0affb4007c2324aede03eae842a00443f056d323fe2b4ea8ef65139ddbe8a43bc192a27364f081346f64fd01bdadb70e4f7eccd3e7b9350122496fef6bec8dc5 SHA512 89b39480a4b8a24f7a1fe3a6231b25d9b5d70b21c2e8d3d4aab95581b9906b6e6be1aac50b4cf3914995f5e2c27482f40c56eade9cbb3efc59b24a5e899c86f5
 EBUILD yarn-1.2.1.ebuild 841 BLAKE2B 0affb4007c2324aede03eae842a00443f056d323fe2b4ea8ef65139ddbe8a43bc192a27364f081346f64fd01bdadb70e4f7eccd3e7b9350122496fef6bec8dc5 SHA512 89b39480a4b8a24f7a1fe3a6231b25d9b5d70b21c2e8d3d4aab95581b9906b6e6be1aac50b4cf3914995f5e2c27482f40c56eade9cbb3efc59b24a5e899c86f5
 EBUILD yarn-1.3.2.ebuild 841 BLAKE2B 08bf76001e5e2aa1e7cb0efa3d022bd562b79a058c83363d7a27abeca51aef0141a199676d2a561d58cc01035c51822a55913538d0c44d24f81d3c6312d85ed8 SHA512 4e53d8287c9c49563c2d36e7fc5dd0657c2926f32bc7aa1b8caba62e8278fe0ed029e59afb3147d554344b7997ffc79e3f230ae3adaa419cad265595f3250062
 EBUILD yarn-1.5.1.ebuild 841 BLAKE2B 08bf76001e5e2aa1e7cb0efa3d022bd562b79a058c83363d7a27abeca51aef0141a199676d2a561d58cc01035c51822a55913538d0c44d24f81d3c6312d85ed8 SHA512 4e53d8287c9c49563c2d36e7fc5dd0657c2926f32bc7aa1b8caba62e8278fe0ed029e59afb3147d554344b7997ffc79e3f230ae3adaa419cad265595f3250062
-MISC metadata.xml 249 BLAKE2B 40574a5c45dfb1d3be956c6034adc79f009243f2fd43280002f05cc451d8f7f5b8916c815660693a8ca3cfadd9dc5a5fc52b52211f9e256dfbbac2b26c5bb2c7 SHA512 d406f99c7fb4c5839522e07fbee81cf55330fc0c4ba6fff5281179f2ea7c21048e7cbd5563665b9a458f8b5a9724dd1fb9ac8641e2bb192f1514358902560f73
+EBUILD yarn-1.6.0.ebuild 848 BLAKE2B b0532cde76950dee68e42c3b861ad021657134752b6682245f3920e3577cff8ccd9d8846c7a8fe73cccb3a49a730b962e428ef75eace21c8acbd887a135f8231 SHA512 f18e0e8701e6375c3af0f91569fde1e054a68d9d8c8545ea22c83dfd24f0b0d229eaa6465aec7f5281db596a92e8da2bb58f237ca312cdca84e6934c87d3f613
+MISC metadata.xml 440 BLAKE2B 526fb5eb5ad9a9ed7062fac74a6c5cbd0bfc82b8f69da9cf687b16c0c6d0cc03728abf1508c6c48960c26198fa88ca8fe64f924c080010b5158ff8f9cb06e850 SHA512 3c6dfd749421e6620930993f60bdac847c8e3baa65d4389861de3b8d63641cdc54402274e4b663a718adf8889d2e8bb9b036b427184e1f4d71e290fa74a273cd
diff --git a/sys-apps/yarn/metadata.xml b/sys-apps/yarn/metadata.xml
index b70cf1a5b6a1..487b031d3e68 100644
--- a/sys-apps/yarn/metadata.xml
+++ b/sys-apps/yarn/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">yarnpkg/yarn</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>saboya@gmail.com</email>
+		<name>Rodrigo Saboya</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">yarnpkg/yarn</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/yarn/yarn-1.6.0.ebuild b/sys-apps/yarn/yarn-1.6.0.ebuild
new file mode 100644
index 000000000000..b3b3e1e95196
--- /dev/null
+++ b/sys-apps/yarn/yarn-1.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="Fast, reliable, and secure node dependency management"
+HOMEPAGE="https://yarnpkg.com"
+SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!dev-util/cmdtest
+	net-libs/nodejs"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path
+	insinto "${install_dir}"
+	doins -r .
+	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
+
+	while read -r -d '' path; do
+		read -r shebang < ${path} || die
+		[[ "${shebang}" == \#\!* ]] || continue
+		chmod +x "${path}" || die #614094
+	done < <(find "${ED}" -type f -print0 || die)
+}