Sync with portage [Tue Oct 3 08:59:17 MSK 2017].

7 years ago · 0f43c98eae
parent 09f515ea16
commit 0f43c98eae
599 changed files with 9676 additions and 2934 deletions
--- a/app-admin/logrotate/logrotate-3.12.3-r1.ebuild
+++ b/app-admin/logrotate/logrotate-3.12.3-r1.ebuild
@ -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="
--- a/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild
+++ b/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/swatch/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE=""

 RDEPEND="dev-perl/Date-Manip
--- a/app-admin/tripwire/Manifest
+++ b/app-admin/tripwire/Manifest
@ -1 +1,2 @@
 DIST tripwire-2.4.3.5.tar.gz 965014 SHA256 4bb0b400d8f5d7f8762ffb87a683f113f8c77186689cc63b8cedbbc628c9c33b SHA512 7aef0e7d38f4b6966a806a4e556636c7b2477f4ea5451e89f1749c1535a489c2f490ea13898edff5d7786acf572f77d04430115b8ddd4c6a03c38382feb45269 WHIRLPOOL f5f06d2f509e8047ede81226d3179f253e32aae4193817ab1000dd843f4b9810f6aacc6cd9c0bdc8a0c6835fdb11f79c85838a3b799d8c6565861d43dd433a99
+DIST tripwire-2.4.3.6.tar.gz 1001145 SHA256 f55fe6805f2c159bd67fa3761ba52df95b2a7d0bdd06196847564bac00dd5606 SHA512 4757827b908fd56a014de81609be9cfdf3631d34cbc02214ac800bf6d9c413d85d812bc3211f9dc32ceee97e1f13decd955037a0cbbaf2f8e3020699492bd9bf WHIRLPOOL 0dad2b00a6e868179c1538ec48859a03857fa5bc62dcb9eb3240e11e10cd7ebf4de1fe85802c08abbf1ff1efca0768dcd63ff8088914f53f32cbf7fda20ec706
--- a/app-admin/tripwire/tripwire-2.4.3.6.ebuild
+++ b/app-admin/tripwire/tripwire-2.4.3.6.ebuild
@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Open Source File Integrity Checker and IDS"
+HOMEPAGE="http://www.tripwire.org/"
+SRC_URI="https://github.com/Tripwire/tripwire-open-source/archive/${PV}.tar.gz -> ${PF}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="libressl selinux ssl static +tools"
+
+DEPEND="sys-devel/automake
+	sys-devel/autoconf
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+RDEPEND="virtual/cron
+	virtual/mta
+	selinux? ( sec-policy/selinux-tripwire )
+	ssl? ( dev-libs/openssl )"
+PDEPEND="tools? ( app-admin/mktwpol )"
+
+S="${WORKDIR}/tripwire-open-source-${PV}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# tripwire can be sensitive to compiler optimisation.
+	# see #32613, #45823, and others.
+	# 	-taviso@gentoo.org
+	strip-flags
+	append-cppflags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing
+	econf $(use_enable ssl openssl) $(use_enable static)
+}
+
+src_install() {
+	dosbin "${S}"/bin/{siggen,tripwire,twadmin,twprint}
+	doman "${S}"/man/man{4/*.4,5/*.5,8/*.8}
+	dodir /etc/tripwire /var/lib/tripwire{,/report}
+	keepdir /var/lib/tripwire{,/report}
+
+	exeinto /etc/cron.daily
+	doexe "${FILESDIR}"/tripwire
+
+	dodoc ChangeLog policy/policyguide.txt TRADEMARK \
+		"${FILESDIR}"/tripwire.txt
+
+	insinto /etc/tripwire
+	doins "${FILESDIR}"/twcfg.txt policy/twpol-GENERIC.txt
+
+	fperms 750 /etc/cron.daily/tripwire
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Tripwire needs to be configured before its first run. You can"
+		elog "do this by manually editing the twpol-GENERIC.txt file shipped with"
+		elog "the package to suit your needs. A quickstart guide is provided"
+		elog "in tripwire.txt file to help you with this."
+		elog "To configure tripwire automatically, you can use the twsetup.sh"
+		elog "script provided by the app-admin/mktwpol package. This package is"
+		elog "installed for you by the \"tools\" USE flag (which is enabled by"
+		elog "default."
+else
+		elog "Maintenance of tripwire policy files as packages are added"
+		elog "and deleted from your system can be automated by the mktwpol.sh"
+		elog "script provided by the app-admin/mktwpol package. This package"
+		elog "is installed for you if you append \"tools\" to your USE flags"
+	fi
+}
--- a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
-#      (since we're building shared libs) ...
-
-EAPI=4
-
-inherit eutils toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
-HOMEPAGE="http://www.bzip.org/"
-SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz"
-
-LICENSE="BZIP2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="static static-libs"
-
-RDEPEND="abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
-	epatch "${FILESDIR}"/${PN}-1.0.6-saneso.patch
-	epatch "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
-	epatch "${FILESDIR}"/${PN}-1.0.6-progress.patch
-	epatch "${FILESDIR}"/${PN}-1.0.3-no-test.patch
-	epatch "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
-	epatch "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
-	epatch "${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch
-
-	# - Use right man path
-	# - Generate symlinks instead of hardlinks
-	# - pass custom variables to control libdir
-	sed -i \
-		-e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
-		-e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
-		-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
-		Makefile || die
-}
-
-bemake() {
-	emake \
-		VPATH="${S}" \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		"$@"
-}
-
-multilib_src_compile() {
-	bemake -f "${S}"/Makefile-libbz2_so all
-	# Make sure we link against the shared lib #504648
-	ln -sf libbz2.so.${PV} libbz2.so
-	bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
-}
-
-multilib_src_install() {
-	into /usr
-
-	# Install the shared lib manually.  We install:
-	#  .x.x.x - standard shared lib behavior
-	#  .x.x   - SONAME some distros use #338321
-	#  .x     - SONAME Gentoo uses
-	dolib.so libbz2.so.${PV}
-	local v
-	for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
-		dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
-	done
-	use static-libs && dolib.a libbz2.a
-
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a bz2
-
-		dobin bzip2recover
-		into /
-		dobin bzip2
-	fi
-}
-
-multilib_src_install_all() {
-	# `make install` doesn't cope with out-of-tree builds, nor with
-	# installing just non-binaries, so handle things ourselves.
-	insinto /usr/include
-	doins bzlib.h
-	into /usr
-	dobin bz{diff,grep,more}
-	doman *.1
-
-	dosym bzdiff /usr/bin/bzcmp
-	dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
-
-	dosym bzmore /usr/bin/bzless
-	dosym bzmore.1 /usr/share/man/man1/bzless.1
-
-	local x
-	for x in bunzip2 bzcat bzip2recover ; do
-		dosym bzip2.1 /usr/share/man/man1/${x}.1
-	done
-	for x in bz{e,f}grep ; do
-		dosym bzgrep /usr/bin/${x}
-		dosym bzgrep.1 /usr/share/man/man1/${x}.1
-	done
-
-	dodoc README* CHANGES manual.pdf
-	dohtml manual.html
-
-	# move "important" bzip2 binaries to /bin and use the shared libbz2.so
-	dosym bzip2 /bin/bzcat
-	dosym bzip2 /bin/bunzip2
-}
--- a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz"

 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"

 PATCHES=(
--- a/app-backup/duply/Manifest
+++ b/app-backup/duply/Manifest
@ -3,3 +3,4 @@ DIST duply_1.11.3.tgz 44198 SHA256 585757a02abc91bcc0e37004eef735794d6581d1a30ec
 DIST duply_1.9.2.tgz 36222 SHA256 2bfc0964ebc0bae5752e0b4a12eb8fb6f78a27739f32c9acb4ac81947506c5ab SHA512 9ef5e22f43a6854e413ed1c2b88b10d0ae75cff7b2bcd927d20a588234555e9b7eff25d094f688f9d4f8510eba6bc20f7635c0de9ab9b402966075595922333e WHIRLPOOL 6a3e79c87e0b28386f0ed6fd8eb7973659477ad278e80e292a3e6cea944fd512baffc9a455e148faeadb687a46a8e274ce86668c29f30244b5b63f1f850a9c00
 DIST duply_2.0.1.tgz 44914 SHA256 9d2baf55ada5ab36a6da3fa909c8bdc4ce9a0116eac259ebba0efe9b93180bb0 SHA512 28f1670f2579956cb4d0d5727403e8b9f4afcdd8ea79e117536dfb89b3f3cf6a7bc7eb802bc4dcd39fc6a443a9f8fa3fe722f2b8336186517184940ce6fa73ec WHIRLPOOL 7c41a8d14cf6f372dea831de0d16179c369a75fc4eff77469ae85b3877526babc2fe112829b4cf295be8808bdda803a01ed83f6db73fa4ed952ae936ac990766
 DIST duply_2.0.2.tgz 45406 SHA256 33869adad763d5dd0a79a3d1d5b860a77f8e40be5150c3876d6ce5476004415f SHA512 2f53d380445272a2354f6914c39373e93d27fdcc5c712d7041fc798547280cebff53882f93d0467d86fc044b8a3a73a6b2fe04a9eaadae55b58bc9c617bab48a WHIRLPOOL 2c8b50b71b27e669c831639093b45a08906f2c6d8af735350e532a34bdf96c21f3ed0b1e191cf97bf6c7215def5cd2c65e6a4fd7dd62e54ee25e8aa0726ee724
+DIST duply_2.0.3.tgz 45542 SHA256 34b4c544a92faf190c29cbc9eda5f1420ae1550fc7e0a33126a1775d3187b9e1 SHA512 c24dd57f75ab80795d67baf8a7ab79a5ae9608c7faea0ae8b711045371ef0cba49c855cfa0610f030c1c37734775b50052fd1e4162420cb3db624f984e4e8bc1 WHIRLPOOL c03230b6ad23b7ccd70b0f98ebd469e1e73b33a1497492a3f6bc42fcea51e329eecbbd1faed4ec63926d242692549c37a8549e88d9219b4c659817e8acd61b9e
--- a/app-backup/duply/duply-2.0.3.ebuild
+++ b/app-backup/duply/duply-2.0.3.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="A shell frontend for duplicity"
+HOMEPAGE="http://duply.net"
+SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/${PN}_${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-text/txt2man"
+RDEPEND="app-backup/duplicity"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_install() {
+	dobin ${PN}
+	./${PN} txt2man > ${PN}.1 || die
+	doman ${PN}.1
+	dodoc CHANGELOG.txt
+	readme.gentoo_create_doc
+}
--- a/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
@ -9,7 +9,7 @@ SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"

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

 S="${WORKDIR}/${P}"
--- a/app-editors/atom/Manifest
+++ b/app-editors/atom/Manifest
@ -1,7 +1,12 @@
 DIST asar-0.12.1.tar.gz 1016626 SHA256 731714f0036318fe0878b517391a01977954bb088d4dbc7dd98682ff1e03c0e7 SHA512 fc64be9b11215426d405f7acd7adf6c0eead3135b0012baf6d168a13c77675058a4e2c60682928ac014e4bef4538d452ad745d1e87dd315387997a19e04718a7 WHIRLPOOL d73b8bb459724bb3b011de312171519c1f1954a94ce1bb0a20eb9877c168baa82a15786d3ab420d5b3d32ce8a11333e85f844b43c21cbd56c3b019e73774388e
+DIST asar-0.13.0.tar.gz 1622264 SHA256 f22b508d724c420e6aac3fa863cb03a6f668e841fd36486e6098fcce566415de SHA512 619b59e9576a185905b455b780630188ce32aed72b424c69967a7bf15236d1edf2f5d92f7dde972599679c88fe0a80f05295a3d82b2ae0944be08d332a659aee WHIRLPOOL 9d8fdb1f9c92eeb7d185583d2dcf9b2bf1b52a4feb158b4a676a16836c2402f80a80d133a24306ae4bf87216a345672e6a71a272bb30c0635fc46bf2bae1a7ad
 DIST atom-1.15.0.rpm 86561729 SHA256 935b444d9122f46d3ab490611476498c963de1232f9c732d9ad33f0e380a37be SHA512 e8f5ceaae020f9fbf8cb1ffbef0f64b7b5d23a0be20d063591e3ba3b9fd33c771a028aca9aa0ecad254e250342d40106dac85bf6bdeff4de64da0b57fe6de3ea WHIRLPOOL 4d4311654b8afaa4aa2d07611960d24775aeb825e97ea65e6f69d72790d4c160e8a371432346f1873a71b2e1bf4158f3eb5d35fc1fd882906765f3ea4328e526
 DIST atom-1.16.0.rpm 90249819 SHA256 6305f149f7b85e498e56d92fe0927ca81fd4cce62153f266fcd8f39958a59e69 SHA512 e3e9096caf6d5ca802ad47e434a6e8a51c0ab25b967747621e2ea4eb440d5401df3b7cd3d101d6d5a1f2f12fa77525e7e54e252438ff24ec9b651601bb7f4d97 WHIRLPOOL b294fa728388a2b10000a85c02d7548e077e34c5db83ddea1d2b5d6bdebd4c72db906ccc856fd766e3f2f3900ad5f02de3c4bd22e273683c92e4f0dd027fa6f3
 DIST atom-1.18.0.rpm 128551353 SHA256 08609b26776ee12effd47ff87a2eb44f7ba9000a0e28b8022ca0bace0216e8d8 SHA512 c30df4b3c10e2e886c349a8c255ea6e9e308b38811f02b2517ba464959a873d159b5fa4fe89d68ed50500038b92219cb061d9dee0917b0b807e086cceec2803b WHIRLPOOL 3a1607be3155ac614b403df94f8974a675a646e777e4cc7ce351b975e17a9e6708676f8c6772d35f90f9240757a0fbeb1e1fa1a304c3f08728041440e59b7192
+DIST atom-1.20.1.tar.gz 9358859 SHA256 0577ff9df069f8c290fb73b387ea88f8af1fae8b4a40c5ad7cf97af824584b11 SHA512 a7f9edcfc84b81d768a92af5967a6889f85155c46a623b33e51999706e22f411ce570f42777fb3015174611ef19a956d8ed336ab1172612b27d75de8ef9c96fa WHIRLPOOL 467169cd0e26d9738f25e974ac188b00e80d1bc5c525d17b1b0c221bf5826c2258267fd1723ff26fb827f6f9f268a34b6d25f6278adbd2bd628dd5dad03296a1
+DIST atom-1.21.0-beta2.tar.gz 9378306 SHA256 9ff06ad890b85b68d85ae9b699d2b05ac3defc3130ff590fe0441efa9e3ac55f SHA512 9e5e75bca7dbbded19e7dac3444b4c3d86d24874d0d3b83692eaf66906e6c78ecf212c63718fcb92aa9c6ef28477042564e3dec1eb0e23398fb04272b79c0b5f WHIRLPOOL 6dc0411e46832ed21b7c42b9eda0e73c6424805b0bc2966716d7f42d218b549ab8ec5b6198747f0058c892bbb661512ee3cdd4f6fe185e27288b3f4a6531dd62
+DIST atom-bin-1.20.1.rpm 134506625 SHA256 20a0a1e398a1eace09f298231b7169bdb73c345c6ccb784a2929bc9df5996b17 SHA512 7bf8c4b092e0b45d56c5414d088633ae016b5564a7a97e1d706ad46743b6aad43a7268b7ade881680fa5f005eed0f46ba1523909a09cf3ec0aa51ce2335b8d92 WHIRLPOOL 263c888e9ba4c103a0fb859c210d1c49cc8a956dc50ae6dd6da0322c8e908b6741f6ff931f68f60800fce90fb5133494d7ffdb7455b74ea6cae6e32af022f0e9
+DIST atom-bin-1.21.0-beta2.rpm 131042161 SHA256 a70ef4e0198e424358029c265f776928b098e6a9005078cab8def44ddf5f0697 SHA512 af648caaada35475e57f151b9c658eaaeb14d9705d732f5b4a58357e21d6e1cd5efff5b34207403d46f257b693ded5894115d1e4948b9b2aad0cf2f4430ce3a4 WHIRLPOOL 6b6b9597f5da79c3249577ce4baea748a4c7c2b63bb0917d61329a5d94143918452fd8c0b2f3ba90363cabf69d7d9098a113e07662255bc73af8cb1e36c42242
 DIST atom-cached-run-in-this-context-0.4.1.tar.gz 3855 SHA256 5487e7641d5031e652deeef8bebe2d3af4e4d2b89989dd8700bf14e33843ce89 SHA512 dca2a6c77bb94e704aa99b405ae017bf0c56ce536a7246a8feaf133722556d444fb684cd6b9b475abcd0b946a42073a9fc0d61f5141b564320ac023ab2fbf79d WHIRLPOOL 573d0f703989f31109854f0eb324d6b1364e93cd057c4cfe20409415dee3101964cacabc246d4df43124dad881d8fec8575c6bbb23ba98698e6c73cf3c5614d4
 DIST atom-git-utils-4.1.2.tar.gz 36492 SHA256 fd627647742359946d3b8f88bc91dd4d68a047dcba5bfafbd690e1a20afeb908 SHA512 d1f0a5bbd6b059131ccf4ab92174d80caddbb254ea6d0676a5ce71d7dba55d60c86ed1c412862b9d104a5f6deb2671facad84841f9644afb9b37416b743e917a WHIRLPOOL 4ee4620b0208a30f848167fffce05c5999d38bf5a3e50567e6bcf295fdafc7861e870346cfeb28a61392e7a737e100f90ae1dbd25066469926e3148006e02937
 DIST atom-git-utils-5.0.0.tar.gz 36545 SHA256 a79e4951de6ac0a81f2ea359f82c575f826a4409f91b90a11f75a85c7886bec9 SHA512 42fd7589ca56049b1ad5cf7f2df7e295fc8575f4eee8a562fa103541157bd487c1748e3d6c536237b260dcbb4b530619dfcc121ba84b6d2fbf6d684dc959f819 WHIRLPOOL 03ae2290fc1ef0863c643a1fd4f9d4c98bc9b2939fddf6fd366eea9122b9d5612f53ad7ea6eb57c020eb376fa623253082da4c26f67d8de1bb59189b64f9d60b
@ -21,4 +26,20 @@ DIST atom-nsfw-1.0.15.tar.gz 45222 SHA256 6dc20bcf6eafcd0d1c2293841d2f2da7216c45
 DIST atom-scrollbar-style-3.2.0.tar.gz 4609 SHA256 ea0f8f00cac609537af0d10d228054371c58b5a74785bd52fbbd276af02911ef SHA512 fc3ddfe7582517df45d7258a5857ca05fbadb92417d68b0c77d1e89e54b3bdaef3a1624e29177ebe64a2a994e62e1d1f5cb438911e881124aeec359426fab1bc WHIRLPOOL f6e75aafa8946ccc16949bdffa33b2bf050f06434a3fedcf8e1abac8b6b2d31dd37fcc137a43274d4c55d5926349486fda157d3fb6948d97063aac33b99e6578
 DIST atom-superstring-1.1.0.tar.gz 259961 SHA256 fcfc7f94bc3631fda8b08b2b91778f8a62e863b346a2f90b66f9af9f4f3f8cbb SHA512 880c97d696036065aeb4320dc71c88b49b22b04e6582c75310131e61d8067fdf3d26c901d7b22a2bfd2a2a2056f350ba9485b7e55410cdee9ef29f5a75a8af59 WHIRLPOOL 6f857ea91c8df678c592232816ec3c251355cb7af4f1f6dbf0f16c44aa1a978c66c0ce8225d176e7b253addb1e38795a3902a8dd302dd72db1f35e4c18cd3236
 DIST atom-superstring-1.2.1.tar.gz 264386 SHA256 9d899c2dd497f25f9d629d4d8c4df9e1f7af21e8958a0e1458fc505b1c6ea8ca SHA512 8641f44defb9248c4fd91c4c7d5117322f83613386693ab51c3e77c9ad95ae383f69e662b6a870196504d7d99cd23527a822e989babdd95f42b6ddf517df7afc WHIRLPOOL 6a363569c737c2960140182cf7d5b77d551a2b463d096de4d32c64ee217dab733b30cb111521035bbb68bc510afa9532bc91af6037e4c9f11ae67672ed424deb
+DIST atomdep-cached-run-in-this-context-0.4.1.tar.gz 2388 SHA256 2bff3d01e95c3458ab0d1f2b22a61c0f8c675a0ef05f4936f51545dbd9095345 SHA512 942db40139b0beda616a25628772e515ce92ceca3e9a5288b10920e68c35149c52677a975e6e30f278ec64f06ae341fa1fa00702b339b2fb8f7af1cf9685efe5 WHIRLPOOL e7f7c4fe6cb642afcee2c71926cd813304071b0feff71c06e227bfb143f18438a49062a39068b7551938d8ebd8977bcf93ef98d187ea12cbe4afcde503aa9b14
+DIST atomdep-ctags-3.0.0.tar.gz 12864 SHA256 873139ccaf0b58567e1e6a8d99e934f637cb7ac6287fcc873678bb170bfdaf0b SHA512 af1d3764cc3a6bb781a9a2357eeb8503886fc14481c3dbe4a899d3c672fea9325524aed3a4c1c87965bc4cce2fbae20b56b32690849afc1fcb751cd5462adbcc WHIRLPOOL f00065a1ae36a73ea92f3175780e672ebfba2d69d17b00605ea0140fb16d7c451dddc2df757504231a0fd3d59f2524a8f06a3f121d2a29190e11b01dd4c9cd28
+DIST atomdep-fs-admin-0.1.6.tar.gz 5539 SHA256 976e7ea028d2a1166596119d434302c046869a722edd6e9808421ad11a6b4916 SHA512 2474523d5441ad882000633a929bcdbc5771b859a80f16a69c15504ff240a59b558e2edb1ca6e12ce91ad58da935243f3950a16e664529c59da70b9912903ae7 WHIRLPOOL 429a5b8bd5b8ae36ab4431e21c165b097931e6fad2ef3c13192bde67725b38e28f017e847b6e1f1931a8a101c76c6e2885bd9f07d19e9145a3b0c1cfe5eab280
+DIST atomdep-git-utils-5.0.0.tar.gz 4147470 SHA256 66934cbc288859028a1ab19bbb88cdba01c74c8bfb4d06bfb14b967762db091a SHA512 ffb2ecf8eb89f7e4cbf51e5953d4e547c4ccf21985a6177cffd5f958433ac7c98d36070ffea82dae65b02bed53c49ba94fc12fb4823e1ef985a350726fe46424 WHIRLPOOL 3b5a4767288a39e20ed419639da555fcd429585cf6a987c9709c8859b158cba5d629ad0bd3839003a13f4c7b9f561c2b6d08926de35f5aa8c7a3767a46854267
+DIST atomdep-keyboard-layout-2.0.13.tar.gz 17881 SHA256 9ef323cb2c333861e7ce834448ed00519eecf06035c03b66208e85727fdffa92 SHA512 5b155cddb0484edb47a334b21183eccabe6b376290b97b4469732541f4231337b526b90bc37d321ff6dc367d481b1e3c6feb5d39dc9ba67abef8914b53615a66 WHIRLPOOL cb5db27b2bac5250a07b73039dd4ace956d53709c206b8a9510def9779b87aa131cc4f414d3eb8279fbcc97850e6da393e4e8618541c608f7f57b3e71ccd6c84
+DIST atomdep-keytar-4.0.4.tar.gz 6550 SHA256 65221a8a44c542befd718374e7fd3fce61dab5cfe13fc57cac0c770ce6ebefc1 SHA512 78544e3646ce0f772a9adae055e137034d4b0e83bb8b95647a4efe239bf4bdf863f05317f4b37b0d2ac89e6a6e0107abd0022ccd7abb4310a39fa1c07982b4d4 WHIRLPOOL 249020aef10bc5be6630efa440449350207ca9893102a37173e82c98ab6110d61063abaa92c046a3dfdf2c57cd2d389cfd473092fae036e21bb16426abdbe5a2
+DIST atomdep-nsfw-1.0.16.tar.gz 43214 SHA256 ec205c8796dfac3d884ee50f6c0a0d1c9f8a365fe08e2abc5e73191e4d938eed SHA512 0060d7fb5016454aaaf7df438d973b9a389a6e5f7a166c5d402cf8ef8bcda724501c3bfbd44e37e9e6c38d5f1decaeb48c571aad9145dec38ba0c94073b9702a WHIRLPOOL ff797a7371c79a6cf67b90d9cd0d91bfa0540058354d305d6f3a8c9d1aeb9cbbcaad36892ab63bc77d5b835e1da608f7652da8169f69382dd8490022006eb2ca
+DIST atomdep-nslog-3.0.0.tar.gz 2270 SHA256 a972eaacf92c14e31ae7bfd24c9be5be9c71e693425305e0aa20121cd00d4e73 SHA512 6a0ce8970ae12fdefd0935916e5501bb89e366fb66b05fffade884f3adf4add4b135eb4f0f208684e28424fdb9858ee8193eb1f3db1f7eac3cb49bdb5d1a4bb1 WHIRLPOOL 0b3d1d40c0cfe892fd4b99f39fc8e308c92ef36eee16db8988782ff2b56b839c90910ada28997cadf5b9797305b408abed46b852eb4ddc6a26a1d38b15a0ff80
+DIST atomdep-oniguruma-6.2.1.tar.gz 586350 SHA256 ace3257ba94772982c8326156f2bda9e0def43185e150274b5b209e5e89f78ac SHA512 faa46dc4c1b8d7e75ab54512de9a823c5b958a7ccb43333375b33e16de47a464ea2a9ba9996596a8359d423a3e8c9d63cc92a5162b3f9d44b4485304073b41f1 WHIRLPOOL e0fdd3e1a9de2565b3bb5c8907e5c804907d0fcf7cdde67f13164178baaacf9e7a375eb8afe3c4113b91eecae3b88bab14f9ee68265acac9463a65678006c175
+DIST atomdep-pathwatcher-8.0.1.tar.gz 18357 SHA256 7da47cef336345ec37c9d22a8cf3cd516938e5bf512b95b25304e9c6edd184ac SHA512 34df8fecf456753f1977517018e5ff78b143f2d36e1417435bfcac2f9b9f8bd045a8080e7d0ad5d2930c63fa110c539911447863c46e757a4bb8f8c4f5bda999 WHIRLPOOL 4fe65035e0d594f3d0d2fae3cc7440a32382450ef09b294cbc5ed0421b1dfedef8101a2df0401553074457d24859404e6893fa5b160eb28051bb87229ce36db6
+DIST atomdep-runas-3.1.1.tar.gz 6197 SHA256 4322d505a2542c04b66da17d8342b08ae6d49173b5c221c8267ce8bb4b4453d2 SHA512 29b01d8a1bd05f7f0ad7cf4472f13d12ff27524d44fc0c2ffcf87c187633ccdd5a2d9ae6af2a771eb8e2432b6a957451ea6a6c68d15aa861c4a29affac711d79 WHIRLPOOL 01b83dd5f769d84e4ecacc0eb62acb9831f9b8fc396ad1e59a650faea1725a439e15c3c7bc73896097a9b0723654aa124bf99a121c50c6b5b2d5a012daa06636
+DIST atomdep-scrollbar-style-3.2.0.tar.gz 3498 SHA256 480ed4ff284fb3a1773d58975a18ac13ef4aa5c71a918acbae6542d078da0e90 SHA512 9f5fcc2bcb13cb81e95a52aa6db0c99ffd67c9cd48a9faf0223587359f4082c3e867cb384497dc6be3e8230b4cd035e910a7048d431e81a28dfded0bc572da18 WHIRLPOOL b39d66672bd5e038638c89ffbd8ee85cd663ebcdd2fc9ca55176ed7289fb7895e5adb384a435e716c5a9f54d5328b62532b14b0455adebff7f3f24f858d991bd
+DIST atomdep-spellchecker-3.4.2.tar.gz 476093 SHA256 e35619e9e8efcaa63ed126e43467e0c127e65b24a822f3d4e1c4ff17f25d0eff SHA512 8ed6fa4251cd79de6e77004ea91a438080df7109ebbe2c92934366c34433388bc30c8b1ebc97a47aa2a9f3eb28ac5ba2ccf3a0de9d6f59b2d3125ff7ff2c06a4 WHIRLPOOL 967b1f542e76d73b72e01656cc71c90c76f32542642de7f3bb5c5e3f06422b32e17fc6aaa4b6c3b3d88abe722937d75e8a48c1503125770aa6bae6478c86ec05
+DIST atomdep-spellchecker-3.4.3.tar.gz 480739 SHA256 ad74c118c1cd5f209946801554e5ede1ffa5332c020e7e50eb4ab5245a403b4f SHA512 cef2aa6adf95772f0d38760adb9a805ad540bfb422647486ccd63db7afcca508eb821b6099d9913912dd1b0881f3b5ccc62d203f2ce6bc47859f36a76c781376 WHIRLPOOL 0f3441f6ef01900d14fd949a2b33f91ef19f0731dd08cbab1969c1adfc24594840698b0606e555a27dcf72fa3565a30aa65342f312c09d532be19bd4665476f4
+DIST atomdep-superstring-2.2.3.tar.gz 785373 SHA256 a2a78064a0272094b312fa74dc04521b2badf776eb7b114f691b05c484fc70f6 SHA512 edb71f4cc54436f563b6491f71e8c6c78aa711d1da821619031062e5e85fd60d66f0bcb6a70184b1fd55f31724d63ed9ba9c872d6d80387710262e404541a355 WHIRLPOOL 86b4cbcf1b4e169f7ee3c3999912ef34224ce52ae909a291ea86e73891b04904dcb7bdf5aa0e3889b3abb30bd40dfcf215ae8f86c05e09eb500aff6de56d9c5e
 DIST nodejs-nan-2.4.0.tar.gz 157071 SHA256 290b4cd678bb0770fcc0dfa8415f908db09173acfdde31135a4e31716c311883 SHA512 e6f3ab3f67c72b3cc9e6e6b9b5de0f73134ef504dedae5e68376198858a6796f00c35869438e0480f28006dd8f6be13dca3bcc436a1a6b28b1dea5cbc72f9e45 WHIRLPOOL 8628452c69c1774e02b8069ee8db12b7b97bc45166dd4dbec3e8d3f532c97f15a24920f2f59ecb3b8d4addcbada33eb04c1f71222531a7377bcbfaf7d4f3d86b
+DIST nodejs-nan-2.6.2.tar.gz 161949 SHA256 c6b046499f6b2e2c09d6650849e429e226ad884c74dbb5ca8eacb1518d453e7f SHA512 d1b5ed12e90accfa117cb73b9432897631ed2dd6045f93fa8b53237a13cec0ec467b14c035e9e4d4a5c6588949c1c80b0eef48a46d5c9c0a1f81ef400da031c3 WHIRLPOOL 77d0dcf7b2f50007f76024235f2670d9154e8dc02be0dc71e99fb6da86b3e4d56b30271d3e3eb81b1a6715a1eb09d73ef8c2dedb4ac9adb51b8672de4c9cb5e2
--- a/app-editors/atom/atom-1.20.1.ebuild
+++ b/app-editors/atom/atom-1.20.1.ebuild
@ -0,0 +1,514 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTE: this ebuild has been generated by atom-ebuild-gen.py from the
+#       atom overlay.
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 multiprocessing rpm virtualx
+
+DESCRIPTION="A hackable text editor for the 21st Century"
+HOMEPAGE="https://atom.io"
+MY_PV="${PV//_/-}"
+
+ELECTRON_V=1.6.9
+ELECTRON_SLOT=1.6
+
+ASAR_V=0.13.0
+# All binary packages depend on this
+NAN_V=2.6.2
+
+CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
+CTAGS_V=3.0.0
+FS_ADMIN_V=0.1.6
+GIT_UTILS_V=5.0.0
+KEYBOARD_LAYOUT_V=2.0.13
+KEYTAR_V=4.0.4
+NSFW_V=1.0.16
+NSLOG_V=3.0.0
+ONIGURUMA_V=6.2.1
+PATHWATCHER_V=8.0.1
+RUNAS_V=3.1.1
+SCROLLBAR_STYLE_V=3.2.0
+SPELLCHECKER_V=3.4.2
+SUPERSTRING_V=2.2.3
+
+# The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
+SRC_URI="
+	https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/atom.x86_64.rpm -> atom-bin-${MY_PV}.rpm
+	https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> atom-${MY_PV}.tar.gz
+	https://github.com/elprans/asar/releases/download/v${ASAR_V}-gentoo/asar-build.tar.gz -> asar-${ASAR_V}.tar.gz
+	https://github.com/nodejs/nan/archive/v${NAN_V}.tar.gz -> nodejs-nan-${NAN_V}.tar.gz
+	https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz
+	https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz
+	https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz
+	https://registry.npmjs.org/git-utils/-/git-utils-5.0.0.tgz -> atomdep-git-utils-5.0.0.tar.gz
+	https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz
+	https://registry.npmjs.org/keytar/-/keytar-4.0.4.tgz -> atomdep-keytar-4.0.4.tar.gz
+	https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz
+	https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz
+	https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz
+	https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz
+	https://registry.npmjs.org/runas/-/runas-3.1.1.tgz -> atomdep-runas-3.1.1.tar.gz
+	https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz
+	https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.2.tgz -> atomdep-spellchecker-3.4.2.tar.gz
+	https://registry.npmjs.org/superstring/-/superstring-2.2.3.tgz -> atomdep-superstring-2.2.3.tar.gz
+"
+
+BINMODS=(
+	cached-run-in-this-context
+	ctags
+	fs-admin
+	git-utils
+	keyboard-layout
+	keytar
+	nsfw
+	nslog
+	oniguruma
+	pathwatcher
+	runas
+	scrollbar-style
+	spellchecker
+	superstring
+)
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=app-text/hunspell-1.3.3:=
+	>=dev-libs/libgit2-0.23:=[ssh]
+	>=dev-libs/libpcre2-10.22:=[jit,pcre16]
+	>=gnome-base/libgnome-keyring-3.12:=
+	>=dev-libs/oniguruma-5.9.5:=
+	>=dev-util/ctags-5.8
+	>=dev-util/electron-${ELECTRON_V}:${ELECTRON_SLOT}
+	x11-libs/libxkbfile"
+RDEPEND="
+	${DEPEND}
+	!sys-apps/apmd
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+BIN_S="${WORKDIR}/${PN}-bin-${MY_PV}"
+BUILD_DIR="${S}/out"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	local a
+
+	for a in ${A} ; do
+		case ${a} in
+		*.rpm) srcrpm_unpack "${a}" ;;
+		*) _unpack "${a}" ;;
+		esac
+	done
+
+	mkdir "${BIN_S}" || die
+	mv "${WORKDIR}/usr" "${BIN_S}" || die
+}
+
+src_prepare() {
+	local install_dir="$(get_install_dir)"
+	local suffix="$(get_install_suffix)"
+	local nan_s="${WORKDIR}/nodejs-nan-${NAN_V}"
+	local patch
+	local binmod
+	local _s
+
+	mkdir "${BUILD_DIR}" || die
+	cp -a "${BIN_S}/$(get_atom_rpmdir)/resources/app" \
+		"${BUILD_DIR}/app" || die
+
+	# Add source files omitted from the upstream binary distribution,
+	# and which we want to include in ours.
+	cp -a -t "${BUILD_DIR}/app" "${S}/spec" || die
+
+	# Unpack app.asar
+	if [ -e "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" ]; then
+		easar extract "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" \
+			"${BUILD_DIR}/app"
+	fi
+
+	cd "${BUILD_DIR}/app" || die
+
+	eapply "${FILESDIR}/atom-python.patch"
+	eapply "${FILESDIR}/apm-python.patch"
+	eapply "${FILESDIR}/atom-unbundle-electron.patch"
+	eapply "${FILESDIR}/atom-apm-path-r1.patch"
+	eapply "${FILESDIR}/atom-license-path-r1.patch"
+	eapply "${FILESDIR}/atom-fix-app-restart-r1.patch"
+	eapply "${FILESDIR}/atom-marker-layer-r1.patch"
+
+	sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
+		./atom.sh \
+		|| die
+
+	sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
+		./atom.sh \
+		|| die
+
+	sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${install_dir}/app.asar|g" \
+		./atom.sh \
+		|| die
+
+	local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)\n\
+			   export ELECTRON_NO_ASAR=1"
+	sed -i -e \
+		"s|\"\$binDir/\$nodeBin\"|${env}\nexec $(get_electron_dir)/node|g" \
+			apm/bin/apm || die
+
+	sed -i -e \
+		"s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
+			apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
+
+	sed -i -e \
+		"s|atomCommand = 'atom';|atomCommand = '/usr/bin/atom${suffix}'|g" \
+			apm/lib/test.js || die
+
+	rm apm/bin/node || die
+
+	sed -i -e "s|/$(get_atom_rpmdir)/atom|/usr/bin/atom${suffix}|g" \
+		"${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" || die
+
+	for binmod in ${BINMODS[@]}; do
+		_s="${WORKDIR}/$(package_dir ${binmod})"
+		cd "${_s}" || die
+		if _have_patches_for "${binmod}"; then
+			for patch in "${FILESDIR}"/${binmod}-*.patch; do
+				eapply "${patch}"
+			done
+		fi
+	done
+
+	cd "${BUILD_DIR}/app" || die
+
+	# Unbundle bundled libs from modules
+
+	_s="${WORKDIR}/$(package_dir git-utils)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle "git;libgit2;git2" \
+		"${_s}/binding.gyp" || die
+
+	_s="${WORKDIR}/$(package_dir oniguruma)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle "onig_scanner;oniguruma;onig" \
+		"${_s}/binding.gyp" || die
+
+	_s="${WORKDIR}/$(package_dir spellchecker)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle "spellchecker;hunspell;hunspell" \
+		"${_s}/binding.gyp" || die
+
+	_s="${WORKDIR}/$(package_dir superstring)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle \
+		"superstring_core;./vendor/pcre/pcre.gyp:pcre;pcre2-16; \
+			-DPCRE2_CODE_UNIT_WIDTH=16" \
+		"${_s}/binding.gyp" || die
+
+	for binmod in ${BINMODS[@]}; do
+		_s="${WORKDIR}/$(package_dir ${binmod})"
+		mkdir -p "${_s}/node_modules" || die
+		ln -s "${nan_s}" "${_s}/node_modules/nan" || die
+	done
+
+	sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
+		"${BUILD_DIR}/app/src/config-schema.js" || die
+
+	eapply_user
+}
+
+src_configure() {
+	local binmod
+
+	for binmod in ${BINMODS[@]}; do
+		einfo "Configuring ${binmod}..."
+		cd "${WORKDIR}/$(package_dir ${binmod})" || die
+		enodegyp_atom configure
+	done
+}
+
+src_compile() {
+	local binmod
+	local x
+	local ctags_d="node_modules/symbols-view/vendor"
+	local jobs=$(makeopts_jobs)
+	local gypopts
+
+	# Transpile any yet untranspiled files.
+	ecoffeescript "${BUILD_DIR}/app/spec/*.coffee"
+
+	gypopts="--verbose"
+
+	if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+		gypopts+=" --jobs ${jobs}"
+	fi
+
+	mkdir -p "${BUILD_DIR}/modules/" || die
+
+	for binmod in ${BINMODS[@]}; do
+		einfo "Building ${binmod}..."
+		cd "${WORKDIR}/$(package_dir ${binmod})" || die
+		enodegyp_atom ${gypopts} build
+		x=${binmod##node-}
+		mkdir -p "${BUILD_DIR}/modules/${x}" || die
+		cp build/Release/*.node "${BUILD_DIR}/modules/${x}" || die
+	done
+
+	# Put compiled binary modules in place
+	_fix_binmods "${BUILD_DIR}/app" "apm"
+	_fix_binmods "${BUILD_DIR}/app" "node_modules"
+
+	# Remove non-Linux vendored ctags binaries
+	rm "${BUILD_DIR}/app/${ctags_d}/ctags-darwin" \
+	   "${BUILD_DIR}/app/${ctags_d}/ctags-win32.exe" || die
+
+	# Re-pack app.asar
+	# Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
+	cd "${BUILD_DIR}" || die
+	x="--unpack={*.node,ctags-config,ctags-linux,**/spec/fixtures/**,**/node_modules/spellchecker/**,**/resources/atom.png}"
+	xd="--unpack-dir=apm"
+	easar pack "${x}" "${xd}" "app" "app.asar"
+
+	rm -r "${BUILD_DIR}/app.asar.unpacked/apm" || die
+
+	# Replace vendored ctags with a symlink to system ctags
+	rm "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+	ln -s "/usr/bin/ctags" \
+		"${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+}
+
+src_test() {
+	local electron="$(get_electron_dir)/electron"
+	local app="${BUILD_DIR}/app.asar"
+
+	virtx "${electron}" --app="${app}" --test "${app}/spec"
+}
+
+src_install() {
+	local install_dir="$(get_install_dir)"
+	local suffix="$(get_install_suffix)"
+
+	insinto "${install_dir}"
+
+	doins "${BUILD_DIR}/app.asar"
+	doins -r "${BUILD_DIR}/app.asar.unpacked"
+
+	insinto "${install_dir}/app"
+	doins -r "${BUILD_DIR}/app/apm"
+
+	insinto "/usr/share/applications/"
+	newins "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" \
+		"atom${suffix}.desktop"
+
+	insinto "/usr/share/icons/"
+	doins -r "${BIN_S}/usr/share/icons/hicolor"
+
+	exeinto "${install_dir}"
+	newexe "${BUILD_DIR}/app/atom.sh" atom
+	insinto "/usr/share/licenses/${PN}${suffix}"
+	doins "${BIN_S}/$(get_atom_rpmdir)/resources/LICENSE.md"
+	dosym "${install_dir}/atom" "/usr/bin/atom${suffix}"
+	dosym "${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}"
+
+	_fix_executables "${install_dir}/app/apm/bin"
+	_fix_executables "${install_dir}/app/apm/node_modules/.bin"
+	_fix_executables "${install_dir}/app/apm/node_modules/npm/bin"
+	_fix_executables "${install_dir}/app/apm/node_modules/npm/bin/node-gyp-bin"
+	_fix_executables "${install_dir}/app/apm/node_modules/node-gyp/bin"
+}
+
+# Helpers
+# -------
+
+# Return the installation suffix appropriate for the slot.
+get_install_suffix() {
+	local c=(${SLOT//\// })
+	local slot=${c[0]}
+	local suffix
+
+	if [[ "${slot}" == "0" ]]; then
+		suffix=""
+	else
+		suffix="-${slot}"
+	fi
+
+	echo -n "${suffix}"
+}
+
+# Return the upstream app name appropriate for $PV.
+get_atom_appname() {
+	if [[ "${PV}" == *beta* ]]; then
+		echo -n "atom-beta"
+	else
+		echo -n "atom"
+	fi
+}
+
+# Return the app installation path inside the upstream archive.
+get_atom_rpmdir() {
+	echo -n "usr/share/$(get_atom_appname)"
+}
+
+# Return the installation target directory.
+get_install_dir() {
+	echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
+}
+
+# Return the Electron installation directory.
+get_electron_dir() {
+	echo -n "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
+}
+
+# Return the directory containing appropriate Node headers
+# for the required version of Electron.
+get_electron_nodedir() {
+	echo -n "/usr/include/electron-${ELECTRON_SLOT}/node/"
+}
+
+# Run JavaScript using Electron's version of Node.
+enode_electron() {
+	"$(get_electron_dir)"/node $@
+}
+
+# Run node-gyp using Electron's version of Node.
+enodegyp_atom() {
+	local apmpath="$(get_atom_rpmdir)/resources/app/apm"
+	local nodegyp="${BIN_S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
+
+	PATH="$(get_electron_dir):${PATH}" \
+		enode_electron "${nodegyp}" \
+			--nodedir="$(get_electron_nodedir)" $@ || die
+}
+
+# Coffee Script wrapper.
+ecoffeescript() {
+	local cscript="${FILESDIR}/transpile-coffee-script.js"
+
+	# Disable shell glob expansion, as we want the coffee script
+	# transpiler to do that instead.
+	set -f
+	echo "ecoffeescript" $@
+	ATOM_HOME="${T}/.atom" ATOM_SRC_ROOT="${BUILD_DIR}/app" \
+	NODE_PATH="${BUILD_DIR}/app/node_modules" \
+		enode_electron "${cscript}" $@ || die
+	set +f
+}
+
+# asar wrapper.
+easar() {
+	local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
+	echo "asar" $@
+	enode_electron "${asar}" $@ || die
+}
+
+# Return a $WORKDIR directory for a given package name.
+package_dir() {
+	local binmod="${1//-/_}"
+	local binmod_v="${binmod^^}_V"
+	echo -n ${1}-${!binmod_v}
+}
+
+# Check if there are patches for a given package.
+_have_patches_for() {
+	local _patches="${1}-*.patch" _find
+	_find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
+	test -n "$_find"
+}
+
+# Tarballs on registry.npmjs.org are wildly inconsistent,
+# and violate the convention of having ${P} as the top directory name.
+# This helper detects and fixes that.
+_unpack() {
+	local a="${1}"
+	local b="${a%.tar.gz}"
+	local p="${b#atomdep-}"
+	local dir="$(tar -tzf "${DISTDIR}/${a}" | head -1 | cut -f1 -d'/')"
+
+	unpack "${a}"
+
+	if [[ "${dir}" != "${p}" ]]; then
+		# Set the correct name for the unpacked directory.
+		mv "${WORKDIR}/${dir}" "${WORKDIR}/${p}" || die
+	fi
+}
+
+# Check if the binary node module is actually a valid dependency.
+# Sometimes the upstream removes a dependency from package.json but
+# forgets to remove the module from node_modules.
+_is_valid_binmod() {
+	local mod
+
+	for mod in "${BINMODS[@]}"; do
+		if [[ "${mod}" == "${1}" ]]; then
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+# Replace binary node modules with the newly compiled versions thereof.
+_fix_binmods() {
+	local _dir="${2}"
+	local _prefix="${1}"
+	local path
+	local relpath
+	local modpath
+	local mod
+	local f
+	local d
+	local cruft
+
+	(find "${_prefix}/${_dir}" -name '*.node' -print || die) \
+	| while IFS= read -r path; do
+		f=$(basename "${path}")
+		d=$(dirname "${path}")
+	    relpath=${path#${_prefix}}
+		relpath=${relpath##/}
+		relpath=${relpath#W${_dir}}
+		modpath=$(dirname ${relpath})
+		modpath=${modpath%build/Release}
+		mod=$(basename ${modpath})
+
+		_is_valid_binmod "${mod}" || continue
+
+		# must copy here as symlinks will cause the module loading to fail
+		cp -f "${BUILD_DIR}/modules/${mod}/${f}" "${path}" || die
+		cruft=$(find "${d}" -name '*.a' -print)
+		if [[ -n "${cruft}" ]]; then
+			rm ${cruft} || die
+		fi
+	done
+}
+
+# Fix script permissions and shebangs to point to the correct version
+# of Node.
+_fix_executables() {
+	local _dir="${1}"
+	local _node_sb="#!$(get_electron_dir)"/node
+
+	(find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) \
+	| while IFS= read -r f; do
+		IFS= read -r shebang < "${f}"
+
+		if [[ ${shebang} == '#!'* ]]; then
+			fperms +x "${f#${ED}}"
+			if [[ "${shebang}" == "#!/usr/bin/env node" || "${shebang}" == "#!/usr/bin/node" ]]; then
+				einfo "Fixing node shebang in ${f#${ED}}"
+				sed --follow-symlinks -i \
+					-e "1s:${shebang}$:${_node_sb}:" "${f}" || die
+			fi
+		fi
+	done || die
+}
--- a/app-editors/atom/atom-1.21.0_beta2.ebuild
+++ b/app-editors/atom/atom-1.21.0_beta2.ebuild
@ -0,0 +1,511 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTE: this ebuild has been generated by atom-ebuild-gen.py from the
+#       atom overlay.
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 multiprocessing rpm virtualx
+
+DESCRIPTION="A hackable text editor for the 21st Century"
+HOMEPAGE="https://atom.io"
+MY_PV="${PV//_/-}"
+
+ELECTRON_V=1.6.9
+ELECTRON_SLOT=1.6
+
+ASAR_V=0.13.0
+# All binary packages depend on this
+NAN_V=2.6.2
+
+CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
+CTAGS_V=3.0.0
+FS_ADMIN_V=0.1.6
+GIT_UTILS_V=5.0.0
+KEYBOARD_LAYOUT_V=2.0.13
+KEYTAR_V=4.0.4
+NSFW_V=1.0.16
+NSLOG_V=3.0.0
+ONIGURUMA_V=6.2.1
+PATHWATCHER_V=8.0.1
+SCROLLBAR_STYLE_V=3.2.0
+SPELLCHECKER_V=3.4.3
+SUPERSTRING_V=2.2.3
+
+# The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
+SRC_URI="
+	https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/atom.x86_64.rpm -> atom-bin-${MY_PV}.rpm
+	https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> atom-${MY_PV}.tar.gz
+	https://github.com/elprans/asar/releases/download/v${ASAR_V}-gentoo/asar-build.tar.gz -> asar-${ASAR_V}.tar.gz
+	https://github.com/nodejs/nan/archive/v${NAN_V}.tar.gz -> nodejs-nan-${NAN_V}.tar.gz
+	https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.4.1.tgz -> atomdep-cached-run-in-this-context-0.4.1.tar.gz
+	https://registry.npmjs.org/ctags/-/ctags-3.0.0.tgz -> atomdep-ctags-3.0.0.tar.gz
+	https://registry.npmjs.org/fs-admin/-/fs-admin-0.1.6.tgz -> atomdep-fs-admin-0.1.6.tar.gz
+	https://registry.npmjs.org/git-utils/-/git-utils-5.0.0.tgz -> atomdep-git-utils-5.0.0.tar.gz
+	https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.13.tgz -> atomdep-keyboard-layout-2.0.13.tar.gz
+	https://registry.npmjs.org/keytar/-/keytar-4.0.4.tgz -> atomdep-keytar-4.0.4.tar.gz
+	https://registry.npmjs.org/nsfw/-/nsfw-1.0.16.tgz -> atomdep-nsfw-1.0.16.tar.gz
+	https://registry.npmjs.org/nslog/-/nslog-3.0.0.tgz -> atomdep-nslog-3.0.0.tar.gz
+	https://registry.npmjs.org/oniguruma/-/oniguruma-6.2.1.tgz -> atomdep-oniguruma-6.2.1.tar.gz
+	https://registry.npmjs.org/pathwatcher/-/pathwatcher-8.0.1.tgz -> atomdep-pathwatcher-8.0.1.tar.gz
+	https://registry.npmjs.org/scrollbar-style/-/scrollbar-style-3.2.0.tgz -> atomdep-scrollbar-style-3.2.0.tar.gz
+	https://registry.npmjs.org/spellchecker/-/spellchecker-3.4.3.tgz -> atomdep-spellchecker-3.4.3.tar.gz
+	https://registry.npmjs.org/superstring/-/superstring-2.2.3.tgz -> atomdep-superstring-2.2.3.tar.gz
+"
+
+BINMODS=(
+	cached-run-in-this-context
+	ctags
+	fs-admin
+	git-utils
+	keyboard-layout
+	keytar
+	nsfw
+	nslog
+	oniguruma
+	pathwatcher
+	scrollbar-style
+	spellchecker
+	superstring
+)
+
+LICENSE="MIT"
+SLOT="beta"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=app-text/hunspell-1.3.3:=
+	>=dev-libs/libgit2-0.23:=[ssh]
+	>=dev-libs/libpcre2-10.22:=[jit,pcre16]
+	>=gnome-base/libgnome-keyring-3.12:=
+	>=dev-libs/oniguruma-5.9.5:=
+	>=dev-util/ctags-5.8
+	>=dev-util/electron-${ELECTRON_V}:${ELECTRON_SLOT}
+	x11-libs/libxkbfile"
+RDEPEND="
+	${DEPEND}
+	!sys-apps/apmd
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+BIN_S="${WORKDIR}/${PN}-bin-${MY_PV}"
+BUILD_DIR="${S}/out"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	local a
+
+	for a in ${A} ; do
+		case ${a} in
+		*.rpm) srcrpm_unpack "${a}" ;;
+		*) _unpack "${a}" ;;
+		esac
+	done
+
+	mkdir "${BIN_S}" || die
+	mv "${WORKDIR}/usr" "${BIN_S}" || die
+}
+
+src_prepare() {
+	local install_dir="$(get_install_dir)"
+	local suffix="$(get_install_suffix)"
+	local nan_s="${WORKDIR}/nodejs-nan-${NAN_V}"
+	local patch
+	local binmod
+	local _s
+
+	mkdir "${BUILD_DIR}" || die
+	cp -a "${BIN_S}/$(get_atom_rpmdir)/resources/app" \
+		"${BUILD_DIR}/app" || die
+
+	# Add source files omitted from the upstream binary distribution,
+	# and which we want to include in ours.
+	cp -a -t "${BUILD_DIR}/app" "${S}/spec" || die
+
+	# Unpack app.asar
+	if [ -e "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" ]; then
+		easar extract "${BIN_S}/$(get_atom_rpmdir)/resources/app.asar" \
+			"${BUILD_DIR}/app"
+	fi
+
+	cd "${BUILD_DIR}/app" || die
+
+	eapply "${FILESDIR}/atom-python.patch"
+	eapply "${FILESDIR}/apm-python.patch"
+	eapply "${FILESDIR}/atom-unbundle-electron.patch"
+	eapply "${FILESDIR}/atom-apm-path-r1.patch"
+	eapply "${FILESDIR}/atom-license-path-r1.patch"
+	eapply "${FILESDIR}/atom-fix-app-restart-r1.patch"
+	eapply "${FILESDIR}/atom-marker-layer-r1.patch"
+
+	sed -i -e "s|{{NPM_CONFIG_NODEDIR}}|$(get_electron_nodedir)|g" \
+		./atom.sh \
+		|| die
+
+	sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
+		./atom.sh \
+		|| die
+
+	sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${install_dir}/app.asar|g" \
+		./atom.sh \
+		|| die
+
+	local env="export NPM_CONFIG_NODEDIR=$(get_electron_nodedir)\n\
+			   export ELECTRON_NO_ASAR=1"
+	sed -i -e \
+		"s|\"\$binDir/\$nodeBin\"|${env}\nexec $(get_electron_dir)/node|g" \
+			apm/bin/apm || die
+
+	sed -i -e \
+		"s|^\([[:space:]]*\)node[[:space:]]\+|\1\"$(get_electron_dir)/node\" |g" \
+			apm/node_modules/npm/bin/node-gyp-bin/node-gyp || die
+
+	sed -i -e \
+		"s|atomCommand = 'atom';|atomCommand = '/usr/bin/atom${suffix}'|g" \
+			apm/lib/test.js || die
+
+	rm apm/bin/node || die
+
+	sed -i -e "s|/$(get_atom_rpmdir)/atom|/usr/bin/atom${suffix}|g" \
+		"${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" || die
+
+	for binmod in ${BINMODS[@]}; do
+		_s="${WORKDIR}/$(package_dir ${binmod})"
+		cd "${_s}" || die
+		if _have_patches_for "${binmod}"; then
+			for patch in "${FILESDIR}"/${binmod}-*.patch; do
+				eapply "${patch}"
+			done
+		fi
+	done
+
+	cd "${BUILD_DIR}/app" || die
+
+	# Unbundle bundled libs from modules
+
+	_s="${WORKDIR}/$(package_dir git-utils)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle "git;libgit2;git2" \
+		"${_s}/binding.gyp" || die
+
+	_s="${WORKDIR}/$(package_dir oniguruma)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle "onig_scanner;oniguruma;onig" \
+		"${_s}/binding.gyp" || die
+
+	_s="${WORKDIR}/$(package_dir spellchecker)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle "spellchecker;hunspell;hunspell" \
+		"${_s}/binding.gyp" || die
+
+	_s="${WORKDIR}/$(package_dir superstring)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle \
+		"superstring_core;./vendor/pcre/pcre.gyp:pcre;pcre2-16; \
+			-DPCRE2_CODE_UNIT_WIDTH=16" \
+		"${_s}/binding.gyp" || die
+
+	for binmod in ${BINMODS[@]}; do
+		_s="${WORKDIR}/$(package_dir ${binmod})"
+		mkdir -p "${_s}/node_modules" || die
+		ln -s "${nan_s}" "${_s}/node_modules/nan" || die
+	done
+
+	sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
+		"${BUILD_DIR}/app/src/config-schema.js" || die
+
+	eapply_user
+}
+
+src_configure() {
+	local binmod
+
+	for binmod in ${BINMODS[@]}; do
+		einfo "Configuring ${binmod}..."
+		cd "${WORKDIR}/$(package_dir ${binmod})" || die
+		enodegyp_atom configure
+	done
+}
+
+src_compile() {
+	local binmod
+	local x
+	local ctags_d="node_modules/symbols-view/vendor"
+	local jobs=$(makeopts_jobs)
+	local gypopts
+
+	# Transpile any yet untranspiled files.
+	ecoffeescript "${BUILD_DIR}/app/spec/*.coffee"
+
+	gypopts="--verbose"
+
+	if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+		gypopts+=" --jobs ${jobs}"
+	fi
+
+	mkdir -p "${BUILD_DIR}/modules/" || die
+
+	for binmod in ${BINMODS[@]}; do
+		einfo "Building ${binmod}..."
+		cd "${WORKDIR}/$(package_dir ${binmod})" || die
+		enodegyp_atom ${gypopts} build
+		x=${binmod##node-}
+		mkdir -p "${BUILD_DIR}/modules/${x}" || die
+		cp build/Release/*.node "${BUILD_DIR}/modules/${x}" || die
+	done
+
+	# Put compiled binary modules in place
+	_fix_binmods "${BUILD_DIR}/app" "apm"
+	_fix_binmods "${BUILD_DIR}/app" "node_modules"
+
+	# Remove non-Linux vendored ctags binaries
+	rm "${BUILD_DIR}/app/${ctags_d}/ctags-darwin" \
+	   "${BUILD_DIR}/app/${ctags_d}/ctags-win32.exe" || die
+
+	# Re-pack app.asar
+	# Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
+	cd "${BUILD_DIR}" || die
+	x="--unpack={*.node,ctags-config,ctags-linux,**/spec/fixtures/**,**/node_modules/spellchecker/**,**/resources/atom.png}"
+	xd="--unpack-dir=apm"
+	easar pack "${x}" "${xd}" "app" "app.asar"
+
+	rm -r "${BUILD_DIR}/app.asar.unpacked/apm" || die
+
+	# Replace vendored ctags with a symlink to system ctags
+	rm "${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+	ln -s "/usr/bin/ctags" \
+		"${BUILD_DIR}/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+}
+
+src_test() {
+	local electron="$(get_electron_dir)/electron"
+	local app="${BUILD_DIR}/app.asar"
+
+	virtx "${electron}" --app="${app}" --test "${app}/spec"
+}
+
+src_install() {
+	local install_dir="$(get_install_dir)"
+	local suffix="$(get_install_suffix)"
+
+	insinto "${install_dir}"
+
+	doins "${BUILD_DIR}/app.asar"
+	doins -r "${BUILD_DIR}/app.asar.unpacked"
+
+	insinto "${install_dir}/app"
+	doins -r "${BUILD_DIR}/app/apm"
+
+	insinto "/usr/share/applications/"
+	newins "${BIN_S}/usr/share/applications/$(get_atom_appname).desktop" \
+		"atom${suffix}.desktop"
+
+	insinto "/usr/share/icons/"
+	doins -r "${BIN_S}/usr/share/icons/hicolor"
+
+	exeinto "${install_dir}"
+	newexe "${BUILD_DIR}/app/atom.sh" atom
+	insinto "/usr/share/licenses/${PN}${suffix}"
+	doins "${BIN_S}/$(get_atom_rpmdir)/resources/LICENSE.md"
+	dosym "${install_dir}/atom" "/usr/bin/atom${suffix}"
+	dosym "${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}"
+
+	_fix_executables "${install_dir}/app/apm/bin"
+	_fix_executables "${install_dir}/app/apm/node_modules/.bin"
+	_fix_executables "${install_dir}/app/apm/node_modules/npm/bin"
+	_fix_executables "${install_dir}/app/apm/node_modules/npm/bin/node-gyp-bin"
+	_fix_executables "${install_dir}/app/apm/node_modules/node-gyp/bin"
+}
+
+# Helpers
+# -------
+
+# Return the installation suffix appropriate for the slot.
+get_install_suffix() {
+	local c=(${SLOT//\// })
+	local slot=${c[0]}
+	local suffix
+
+	if [[ "${slot}" == "0" ]]; then
+		suffix=""
+	else
+		suffix="-${slot}"
+	fi
+
+	echo -n "${suffix}"
+}
+
+# Return the upstream app name appropriate for $PV.
+get_atom_appname() {
+	if [[ "${PV}" == *beta* ]]; then
+		echo -n "atom-beta"
+	else
+		echo -n "atom"
+	fi
+}
+
+# Return the app installation path inside the upstream archive.
+get_atom_rpmdir() {
+	echo -n "usr/share/$(get_atom_appname)"
+}
+
+# Return the installation target directory.
+get_install_dir() {
+	echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
+}
+
+# Return the Electron installation directory.
+get_electron_dir() {
+	echo -n "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
+}
+
+# Return the directory containing appropriate Node headers
+# for the required version of Electron.
+get_electron_nodedir() {
+	echo -n "/usr/include/electron-${ELECTRON_SLOT}/node/"
+}
+
+# Run JavaScript using Electron's version of Node.
+enode_electron() {
+	"$(get_electron_dir)"/node $@
+}
+
+# Run node-gyp using Electron's version of Node.
+enodegyp_atom() {
+	local apmpath="$(get_atom_rpmdir)/resources/app/apm"
+	local nodegyp="${BIN_S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
+
+	PATH="$(get_electron_dir):${PATH}" \
+		enode_electron "${nodegyp}" \
+			--nodedir="$(get_electron_nodedir)" $@ || die
+}
+
+# Coffee Script wrapper.
+ecoffeescript() {
+	local cscript="${FILESDIR}/transpile-coffee-script.js"
+
+	# Disable shell glob expansion, as we want the coffee script
+	# transpiler to do that instead.
+	set -f
+	echo "ecoffeescript" $@
+	ATOM_HOME="${T}/.atom" ATOM_SRC_ROOT="${BUILD_DIR}/app" \
+	NODE_PATH="${BUILD_DIR}/app/node_modules" \
+		enode_electron "${cscript}" $@ || die
+	set +f
+}
+
+# asar wrapper.
+easar() {
+	local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
+	echo "asar" $@
+	enode_electron "${asar}" $@ || die
+}
+
+# Return a $WORKDIR directory for a given package name.
+package_dir() {
+	local binmod="${1//-/_}"
+	local binmod_v="${binmod^^}_V"
+	echo -n ${1}-${!binmod_v}
+}
+
+# Check if there are patches for a given package.
+_have_patches_for() {
+	local _patches="${1}-*.patch" _find
+	_find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
+	test -n "$_find"
+}
+
+# Tarballs on registry.npmjs.org are wildly inconsistent,
+# and violate the convention of having ${P} as the top directory name.
+# This helper detects and fixes that.
+_unpack() {
+	local a="${1}"
+	local b="${a%.tar.gz}"
+	local p="${b#atomdep-}"
+	local dir="$(tar -tzf "${DISTDIR}/${a}" | head -1 | cut -f1 -d'/')"
+
+	unpack "${a}"
+
+	if [[ "${dir}" != "${p}" ]]; then
+		# Set the correct name for the unpacked directory.
+		mv "${WORKDIR}/${dir}" "${WORKDIR}/${p}" || die
+	fi
+}
+
+# Check if the binary node module is actually a valid dependency.
+# Sometimes the upstream removes a dependency from package.json but
+# forgets to remove the module from node_modules.
+_is_valid_binmod() {
+	local mod
+
+	for mod in "${BINMODS[@]}"; do
+		if [[ "${mod}" == "${1}" ]]; then
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+# Replace binary node modules with the newly compiled versions thereof.
+_fix_binmods() {
+	local _dir="${2}"
+	local _prefix="${1}"
+	local path
+	local relpath
+	local modpath
+	local mod
+	local f
+	local d
+	local cruft
+
+	(find "${_prefix}/${_dir}" -name '*.node' -print || die) \
+	| while IFS= read -r path; do
+		f=$(basename "${path}")
+		d=$(dirname "${path}")
+	    relpath=${path#${_prefix}}
+		relpath=${relpath##/}
+		relpath=${relpath#W${_dir}}
+		modpath=$(dirname ${relpath})
+		modpath=${modpath%build/Release}
+		mod=$(basename ${modpath})
+
+		_is_valid_binmod "${mod}" || continue
+
+		# must copy here as symlinks will cause the module loading to fail
+		cp -f "${BUILD_DIR}/modules/${mod}/${f}" "${path}" || die
+		cruft=$(find "${d}" -name '*.a' -print)
+		if [[ -n "${cruft}" ]]; then
+			rm ${cruft} || die
+		fi
+	done
+}
+
+# Fix script permissions and shebangs to point to the correct version
+# of Node.
+_fix_executables() {
+	local _dir="${1}"
+	local _node_sb="#!$(get_electron_dir)"/node
+
+	(find -L "${ED}/${_dir}" -maxdepth 1 -mindepth 1 -type f -print || die) \
+	| while IFS= read -r f; do
+		IFS= read -r shebang < "${f}"
+
+		if [[ ${shebang} == '#!'* ]]; then
+			fperms +x "${f#${ED}}"
+			if [[ "${shebang}" == "#!/usr/bin/env node" || "${shebang}" == "#!/usr/bin/node" ]]; then
+				einfo "Fixing node shebang in ${f#${ED}}"
+				sed --follow-symlinks -i \
+					-e "1s:${shebang}$:${_node_sb}:" "${f}" || die
+			fi
+		fi
+	done || die
+}
--- a/app-editors/atom/files/apm-python.patch
+++ b/app-editors/atom/files/apm-python.patch
@ -0,0 +1,16 @@
+diff --git a/apm/bin/python-interceptor.sh b/apm/bin/python-interceptor.sh
+index 7ce1965..12cc72f 100755
+--- a/apm/bin/python-interceptor.sh
+++ b/apm/bin/python-interceptor.sh
+@@ -34,9 +34,9 @@ case $1 in
+       ARGS+=("--format=safemake.py")
+     fi
+ 
+-    exec python "${ARGS[@]}"
+    exec python2 "${ARGS[@]}"
+     ;;
+   *)
+-    exec python "$@"
+    exec python2 "$@"
+     ;;
+ esac
--- a/app-editors/atom/files/atom-apm-path-r1.patch
+++ b/app-editors/atom/files/atom-apm-path-r1.patch
@ -0,0 +1,16 @@
+diff --git a/src/config-schema.js b/src/config-schema.js
+index 39f0585..24ee2de 100644
+--- a/src/config-schema.js
+++ b/src/config-schema.js
+@@ -5,6 +5,11 @@ const configSchema = {
+   core: {
+     type: 'object',
+     properties: {
+      apmPath: {
+        type: 'string',
+        "default": '/usr/bin/apm{{ATOM_SUFFIX}}',
+        description: 'Path to apm executable.'
+      },
+       ignoredNames: {
+         type: 'array',
+         default: ['.git', '.hg', '.svn', '.DS_Store', '._*', 'Thumbs.db', 'desktop.ini'],
--- a/app-editors/atom/files/atom-fix-app-restart-r1.patch
+++ b/app-editors/atom/files/atom-fix-app-restart-r1.patch
@ -0,0 +1,12 @@
+diff --git a/atom-application.js.orig b/atom-application.js
+index 92d985f..9a120e6 100644
+--- a/src/main-process/atom-application.js
+++ b/src/main-process/atom-application.js
+@@ -1178,6 +1178,7 @@
+     AtomApplication.prototype.restart = function() {
+       var args;
+       args = [];
+      args.push("--app=" + this.resourcePath);
+       if (this.safeMode) {
+         args.push("--safe");
+       }
--- a/app-editors/atom/files/atom-license-path-r1.patch
+++ b/app-editors/atom/files/atom-license-path-r1.patch
@ -0,0 +1,11 @@
+--- a/src/main-process/atom-application.js
+++ b/src/main-process/atom-application.js
+@@ -406,7 +406,7 @@
+       this.openPathOnEvent('application:open-your-keymap', 'atom://.atom/keymap');
+       this.openPathOnEvent('application:open-your-snippets', 'atom://.atom/snippets');
+       this.openPathOnEvent('application:open-your-stylesheet', 'atom://.atom/stylesheet');
+-      this.openPathOnEvent('application:open-license', path.join(process.resourcesPath, 'LICENSE.md'));
+      this.openPathOnEvent('application:open-license', '/usr/share/licenses/atom/LICENSE.md');
+       this.disposable.add(ipcHelpers.on(app, 'before-quit', (function(_this) {
+         return function(event) {
+           if (!_this.quitting) {
--- a/app-editors/atom/files/atom-marker-layer-r1.patch
+++ b/app-editors/atom/files/atom-marker-layer-r1.patch
@ -0,0 +1,11 @@
+--- a/node_modules/text-buffer/lib/marker-layer.js
+--- b/node_modules/text-buffer/lib/marker-layer.js
+@@ -192,7 +192,7 @@
+         return function(markerId) {
+           var marker;
+           marker = _this.markersById[markerId];
+-          if (!marker.matchesParams(params)) {
+          if (marker == null || !marker.matchesParams(params)) {
+             return;
+           }
+           return result.push(marker);
--- a/app-editors/atom/files/atom-unbundle-electron.patch
+++ b/app-editors/atom/files/atom-unbundle-electron.patch
@ -1,17 +1,17 @@
-From 19f9a5c6f8be7b4df069f728d9ea037a36bc03d2 Mon Sep 17 00:00:00 2001
+From ea6d1be3558d7610ccc82b3a44dd30657a686639 Mon Sep 17 00:00:00 2001
 From: Elvis Pranskevichus <elvis@magic.io>
-Date: Thu, 5 May 2016 17:23:35 -0400
+Date: Thu, 27 Jul 2017 13:18:54 -0400
 Subject: [PATCH] Unbundle electron

 ---
- atom.sh | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
+ atom.sh | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)

 diff --git a/atom.sh b/atom.sh
-index b68716b..e119cbd 100755
+index 6b0e94430..ea8e0dc2e 100755
 --- a/atom.sh
 +++ b/atom.sh
-@@ -87,11 +87,9 @@ elif [ $OS == 'Linux' ]; then
+@@ -102,11 +102,10 @@ elif [ $OS == 'Linux' ]; then
   SCRIPT=$(readlink -f "$0")
   USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
 
@ -22,11 +22,12 @@ index b68716b..e119cbd 100755
 -  fi
 +  export NPM_CONFIG_NODEDIR="{{NPM_CONFIG_NODEDIR}}"
 +  export ATOM_RESOURCE_PATH="{{ATOM_RESOURCE_PATH}}"
+  export LOCAL_GIT_DIRECTORY="/usr"
 +  ATOM_PATH="{{ATOM_PATH}}"
 
   ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
   mkdir -p "$ATOM_HOME"
-@@ -101,11 +99,11 @@ elif [ $OS == 'Linux' ]; then
+@@ -116,11 +115,11 @@ elif [ $OS == 'Linux' ]; then
   [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
 
   if [ $EXPECT_OUTPUT ]; then
@ -41,5 +42,4 @@ index b68716b..e119cbd 100755
       cat "$ATOM_HOME/nohup.out"
       exit $?
 -- 
-2.7.3
-
+2.13.3
--- a/app-editors/atom/files/gyp-unbundle.py
+++ b/app-editors/atom/files/gyp-unbundle.py
@ -4,6 +4,7 @@ from __future__ import print_function


 import argparse
+import pprint
 import sys


@ -19,7 +20,7 @@ def do_unbundle(gypdata, targets):
    def _unbundle_in_block(gypblock):
        gypdeps = gypblock.get('dependencies') or {}

-        for dep, libs in unbundlings.items():
+        for dep, (libs, defines) in unbundlings.items():
            if dep not in gypdeps:
                continue

@ -37,6 +38,14 @@ def do_unbundle(gypdata, targets):

            gyplibs.extend('-l{}'.format(lib) for lib in libs)

+            if defines:
+                try:
+                    dd = gyptarget['defines']
+                except KeyError:
+                    dd = gyptarget['defines'] = []
+
+                dd.extend(defines)
+
            dropped_deps.add(dep)

        gypconds = gypblock.get('conditions') or []
@ -84,7 +93,8 @@ def main():
    parser.add_argument('gypfile', type=str, help='input gyp file')
    parser.add_argument(
        '--unbundle', type=str, action='append',
-        help='unbundle rule in the format <target>;<dep>;<lib>[;lib]')
+        help='unbundle rule in the format '
+             '<target>;<dep>;<lib>[;lib][;-DMACRO]')
    parser.add_argument(
        '-i', '--inplace', action='store_true',
        help='modify gyp file in-place')
@ -94,18 +104,26 @@ def main():
    targets = {}

    for unbundle in args.unbundle:
-        rule = unbundle.split(';')
+        rule = list(filter(None, (i.strip() for i in unbundle.split(';'))))
        if len(rule) < 3:
            die('Invalid unbundle rule: {!r}'.format(unbundle))
        target, dep = rule[:2]
-        libs = rule[2:]
+
+        defines = []
+        libs = []
+
+        for item in rule[2:]:
+            if item.startswith('-D'):
+                defines.append(item[2:])
+            else:
+                libs.append(item)

        try:
            target_unbundlings = targets[target]
        except KeyError:
            target_unbundlings = targets[target] = {}

-        target_unbundlings[dep] = libs
+        target_unbundlings[dep] = libs, defines

    with open(args.gypfile, 'rt') as f:
        gypdata = eval(f.read())
@ -114,9 +132,9 @@ def main():

    if args.inplace:
        with open(args.gypfile, 'wt') as f:
-            f.write(repr(gypdata) + "\n")
+            pprint.pprint(gypdata, stream=f)
    else:
-        print(repr(gypdata))
+        pprint.pprint(gypdata)


 if __name__ == '__main__':
--- a/app-editors/atom/files/transpile-coffee-script.js
+++ b/app-editors/atom/files/transpile-coffee-script.js
@ -0,0 +1,23 @@
+'use strict'
+
+const CompileCache = require(process.env.ATOM_SRC_ROOT + '/src/compile-cache')
+const fs = require('fs')
+const glob = require('glob')
+const path = require('path')
+
+module.exports = function () {
+  let paths = new Set()
+
+  for (let pattern of process.argv.slice(2)) {
+    for (let path of glob.sync(pattern, {nodir: true})) {
+      paths.add(path)
+    }
+  }
+
+  for (let path of paths) {
+    let jsPath = coffeePath.replace(/coffee$/g, 'js')
+    fs.writeFileSync(
+      jsPath, CompileCache.addPathToCache(coffeePath, process.env.ATOM_HOME))
+    fs.unlinkSync(coffeePath)
+  }
+}
--- a/app-editors/emacs/emacs-23.4-r16.ebuild
+++ b/app-editors/emacs/emacs-23.4-r16.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2

 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="23"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 REQUIRED_USE="?? ( aqua X )"

--- a/app-editors/emacs/emacs-24.5-r4.ebuild
+++ b/app-editors/emacs/emacs-24.5-r4.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz

 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"

--- a/app-editors/emacs/emacs-25.3.ebuild
+++ b/app-editors/emacs/emacs-25.3.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"

 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
-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"
+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"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"

--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@ -1,4 +1,4 @@
 DIST VBoxGuestAdditions_5.0.16.iso 60063744 SHA256 8190f1e4031f8195971c2a97d2d3b1cf2d86fc83219f750d05cee9255c7dad85 SHA512 8a9d3fcb96a450163f357b92f8149f58700ec65c127fb872b103554417979fbe624a9e1bced3bb6cbf4b0bb6a5c3bbcae9581836cc5d3fde7a034d4032e519f9 WHIRLPOOL 89ed9064014a715a892388b5dbe3c4b577a5a813580be4fd2bd604672354f258b00a619980ba1369aeaceff6a77c6d370cc2b6bf3c17d2cd73a5c8fc9dcad1e8
 DIST VBoxGuestAdditions_5.0.40.iso 58466304 SHA256 df3a1849fe796b476b1095576fd72a27fd3f253d4770a2fb6bc792593ed9726b SHA512 f92dc50cfa0be3583c1b15e041d73948fba4d2a83dfd1a7a750feecede13a00e70b641da03533dd0f23f520cc5778cfeb824b3d8455042dcc85ee4f677f3d699 WHIRLPOOL 5e9d0a01bb1a065789b9a16416dde0156c9e3a0b28161f2944ad143e00905a2e328c93e2301f73ad518bac9c50dd5d3b946e1676fa3465a84f5c68bb52d56083
-DIST VBoxGuestAdditions_5.1.24.iso 59494400 SHA256 01a77500df9127d8d6aa27c7d784af8f773d8e84b2b252c9e866b9038ed8bd43 SHA512 4b266ccad53217d03eee7ebe0fbc52ca47ee9a70eb4f50ae9bf87ea3c0707d87e97e65b2a3e4616cc4ad1ab746e2fa88d9f5dbb234dbf1cd96487e231fd15870 WHIRLPOOL a432d973fabaf2da5db419b0229e9c1bb1037d89da43ae195f05f7cc8417f67101d182087537a3a27735e53d8c91c979e09408ffec6814183d9304baf1993062
 DIST VBoxGuestAdditions_5.1.26.iso 59496448 SHA256 6df8c8ab6e7ac3a70a5e29116f8a5dcdb7dfbd0b226ef849a5cd9502e956b06f SHA512 5329ce9bb787efed088a9f89412974cef3a982a351c0053b3daf15a9c95c55f99556e2b86cdcd39c168042503eb00eaa83fb99f8f5c4c97d177dd2b61bb33f5d WHIRLPOOL d8c2bd468673a0d9cee9b7f3630a6581c8124cd4b6bfe942b69ceff70cfa7096b7c1e947a86ed4fd00d7d4dac3eeae52b55bbed4bbb9c3268dd864fcd53068e9
+DIST VBoxGuestAdditions_5.1.28.iso 59494400 SHA256 66824ee3a0373da62b15f6687a68e2305d7e62d700e538cf32705227bb38c46d SHA512 68a1bcaa658bff040d18c5d59fe20bb0e6155186bdaea5cf30d673d8356fa33087a23280f3d571742ca1c144caef421d0c32a080fee0cb05c6046f361fbe2785 WHIRLPOOL 539994c2fa2271e425ba6b517e69906684f8a3d730899433d5de8ad5722152889fc3390035e66dd64646a9f10c611074cf95f820294a17e398c581b094536cb0
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.26.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.26.ebuild
@ -16,7 +16,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"

 LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror"

--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.28.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.28.ebuild
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@ -1,16 +1,16 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.16-105871.tar.gz 16896587 SHA256 c234e158c49f4f92c38e41918c117d756a81236ff1030a896e44faf88284ecc7 SHA512 39a7c6726e57c89a970e771f80369617c95e154498174deed025ca953e85197981215dd1250317285213a8e9bf6b7140e06311bd6df464613bfe90a37ef1c3c8 WHIRLPOOL 8bdf4a499e8d2d463249fb98ea35ee3a91d81004418e171396c0a26d91f3de9eda6fe632a1d85df58e1de1c32c5c939a365277ad836c685f83600277bd7282bf
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.40-115130.tar.gz 19050961 SHA256 ebb29de8962d60760a2f25c318833a1fe163368b824b6b26802b6b284af70585 SHA512 fb27a8efa376b2a51558e0a8dfcb87a7116e950783030c1aab996675c776c46cdf4d4ff35d111f925f6b2b4c6fd070ff80a971fd2f6ce77b857b17898950f5a3 WHIRLPOOL db1ba8492abf791f2244d12b7a62643c02c8c7999c607464e117cc42360c876d9ee83d36ea8860e18912b52171d12291d93fdcc3d3ff18ff05c2b3a4cea5373c
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.24-117012.tar.gz 19624088 SHA256 65198a2e048d30fc7d18cd4670fb84fed9a878cca1b77f416b4fea4efe8ca2a4 SHA512 fc821a446c67c4046dd2aa2078d6a71a63a490d59c96f76b29a5a46b26ad7e51588c1009efbafa448e73c799dc816de0b5f0ee17b10d306d3e701a15f69c595d WHIRLPOOL b86d40a08774cd56f612e4bd1edd1bea0e070185e9fab19ca21c0a08ffe092c73877a62dfa5be68e7a963145a84785330c935dd43b5c9ddcfbfc3ee2236f9e0a
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.26-117224.tar.gz 19624237 SHA256 14f152228495a715f526eb74134d43c960919cc534d2bc67cfe34a63e6cf7721 SHA512 c6e31e8fb26b8ca32c423d14e85e15f6372a030ec40e9f06ce1e1234913d3586cc58d46819684c99cf3ced37f35d0a964339199cad5cf43580c88bf1afa63ef6 WHIRLPOOL 9b0ceb8ab21ce54a199ac312879ae4bf17b5bbf3bae6d28035436ae8dd8295ea6fa1d8bb3fc095867a017fdcc357b630436dca46d4875bcdd2aad1ce0cfd9d9f
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.28-117968.tar.gz 19626161 SHA256 1a2551b204bd53a252a75a4653b983427bb15d473bc77b14149c7870ce049871 SHA512 71c6ce267c14303bbd9e386ea849d37aeb569afff848054deced4c74fd6fffca83c96b392d066f684b7101a786cc7d24cf9308114c08cbb77b26bb07bf23fcf8 WHIRLPOOL c6fd42f422dca4db4165ff18da0054aff5c0d275850dec4002fb70e8e4248f8f5cffc87697b0802343ebff29cf62938f298df365f9ce19523092d418206deff9
 DIST VirtualBox-5.0.16-105871-Linux_amd64.run 85913042 SHA256 2fc30af485c67162a8f1fafb5a0d9c6cbab4dc17ec362e6d8d2487071b4daa47 SHA512 706159c25ad144a489d7519dcc5a9fa6ee47415bac8fc48bb56fbbe72953f5e65fcdf9d045fbe686520ea676dbf511a19208adfd81f199c804e1b632de581f6b WHIRLPOOL 298235fe47a08136232916b990675b4b26dbab7155fd00c82d2405170fd7d255cfa5f93c07a13a89cdc0a129662f3a14d3386be17e11c02bbd3a564de554bcf3
 DIST VirtualBox-5.0.16-105871-Linux_x86.run 84909518 SHA256 46421f6ebed4de2466d32193597fbcfe71c2a89c5fd5ac1493856b509d6259e1 SHA512 a16e5a9ee4c643985d48c6ac8e7224074dd2a775bf05b9ef712fff898962493a2126bb1ced20b5ec525ddd86d0ce6c42c06e286f03758aad5d39d58b87db51a8 WHIRLPOOL dbc4af908d3e2879388426defd733539f3bbff10a4f957858f42ae7c328a5cbd0480667b50777a69e860be475d8c66a392badb79503d9f22c267688edc6a1e4e
 DIST VirtualBox-5.0.40-115130-Linux_amd64.run 84571603 SHA256 f633e88b22470b36b4586fbc8a14e0ee99dad5e094cb1ed73a77016fdbc616c8 SHA512 51e23c3b5eed256e799f9cd6be950a00d0c4f57276d8554cad8c1beb6310ee8625b6eaa364d47dab54274ef0ebd37114d3c6a1312313dce748ca9c985e08b59c WHIRLPOOL 2d6f465cee91be4637c84d65655c0b3c667d6f88af85c3c4b577ad416136d99094ad0fa089314730f7dce89224ed99f5be4ad6fd35db8bc2c23d1e0826400e76
 DIST VirtualBox-5.0.40-115130-Linux_x86.run 83793358 SHA256 1371ae3ceec0f2af5e31e569eab1ffd405a75bbf6fb8889a836d07167806d6cd SHA512 98f249e6a461b40856231f31ceb0914093dd97e513ff01fbeb308cb9d0e5d1fee98e69a9f5c1f73c082676c3273517ff2a1f3c658e57035c5d8d6b0cc0627a6b WHIRLPOOL f659c4edd9fa16e532f1c1729a2044b3ebb3a56c9d087c2310c0443e95545d96640b31b9f06f55529c765f4d52b835e528c3914e3a09d58f5cc62aa5cc4b9864
-DIST VirtualBox-5.1.24-117012-Linux_amd64.run 87971283 SHA256 6a01f975558707153cd95d6789e6d92f65751db26e9443ee8656cf9ee17a29b3 SHA512 31718701bdb44660923a2897c15d4943cf64cd99be44625751ac0829573a6dd2e63a497fede8511670e72b73c240b2cc7379fd9e3efff33fbe0d30e38b3ea07f WHIRLPOOL b28bdb1220b0c6be67a74c2042f499ac389812b53d5a31e22f7948f9116ce38d4a297f30bab135bf07aefc54cacc27e4cae40d0cf8e02e383af5baa06bcf0906
-DIST VirtualBox-5.1.24-117012-Linux_x86.run 87182799 SHA256 f4151be5c046b4271cba8c8f2bc776114ef8cad3b26f8880fe87f1302f500f64 SHA512 890fd9433f69e5dfb8854fbb1eb546b3ac558cedc121ebf346d6c20d1fc14cc2a9962be5bfff454bcd963f079395c720510b8ba3e119e52028e73d3885a6e202 WHIRLPOOL a33cd9f1f4bea0efe1a943176707348fa10601a06e667b1068a193b6af3d1f9d16a579a9753d7a84bac248d561cded59edbab09e48bed69feb4c38d5e79af0e1
 DIST VirtualBox-5.1.26-117224-Linux_amd64.run 87981522 SHA256 be541c9ad60655b436bb27dc91c482e2e1485da4fc0e632ec92bfbed625a48ed SHA512 9b486fd52918469fdffaa39bbef234d22fad9d3b562fa04443bf6c1040e744db6dc9bd103ead299127b82c5d4bc96c1e05f677cacd623affa6569408c8d26df5 WHIRLPOOL 3c3c7b8254f85223f06cdfdea6cb0cb982222889b899018ea03a6e7807243f5e85ec37ef4a5f829dc09d1fa0123c1c28738b0d1826cd381d4b550360efd9a268
 DIST VirtualBox-5.1.26-117224-Linux_x86.run 87090639 SHA256 05f82b704558efdda8a9c569b52fcf761793a54e8405d062fd20a4a56fffd5da SHA512 3aafad5374dc79c0fdd9bf1da6708ae4ce2f43d9fce3222326424bf03d6b73a7283ba5ebeb01a9ab6b24eeb8a8ec7c23af84e40f3edeb512c2101c329f4091e7 WHIRLPOOL 58c4ff741fed816f08c44af68eaae4fe0d206c59ea1300975d754781a44a8ab513054b5601cc23caefa7fbeb950bc41e8d544e6008e2de377e25661fadc9f9e1
+DIST VirtualBox-5.1.28-117968-Linux_amd64.run 88391123 SHA256 c3cbc56f5df1ff45c68094066dfc677d4d4f51f5df627b33a4d253db00ce12e4 SHA512 e84f002ed4804533832dfcc65f12ad4e72d6693de5af62bf26b702d19d8f17511335415968eac44ee3d98e87d5137c0004afa213b0bf75b89699cbe3bc20097c WHIRLPOOL cc686f6ed52a081e178aad6748703cd56f09adeac690f8a0ef9bb9aa1e3db394ad9e1187826d3f7b0d3a52df0314df82efcddd1fec2e9e72d968ab49b6687be6
+DIST VirtualBox-5.1.28-117968-Linux_x86.run 87582159 SHA256 8e9399547355eecc09b5866bc79813dcad9013172d09bca9e8f8aad01556f164 SHA512 96491961bfae60671b40f591151da26dab3135feaa3b9cf3838d7e74104cb4ae716eb5ff76ab75683c98ffba840cacaa045fa959f8e4eb4ab976801d38ebb917 WHIRLPOOL 287455f57191c8c567e34ba7047540cf443416fbdf4cb7e887d50582c15c9b31567871ee2112f782f513ae03584c95a3769596dc9ef5b8fe64030d71b41ab32a
 DIST VirtualBoxSDK-5.0.16-105871.zip 9639569 SHA256 df1bd5ed7f7fe9c401555498a1abed6f1f98e001c0069f16d401ccf3afe3061b SHA512 f4e1af1d97a26818722124fbbaffa6d61369b1a5f3b350b749284afdde038802f4a0e93e9bbb4c9ab0f49aad1f4fa19bbc4b0bdb04aa172a433a77a538816e25 WHIRLPOOL 0598061b47e5d0ef775665300ab61ad7b94638d32fb358a9c189536b00b2456ce4c90dfbcc00bac86da736289253e84a3b586b8b7d1da4087db76e8845a8ca33
 DIST VirtualBoxSDK-5.0.40-115130.zip 9674379 SHA256 9c27d4963f0afd9e11c0105739720b63df919162dfb6c88c52bb1f0e4f68c8ea SHA512 fc02623b5a4d288e37d8895f936f1552c284be2523762688e62d2fb57d3b2e83a2edb7193d0775bc481282e93242d8a691c408e931c8a42e2945a6507625f5f3 WHIRLPOOL b84f02c03e2de1baa3eda5ebc1d4de82d8c16205a2e624a9ecc7985ed70ccdfa8bc5cf066bcc9066cd4e82722600a76972dc472665ef576e6ac41045f5fa8047
-DIST VirtualBoxSDK-5.1.24-117012.zip 9862325 SHA256 559aa1805d8f341e9d17168bde70b1a6a50898432f4fd854be3a2212f978b6d2 SHA512 7b5f2b0b54bb895ffcc9bb8b391f0b5ca1eaf67fcad081fa9c4233a10beda9454350c2c3acea5ea336fc5155ca1758c30a1edc8b1b8567c273946f8259d91e63 WHIRLPOOL 801491377068d63d8ad611be2448a4f99b761e76ad82002304e1f559b148c9a427063526343f75f3e9f6e043ac71b5c41de63a3cfecbffafcc3039eab78e82a7
 DIST VirtualBoxSDK-5.1.26-117224.zip 9860247 SHA256 fb3e7e3cc425bd7ec3555cd4b1db6a69c85ae1744fb7df8060e4884ad26f09e5 SHA512 d2bef837d61bfb35ba550f004345c2c412c2f62da23ffded6dff8aa33281fdce7c0a8f6b70c131b35e04c34ca0a4221bf97a78e65a470c657980572ebedb0774 WHIRLPOOL 098de72faec934092150abe5a75dff3712b8b0e160eaba3c435d0131e323c74f584841ecbb5a14fd5c29fa2495d7717ef29ddad609939de8ad15752a6111cbf9
+DIST VirtualBoxSDK-5.1.28-117968.zip 9860778 SHA256 8eed55336c3c75bb925af14c720b880e2136cf2530f69ea0f087cd07081d13bf SHA512 d7e365c57a1179ccbba7e695b8b8fc4dcdf36b45fbb199000878ccb161b13208b14ad3fe963f99a9b680cba5a2c562e3d39cf9892acc16879919ddaa4d24c22b WHIRLPOOL 93fe7e6ce03f9be3d2b84c8d53c4632f8c01af5790d8d553fbd08ca45073725d3d961dcb26f4dd6c2c2007305f97a1c5753aaed27b3fb41687a87618887c24da
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.16.105871-r1.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.16.105871-r1.ebuild
@ -5,7 +5,7 @@ EAPI=5

 PYTHON_COMPAT=( python2_7 )

-inherit eutils fdo-mime gnome2 pax-utils python-r1 udev unpacker versionator
+inherit eutils xdg-utils gnome2 pax-utils python-r1 udev unpacker versionator

 MAIN_PV="$(get_version_component_range 1-3)"
 if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
@ -325,7 +325,7 @@ src_install() {
 }

 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update

 	gnome2_icon_cache_update

@ -352,5 +352,5 @@ pkg_postinst() {
 }

 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.40.115130.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.40.115130.ebuild
@ -5,7 +5,7 @@ EAPI=5

 PYTHON_COMPAT=( python2_7 )

-inherit eutils fdo-mime gnome2 pax-utils python-r1 udev unpacker versionator
+inherit eutils xdg-utils gnome2 pax-utils python-r1 udev unpacker versionator

 MAIN_PV="$(get_version_component_range 1-3)"
 if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
@ -256,7 +256,7 @@ src_install() {
 }

 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update

 	gnome2_icon_cache_update

@ -283,5 +283,5 @@ pkg_postinst() {
 }

 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.26.117224.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.26.117224.ebuild
@ -5,7 +5,7 @@ EAPI=5

 PYTHON_COMPAT=( python2_7 )

-inherit eutils fdo-mime gnome2 pax-utils python-r1 udev unpacker versionator
+inherit eutils xdg-utils gnome2 pax-utils python-r1 udev unpacker versionator

 MAIN_PV="$(get_version_component_range 1-3)"
 if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
@ -34,7 +34,7 @@ SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd

 LICENSE="GPL-2 PUEL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
 RESTRICT="mirror"

@ -256,7 +256,7 @@ src_install() {
 }

 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update

 	gnome2_icon_cache_update

@ -283,5 +283,5 @@ pkg_postinst() {
 }

 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.28.117968.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.28.117968.ebuild
@ -5,7 +5,7 @@ EAPI=5

 PYTHON_COMPAT=( python2_7 )

-inherit eutils fdo-mime gnome2 pax-utils python-r1 udev unpacker versionator
+inherit eutils xdg-utils gnome2 pax-utils python-r1 udev unpacker versionator

 MAIN_PV="$(get_version_component_range 1-3)"
 if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
@ -256,7 +256,7 @@ src_install() {
 }

 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update

 	gnome2_icon_cache_update

@ -283,5 +283,5 @@ pkg_postinst() {
 }

 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@ -1,3 +1,3 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.40-115130.tar.gz 19050961 SHA256 ebb29de8962d60760a2f25c318833a1fe163368b824b6b26802b6b284af70585 SHA512 fb27a8efa376b2a51558e0a8dfcb87a7116e950783030c1aab996675c776c46cdf4d4ff35d111f925f6b2b4c6fd070ff80a971fd2f6ce77b857b17898950f5a3 WHIRLPOOL db1ba8492abf791f2244d12b7a62643c02c8c7999c607464e117cc42360c876d9ee83d36ea8860e18912b52171d12291d93fdcc3d3ff18ff05c2b3a4cea5373c
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.24-117012.tar.gz 19624088 SHA256 65198a2e048d30fc7d18cd4670fb84fed9a878cca1b77f416b4fea4efe8ca2a4 SHA512 fc821a446c67c4046dd2aa2078d6a71a63a490d59c96f76b29a5a46b26ad7e51588c1009efbafa448e73c799dc816de0b5f0ee17b10d306d3e701a15f69c595d WHIRLPOOL b86d40a08774cd56f612e4bd1edd1bea0e070185e9fab19ca21c0a08ffe092c73877a62dfa5be68e7a963145a84785330c935dd43b5c9ddcfbfc3ee2236f9e0a
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.26-117224.tar.gz 19624237 SHA256 14f152228495a715f526eb74134d43c960919cc534d2bc67cfe34a63e6cf7721 SHA512 c6e31e8fb26b8ca32c423d14e85e15f6372a030ec40e9f06ce1e1234913d3586cc58d46819684c99cf3ced37f35d0a964339199cad5cf43580c88bf1afa63ef6 WHIRLPOOL 9b0ceb8ab21ce54a199ac312879ae4bf17b5bbf3bae6d28035436ae8dd8295ea6fa1d8bb3fc095867a017fdcc357b630436dca46d4875bcdd2aad1ce0cfd9d9f
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.28-117968.tar.gz 19626161 SHA256 1a2551b204bd53a252a75a4653b983427bb15d473bc77b14149c7870ce049871 SHA512 71c6ce267c14303bbd9e386ea849d37aeb569afff848054deced4c74fd6fffca83c96b392d066f684b7101a786cc7d24cf9308114c08cbb77b26bb07bf23fcf8 WHIRLPOOL c6fd42f422dca4db4165ff18da0054aff5c0d275850dec4002fb70e8e4248f8f5cffc87697b0802343ebff29cf62938f298df365f9ce19523092d418206deff9
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.26.117224.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.26.117224.ebuild
@ -25,7 +25,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack

 LICENSE="PUEL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror strip"

--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.28.117968.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.28.117968.ebuild
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@ -1,5 +1,5 @@
 DIST VirtualBox-5.0.16.tar.bz2 111062984 SHA256 f5a44d33a1db911f445b2eb2d22d9293a96a535cba488b5a235577ef868fa63c SHA512 3da3a227360fb50d299e99770378f65e8cb99525377343fa8faff2360be66643d46f68323d6a8b8d4d26182082f171bb35ab2497167bf6df18827a5ea7742074 WHIRLPOOL ea709057c588f28820790c2b193decba9ee0c57e0f82aa4361ca87aef661315182e18b5ee29558e47ed92f6037eb91befa5390680661a7b9f2248c7819b4a85c
 DIST VirtualBox-5.0.40.tar.bz2 112997095 SHA256 e4275b7ada40b358e6e3bd1231b3a320aa06c72ae301283cac5adb42eaa8e4b5 SHA512 70cd4355591c5aed82148954bf55637a5dcdd1a5177dba78192e7c6eadfbf3f7023f352ba8f89d9eb3c3fc55b049f7c76af6bc94e04d1766d7fbe39e51a1393c WHIRLPOOL 9f471e63814c9d48063857f3b95410f5acdd4a3bd2716c525f2449f1eae95d0e91dbe5422374a49f31f8219daa155f716455f0259d131d93afb5cd9e13a7d467
-DIST VirtualBox-5.1.24.tar.bz2 116135442 SHA256 ee2db169a322bf0db3c3b6d8b84aa39236f36cbf37d0a4c10ab65902a396bb60 SHA512 3c9ad230a53f9159e648ae1f342bdb220ffd85f2ddd45ae4c61d6606f358e9343a4968b2a91784893fb1284288ad41c538b1ab299b3a49e7739bfc8c4fdea910 WHIRLPOOL aad73184e2d36928449e688fd86c6f42c061f77e86c7e6119a205154b307846ed25175f49e3f8e451844b48c0e71e9531902753f1fd917123c401ffbf7744a2d
 DIST VirtualBox-5.1.26.tar.bz2 115915813 SHA256 b5715035e681a11ef1475f83f9503d34a00f0276b89c572eebec363dda80c8a9 SHA512 680e9646a51a0a5923b3ded10007ee1c1e2a41c6d8a961d2b2540db6578bed2847154f4cac87e3cfe1118a62595b47c7df99da854f6c340e173b9eb8cacf2add WHIRLPOOL 9d7950ec3ec2cd9b8aaa0ea319f9f5089eed7d2cd2879d313426b448a27570b5582235aa46c5ad5a0fd4d0b967f8d58a963f001549232136d6a8609262af71d0
+DIST VirtualBox-5.1.28.tar.bz2 116427658 SHA256 ce7d4bf6535f70e3214abeb4866f7a8634aa3c7b6dedf8825e6ad80bd821398d SHA512 5c21fd535424d7fd9adbb51894ec6d37ecf00a63a850362bd7b61fedca5031e096641814130a97ad839c0bd7089dc3dc465509615aab2af3c5735ff71005670a WHIRLPOOL 2e3fbeb39083c2e69fb23200570781a8845780a6295553af48fa9155db132e37d0fc2fb26e8a45c52864f69f02e8a0d0cbd4c895e5fbb87ab9a51dd60c7c7904
 DIST virtualbox-5.1.24-patches-01.tar.xz 2708 SHA256 8ea5e08da07d555a4868abf6f4d689c2f6695bdb773010a01915fcc6c354f361 SHA512 0028e593818013f809831ac5a73eec63988c0aefb4b309fb3c928efbea8db8b8f46bd7c82f156396adc704f0567474df262dfe9bb6e09af0b2c23528fe2c6e2d WHIRLPOOL 5a1af78c2767608d2b1c2a4b262dbce038d2b6ed9d0499eb60ac1eb64fd6b832efdbafc2b85881ac67efd8794adcc3490fcbf61b74ad7ae576d52e8aff597b04
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.26.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.26.ebuild
@ -15,7 +15,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X"

 RDEPEND="X? ( x11-apps/xrandr
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.28.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.28.ebuild
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@ -1,4 +1,4 @@
 DIST vbox-kernel-module-src-5.0.16.tar.xz 593944 SHA256 8905e174069a6caf0200808fda6726704a947ab56fc48c3b6ebbf8831dde4123 SHA512 5311f6cfd917c04bcb51182ad414c0930fb85a73a90d81156f08640cdb4e4d442ed46a10b62b5d07ed81aa1ad65430d5186e95cc64293502c9b84937a6470bb4 WHIRLPOOL daf741cd8465ce65ae0e3f304b7c49d55be828da5fc285ac3a2b8e6fc7e68865b184b738a79fa7fbf1e106d647200a40224902ef7041e4dd5ab2c9ef054e4199
 DIST vbox-kernel-module-src-5.0.40.tar.xz 601604 SHA256 fb5dd2a62e1a53266f32c35523fa5ccc1d7928d4867c92637ef7368686acb70d SHA512 1236b16f2138872233a1a4f8933ec8803c7a15370cfadc148d338c803da572480d978d6be4b2512c3c80f7ee77cfef3d0a939b876ba9c53afbd267b24e2bfa65 WHIRLPOOL 59916e48536e1711cf0d98fecd3fe3ea0cce4b2eec622d34e5e52f20b05adb45dc627f4de5e55cfc92e2669b0fe71d4e1ba361d911d51da5bad3d80c42a66d24
-DIST vbox-kernel-module-src-5.1.24.tar.xz 625508 SHA256 279e8ac5d5342896c63fd94dfe04d2462f759318b1dfc9eb3a617fbf8cc5e683 SHA512 2a2de8b4b328234470ed5f2209d792efef0c81251c20e45c13b923865fe5855d76512f17f8727daa17c10b09306748f70c1ec588a027c31645f7c676f96fca4c WHIRLPOOL eeaea483c46e0533053aff80af1f990fbaaeb073c7fbe535ec8425be6e73840c332dc3f22ccb0b6cd3b0f05a24fd206beb50dcdf8edf0245f4fa5be957bbb8d7
 DIST vbox-kernel-module-src-5.1.26.tar.xz 625384 SHA256 5ba4f728c5b62c3d93828d99c5b54b8fb24a16bc8674e704714c4f71eb95ddc4 SHA512 c77e0d8dfade2abac95162e7e7a424be4875e44d43bcf2a13e0e50caa69f5fd0d21c77f03bb2cd4cbd5df4ab31e9fbd49ecd9220a49af8cd10081b960e014010 WHIRLPOOL 519246aeae6637cb8eb4b841552dc5e63f9a3d761fa6bcec43601c8a3194264457e4e78d200e975e31266af2944aa81f7487cf389f43d93db08f60a700a7758e
+DIST vbox-kernel-module-src-5.1.28.tar.xz 625464 SHA256 d6f3b7afa98d2b526d8da3c8906addc307eea069db371d012ebbffc1ccdf9dd2 SHA512 c8ae6c065ad42e57eee9a54f288ba60fd9b32efe18cb74c8a035d547b30e7d857c9091307485a8dfc77eec45de29d3217c6871140e167e2438759c314c47680a WHIRLPOOL c6508d63cacfcd3ac901f276cd793dc83c595bc73965518baa544b5cf5157ea52363b759f03586f743d6c2e0fda7252b98136c96cef28ecfb31f6915d4ce5709
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.26.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.26.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pax_kernel"

 RDEPEND="!=app-emulation/virtualbox-9999"
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.28.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.28.ebuild
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@ -1,7 +1,7 @@
 DIST VirtualBox-5.0.16.tar.bz2 111062984 SHA256 f5a44d33a1db911f445b2eb2d22d9293a96a535cba488b5a235577ef868fa63c SHA512 3da3a227360fb50d299e99770378f65e8cb99525377343fa8faff2360be66643d46f68323d6a8b8d4d26182082f171bb35ab2497167bf6df18827a5ea7742074 WHIRLPOOL ea709057c588f28820790c2b193decba9ee0c57e0f82aa4361ca87aef661315182e18b5ee29558e47ed92f6037eb91befa5390680661a7b9f2248c7819b4a85c
 DIST VirtualBox-5.0.40.tar.bz2 112997095 SHA256 e4275b7ada40b358e6e3bd1231b3a320aa06c72ae301283cac5adb42eaa8e4b5 SHA512 70cd4355591c5aed82148954bf55637a5dcdd1a5177dba78192e7c6eadfbf3f7023f352ba8f89d9eb3c3fc55b049f7c76af6bc94e04d1766d7fbe39e51a1393c WHIRLPOOL 9f471e63814c9d48063857f3b95410f5acdd4a3bd2716c525f2449f1eae95d0e91dbe5422374a49f31f8219daa155f716455f0259d131d93afb5cd9e13a7d467
-DIST VirtualBox-5.1.24.tar.bz2 116135442 SHA256 ee2db169a322bf0db3c3b6d8b84aa39236f36cbf37d0a4c10ab65902a396bb60 SHA512 3c9ad230a53f9159e648ae1f342bdb220ffd85f2ddd45ae4c61d6606f358e9343a4968b2a91784893fb1284288ad41c538b1ab299b3a49e7739bfc8c4fdea910 WHIRLPOOL aad73184e2d36928449e688fd86c6f42c061f77e86c7e6119a205154b307846ed25175f49e3f8e451844b48c0e71e9531902753f1fd917123c401ffbf7744a2d
 DIST VirtualBox-5.1.26.tar.bz2 115915813 SHA256 b5715035e681a11ef1475f83f9503d34a00f0276b89c572eebec363dda80c8a9 SHA512 680e9646a51a0a5923b3ded10007ee1c1e2a41c6d8a961d2b2540db6578bed2847154f4cac87e3cfe1118a62595b47c7df99da854f6c340e173b9eb8cacf2add WHIRLPOOL 9d7950ec3ec2cd9b8aaa0ea319f9f5089eed7d2cd2879d313426b448a27570b5582235aa46c5ad5a0fd4d0b967f8d58a963f001549232136d6a8609262af71d0
+DIST VirtualBox-5.1.28.tar.bz2 116427658 SHA256 ce7d4bf6535f70e3214abeb4866f7a8634aa3c7b6dedf8825e6ad80bd821398d SHA512 5c21fd535424d7fd9adbb51894ec6d37ecf00a63a850362bd7b61fedca5031e096641814130a97ad839c0bd7089dc3dc465509615aab2af3c5735ff71005670a WHIRLPOOL 2e3fbeb39083c2e69fb23200570781a8845780a6295553af48fa9155db132e37d0fc2fb26e8a45c52864f69f02e8a0d0cbd4c895e5fbb87ab9a51dd60c7c7904
 DIST virtualbox-5.0.16-patches-01.tar.xz 4024 SHA256 200eb980a12323a61d0fa6dbf61ed64ee1e2bb5e18e16eabdf8668d8fd8be3e4 SHA512 4eed117253754abee9088d4c320b4a6f0b3e1c8313b98f354cb727001156fe68d553a677073d40b921437f4cc073420866d1533aad4e61a79607d8360abbfd4a WHIRLPOOL ab40851873d55ae873ca8ff88670a17476c0d502116f4abda7b766064a2daa71929eb69b4b68c64c3d2d0762134fe85d07044bdedde4bf15924520a604972aaa
 DIST virtualbox-5.0.32-patches-01.tar.xz 4400 SHA256 e5bf5b5b391b3402172b5a30952da50affacaeaf40a75df0430ad623fcd8ed6f SHA512 5df0ecb4f9190375edc62d231aacd381c36a1697cc33df48b2f2d68a05ca1c855d127e466eda62030736dbcee76f5c67a519a2f42b72eacaf7ed65a8cf991e8a WHIRLPOOL 4c11787951848aadacc0772df5a46ce8d54445e0120901be280f493d4cc6333e986d0376f33ac0217dbb23758240c025028ea1d21c360fc2840c8e3003a0ff62
 DIST virtualbox-5.1.24-patches-01.tar.xz 2708 SHA256 8ea5e08da07d555a4868abf6f4d689c2f6695bdb773010a01915fcc6c354f361 SHA512 0028e593818013f809831ac5a73eec63988c0aefb4b309fb3c928efbea8db8b8f46bd7c82f156396adc704f0567474df262dfe9bb6e09af0b2c23528fe2c6e2d WHIRLPOOL 5a1af78c2767608d2b1c2a4b262dbce038d2b6ed9d0499eb60ac1eb64fd6b832efdbafc2b85881ac67efd8794adcc3490fcbf61b74ad7ae576d52e8aff597b04
--- a/app-emulation/virtualbox/virtualbox-5.1.26.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.26.ebuild
@ -18,7 +18,7 @@ HOMEPAGE="http://www.virtualbox.org/"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"

 RDEPEND="!app-emulation/virtualbox-bin
@ -188,7 +188,7 @@ src_prepare() {

 	# Only add paxmark patch when we're on pax_kernel
 	if use pax_kernel ; then
-		epatch "${FILESDIR}"/virtualbox-5.1.4-paxmark-bldprogs.patch || die
+		eapply "${FILESDIR}"/virtualbox-5.1.4-paxmark-bldprogs.patch
 	fi

 	eapply "${WORKDIR}/patches"
--- a/app-emulation/virtualbox/virtualbox-5.1.28.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.28.ebuild
@ -182,13 +182,13 @@ src_prepare() {
 	fi

 	# Only add nopie patch when we're on hardened
-	if gcc-specs-pie ; then
+	if  gcc-specs-pie ; then
 		eapply "${FILESDIR}/050_virtualbox-5.1.24-nopie.patch"
 	fi

 	# Only add paxmark patch when we're on pax_kernel
 	if use pax_kernel ; then
-		epatch "${FILESDIR}"/virtualbox-5.1.4-paxmark-bldprogs.patch || die
+		eapply "${FILESDIR}"/virtualbox-5.1.4-paxmark-bldprogs.patch
 	fi

 	eapply "${WORKDIR}/patches"
--- a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
@ -33,6 +33,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
 	virtual/libintl
 	x11-libs/libxkbcommon"
 DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
 	kde-frameworks/extra-cmake-modules:5
 	virtual/pkgconfig"

--- a/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
@ -27,9 +27,10 @@ IUSE="+macro-editor"
 RDEPEND=">=app-i18n/fcitx-4.2.9:4
 	virtual/libintl
 	macro-editor? (
-		>=app-i18n/fcitx-4.2.9:4[qt4]
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
+		>=app-i18n/fcitx-qt5-1.1:4
+		>=dev-qt/qtcore-5.7:5
+		>=dev-qt/qtgui-5.7:5
+		>=dev-qt/qtwidgets-5.7:5
 	)"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
--- a/app-i18n/libchewing/libchewing-0.5.1.ebuild
+++ b/app-i18n/libchewing/libchewing-0.5.1.ebuild
@ -19,7 +19,7 @@ fi

 LICENSE="LGPL-2.1"
 SLOT="0/3"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE="static-libs test"

 RDEPEND="dev-db/sqlite:3"
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@ -9,5 +9,5 @@ DIST jsoncpp-src-0.6.0-rc2.tar.gz 117661 SHA256 d4d193d163f520b08b9155cba9786158
 DIST mozc-1.10.1390.102.tar.bz2 57879881 SHA256 72a8ed6657daa1c03b1efe50c262a69be2ab66d45747a47df6e54996b6d5ee39 SHA512 4482e822f8a14bffd02cb1eaa5d14ba0a213266b2f0dd6402c42b9b357bf0d8c4dd572cef79f1d400bd68b7bd6cb4367933574f8f5967f68738249a300e3cfb9 WHIRLPOOL 90518e621ef784b438fcf677e211fdb6753719f3d78d14ce866ccea22d6d87f8d64e334bc568eebe93cb2850d3d545eb0b73d6f6de820eaf1d43f16bfdef4100
 DIST mozc-1.13.1651.102.tar.bz2 31635636 SHA256 a275accc726d55d696adf235fa40822ae099f0a02d3dc9f8d0257ba191a1bc49 SHA512 caa75e60704e904a72fd06e315a219ff304a54adaeee70a8ab75d413f7801960add103b9aae1c19ee92f6d10c4c408fd840cf78c5dde0cc21c605feac59deaf4 WHIRLPOOL 72a870cc1bc5bc63227bba61c73183f69160aa5c58c9b89e75fa65bf16bbdc2c2b873b7407d0543b3847bc046866392d9bbe6d771d7b4b7eb3f6be759f1a63b4
 DIST mozc-2.16.2037.102.tar.bz2 41172838 SHA256 4b78769b36366f056282267935a859e587f77e9aaf17132687d0e4d0c4da5cd0 SHA512 ff114a93054b43109407c44bc7c75de79fa2b028f9dba5c2ecc1776c5cbb032f184a91155b6b31bc17f0183dd70b0150ce13e80f59e26810daf4b65ba7e52be1 WHIRLPOOL 625c5a28da164ee96cdf523af32a7101357254cea1d57cd7f272bdf86ba8344d3e39bf2b2bfb0a79640d7961fd46c183eabc4002c8d86215ecffe183e4e0d193
-DIST mozc-2.20.2673.102.tar.gz 48623065 SHA256 794ec312e9a5567d2097059beb25718ddb1636cd8dd99b880ec97e26824276ea SHA512 409d406fdb21d55c93a4287cd3757a164c65c1c309918b4e905aec422d9c86bc6e51ae67c23ad0db2c87ab968443bd62f5a58684a0bf5d52751988a5ec5b0bd5 WHIRLPOOL 022029c7828502907f3c3e6fd39cfa059a947f75538b6958ec81528caec0a1be0cce48a3e94ff67303021f2003fcd1a966cdf3a4bbbf113968e454ba3e84295c
+DIST mozc-2.20.2673.102.tar.gz 48624369 SHA256 004cb773d335e7e1075cf20fd9e713f6dcf6d158d75077bcb95358a116ad3cca SHA512 ad7a78b03b29847057625fd5422c03ac8fc5755c5e85c66fd6e80f81be719dd56bf1349a1d745797118deed239641512789687b4f9ffe49bab1bc966385229ae WHIRLPOOL f78140126a950eb28548c6ef8b20ec5599e04ac1de7d22d2b0ba00cc2471d43ec9823996e399f9025cfcbc7b50a3ecdbd3283463acb423b65089f56c96cc88db
 DIST protobuf-2.5.0.tar.bz2 1866763 SHA256 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 SHA512 5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee WHIRLPOOL 7e6786e1f20bf253d0e386a95c2bbfe1b443f484d492f97552cadcea62c24461436aa88130e3ff20b4dc9f352c101458cb8c03686f1cc4e6e2133b6e78f5b70d
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@ -1,3 +1,5 @@
+DIST eix-0.32.10.tar.xz 600120 SHA256 4ecd6ed7e5bb8859c5e5548265e622bffd19800c889d49e75c0bad556830c5da SHA512 cf67889cb54c9b1453b626339038f8bc87ad9de1d3637caa56aa0de0580904cd0061c4d70c2a004e75fdc35e204e640917288a619653edb17ce7c495d20e4c4b WHIRLPOOL 96781b9324be20d081f43acca31ee1dd299ff1feed680346508fee0fba3b735f5b9f1c4b5c309875ffddfc75a7215dbf4f700117fa2afa27da66231635cf1766
 DIST eix-0.32.4.tar.xz 592284 SHA256 8132be9c496b5b19699c50d9aacd49560ca1f0466e3de4f47b896337f3527fc6 SHA512 382181d082648e9b236c3bf54fdf5d75a8575a7994e6a1d3380e80bcc36ff5779c660c5b5fc5f233cef79e48099fc53bb1c8b87e2ca919dcdb43d5fde276f553 WHIRLPOOL 0c8258d36a30a76fec2e7315e07776c277b2f098f6c0fb0a9a182f28827a659c334b190e10c52ea7ec8facd7a6e1f6124b3ffefd3ed2aade6da747e815276737
 DIST eix-0.32.5.tar.xz 595124 SHA256 1ebe07f46800f3f254d1385cd88eba328da9f07cc17731ad1b231a8b13450f6e SHA512 355c0daf81c349ceaa53a7253816a072578923f2044e53c9a8e98ceb9726b238f86f8b1d8ad96bb62851f887e50c1e5e443115dc12fcae7c8bca851caf9b9650 WHIRLPOOL 3b707ebeadc1653917269c81a594469ff2c603e5ad3772d1b19efb9fbd81dcf76b527c9d03975748e9cf0e1f011d1704ecd39f108ea166d78c9bb3be7370ada7
 DIST eix-0.32.9.tar.xz 599072 SHA256 0929581db3282a81a82ab9e17e6522a6517609de96f3a22ab7c081d0c3288edd SHA512 1a7c3d5f371150f5990fe1f1c4cadb0e3ee0a5810011702904aabd58ca250c10f820d6c64e7182096e0b7e2aa001cf573c5f2e83499ceb350cc59b599ec2ca5b WHIRLPOOL d22f2c536baeb2d2204800b6d8600d27c6933b1f89f1b09954fbc2945939d9981d26d8f20f05b066e2edae75dba6db5b41e37273d19d36481946e106699bc95f
+DIST eix-0.33.0.tar.xz 610600 SHA256 18e4f195d465a0fbecaf44c49d5ea6e63e14bdafe8aa7d32682f9f369ee648c2 SHA512 6fd4ca253ee908eb192ee35c4228bea0fa8a04030070b35489bddc639053c2e3f6a2faf32f539ffd2c7d9da0c664ff5f29ac0d732d9a47b6c9976a65dd402de2 WHIRLPOOL eb2517a7fde169d2e1359bca0bcea0bd273459af3ec83aff4f34aa7ee5624046ef1e5e91bec63a8ba69ec301d3eb50fabb9a7676501b65dd1137a8f837014c13
--- a/app-portage/eix/eix-0.32.10.ebuild
+++ b/app-portage/eix/eix-0.32.10.ebuild
@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="de ru"
+inherit autotools bash-completion-r1 l10n systemd flag-o-matic
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+BOTHDEPEND="nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${BOTHDEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+DEPEND="${BOTHDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT%/}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}usr/share/eix/eix-functions.sh\\\\\":" \
+		-i src/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoicasserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	# https://github.com/vaeth/eix/issues/35
+	append-cxxflags -std=c++11
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	systemd_dotmpfilesd tmpfiles.d/eix.conf
+
+	insinto /usr/share/${PN}
+	doins "${ED}"/usr/bin/eix-functions.sh
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+
+	keepdir /var/cache/eix
+}
+
+pkg_postinst() {
+	if ! use prefix; then
+		# note: if this is done in src_install(), portage:portage
+		# ownership may be reset to root
+		chown portage:portage "${EROOT%/}"/var/cache/eix || die
+	fi
+
+	local obs=${EROOT%/}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT%/}/var/cache/${PN}" || die
+	fi
+}
--- a/app-portage/eix/eix-0.33.0.ebuild
+++ b/app-portage/eix/eix-0.33.0.ebuild
@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="de ru"
+inherit autotools bash-completion-r1 l10n systemd flag-o-matic
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+BOTHDEPEND="nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${BOTHDEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+DEPEND="${BOTHDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT%/}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}usr/share/eix/eix-functions.sh\\\\\":" \
+		-i src/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoic-assertsasserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	# https://github.com/vaeth/eix/issues/35
+	append-cxxflags -std=c++11
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	systemd_dotmpfilesd tmpfiles.d/eix.conf
+
+	insinto /usr/share/${PN}
+	doins "${ED}"/usr/bin/eix-functions.sh
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+
+	keepdir /var/cache/eix
+}
+
+pkg_postinst() {
+	if ! use prefix; then
+		# note: if this is done in src_install(), portage:portage
+		# ownership may be reset to root
+		chown portage:portage "${EROOT%/}"/var/cache/eix || die
+	fi
+
+	local obs=${EROOT%/}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT%/}/var/cache/${PN}" || die
+	fi
+}
--- a/app-portage/repoman/repoman-2.3.3.ebuild
+++ b/app-portage/repoman/repoman-2.3.3.ebuild
@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
--- 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-text/djvu/djvu-3.5.27.ebuild
+++ b/app-text/djvu/djvu-3.5.27.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"

 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-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-solaris"
 IUSE="debug doc jpeg tiff xml"

 RDEPEND="jpeg? ( virtual/jpeg:0 )
--- a/app-text/poppler/poppler-0.57.0.ebuild
+++ b/app-text/poppler/poppler-0.57.0.ebuild
@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/68"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi

--- a/app-text/referencer/metadata.xml
+++ b/app-text/referencer/metadata.xml
@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>dominik.kriegner+gentoo@gmail.com</email>
+		<email>dominik.kriegner@gmail.com</email>
 		<name>Dominik Kriegner</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
--- a/app-vim/exheres-syntax/metadata.xml
+++ b/app-vim/exheres-syntax/metadata.xml
@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>ahf@0x90.dkg</email>
-    <name>Alexander Faeroy</name>
-    <description>Proxied upstream</description>
-  </maintainer>
 <maintainer type="project">
    <email>vim@gentoo.org</email>
    <name>Gentoo Vim Project</name>
-  </maintainer>
-<maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+</maintainer>
 </pkgmetadata>
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@ -2,3 +2,4 @@ DIST etcd-2.3.8.tar.gz 2206562 SHA256 6a138b2005e42b0961a12886cc641b792e991cd631
 DIST etcd-3.0.17.tar.gz 2208002 SHA256 c56c68a8cd5d120a51432f3a79a2c19082a6824493e4bb08c4e440aefbf73d8f SHA512 6eb6a61210f225b6fe7e911ad135e5014f80f71a04adccc3f382ca7b5e1b1b692b12dde26335ecac176cb8b8f4586732cb6e650b32730ec68ef7fbcbba7ab160 WHIRLPOOL 102dc47d120a1f4173b67168e5e51f64025da280ca41161131a6bd2ef9521605ef19e03166848f6c32862a3adbfc0a026f547dc7764018e85f6ac28f89c8d256
 DIST etcd-3.1.10.tar.gz 2532936 SHA256 22b25185571cf72409d35e28b9f15ea12cef02cffb552bc4efb7b74ffb62c0e7 SHA512 feb0745c2377248f9ad62359fbd6c2f0b3afbd94f89919963edf56965c98b5666f7b24fcf698599b35483b89b773dcbd647696eabc0436db6a88c68dbfc6dd6b WHIRLPOOL 0c922f1114753e126063689ebe722db59dace7715f7631ec6ca2f92438c405d9184bdebe277f2b808f5194bf2cf42904180bc7b80da051941ee3db2620b82ab7
 DIST etcd-3.2.7.tar.gz 2886948 SHA256 b91a40102b944ba8e4dad439721c7068eccbc1d0cb0e7f2ded9dad134d2875ce SHA512 75d602d985d829455e7a10a0b347336104a0b8320949a73abd7963b08ab095e9b7cff58999ed2d365b965ba49705dff5e056e61e9a5018970a49e68278701618 WHIRLPOOL 6293415746bd6e4b943694d8a067acce59cb2850791fcef8e1a858a5b7199b9e7281228448783f1540be956e795a7a8fc729a6a4fe406b28cb1dfd5102b81cc7
+DIST etcd-3.2.8.tar.gz 2889040 SHA256 800dff80c28fdcf753d8819f0a531ad974742e204489ad0050e2601fd1379ee8 SHA512 7ef172e4e864ccfe07a3f93e31ef77fe9e225e30ca49ecda85038c36f775def0c2633c998fe840cfd665ac912c00ba238a3ded09cff616c1e7faae0dbd5d4152 WHIRLPOOL 4d8d8d2177c2d0cc90377872a8bb8e3a810b5770fba4b43acbd83bbd76f7dd8fdcae2f6403b1d6245dd8fb1b28a5003f2a0acc0c8a963c8bf6ade66196117fe4
--- a/dev-db/etcd/etcd-3.2.8.ebuild
+++ b/dev-db/etcd/etcd-3.2.8.ebuild
@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/coreos/etcd"
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/coreos/etcd"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc"
+DEPEND=">=dev-lang/go-1.8:="
+RDEPEND="!dev-db/etcdctl"
+
+src_prepare() {
+	default
+	sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
+		-i "${S}"/src/${EGO_PN}/build || die
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_compile() {
+	export GOPATH=${S}
+	pushd src/${EGO_PN} || die
+	./build || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	insinto /etc/${PN}
+	doins "${FILESDIR}/${PN}.conf"
+	dobin bin/*
+	dodoc README.md
+	use doc && dodoc -r Documentation
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	dodir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN}
+	fperms 755 /var/lib/${PN}
+	dodir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	fperms 755 /var/log/${PN}
+	popd || die
+}
+
+src_test() {
+	pushd src/${EGO_PN} || die
+	./test || die
+	popd || die
+}
--- a/dev-db/mariadb/mariadb-10.2.9.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.9.ebuild
@ -568,22 +568,6 @@ multilib_src_install_all() {
 		fi
 		eprefixify "${TMPDIR}/my.cnf.ok"
 		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-		einfo "Creating initial directories"
-		# Empty directories ...
-		diropts "-m0750"
-		if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
-			dodir "${MY_DATADIR#${EPREFIX}}"
-			keepdir "${MY_DATADIR#${EPREFIX}}"
-			nonfatal fowners -R mysql:mysql "${MY_DATADIR}"
-		fi
-
-		diropts "-m0755"
-		local folder
-		for folder in "${MY_LOGDIR#${EPREFIX}}" ; do
-			dodir "${folder}"
-			keepdir "${folder}"
-			nonfatal fowners -R mysql:mysql "${folder}"
-		done

 		einfo "Including support files and sample configurations"
 		docinto "support-files"
@ -929,8 +913,6 @@ pkg_config() {
 		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
 	done

-	use prefix || options="${options} --user=mysql"
-
 	einfo "Creating the mysql database and setting proper permissions on it ..."

 	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
@ -963,6 +945,8 @@ pkg_config() {
 	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
 	|| die "MySQL databases not installed"

+	use prefix || options="${options} --user=mysql"
+
 	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
 	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
 	local mysqld="${EROOT}/usr/sbin/mysqld \
--- a/dev-java/batik/batik-1.9.ebuild
+++ b/dev-java/batik/batik-1.9.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/sou

 LICENSE="Apache-2.0"
 SLOT="1.9"
-KEYWORDS="~amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc python tcl"

 CDEPEND="
--- a/dev-java/jython/jython-2.7.0-r2.ebuild
+++ b/dev-java/jython/jython-2.7.0-r2.ebuild
@ -15,7 +15,7 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV

 LICENSE="PSF-2"
 SLOT="2.7"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="examples test"

 CP_DEPEND="dev-java/antlr:3
--- a/dev-lang/ruby/ruby-2.2.8.ebuild
+++ b/dev-lang/ruby/ruby-2.2.8.ebuild
@ -30,7 +30,7 @@ SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
 		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"

 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"

 RDEPEND="
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@ -1,2 +1,3 @@
 DIST pcsc-cyberjack-3.99.5final.SP10.tar.bz2 958494 SHA256 910ac025b504a0407cee3d9f8a77655f3007871591113054bedede5f1aeae958 SHA512 d4094b531ab523db29856ea0cf784db925bece51a5c4b5c7fec259ff319d58a50443cabdfebc0a1f6818b678a1284500429274478bf1db780ff594612e307d56 WHIRLPOOL 8a80cbd2dc8e3597f169a0a16c963c4b02faba2909639c2a5affe85098cf4c63e244ed5076477b7b5032e446097c24da07dfc88fc1a68a9f48a64624d3a6cbc0
+DIST pcsc-cyberjack-3.99.5final.SP11.tar.bz2 965662 SHA256 5cd78f527596f2905500b210d066ece62a8ab36a0d4d3677463805f8f4d3aa0c SHA512 4d63ef0442c7e919456e8b6ab1d571ab621eb45fc34fc9b61a7a024f1ae2115f7474b4aa538ee7fb8bf4ce016067c876d9970b52e6b4e8b531e2d736677ab794 WHIRLPOOL 541e0cf4dc24848d1f2bd66f0fab2745b955610dc4d9f31dfac080341df2b2ea4362b4da4020d1a9b813437b3a6b3e835ae04e70923cf6b3a14b172aa01340ff
 DIST pcsc-cyberjack_3.99.5final.SP03.tar.gz 1485952 SHA256 fa5324d8a270d50aec20345cb57362f684ddadd3a50dbd0773ee13d2d87bc0a9 SHA512 a091a09b501d7a7c757f0a458007f44ac281cbeaaf5bc3c2aa89915ee7a39478e6f80b6f24fec77be753c8d77deeda2858b7a806e3c982f54c199bd797288e05 WHIRLPOOL 51429512a9037e6ec4a98cc33576176cafda5fe3a3b33c56b2d928c7a7bc06135ac93e92a713836e4dc20e90f6106f9ca3643de5baed7c25672c26f6fc4a6368
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p11.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p11.ebuild
@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools versionator eutils linux-info toolchain-funcs udev
+
+MY_PV="${PV/_p/_SP}"
+MY_PV2="${PV/_p/final.SP}"
+MY_P="pcsc-${PN}-${MY_PV2}"
+#MY_P2="${PN}-$(get_version_component_range 4 $MY_PV)"
+
+DESCRIPTION="REINER SCT cyberJack pinpad/e-com USB user space driver library"
+HOMEPAGE="http://www.reiner-sct.de/"
+SRC_URI="http://support.reiner-sct.de/downloads/LINUX/V${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs threads +udev +usb"
+
+# FIXME:
+# xml is actually optional but the code is still used anyway. We'll have to wait
+# until upstream fixed it.
+COMMON_DEPEND="sys-apps/pcsc-lite
+	usb? ( virtual/libusb:1 )"
+RDEPEND="${COMMON_DEPEND}
+	udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+#S=${WORKDIR}/${MY_P2}
+S=${WORKDIR}/${MY_P}
+
+DOCS="debian/changelog doc/README.txt"
+
+pkg_setup() {
+	CONFIG_CHECK="~USB_SERIAL_CYBERJACK"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-manpages.patch"
+	epatch "${FILESDIR}/${PN}-returnvalue.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/${PN} \
+		--disable-hal \
+		--enable-pcsc \
+		$(use_enable static-libs static) \
+		$(use_enable usb nonserial) \
+		$(use_enable threads) \
+		--with-usbdropdir="$($(tc-getPKG_CONFIG) libpcsclite --variable=usbdropdir)"
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+
+	use udev && udev_newrules "${FILESDIR}"/${PN}-r1.rules 92-${PN}.rules #388329
+}
+
+pkg_postinst() {
+	local conf="${EROOT}etc/${PN}/${PN}.conf"
+	elog
+	elog "To configure logging, key beep behaviour etc. you need to"
+	elog "copy ${conf}.default"
+	elog "to ${conf}"
+	elog "and modify the latter as needed."
+	elog
+}
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@ -3,3 +3,5 @@ DIST libnl-3.2.28-in6.patch.xz 6368 SHA256 0cbb8dc4e3cdc90a4a0608a26af1971d7c1c3
 DIST libnl-3.2.28.tar.gz 941954 SHA256 cd608992c656e8f6e3ab6c1391b162a5a51c49336b9219f7f390e61fc5437c41 SHA512 b5f145ecafb2625ed1c42594afd6063f112a601077de5c35884b3c3bc8c562b29b52a006ccebd795c127fe69692a82def425c8605afed7e6d441582943e803d9 WHIRLPOOL ff49346ddc31105a300ebffc0e4d4956ac85ade5e92e884c62e696d7d4234d40e63cf4839e6b6fd2d98d2122662d36d3f41666391686a83c8bf966e53e22ed25
 DIST libnl-3.2.29.tar.gz 963681 SHA256 0beb593dc6abfffa18a5c787b27884979c1b7e7f1fd468c801e3cc938a685922 SHA512 45e22b02368c479e01db7160345a0d3c73abf345e7b49bf350811243a17f307f5c6c3df639ec1e0c456707578aca8d69aad8afa697ac21449f521a3e39712670 WHIRLPOOL 1273dcaee79ecfdca947110c5e7ff70947703b1b0fda43fdb7c74edd78c6938f675e9a586aaff8feefce56a1f3137cbc50d3626ac336e6afa2ca8cbd8627e6eb
 DIST libnl-3.3.0.tar.gz 933390 SHA256 705468b5ae4cd1eb099d2d1c476d6a3abe519bc2810becf12fb1e32de1e074e4 SHA512 3fc5d95b875605ab6378d2d454020c1276a6772205fa11bbd22eba9fd9ef1deb8c75347e5d4602f0ab7bf13bd66b418f5ef73ed05f18134f08638ce06eef622c WHIRLPOOL a6f7c066c9d05af807ed17babe1f39107d24b4b5ef44ca94e487543a39b0a2f1298fbf6448356fa3701c033fbff0df392945666c125f16246398d47a8c828f5b
+DIST libnl-3.4.0-rc1.tar.gz 945094 SHA256 31eae336fe4383ec52eea9dd2db51f33ac83cd1c349e4a31ed80c777eed7d0fe SHA512 f0a3c6d368b2b60b198a7e96d67a99daefb3bad194961c5472bd6401e6c274058b7a7173015b73d90df41db43c7ffdfd99252f6378dc5912a33e4e70212e0c75 WHIRLPOOL e156c2400ebe5827cbbfb9ae84bf71fa569ab1c7e8e44c7f00492cffd01e629ee90afa88bcc374e04711187ec083932a5c7c2fef28b3ac25d76e69f1d75a36b4
+DIST libnl-3.4.0_rc1.tar.xz 1124 SHA256 3857952e47656e7f50ecf55ca40b9e67b9a4864b4bcb1a126ddd380956f5dc9f SHA512 6175e3234691d0ff875e6cde79ec93ff7dec1deb66300e8fffe54a5a7d816c5a73d0a4ad371f962792181622d20c59fc3ff7c086062d4f20db18a7b99b050858 WHIRLPOOL b88b5a5f81201c689c181f88f0b7d59b3fad717ee875cf09282dc943350a78f83aaedac50cdf94b40a10b4ce258b63fa9906b75a0eed1b83dd27c1d927ef0a92
--- a/dev-libs/libnl/libnl-3.4.0_rc1.ebuild
+++ b/dev-libs/libnl/libnl-3.4.0_rc1.ebuild
@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+DISTUTILS_OPTIONAL=1
+inherit distutils-r1 eutils libtool multilib multilib-minimal
+
+LIBNL_P=${P/_/-}
+LIBNL_DIR=${PV/_/}
+LIBNL_DIR=${LIBNL_DIR//./_}
+
+DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
+HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
+SRC_URI="
+	https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz
+	https://dev.gentoo.org/~jer/${P}.tar.xz
+"
+LICENSE="LGPL-2.1 utils? ( GPL-2 )"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs python utils"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r5
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	python? ( dev-lang/swig )
+	sys-devel/bison
+	sys-devel/flex
+"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+DOCS=(
+	ChangeLog
+)
+
+S=${WORKDIR}/${LIBNL_P}
+
+MULTILIB_WRAPPED_HEADERS=(
+	# we do not install CLI stuff for non-native
+	/usr/include/libnl3/netlink/cli/addr.h
+	/usr/include/libnl3/netlink/cli/class.h
+	/usr/include/libnl3/netlink/cli/cls.h
+	/usr/include/libnl3/netlink/cli/ct.h
+	/usr/include/libnl3/netlink/cli/exp.h
+	/usr/include/libnl3/netlink/cli/link.h
+	/usr/include/libnl3/netlink/cli/neigh.h
+	/usr/include/libnl3/netlink/cli/qdisc.h
+	/usr/include/libnl3/netlink/cli/route.h
+	/usr/include/libnl3/netlink/cli/rule.h
+	/usr/include/libnl3/netlink/cli/tc.h
+	/usr/include/libnl3/netlink/cli/utils.h
+)
+
+src_prepare() {
+	default
+
+	elibtoolize
+
+	if use python; then
+		cd "${S}"/python || die
+		distutils-r1_src_prepare
+	fi
+
+	# out-of-source build broken
+	# https://github.com/thom311/libnl/pull/58
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		--disable-silent-rules \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable utils cli)
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use python; then
+		# Unset DOCS= since distutils-r1.eclass interferes
+		local DOCS=()
+		cd python || die
+		distutils-r1_src_install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@ -1,3 +1,4 @@
 DIST libsodium-1.0.11.tar.gz 1846782 SHA256 a14549db3c49f6ae2170cbbf4664bd48ace50681045e8dbea7c8d9fb96f9c765 SHA512 4b1293c4d0e52264beecdd05833857bc4d77d1c2a97eea0138fe04df383b9a2dfcad4a79ccd9aed8f6c0047ba67c49292b0d2ccf987ab0b5046b46b1586ccbd7 WHIRLPOOL ff02835e05a491695ba1b6d55d1b3168c15c9c6326377d2a24d1dbc9eaa3da538efcf22610c81d32297b057138162132e340b64ce980a199563d4101beb9d899
 DIST libsodium-1.0.13.tar.gz 1895139 SHA256 9c13accb1a9e59ab3affde0e60ef9a2149ed4d6e8f99c93c7a5b97499ee323fd SHA512 c619b12fdf0b2e59174b6e383a62d5499ebcd720fdbb2c1a41a98a46c285df075202423454b294fefee185432441e943805397d7656f7cd7837de425da623929 WHIRLPOOL 30f80a05eabe475dc42a6c1f9028cd6eec581b063385a5b789cc414c98efb5faddd451473f52059a05f8412d5b10d800ec60ad7801e086c7e9d3b119d8ce0e7c
 DIST libsodium-1.0.14.tar.gz 1876526 SHA256 3cfc84d097fdc891b40d291f2ac2c3f99f71a87e36b20cc755c6fa0e97a77ee7 SHA512 46663b05aab13ec4003ecc32c89bdaedf60824703be522661eeaa3db8013140bda434c19a759dc38bcbce757e9673a03e701c0eac1526a31a4b7a15608ae8696 WHIRLPOOL 76c32b5c3ea746744f7af17b6d335dc843276c51aef4bc69dc7871d8b9ea2e25972258aaab473827ec21177aac18e747d16aa0bd81499c77040104e22c906cec
+DIST libsodium-1.0.15.tar.gz 1866057 SHA256 fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4 SHA512 299a208f8342793d13498e95b23f1749f5b5b13ec276db3ec401130615e837ef475b6a1283b6e87a5f8227d23e70e38ca721073dadd5dc88fe4aff342aa64adc WHIRLPOOL 193e804acd32a408b6c3e29689e427b061c68a5a8152a35167d618b350f8c08e64b751a808385d4307485e8ccdfdd36c814f6a63155cfd64b6a76d11424f0840
--- a/dev-libs/libsodium/libsodium-1.0.15.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.15.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools
+
+DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
+HOMEPAGE="https://github.com/jedisct1/libsodium"
+SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/23"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# --disable-pie needed on x86, bug #512734
+	use x86 && myconf="${myconf} --disable-pie"
+
+	econf \
+		$(use_enable asm) \
+		$(use_enable minimal) \
+		$(use_enable !urandom blocking-random) \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
+		$(use_enable cpu_flags_x86_aes aesni) \
+		${myconf}
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
--- a/dev-libs/ppl/ppl-1.2.ebuild
+++ b/dev-libs/ppl/ppl-1.2.ebuild
@ -9,7 +9,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz

 LICENSE="GPL-3"
 SLOT="0/4.14" # SONAMEs
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
 IUSE="+cxx doc lpsol pch static-libs test"

 RDEPEND=">=dev-libs/gmp-6[cxx]
--- a/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.
 LICENSE="BSD-2"
 # Subslot == SONAME version
 SLOT="0/1.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sparc x86"
 IUSE="static-libs test"

 RDEPEND=">=dev-libs/protobuf-2.6.0:0=[${MULTILIB_USEDEP}]"
--- a/dev-libs/re2/files/re2-compile-r0.patch
+++ b/dev-libs/re2/files/re2-compile-r0.patch
@ -1,27 +0,0 @@
--- util/mutex.h.orig	2013-09-22 13:24:25.126582479 -0500
-+++ util/mutex.h	2013-09-22 13:25:11.376179517 -0500
-@@ -10,6 +10,8 @@
- #ifndef RE2_UTIL_MUTEX_H_
- #define RE2_UTIL_MUTEX_H_
- 
-+#include <stdlib.h>
-+
- namespace re2 {
- 
- #define HAVE_PTHREAD 1
-@@ -102,7 +104,6 @@
- 
- #elif defined(HAVE_PTHREAD) && defined(HAVE_RWLOCK)
- 
-#include <stdlib.h>      // for abort()
- #define SAFE_PTHREAD(fncall)  do { if ((fncall) != 0) abort(); } while (0)
- 
- Mutex::Mutex()             { SAFE_PTHREAD(pthread_rwlock_init(&mutex_, NULL)); }
-@@ -117,7 +118,6 @@
- 
- #elif defined(HAVE_PTHREAD)
- 
-#include <stdlib.h>      // for abort()
- #define SAFE_PTHREAD(fncall)  do { if ((fncall) != 0) abort(); } while (0)
- 
- Mutex::Mutex()             { SAFE_PTHREAD(pthread_mutex_init(&mutex_, NULL)); }
--- a/dev-libs/re2/files/re2-symbols-r0.patch
+++ b/dev-libs/re2/files/re2-symbols-r0.patch
@ -1,10 +0,0 @@
--- libre2.symbols.orig	2012-11-07 04:45:57.000000000 +0100
-+++ libre2.symbols	2012-11-07 04:46:20.000000000 +0100
-@@ -10,6 +10,7 @@
- 		_ZlsRSoRKN3re211StringPieceE;
- 		# re2::FilteredRE2*
- 		_ZN3re211FilteredRE2*;
-+		_ZNK3re211FilteredRE2*;
- 	local:
- 		*;
- };
--- a/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
+++ b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/tvision/rhtvision_${PV/_pre/-}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE=""

 DOCS=( readme.txt THANKS TODO )
--- a/dev-perl/CBOR-XS/CBOR-XS-1.700.0.ebuild
+++ b/dev-perl/CBOR-XS/CBOR-XS-1.700.0.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MLEHMANN
+DIST_VERSION=1.7
+inherit perl-module
+
+DESCRIPTION="Concise Binary Object Representation (CBOR, RFC7049)"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/Types-Serialiser
+	dev-perl/common-sense
+"
+DEPEND="${RDEPEND}
+	dev-perl/Canary-Stability
+	>=virtual/perl-ExtUtils-MakeMaker-6.520.0
+"
--- a/dev-perl/CBOR-XS/Manifest
+++ b/dev-perl/CBOR-XS/Manifest
@ -1 +1,2 @@
 DIST CBOR-XS-1.6.tar.gz 72681 SHA256 f5c7c2dbef8de9ecfc2793d5572400b750ff266f24b0e0b9fa2661bc3fb7f0ab SHA512 6060d7cfa77f75d3a900b3d2a6d3948e27677ee5c19f3c17061a66917ad6a1d34a20563a2bfc7a6fc2a0e0b4db2cbb3123d07ff77beae913f07b4a98b6955b85 WHIRLPOOL 310f5d4d1702d428eaeef9cfd1ddcf8e265512d3ece55231a60c3a54688cebb8c10357f112f80886a5e08537125d7aa5c26ee0ea9f7877e8372cfd9fc297e648
+DIST CBOR-XS-1.7.tar.gz 73429 SHA256 2dc5b7124bad3a9d0c6af8bd57a646e957d9973bf1b58e0eebae682fb35b65a3 SHA512 13f5a0db0e983929fe7a670caf23ef130ed18f1974cf471d77d20e9e5d78c8afcad9a3440f198906d8e30625da7f8cb1d3a8919fd896442101f3865f0af5614c WHIRLPOOL 5808568c53528517dbb0569faaee89af3f21d43c12ca945a9a7d25a80b3592e68deea013faa0477def836519dbd09adb755b3e644bd168daa3b838636cd7b65c
--- a/dev-perl/CGI-Fast/CGI-Fast-2.120.0.ebuild
+++ b/dev-perl/CGI-Fast/CGI-Fast-2.120.0.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=LEEJO
+DIST_VERSION=2.12
+inherit perl-module
+
+DESCRIPTION="CGI Interface for Fast CGI"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/CGI-4
+	virtual/perl-Carp
+	>=dev-perl/FCGI-0.670.0
+	virtual/perl-if
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+src_test() {
+	perl_rm_files t/006_changes.t
+	perl-module_src_test
+}
--- a/dev-perl/CGI-Fast/Manifest
+++ b/dev-perl/CGI-Fast/Manifest
@ -1,2 +1,3 @@
 DIST CGI-Fast-2.10.tar.gz 8627 SHA256 98263afcc9f5d88c7cbbd39651c5431b434c1c815fe284962d887ed7be3a1dd3 SHA512 55d05c742bf49045f917aa4a4efdab3e5ce2251ca61de0e7db0a586d8a592784989bc74fa43a3c6430a920f38b2aa818887e96c3e24c701d531dae94b247da2c WHIRLPOOL 5821043926fa707490819a7149e3c085ebf49314242dbd80393d46a400d21461245b46b5bb908390c0d1a6401a156e312193eb0652eaef08386f8fa94a1e2ead
 DIST CGI-Fast-2.11.tar.gz 8662 SHA256 c22d5dfbac2a5044863d2abce2bb04e911fedca193e950f9b8c764202c655901 SHA512 728d1cb2fb15ea4e894563625258bacdf31f7ffac5e8395fcd1dd1e66a2f3575c4fe342bf1cfdcfee736fe323bcdda1170f8ffbe9a37d30cb7ca6ba6484bc2f5 WHIRLPOOL 0e42d987ed4776a922be42908c966e6f45404ae89b67202609b8e017cc30d93a4ad68ed0be41ccceee8aae740cce6e2f1f682227ee8322abd989c3c352f84963
+DIST CGI-Fast-2.12.tar.gz 8807 SHA256 c3a3147dd6ef7236a1984653833e9af169cb548ff3cb655821b06f7139464387 SHA512 00452a2c31eb8fd877808764508a491894d87986bda493b2b15773cd29f2699184559f0c55af1af1684c851005b61eb1364bccae7ba4f4df3166d9020c15b40e WHIRLPOOL f278c48da7c181d686595985ecf05e6a601e7ccbcbce8da67e8f0360c6f9a627d637596e0ce51ea621d146918bd0f276429893242a0279d8fbbad05ff33ebede
--- a/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.100.0.ebuild
+++ b/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.100.0.ebuild
@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=BIGPRESH
+DIST_VERSION=3.10
+inherit perl-module
+
+DESCRIPTION="Extremely fast, reliable form generation and processing module"
+HOMEPAGE="http://www.formbuilder.org/ ${HOMEPAGE}"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.90.0-rt81650.patch"
+)
+# Templates that can be used - but they are optional
+#	>=dev-perl/CGI-SSI-0.920.0
+
+RDEPEND="dev-perl/CGI"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+optdep_notice() {
+	local i;
+	elog "This package has support for optional features via the following packages"
+	elog "which you may want to install separately:"
+	elog
+	i="$(if has_version '>=dev-perl/CGI-Session-3.950.0'; then echo '[I]'; else echo '[ ]'; fi)"
+	elog " $i >=dev-perl/CGI-Session-3.950.0"
+	elog "     - Multi-page form persistence with CGI::FormBuilder::Multi";
+	elog
+	elog " Alternative Template Engines:"
+	i="$(if has_version '>=dev-perl/CGI-FastTemplate-1.90.0'; then echo '[I]'; else echo '[ ]'; fi)"
+	elog " $i >=dev-perl/CGI-FastTemplate-1.90.0"
+	elog "     - CGI::FastTemplate via CGI::FormBuilder::Template::Fast";
+
+	i="$(if has_version '>=dev-perl/HTML-Template-2.60.0'; then echo '[I]'; else echo '[ ]'; fi)"
+	elog " $i >=dev-perl/HTML-Template-2.60.0"
+	elog "     - HTML::Template    via CGI::FormBuilder::Template::HTML";
+
+	i="$(if has_version '>=dev-perl/Template-Toolkit-2.80.0'; then echo '[I]'; else echo '[ ]'; fi)"
+	elog " $i >=dev-perl/Template-Toolkit-2.80.0"
+	elog "     - Template.pm       via CGI::FormBuilder::Template::TT2";
+
+	i="$(if has_version '>=dev-perl/Text-Template-1.430.0'; then echo '[I]'; else echo '[ ]'; fi)"
+	elog " $i >=dev-perl/Text-Template-1.430.0"
+	elog "     - Text::Template    via CGI::FormBuilder::Template::Text";
+
+	if use test; then
+		elog
+		elog "This module will perform additonal tests if these dependencies are"
+		elog "pre-installed"
+	fi
+}
+
+src_test() {
+	optdep_notice;
+	echo
+	perl-module_src_test
+}
+
+pkg_postinst() {
+	use test || optdep_notice;
+}
--- a/dev-perl/CGI-FormBuilder/Manifest
+++ b/dev-perl/CGI-FormBuilder/Manifest
@ -1 +1,2 @@
 DIST CGI-FormBuilder-3.09.tgz 163526 SHA256 654907527717c3bbb169c739a9a817f14552054619ab3c93d6a5f808649fa863 SHA512 6907131de95ac0188a4a80e380fd81554bd9fb8d2566e961e5ff05a30e4498bccb157ecfdc77bdcd05427ebc5882caaea47b044aaaddae85f48231c0b7eef240 WHIRLPOOL 1424607dc1d931e9fc71717ccb05c8b42d12b9d65cecf3b36ace4e5b5bb79db9075abae6110ed59ee3f169c853a450c2c8f065e038f49dbb4b4386799db42a51
+DIST CGI-FormBuilder-3.10.tar.gz 162346 SHA256 aec99be0c0f067a7e7269c5378e5ae6c8d7dd39b368b4f12c0d8463b13ee7198 SHA512 38d8e6eb729e188074d872b979ad46133152877bb30b95329a2c7275154646a4afb62dc3539cb34781149f424b1d384d05230efe8b174967742625a81765bad5 WHIRLPOOL b26b819154b28223f088c4435d837e7433c0d0361b5113d212376cbb59351f6bb0ebf2563a1eaf4adbd668bb482802579987d6ef9917073efbad18ef65631417
--- a/dev-perl/CPAN-DistnameInfo/CPAN-DistnameInfo-0.120.0-r2.ebuild
+++ b/dev-perl/CPAN-DistnameInfo/CPAN-DistnameInfo-0.120.0-r2.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=GBARR
+DIST_VERSION=0.12
+inherit perl-module
+
+DESCRIPTION="Extract distribution name and version from a distribution filename"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
--- a/dev-perl/CPAN-DistnameInfo/Manifest
+++ b/dev-perl/CPAN-DistnameInfo/Manifest
@ -0,0 +1 @@
+DIST CPAN-DistnameInfo-0.12.tar.gz 14523 SHA256 2f24fbe9f7eeacbc269d35fc61618322fc17be499ee0cd9018f370934a9f2435 SHA512 f52eb88b87ab732d13c2ee4e4770cf27c249d2b2446b51e75abe31f2a70b8dc7d8370f4c4426fa68cc8fa7a905668dfdcd1387cd98e239393bde90d1965929f1 WHIRLPOOL 7cb4c6a557bd6ca9c6214a7f47d224fdd17d0854928f24a56f4f9a13851dbfbea96f8833df68a1194294b9d8234f06174cf2e80cf0824cf7d7f3bc19069cb63f
--- a/dev-perl/CPAN-DistnameInfo/metadata.xml
+++ b/dev-perl/CPAN-DistnameInfo/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">CPAN-DistnameInfo</remote-id>
+    <remote-id type="cpan-module">CPAN::DistnameInfo</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild
+++ b/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=LEONT
+DIST_VERSION=0.014
+inherit perl-module
+
+DESCRIPTION="Verify requirements in a CPAN::Meta object"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="test"
+
+# CPAN::Meta::Prereqs -> perl-CPAN-Meta
+RDEPEND="
+	>=virtual/perl-CPAN-Meta-2.132.830
+	>=virtual/perl-CPAN-Meta-Requirements-2.121.0
+	virtual/perl-Exporter
+	>=virtual/perl-Module-Metadata-1.0.23
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		dev-perl/Test-Deep
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
--- a/dev-perl/CPAN-Meta-Check/Manifest
+++ b/dev-perl/CPAN-Meta-Check/Manifest
@ -1,2 +1,3 @@
 DIST CPAN-Meta-Check-0.012.tar.gz 12570 SHA256 4b4cd9a2ac788456fb43f32e40a380cb29122bb3b4082c70a008366d2881d5e7 SHA512 99ec6721dfb6be8fae7e5a4f6418d4d12d8d093df11f0596480ecc19a46ef3af3fc3da91ccdd7110f974e8f4d04e33166d76804b673a019bc4994f96b7078e7d WHIRLPOOL a3810564ce73e7ca303a76ee49f564bb625299b9cc77719cb98e08461eaef81a16bc7c1c63455c3b7f79221f9776e1551c5ad01d947882adaf2437f6c177c0de
 DIST CPAN-Meta-Check-0.013.tar.gz 12555 SHA256 4fca09a28066e7e134d691dc25c496c838043617a93b7eec4df807df8e7f73d5 SHA512 c7bb972ce6afd21f415d0bca03f9ebefe0298e8b7db32e42f0195ae5da535da079f482c9d2bf598cb39d234b467397eb4b949b93c34c4d02b113caf76fd5a9c5 WHIRLPOOL 76aac05c3264717f5b1371b295d59bb2235e757832cc5cb58ea9d69270baf4f52e4082fa691581714b2410566d40779f675a40264293eed6ad81b16544310b87
+DIST CPAN-Meta-Check-0.014.tar.gz 13187 SHA256 28a0572bfc1c0678d9ce7da48cf521097ada230f96eb3d063fcbae1cfe6a351f SHA512 a10af09a7ce771ca3983adea8053d141750fd09849609a28e7f973831fd3a3ece55281841aec93c099154bb59135986da4983bf612ae4e956c45dbb3f2770f5e WHIRLPOOL 54e058c06750f8d21df8179df80a29a16604b05fd6928606134f0be4c17cda27d6728de930bf0f2998472ef10c524b8a23b6a2a8d2ed7a9ea8e11f813362ce26
--- a/dev-perl/CPAN-Mini-Inject/CPAN-Mini-Inject-0.330.0-r1.ebuild
+++ b/dev-perl/CPAN-Mini-Inject/CPAN-Mini-Inject-0.330.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Inject modules into a CPAN::Mini mirror"

 SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-aix"
+KEYWORDS="~amd64 ~x86 ~ppc-aix"
 IUSE=""

 # Disabled
--- a/dev-perl/CPAN-Mini-Inject/CPAN-Mini-Inject-0.350.0.ebuild
+++ b/dev-perl/CPAN-Mini-Inject/CPAN-Mini-Inject-0.350.0.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MITHALDU
+DIST_VERSION=0.35
+inherit perl-module
+
+DESCRIPTION="Inject modules into a CPAN::Mini mirror"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-aix"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/CPAN-Checksums
+	>=dev-perl/CPAN-Mini-0.320.0
+	virtual/perl-Carp
+	>=dev-perl/Dist-Metadata-0.921.0
+	>=virtual/perl-File-Path-2.70.0
+	dev-perl/File-Slurp
+	>=virtual/perl-File-Spec-2.70.0
+	virtual/perl-File-Temp
+	virtual/perl-Getopt-Long
+	virtual/perl-IO-Compress
+	virtual/perl-IO-Zlib
+	dev-perl/libwww-perl
+	dev-perl/YAML"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.400.0
+	test? (
+		>=dev-perl/HTTP-Server-Simple-0.70.0
+		dev-perl/Test-TCP
+		virtual/perl-Test-Simple
+	)
+"
+# Tests fail with parallel testing
+DIST_TEST="do"
+src_test() {
+	perl_rm_files t/pod-coverage.t t/pod.t
+	perl-module_src_test
+}
--- a/dev-perl/CPAN-Mini-Inject/Manifest
+++ b/dev-perl/CPAN-Mini-Inject/Manifest
@ -1 +1,2 @@
 DIST CPAN-Mini-Inject-0.33.tar.gz 26931 SHA256 f50b029999d2671bfa3caa686b853e688e7c4025b35597ad7d487626d12f3aee SHA512 44a55a91c99aa11053ed9547cd0c857cfcef98a3844e0a3a721a19880bd12d3d99e35c528103a36b91e6b11ead89d727856a7b4c1e58aa7cb6cf1e76e675df27 WHIRLPOOL 8c82b4d5398b0295b4b9471d4b32a0b41ee56d6554dd8da9d6b41760d2ab9def33279e376c2813b4ea03c7c83fbcf0882045316fe9da739925f68b2855aed44c
+DIST CPAN-Mini-Inject-0.35.tar.gz 27156 SHA256 6041fda9e1dc8f9fe34a582381d21c0bbf1d1c22da3a01cf8bdc3ee5b05b85e6 SHA512 58e1fba755d6f13c40f46f3fe6d3c603512b4b0152ab18e69c838d91feab7757fff8175cb8d6b30893e0cd59ca39a513e8fef554c58cd7cc898fba7f490fdbaf WHIRLPOOL cae3d27ea4af1b97fb0389bb57a26604d20b4df6c12194c093bb799ca93937f10a9d937484efd2fd15faf2d4b822a412698e0a8efb9ab6480994cc3228d34d21
--- a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-3.380.0.ebuild
+++ b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-3.380.0.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=BINGOS
+DIST_VERSION=3.38
+inherit perl-module
+
+DESCRIPTION="Mapping Perl releases on CPAN to the location of the tarballs"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		>=virtual/perl-Test-Simple-0.470.0
+	)
+"
+src_test() {
+	perl_rm_files t/author-pod-coverage.t t/author-pod-syntax.t
+	perl-module_src_test
+}
--- a/dev-perl/CPAN-Perl-Releases/Manifest
+++ b/dev-perl/CPAN-Perl-Releases/Manifest
@ -12,3 +12,4 @@ DIST CPAN-Perl-Releases-3.18.tar.gz 24827 SHA256 c9d4ebd3dacab6dc25ff79a234a4068
 DIST CPAN-Perl-Releases-3.20.tar.gz 24849 SHA256 8cc19b619d1e3f448a9b1ad233c194d62409d4f5d9ab78fe9630653d576481f8 SHA512 205e2a81be88464fa932f564076ac502229990afe6eb2967d357fee3ec18716a7d4d538ec088d8fd354f1cf8bdd5fa4699a29d2014a22a0f185685d4db135606 WHIRLPOOL c878dd2f5d93f297582cfa750373f7c4ebd107bbb6581145a28c41a8f15f2c03891fd8400500a1082c33f7430dbe062cc9f597d6f441e43f659ef4e9e3ba7b9f
 DIST CPAN-Perl-Releases-3.22.tar.gz 24890 SHA256 3f665f0a9ee50b3dc8ffe71a355449ba6e5696b9faf736228f0c27b2311881af SHA512 ba91b5cc2f21316753e1e18b0d3105a0b3090f30333c5cc59149636841e35647f39191fa09dfd161d63aa5c57b1266b8866f47abd7d69fc23f0163546d812ade WHIRLPOOL d7a25456100b6caaddd543cb2ea9339d375440e74b95cf736f4721513f9131e11ab1db62f4be6796b658b446bef4d455fbcdbcbfe0ee8354d6a971042f5f5859
 DIST CPAN-Perl-Releases-3.34.tar.gz 25003 SHA256 17179549807a2a7338b124dddf464a24a3eba649caf3d90b29f18f281a7d8f5b SHA512 456ae3638619af31df9c3b4edea56c60d45996838f92464104ccf58b67ed131035855966ca79d171bd5e1c2b0e6fb00556b3565bc6f356e74f45c4728ba83b1b WHIRLPOOL 396f040d683bf5bd6b81a13b83f4e1b9dc8ac0d23609691b815c43211c3e5ae50b1ed8395e36b129a81691a3792310a9d4ff239e8c444577c482d8c70faa8881
+DIST CPAN-Perl-Releases-3.38.tar.gz 25059 SHA256 f3a888511f308f3919e30487372465d53e2f9b0d6a1ecce51c3549b4d2f18e60 SHA512 3021696caf7cd22f42a57fbd21c13696487d99f222de6e07e41cd9fe5d5de35a103beba873c7ab2be9feb00237d9ebd38d5906300170203d28d03391d7fd0e5d WHIRLPOOL 4200a11dcb2f7c732f56c3518c7cfab60d5fb72bc1f8712f319326f911d98a71aebd21dc2dac17329109e5b7c1cce1a29672e26fade435f63d3fc36739d3044c
--- a/dev-perl/Cache-Cache/Cache-Cache-1.80.0.ebuild
+++ b/dev-perl/Cache-Cache/Cache-Cache-1.80.0.ebuild
@ -26,3 +26,9 @@ DEPEND="${RDEPEND}
 # https://rt.cpan.org/Ticket/Display.html?id=92600
 # Parallel testing causes failure
 DIST_TEST="do"
+
+src_test() {
+	# https://bugs.gentoo.org/625736
+	perl_rm_files t/6_test_size_aware_memory_cache.t
+	perl-module_src_test
+}
--- a/dev-perl/Cache-FastMmap/Cache-FastMmap-1.460.0.ebuild
+++ b/dev-perl/Cache-FastMmap/Cache-FastMmap-1.460.0.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+DIST_AUTHOR=ROBM
+DIST_VERSION=1.46
+inherit perl-module
+
+DESCRIPTION="Uses an mmaped file to act as a shared memory interprocess cache"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/perl-Storable
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
--- a/dev-perl/Cache-FastMmap/Manifest
+++ b/dev-perl/Cache-FastMmap/Manifest
@ -1,3 +1,4 @@
 DIST Cache-FastMmap-1.40.tar.gz 47952 SHA256 0d12bcf5bc53a43cb71c1c721a36186ef942f749955440e86ec63646409e6c40 SHA512 55c038cc99b4f6177f45f1610c72a57eb893bfc4598909a6f10352422b8c64376e938b1b175dd417667f7fb0732a420e23bb037ce51b16ee2db2d1a712c892d1 WHIRLPOOL ba3c3122feafccd5021f6c3f08df66000403300f3ccf60c85e929382481254334a3a33e6ab3fe7c7d8d348a75fed2bd3f9b76a8b5f3c01e89f480b3f610f2bbd
 DIST Cache-FastMmap-1.44.tar.gz 49451 SHA256 0597423c9bca4469b124d51dfd439eaacb2241d6a03b48191448fd457d8061d6 SHA512 35ac9ef19fe8f7857d3d999274fcfb8fb3b62524e29db5dde846ab51e77a0166b48e063ece4e1621f4ad53a3264ac607879e3a0ae4decaf1d3a16c4284b4b6ce WHIRLPOOL 29288a3eb4a64e68dfbde76fd01d67e0fec96256dbcb90f7ee6e775eed0a781f7ae135f2c280d77e252fa7a03d2a23362233afef1c0e276069395edb18925750
 DIST Cache-FastMmap-1.45.tar.gz 51306 SHA256 ad8fad2e6601002283757999cd3bcab730c0b05a0c336809adcccc42b28d4ba6 SHA512 7c35ec3dd991295f56f03eb2839d88bcf1cb741c6d9c873e0cabdd8f4ba17ed7c790f82a3843cd40fd200450e4080208893734ff49120ef633309a8686058f3f WHIRLPOOL 98497e72a71e32a4051aeac9f6ea8587b04e7049df3130a6219b2b0c183b48cc3b1d94fa14f6103cd263711032d19b70d573f876e4a356fc5ef75bf1ca794948
+DIST Cache-FastMmap-1.46.tar.gz 51820 SHA256 28e9ae034ad37f36a3a644266c9b5993385ca9c9a14fb0a058288dbd289fc100 SHA512 155c55dcbb05b83a7bf35ef70d4436b54ad0dc8684871c03048ac7dc364c5ce408152409fdc88d7c53f38ff7d767ec2c181da8c1e6118826ba0120ef20b77f59 WHIRLPOOL 3ec03090e61f47aad5628ad2c4c187d09aeaef0f94ce0df75d70f96bc495cfc0e151739eb619b977d6aa83b8e679b7f588f8a9a1ce1be7f190c211c24033ef30
--- a/dev-perl/Convert-PEM/Convert-PEM-0.80.0-r1.ebuild
+++ b/dev-perl/Convert-PEM/Convert-PEM-0.80.0-r1.ebuild
@ -21,11 +21,10 @@ RDEPEND="
 	virtual/perl-MIME-Base64
 "
 DEPEND="${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}/${P}-526.patch"
+	"${FILESDIR}/${P}-decryptiontest.patch"
+	"${FILESDIR}/${P}-testbuilder.patch"
+)

 SRC_TEST=do
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install;/use lib q[.]; use inc::Module::Install;/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
--- a/dev-perl/Convert-PEM/files/Convert-PEM-0.80.0-526.patch
+++ b/dev-perl/Convert-PEM/files/Convert-PEM-0.80.0-526.patch
@ -0,0 +1,23 @@
+From 22b4a18d00c7080972341db2052041448391fbfe Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Sun, 11 Jun 2017 14:42:41 +1200
+Subject: Fix Makefile.PL for Perl 5.26 w/o "." in @INC
+
+Bug: https://bugs.gentoo.org/613632
+Bug: https://rt.cpan.org/Ticket/Display.html?id=120714
+---
+ Makefile.PL | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 8d4d686..3e87348 100644
+--- a/Makefile.PL
+++ b/Makefile.PL
+@@ -1,3 +1,4 @@
+use lib '.';
+ use inc::Module::Install;
+ name 'Convert-PEM';
+ all_from 'lib/Convert/PEM.pm';
+-- 
+2.14.1
+
--- a/dev-perl/Convert-PEM/files/Convert-PEM-0.80.0-decryptiontest.patch
+++ b/dev-perl/Convert-PEM/files/Convert-PEM-0.80.0-decryptiontest.patch
@ -0,0 +1,70 @@
+From 9b8f76ece49348cfdc50c5e3b4098694e07184d6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 5 Sep 2014 11:04:30 +0200
+Subject: Do not test the reason for decryption failure on bad key
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Tests checking error message after using bad decryption key fails
+randomly.
+
+Some bad keys can fool the "Bad key/passphrase" heuristic in the
+Convert::PEM::CBC::decode() because it's a feature a stream cipher to
+spit out bad output on bad key. So the heuristic is just a kind
+service to point to the cause of the decoding failure (i.e. bad key).
+By probabilistic nature of the heuristic, we cannot rely on the
+/^Decryption failed/ error message.
+
+This patch removes these tests.
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=27574
+Bug: https://bugs.gentoo.org/625652
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ t/01-readwrite.t | 3 +--
+ t/02-encode.t    | 3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/t/01-readwrite.t b/t/01-readwrite.t
+index 42a4416..208eba1 100644
+--- a/t/01-readwrite.t
+++ b/t/01-readwrite.t
+@@ -1,5 +1,5 @@
+ use strict;
+-use Test::More tests => 16;
+use Test::More tests => 15;
+ use Test::Exception;
+ 
+ use Convert::PEM;
+@@ -29,7 +29,6 @@ lives_ok { $pem->write( Filename => $objfile, Content => $obj, Password => 'xx'
+ ok -e $objfile, 'output file exists';
+ lives_ok { $obj2 = $pem->read( Filename => $objfile ) } 'can read';
+ ok !defined $obj2, 'cannot read encrypted file';
+-like $pem->errstr, qr/^Decryption failed/, 'errstr matches decryption failed';
+ lives_ok { $obj2 = $pem->read( Filename => $objfile, Password => 'xx') } 'can read';
+ is $obj->{TestObject}{int}, $obj2->{TestObject}{int}, 'input matches output';
+ unlink $objfile;
+diff --git a/t/02-encode.t b/t/02-encode.t
+index 37aa987..9c6ab4c 100644
+--- a/t/02-encode.t
+++ b/t/02-encode.t
+@@ -1,5 +1,5 @@
+ use strict;
+-use Test::More tests => 9;
+use Test::More tests => 8;
+ 
+ use Convert::PEM;
+ use Math::BigInt;
+@@ -25,7 +25,6 @@ $blob = $pem->encode( Content => $obj, Password => 'xx' );
+ ok $blob, 'encode gave us something';
+ $obj2 = $pem->decode( Content => $blob );
+ ok !defined $obj2, 'decode fails on encrypted input';
+-like $pem->errstr, qr/^Decryption failed/, 'errstr matches decrypt failed';
+ $obj2 = $pem->decode( Content => $blob, Password => 'xx' );
+ is $obj->{TestObject}{int}, $obj2->{TestObject}{int}, 'input matches output';
+ 
+-- 
+2.14.1
+
--- a/dev-perl/Convert-PEM/files/Convert-PEM-0.80.0-testbuilder.patch
+++ b/dev-perl/Convert-PEM/files/Convert-PEM-0.80.0-testbuilder.patch
@ -0,0 +1,29 @@
+From 831b57ff2167e1192964c190271767e469dac48a Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Tue, 3 Oct 2017 05:01:21 +1300
+Subject: Fix Test::Builder warning
+
+Ideally upstream should just stop bundling Test::Builder, but this
+is the smallest change that avoids the issue
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=111009
+---
+ inc/Test/Builder.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/inc/Test/Builder.pm b/inc/Test/Builder.pm
+index 795361f..6b0c8c3 100644
+--- a/inc/Test/Builder.pm
+++ b/inc/Test/Builder.pm
+@@ -589,7 +589,7 @@ sub _is_dualvar {
+ 
+     no warnings 'numeric';
+     my $numval = $val + 0;
+-    return $numval != 0 and $numval ne $val ? 1 : 0;
+    return ($numval != 0 and $numval ne $val ? 1 : 0);
+ }
+ 
+ #line 876
+-- 
+2.14.1
+
--- a/dev-perl/Convert-TNEF/Convert-TNEF-0.180.0-r2.ebuild
+++ b/dev-perl/Convert-TNEF/Convert-TNEF-0.180.0-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -13,7 +13,9 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE=""

-RDEPEND="dev-perl/MIME-tools"
+RDEPEND="dev-perl/MIME-tools
+	dev-perl/IO-stringy
+"
 DEPEND="${RDEPEND}"

 SRC_TEST=do
--- a/dev-perl/Crypt-CipherSaber/Crypt-CipherSaber-1.10.0-r1.ebuild
+++ b/dev-perl/Crypt-CipherSaber/Crypt-CipherSaber-1.10.0-r1.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=CHROMATIC
+DIST_VERSION=1.01
+inherit perl-module
+
+DESCRIPTION="Perl module implementing CipherSaber encryption"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-Scalar-List-Utils-1.4.2
+"
+DEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	test? (
+		>=virtual/perl-Test-Simple-0.600.0
+		>=dev-perl/Test-Warn-0.300.0
+	)
+"
+PATCHES=(
+	"${FILESDIR}/${P}-newline-iv.patch"
+)
--- a/dev-perl/Crypt-CipherSaber/files/Crypt-CipherSaber-1.10.0-newline-iv.patch
+++ b/dev-perl/Crypt-CipherSaber/files/Crypt-CipherSaber-1.10.0-newline-iv.patch
@ -0,0 +1,118 @@
+From 966c275a76fa33b57f41cb66a908362b526629a8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Wed, 27 Aug 2014 15:38:54 +0200
+Subject: Fix reading IV with new-lines from a file
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Decrypting filehandle data by fh_crypt() could produce bad decrypted
+data if the initizalization vector read from the filehandle contained
+a new-line character. This caused random failures of 'autogenerating
+and autoreading IV should also round-trip' test in t/fh_encrypt.t.
+
+This patch fixes it by reading first 10 characters regardless of
+current line separator.
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=28370
+Bug: https://bugs.gentoo.org/632253
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ lib/Crypt/CipherSaber.pm | 14 +++++++++-----
+ t/fh_encrypt.t           | 40 +++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 48 insertions(+), 6 deletions(-)
+
+diff --git a/lib/Crypt/CipherSaber.pm b/lib/Crypt/CipherSaber.pm
+index 7cb7cc0..2db153c 100644
+--- a/lib/Crypt/CipherSaber.pm
+++ b/lib/Crypt/CipherSaber.pm
+@@ -67,6 +67,15 @@ sub fh_crypt
+         $iv = $self->_gen_iv() if length($iv) == 1;
+         $self->_setup_key($iv);
+         print OUT $iv;
+    } else {
+        if ( 10 != $in->read($iv, 10) )
+        {
+            require Carp;
+            Carp::carp( 'Could not read IV from input filehandle' );
+            return;
+        }
+        ( $iv ) = unpack( "a10", $iv );
+        $self->_setup_key($iv);
+     }
+ 
+     my $state = $self->[1];
+@@ -75,11 +84,6 @@ sub fh_crypt
+ 
+     while (<$in>)
+     {
+-        unless ($iv)
+-        {
+-            ( $iv, $_ ) = unpack( "a10a*", $_ );
+-            $self->_setup_key($iv);
+-        }
+         my $line;
+         ( $line, $state, @vars ) = _do_crypt( $state, $_, @vars );
+         print OUT $line;
+diff --git a/t/fh_encrypt.t b/t/fh_encrypt.t
+index 35a74fb..e595ff9 100644
+--- a/t/fh_encrypt.t
+++ b/t/fh_encrypt.t
+@@ -6,7 +6,7 @@ BEGIN
+ }
+ 
+ use strict;
+-use Test::More tests => 6;
+use Test::More tests => 7;
+ use_ok( 'Crypt::CipherSaber' );
+ 
+ # tests the fh_crypt() method
+@@ -114,6 +114,44 @@ while (<SOURCE>)
+ 
+ ok( ! $status, 'autogenerating and autoreading IV should also round-trip' );
+ 
+# IV retrieved from encrypted file can contain new-line characters. Check that
+# fh_encrypt can deal with it
+{
+	local $/ = "\012";
+
+	open( IN, 'smiles.png' )      or die "Cannot read smiles.png: $!";
+	open( OUT, '> smiles_2.cs1' ) or die "Cannot write to smiles_2.cs1: $!";
+	binmode( IN );
+	binmode( OUT );
+	$cs->fh_crypt( \*IN, \*OUT, $/ x 10 );
+	close IN;
+	close OUT;
+
+	open( IN, 'smiles_2.cs1'    ) or die "Cannot read smiles_2.cs1: $!";
+	open( OUT, '> smiles_2.png' ) or die "Cannot write to smiles_2.png $!";
+	binmode( IN );
+	binmode( OUT );
+	$cs->fh_crypt( \*IN, \*OUT );
+	close IN;
+	close OUT;
+
+	open( SOURCE, 'smiles.png' )   or die "Cannot read smiles.png: $!";
+	open( DEST,   'smiles_2.png' ) or die "Cannot read smiles_2.png: $!";
+	binmode SOURCE;
+	binmode DEST;
+	$status = 0;
+	while (<SOURCE>)
+	{
+		unless ($_ eq <DEST>)
+		{
+			$status = 1;
+			last;
+		}
+	}
+	ok( ! $status, 'IV with new-lines in the encrypted file' );
+}
+
+
+ END
+ {
+ 	1 while unlink qw( smiles_2.cs1 smiles_2.png outsmiles.cs1 outsmiles.png );
+-- 
+2.14.1
+
--- a/dev-perl/Dist-Metadata/Dist-Metadata-0.927.0.ebuild
+++ b/dev-perl/Dist-Metadata/Dist-Metadata-0.927.0.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=RWSTAUNER
+DIST_VERSION=0.927
+inherit perl-module
+
+DESCRIPTION="Information about a perl module distribution"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-Archive-Tar-1.0.0
+	>=dev-perl/Archive-Zip-1.300.0
+	>=dev-perl/CPAN-DistnameInfo-0.120.0
+	>=virtual/perl-CPAN-Meta-2.100.0
+	virtual/perl-Carp
+	>=virtual/perl-Digest-1.30.0
+	>=virtual/perl-Digest-MD5-2.0.0
+	>=virtual/perl-Digest-SHA-5.0.0
+	>=dev-perl/File-Spec-Native-1.2.0
+	>=virtual/perl-File-Temp-0.190.0
+	virtual/perl-Module-Metadata
+	>=dev-perl/Path-Class-0.240.0
+	virtual/perl-Scalar-List-Utils
+	>=dev-perl/Try-Tiny-0.90.0
+	virtual/perl-parent
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-CPAN-Meta-2.120.900
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		dev-perl/Test-Fatal
+		>=dev-perl/Test-MockObject-1.90.0
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST CPAN-DistnameInfo-0.12.tar.gz 14523 SHA256 2f24fbe9f7eeacbc269d35fc61618322fc17be499ee0cd9018f370934a9f2435 SHA512 f52eb88b87ab732d13c2ee4e4770cf27c249d2b2446b51e75abe31f2a70b8dc7d8370f4c4426fa68cc8fa7a905668dfdcd1387cd98e239393bde90d1965929f1 WHIRLPOOL 7cb4c6a557bd6ca9c6214a7f47d224fdd17d0854928f24a56f4f9a13851dbfbea96f8833df68a1194294b9d8234f06174cf2e80cf0824cf7d7f3bc19069cb63f`