Sync with portage [Thu Feb 9 12:00:31 MSK 2017].

2017-02-09 12:00:31 +03:00 · 2017-02-09 12:00:31 +03:00 · b34ca3619f
commit b34ca3619f
parent ccce16ac23
3300 changed files with 9093 additions and 10682 deletions
--- a/app-admin/gentoo-perl-helpers/Manifest
+++ b/app-admin/gentoo-perl-helpers/Manifest
@ -1 +1,2 @@
 DIST gentoo-perl-helpers-0.1.0.tar.xz 6692 SHA256 e2c0e3eabbdba194460547d4b2beb2b632ff12833bff2454fc7e8a1f57772158 SHA512 929921c4584d990b53163413b58d4fd7a8868073c03095e90914c3565e65d5ee3e86e2c5269079b4c683c9db6fe5e035358539f62091fbc24af818e6330d414b WHIRLPOOL 372f38e18e2c386ad535df36c686597cb9db51fe166d9946a3d10750d85052fd08c242a5c1c781722b63cb4d79d15bd1b6de8d9ce54553511f505d3ca29ade85
+DIST gentoo-perl-helpers-0.2.0.tar.xz 8876 SHA256 73ed0e54870ca3979067251c35750a21a034501894e07d0626f03dbb19b77250 SHA512 f9c534436dc3ad7bc2c50e47491ef3a76bf949e2065c182391b3526e259ce93e9eb4ef1b9d981d6dbf3924394150b90ee6460f51f67d79505039b826af374d95 WHIRLPOOL f8b3eb49ff34b4b43637069496ed396f1c34d4abebba773889268e4eab7ea0a0cec7d39389c501f8c1285893c4193b34e3b2a6eb7270a0daf53d9c81788f6efd
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.0.ebuild
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.0.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Introspection and Upgrade Assistance tools for Gentoo Perl"
+HOMEPAGE="https://github.com/gentoo-perl/gentoo-perl-helpers"
+SRC_URI="
+	https://github.com/gentoo-perl/${PN}/releases/download/${PV}/${P}.tar.xz
+	mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~kentnl/distfiles/${P}.tar.xz
+"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Assumed System:
+# sys-apps/coreutils
+# sys-apps/grep
+# sys-apps/findutils
+# sys-apps/sed
+# app-shells/bash
+# sys-apps/gawk
+# app-arch/tar
+
+RDEPEND="
+	app-portage/portage-utils
+	sys-apps/portage
+"
+DEPEND=""
+
+src_prepare() {
+	sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" 		\
+		   -e "s^@@LIBEXECDIR@@^${EPREFIX}/usr/libexec/gentoo-perl-helpers^g" \
+		   "${S}/bin/gentoo-perl"			\
+		   "${S}/lib/core-functions.sh"		\
+		   || die "Can't patch bin/gentoo-perl"
+	default
+}
+src_compile() { :; }
+src_install() {
+	exeinto /usr/bin
+	doexe "${S}/bin/"*
+
+	exeinto /usr/libexec/gentoo-perl-helpers
+	doexe "${S}/libexec/"*
+
+	insinto /usr/lib/gentoo-perl-helpers
+	doins -r "${S}/lib/"*
+
+	dodoc "${S}/README.mkdn" "${S}/Changes"
+}
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@ -3,3 +3,4 @@ DIST mongo-tools-3.0.14.tar.gz 2413148 SHA256 5a3f706827a9567fc98e2b64a33a2071c6
 DIST mongo-tools-3.2.11.tar.gz 2712014 SHA256 992e9fb94df6bed49e68684afee096f1193dc9cfca8ce8bcc4c912996bba365c SHA512 a6e2dd8dd567f04205e57be2983f5f0ddf2c4aca915f5ffaa777d17b94f62e0f106eb9bad93213d25f60c3949d47f4d91cdf767744e8094278e8ecf3546dfae5 WHIRLPOOL 6d75a9b0e6cd4271f8c6571dd280adafc7ff1bb60f973a037c78b39df0981d6c35f1a38309a8d96300f45053054c4454f22ce75aea2d62da6db06a2b1adcf90d
 DIST mongo-tools-3.2.12.tar.gz 2712079 SHA256 cda5e869b9233d591e91cac0b4c709a2e71dcabd9ac6bcc8b33d906ce3b13afd SHA512 66f7beb85a83ad6a217e65bba97ace6ad0bf84688f40e598e5fb1cf4bbe481b4069e1247d6829f8d06c8230d33c3e0c8bd8465a975576cad584065c361b6fb72 WHIRLPOOL 46123dc3c97fdf20ff94ac373e774932bd30aca677047fe3366653aaab269bf6d7e59cb420cf1e5716558fa959cb3649ee359cc27932bac276e6d24d2eea43b1
 DIST mongo-tools-3.4.1.tar.gz 4700560 SHA256 283d729442fca7a331ca475e234b0880ec7c4339597e0a8e271ca7e153b45439 SHA512 bd5862b220bc9d77d938b87b1e2c974d0088239c51cd091b5e4d578d774e28aa6b25ab18936c9f388fd1ed3caeca264225c14cd5a85e749c3c3e148ca073a990 WHIRLPOOL 2b5ba4e2c91372e5cec355d0e6d651d4fd3de7b3d72839e855e099c75a9ffec172b43caff82d2cf7371fd3c7ac1ca1e71fc303eff75cd2e5afc352fbbf4dba42
+DIST mongo-tools-3.4.2.tar.gz 4700591 SHA256 3679576153ab1a9e1a7fe9811cb6d7c32c6d9320f07be9a94d064d6904618b5a SHA512 5ad4b5421acb10010f72f6b9f8342c095c4f571ac3cb9dc3db78251262f8285a4e2bddbeed3ad26c64f36d5b33ed7f43a759c74e00d2878c0ac6a71069508a2f WHIRLPOOL 208bd7116e1a7be2854f81df95d418667d50166d91522e14fdfa4e1f0b1ce007966fc5b0b1367f3be2c273fa7abbbfe04cb6e970a5010d44ac8542dc1bbd3424
--- a/app-admin/mongo-tools/mongo-tools-3.2.12.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.2.12.ebuild
@ -25,6 +25,7 @@ IUSE="sasl ssl"
 RDEPEND="!<dev-db/mongodb-3.0.0"
 DEPEND="${RDEPEND}
 	dev-lang/go:=
+	net-libs/libpcap
 	sasl? ( dev-libs/cyrus-sasl )
 	ssl? ( dev-libs/openssl )"

--- a/app-admin/mongo-tools/mongo-tools-3.4.2.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.4.2.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl ssl"
+
+# Maintainer note:
+# openssl DEPEND constraint, see:
+# https://github.com/mongodb/mongo-tools/issues/11
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -e 's|go build .*|go build -o "bin/$i" -tags "$tags" "$i/main/$i.go"|g' -i build.sh || die
+
+	# ensure we use bash wrt #582906
+	sed -e 's@/bin/sh@/bin/bash@g' -i build.sh || die
+
+	epatch "${FILESDIR}/${PN}-3.2.10-pie.patch"
+}
+
+src_compile() {
+	local myconf
+
+	if use sasl; then
+	  myconf="${myconf} sasl"
+	fi
+
+	if use ssl; then
+	  myconf="${myconf} ssl"
+	fi
+
+	./build.sh ${myconf} || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
--- a/app-admin/sysstat/metadata.xml
+++ b/app-admin/sysstat/metadata.xml
@ -6,6 +6,7 @@
 		<name>Jeroen Roovers</name>
 	</maintainer>
 	<use>
+		<flag name="cron">Install /etc/cron.d script to periodically run sar</flag>
 		<flag name="isag">Install isag, the Interactive System Activity Graph tool</flag>
 	</use>
 </pkgmetadata>
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@ -0,0 +1 @@
+DIST restic-0.4.0.tar.gz 22926188 SHA256 746dbc7b73f5a542be57b71714b243266a011f1d750f56f5100c08a59df1aeac SHA512 ccd15f010f8da3bae3d33698e70ff1d9565f52fb56991b78d35f95493417a4ab050021153d81c424947233255d9553d050f7a66e1c709843fe3b2d323a81f85b WHIRLPOOL 94e6b9ed777a86cb6e46cf734b9280e68cc2ce1ea061c8a94409dca594add1ec24fb736a56e35571302ff5043a60bef7f60ff3b39b038ee128bc815f7d3d48cd
--- a/app-backup/restic/metadata.xml
+++ b/app-backup/restic/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>davidroman96@gmail.com</email>
+		<name>David Roman</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
--- a/app-backup/restic/restic-0.4.0.ebuild
+++ b/app-backup/restic/restic-0.4.0.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="restic is a backup program that is fast, efficient and secure"
+HOMEPAGE="https://restic.github.io/"
+SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DOCS=( README.md CONTRIBUTING.md doc/Design.md doc/FAQ.md doc/index.md doc/Manual.md doc/REST_backend.md )
+
+DEPEND="dev-lang/go
+	test? ( sys-fs/fuse )"
+
+RDEPEND="sys-fs/fuse"
+
+src_compile() {
+	local mygoargs=(
+		-v
+		-work
+		-x
+		-tags release
+		-ldflags "-w -X main.version=${PV}"
+		-o "${S}"/restic cmds/restic
+	)
+
+	GOPATH="${S}:${S}/vendor" go build "${mygoargs[@]}" || die
+}
+
+src_test() {
+	GOPATH="${S}:${S}/vendor" go test -v -work -x restic/... cmds/... || die
+}
+
+src_install() {
+	dobin restic
+	einstalldocs
+}
--- a/app-benchmarks/httperf/Manifest
+++ b/app-benchmarks/httperf/Manifest
@ -1,2 +1 @@
-DIST httperf-0.9.0.tar.gz 425297 SHA256 e1a0bf56bcb746c04674c47b6cfa531fad24e45e9c6de02aea0d1c5f85a2bf1c SHA512 58ea6a3b8a82181a89e5df22fdf18d5be8c7b533c404108702cc03fc727fb1599a43e620d83d41630f8a951d80e48ed99d0c3dd8469ee1fc7626449b777971e1 WHIRLPOOL 7b36e636a063c9af7ff142f7a81947f5b693bb1a3bdbe98c5dfd1f5ac11edb380e97f19c3ad2a0a8d8505c0d63d8d714fe935a6e326f2373cbbb11a940431a7e
 DIST httperf-0.9.1_p20161228.tar.gz 106357 SHA256 45cf5e92d30cd4191015fff2d0d066b780b54c45e614690bf0e70926633715ed SHA512 e5dbb400e4ab0db3cc1621731d99af9261574a8a1da4279c722ebbd80537d0aae2a3d662f4d51eb9130bc98823c2786710c7819a0144f4ae3f8cf153e28d7dfa WHIRLPOOL 2d0e5ee38b965f8d378cf45038c03782bb64d73981432a24968d6e0b870bacd64e947ee6c0120b2d7927780c4096cf3725ff1866f5f77042498f278cc84683d6
--- a/app-benchmarks/httperf/httperf-0.9.0-r2.ebuild
+++ b/app-benchmarks/httperf/httperf-0.9.0-r2.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils toolchain-funcs
-
-DESCRIPTION="A tool from HP for measuring web server performance"
-HOMEPAGE="https://github.com/httperf/httperf"
-SRC_URI="https://httperf.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x64-macos"
-IUSE="debug"
-
-DEPEND="dev-libs/openssl"
-RDEPEND="dev-libs/openssl"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_configure() {
-	econf --bindir="${EPREFIX}"/usr/bin \
-		$(use_enable debug)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" -j1
-}
--- a/app-benchmarks/httperf/httperf-0.9.0-r3.ebuild
+++ b/app-benchmarks/httperf/httperf-0.9.0-r3.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils toolchain-funcs
-
-DESCRIPTION="A tool from HP for measuring web server performance"
-HOMEPAGE="https://github.com/httperf/httperf"
-SRC_URI="https://httperf.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x64-macos"
-IUSE="debug libressl"
-
-RDEPEND="!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_configure() {
-	econf --bindir="${EPREFIX}"/usr/bin \
-		$(use_enable debug)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" -j1
-}
--- a/app-benchmarks/httperf/httperf-0.9.1_p20161228.ebuild
+++ b/app-benchmarks/httperf/httperf-0.9.1_p20161228.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_COMMIT_HASH}.tar.gz -> ${P}

 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x64-macos"
 IUSE="debug libressl idleconn"

 RDEPEND="!libressl? ( dev-libs/openssl:0= )
--- a/app-benchmarks/httperf/metadata.xml
+++ b/app-benchmarks/httperf/metadata.xml
@ -16,7 +16,6 @@
 		<flag name="idleconn">Build with the idleconn program</flag>
 	</use>
 	<upstream>
-		<remote-id type="google-code">httperf</remote-id>
 		<remote-id type="github">httperf/httperf</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-crypt/aespipe/metadata.xml
+++ b/app-crypt/aespipe/metadata.xml
@ -6,7 +6,7 @@
 		<name>Crypto</name>
 	</maintainer>
 	<use>
-		<flag name="asm">Enable assebly modules</flag>
+		<flag name="asm">Enable assembly modules</flag>
 		<flag name="cpu_flags_x86_padlock">Use VIA padlock instructions,
 		detected at run time, code still works on non-padlock processors</flag>
 	</use>
--- a/app-doc/pms/pms-9999.ebuild
+++ b/app-doc/pms/pms-9999.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

 inherit git-r3

@ -24,7 +24,7 @@ DEPEND="dev-tex/leaflet
 	|| ( dev-texlive/texlive-mathscience dev-texlive/texlive-science )
 	html? (
 		app-text/recode
-		>=dev-tex/tex4ht-20090115_p0029
+		>=dev-tex/tex4ht-20090611_p1038-r5
 	)"
 RDEPEND=""

--- a/app-editors/atom/Manifest
+++ b/app-editors/atom/Manifest
@ -1,8 +1,10 @@
 DIST asar-0.12.1.tar.gz 1016626 SHA256 731714f0036318fe0878b517391a01977954bb088d4dbc7dd98682ff1e03c0e7 SHA512 fc64be9b11215426d405f7acd7adf6c0eead3135b0012baf6d168a13c77675058a4e2c60682928ac014e4bef4538d452ad745d1e87dd315387997a19e04718a7 WHIRLPOOL d73b8bb459724bb3b011de312171519c1f1954a94ce1bb0a20eb9877c168baa82a15786d3ab420d5b3d32ce8a11333e85f844b43c21cbd56c3b019e73774388e
-DIST atom-1.12.2.rpm 84876214 SHA256 bcf95d7a8f4105c016d2940540d7c8db9bf0948a7dc8b5411294bd0fac48ec15 SHA512 a63af5e0da6ce0e9cc70c47da55b13fe463903c27a7df4e7ce311f08ed16fb4e04712678479661febcdf70afa400e3a8235d540bacaf4078e92b1e3d42fdfc11 WHIRLPOOL 4d6793741496cc240da18540bb74751b193e293a2df14c365c8fed2a2672422f87b36c5faf324790cc45951c8006a4b482656e8c8d3fd46d723c12c8ca073b4e
+DIST atom-1.12.7.rpm 84755598 SHA256 8eaa5426c9209efc91969e3f3b1535f2c1895daf6259c07cbd595dd0a599553f SHA512 f2d582eb916e95373a08a1e56b89492f52547ab853fae7975b8193ee5d0a23dfc86bcaf9de5b53bc0dbd955c784abfede5b162fb6ef5ee0f7424fc0882da848c WHIRLPOOL aa029e8ef519f475b0a9a9f592cb685b4f15f4c257774c7ca644ed69bf50128bce4c382581b133e7c43438f690ed6b3d791ad379109b96a8ef9893ef93e0ad98
+DIST atom-1.13.1.rpm 86119349 SHA256 593fa81abb3a3a8c89713de1fb9d7d3dd4e4b34211de69fee67469b63be98f01 SHA512 57e587441fbc5ed7864d54f067386a54e854c761b3ad577e07d58253d693c90de934af98e1dc16bf1b645a7b87e9169d0a869509c0192103ddede51a1d8b95d6 WHIRLPOOL 51b8ce72c4b9b01ca8afc3ae5a548e0dbf437fc629305acf357c6de44a05b20a7d8736c89d78cd1cb84fe22109445e5d9d773e0d50e321fcdabca015f64a55a7
+DIST atom-buffer-offset-index-9588080533c9d0a8a71ee1cfd98596f485940e91.tar.gz 5558 SHA256 ea940264e4d6f2b5ad319c50e7e4ece64e1fd4d1f790c847dedf0a5bc4e9b2c9 SHA512 ebcfa7057c9db85a7884cbb19fa561821fc883bbd6a5d0186fcf68782697a7c7677e019334b44b3477d26e1febccb3a7690dc3390dcb55ca838e176f390b11b7 WHIRLPOOL 1c438ec18c2fcf1c7b1a11421eb9944a2fd90f920dc4dc5cf0b8c5300f9f285cc993689312a23b9882f13316956077bf9994173c0b1c9cd54c6f5ccdd667d16f
 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-keyboard-layout-2.0.1.tar.gz 18561 SHA256 057d01745b5cfb47381aa89d64344d4c1576d3b490756a25e3f616bfc68f6516 SHA512 f5b90c1c83574cd2cb49c82d11fabadb58ec41d34b5b6ea17b28b8a34b22ed9ce1afb1602cf1d3d28ba79e3cebcb60d8659201eea4c5294e0db2b29d7632b07a WHIRLPOOL a859b0d364b9059f4482b52f049e9a420bf356e00a5cfe5b657fbd0e1868fd6cd2bf39846560b88c9763e1ebc54fb7acb025a67af21182b00c3f83b380f4443f
+DIST atom-keyboard-layout-2.0.7.tar.gz 18687 SHA256 3fb6c702c07d4d7116d73e5ed457f8dd2b07a99eafb7da830c032545d6da1f1e SHA512 96a10dad193d2e870e518eb863e4bf758e1efa86c4e377a3dcb818b5f51d42eaab9211732eddac106b7d4dddf6d9ebe80fb4a16ca24c647a0599a3a92e2c4591 WHIRLPOOL 01c28f7dadb8961ed6480a6ca2f9fab6c7e78436317b12f2731e130af405a456ea21719c0a409aa87248eaee956792fc37dcb040d900e2acc5005917c0f4666c
 DIST atom-marker-index-4.0.1.tar.gz 18433 SHA256 ecb6a5294088feb2a2b8ae71845dc262e1ab551a6a75e9ac99b05807b62b2d4a SHA512 2f5639ac0fef1a9d735dc10b464a046ee78f8cf7ecd8a6705232c319958a46056146bd91a0bf421aa0c6da39106f6deacaedaa40c442c0c08f0e6fbfd938b3ea WHIRLPOOL ccbd0f6a515b97a1fcf460f13388206ab3ccee364264203fa6d6ad3d6e68a4e06bad5f38ce19008d2a5f79d2becb14a459cbd016f0daaea48c5387c21ad1bb77
 DIST atom-node-ctags-3.0.0.tar.gz 15062 SHA256 40605012d06d4dcbfc369862b57900b6963613e2e4ee3b37fea21693b2b418a7 SHA512 6f7277a0ff872991c365f811c635fd881c3e466c20219d8a7bdaf6fec7c26c5feaa7ae2118691a8d52ceb3ecfda6d795bf39dfda7f8df5a6d02388575a010f87 WHIRLPOOL 2cff81d2ca405a615e5c7d284785f129f8fcd968998c68a42af1ca2e6d76a6fcb404a92f3c0d20220567b28593448b91657db6df8bce19de1f2eedbfe2959140
 DIST atom-node-keytar-3.0.2.tar.gz 5718 SHA256 16af03d2a7876e3008f82d35e913753384655bc181e93cb771639b6d5a2439bf SHA512 f08ec6e50071e6e8995244607144009eaa8fd61a1724c80c40ccfb497e2b4682b30d6a091de9480b78f49ceb11f1a655e12ccb6b43d3df34f7e089585381697a WHIRLPOOL 69b10619531bedb839c61c1b29d18d1a0bf4e468ed05ebd58db349010b8de555673f45bdf98c4ad252aaa960b47faa00d952470e9b3545a0e1e189bbb3e49ded
--- a/app-editors/atom/atom-1.12.7.ebuild
+++ b/app-editors/atom/atom-1.12.7.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
 # $Id$

@ -34,7 +34,7 @@ MARKER_INDEX_V=4.0.1
 NODE_KEYTAR_V=3.0.2

 # atom-keymap dependency
-KEYBOARD_LAYOUT_V=2.0.1
+KEYBOARD_LAYOUT_V=2.0.7

 # symbols-view dependency
 NODE_CTAGS_V=3.0.0
@ -92,6 +92,7 @@ DEPEND="
 	>=dev-libs/oniguruma-5.9.5:=
 	>=dev-util/ctags-5.8
 	>=dev-util/electron-1.3.5:${ELECTRON_SLOT}
+	x11-libs/libxkbfile
 "
 RDEPEND="
 	${DEPEND}
@ -265,6 +266,7 @@ src_prepare() {

 	eapply "${FILESDIR}/atom-apm-path.patch"
 	eapply "${FILESDIR}/atom-license-path.patch"
+	eapply "${FILESDIR}/atom-fix-app-restart.patch"

 	sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
 		"${S}/build/app/src/config-schema.js" || die
--- a/app-editors/atom/atom-1.13.1.ebuild
+++ b/app-editors/atom/atom-1.13.1.ebuild
@ -0,0 +1,407 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 multiprocessing rpm
+
+DESCRIPTION="A hackable text editor for the 21st Century"
+HOMEPAGE="https://atom.io"
+MY_PV="${PV//_/-}"
+
+ELECTRON_V=1.3.5
+ELECTRON_SLOT=1.3
+
+# All binary packages depend on this
+NAN_V=2.4.0
+
+# Keep dep versions in sync with atom/package.json
+CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
+GIT_UTILS_V=4.1.2
+NODE_NSLOG_V=3.0.0
+NODE_ONIGURUMA_V=6.1.0
+NODE_PATHWATCHER_V=6.5.0
+NODE_RUNAS_V=3.1.1
+SCROLLBAR_STYLE_V=3.2.0
+SPELL_CHECK_V=0.68.5
+
+# text-buffer dependencies
+BUFFER_OFFSET_INDEX_V=9588080533c9d0a8a71ee1cfd98596f485940e91
+MARKER_INDEX_V=4.0.1
+
+# apm dependency
+NODE_KEYTAR_V=3.0.2
+
+# atom-keymap dependency
+KEYBOARD_LAYOUT_V=2.0.7
+
+# symbols-view dependency
+NODE_CTAGS_V=3.0.0
+
+# spell-check dependency
+NODE_SPELLCHECKER_V=3.2.3
+
+ASAR_V=0.12.1
+
+# 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-${MY_PV}.rpm
+	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://github.com/atom/cached-run-in-this-context/archive/v${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz -> atom-cached-run-in-this-context-${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz
+	https://github.com/atom/node-ctags/archive/v${NODE_CTAGS_V}.tar.gz -> atom-node-ctags-${NODE_CTAGS_V}.tar.gz
+	https://github.com/atom/git-utils/archive/v${GIT_UTILS_V}.tar.gz -> atom-git-utils-${GIT_UTILS_V}.tar.gz
+	https://github.com/atom/keyboard-layout/archive/v${KEYBOARD_LAYOUT_V}.tar.gz -> atom-keyboard-layout-${KEYBOARD_LAYOUT_V}.tar.gz
+	https://github.com/atom/buffer-offset-index/archive/${BUFFER_OFFSET_INDEX_V}.tar.gz -> atom-buffer-offset-index-${BUFFER_OFFSET_INDEX_V}.tar.gz
+	https://github.com/atom/marker-index/archive/v${MARKER_INDEX_V}.tar.gz -> atom-marker-index-${MARKER_INDEX_V}.tar.gz
+	https://github.com/atom/node-keytar/archive/v${NODE_KEYTAR_V}.tar.gz -> atom-node-keytar-${NODE_KEYTAR_V}.tar.gz
+	https://github.com/atom/node-nslog/archive/v${NODE_NSLOG_V}.tar.gz -> atom-node-nslog-${NODE_NSLOG_V}.tar.gz
+	https://github.com/atom/node-oniguruma/archive/v${NODE_ONIGURUMA_V}.tar.gz -> atom-node-oniguruma-${NODE_ONIGURUMA_V}.tar.gz
+	https://github.com/atom/node-pathwatcher/archive/v${NODE_PATHWATCHER_V}.tar.gz -> atom-node-pathwatcher-${NODE_PATHWATCHER_V}.tar.gz
+	https://github.com/atom/node-runas/archive/v${NODE_RUNAS_V}.tar.gz -> atom-node-runas-${NODE_RUNAS_V}.tar.gz
+	https://github.com/atom/scrollbar-style/archive/v${SCROLLBAR_STYLE_V}.tar.gz -> atom-scrollbar-style-${SCROLLBAR_STYLE_V}.tar.gz
+	https://github.com/atom/node-spellchecker/archive/v${NODE_SPELLCHECKER_V}.tar.gz -> atom-node-spellchecker-${NODE_SPELLCHECKER_V}.tar.gz
+"
+
+BINMODS="
+		cached-run-in-this-context
+		node-ctags
+		git-utils
+		keyboard-layout
+		node-nslog
+		node-oniguruma
+		node-pathwatcher
+		node-runas
+		node-keytar
+		scrollbar-style
+		node-spellchecker
+		marker-index
+		buffer-offset-index
+"
+
+RESTRICT="mirror"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=app-text/hunspell-1.3.3:=
+	>=dev-libs/libgit2-0.23:=[ssh]
+	>=gnome-base/libgnome-keyring-3.12:=
+	>=dev-libs/oniguruma-5.9.5:=
+	>=dev-util/ctags-5.8
+	>=dev-util/electron-1.3.5:${ELECTRON_SLOT}
+	x11-libs/libxkbfile"
+RDEPEND="
+	${DEPEND}
+	!sys-apps/apmd
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+get_install_suffix() {
+	local c=(${SLOT//\// })
+	local slot=${c[0]}
+	local suffix
+
+	if [[ "${slot}" == "0" ]]; then
+		suffix=""
+	else
+		suffix="-${slot}"
+	fi
+
+	echo -n "${suffix}"
+}
+
+get_install_dir() {
+	echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
+}
+
+get_electron_dir() {
+	echo -n "/usr/$(get_libdir)/electron-${ELECTRON_SLOT}"
+}
+
+get_electron_nodedir() {
+	echo -n "/usr/include/electron-${ELECTRON_SLOT}/node/"
+}
+
+enode_electron() {
+	"$(get_electron_dir)"/node $@
+}
+
+enodegyp_atom() {
+	local apmpath="/usr/share/atom/resources/app/apm"
+	local nodegyp="${S}/${apmpath}/node_modules/node-gyp/bin/node-gyp.js"
+
+	PATH="$(get_electron_dir):${PATH}" \
+		enode_electron "${nodegyp}" \
+			--nodedir="$(get_electron_nodedir)" $@ || die
+}
+
+easar() {
+	local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
+	echo "asar" $@
+	enode_electron "${asar}" $@ || die
+}
+
+package_dir() {
+	local binmod="${1//-/_}"
+	local binmod_v="${binmod^^}_V"
+	echo -n ${1}-${!binmod_v}
+}
+
+_unpack_npm_package() {
+	local a="${1}" basename suffix
+
+	basename=${a%.*}
+	suffix=${basename##*.}
+	if [[ "${suffix}" == "tar" ]]; then
+		basename=${basename%.*}
+	fi
+
+	unpack ${a}
+	mv package "${basename}" || die
+}
+
+_have_patches_for() {
+	local _patches="${1}-*.patch" _find
+	_find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
+	test -n "$_find"
+}
+
+src_unpack() {
+	local a
+
+	for a in ${A} ; do
+		case ${a} in
+		*.rpm) srcrpm_unpack "${a}" ;;
+		*) unpack "${a}" ;;
+		esac
+	done
+
+	mkdir "${WORKDIR}/atom-${MY_PV}" || die
+	mv "${WORKDIR}/usr" "${WORKDIR}/atom-${MY_PV}" || die
+}
+
+src_prepare() {
+	local install_dir="$(get_install_dir)"
+	local suffix="$(get_install_suffix)"
+	local patch binmod _s nan_s="${WORKDIR}/nan-${NAN_V}"
+
+	cd "${S}/usr/share/atom/resources/app" || die
+	eapply "${FILESDIR}/${PN}-python.patch"
+	eapply "${FILESDIR}/${PN}-unbundle-electron.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)"
+	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
+
+	rm apm/bin/node || die
+
+	sed -i -e "s|/usr/share/atom/atom|/usr/bin/atom|g" \
+		"${S}/usr/share/applications/atom.desktop" || die
+
+	cd "${S}" || 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
+
+	# 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 node-oniguruma)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle "onig_scanner;oniguruma;onig" \
+		"${_s}/binding.gyp" || die
+
+	_s="${WORKDIR}/$(package_dir node-spellchecker)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle "spellchecker;hunspell;hunspell" \
+		"${_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
+
+	# Unpack app.asar
+	easar extract "${S}/usr/share/atom/resources/app.asar" "${S}/build/app"
+
+	cd "${S}" || die
+
+	eapply "${FILESDIR}/atom-1.13-apm-path.patch"
+	eapply "${FILESDIR}/atom-license-path.patch"
+	eapply "${FILESDIR}/atom-fix-app-restart.patch"
+
+	sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
+		"${S}/build/app/src/config-schema.js" || die
+
+	eapply_user
+}
+
+src_configure() {
+	local binmod _s
+
+	for binmod in ${BINMODS}; do
+		einfo "Configuring ${binmod}..."
+		_s="${WORKDIR}/$(package_dir ${binmod})"
+		cd "${_s}" || die
+		enodegyp_atom configure
+	done
+}
+
+src_compile() {
+	local binmod _s x
+	local ctags_d="node_modules/symbols-view/vendor"
+	local jobs=$(makeopts_jobs) gypopts
+
+	gypopts="--verbose"
+
+	if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+		gypopts+=" --jobs ${jobs}"
+	fi
+
+	mkdir -p "${S}/build/modules/" || die
+
+	for binmod in ${BINMODS}; do
+		einfo "Building ${binmod}..."
+		_s="${WORKDIR}/$(package_dir ${binmod})"
+		cd "${_s}" || die
+		enodegyp_atom ${gypopts} build
+		x=${binmod##node-}
+		mkdir -p "${S}/build/modules/${x}" || die
+		cp build/Release/*.node "${S}/build/modules/${x}" || die
+	done
+
+	# Put compiled binary modules in place
+	_fix_binmods "${S}/build" "app"
+	_fix_binmods "${S}/usr/share/atom/resources" "app"
+
+	# Remove non-Linux vendored ctags binaries
+	rm "${S}/build/app/${ctags_d}/ctags-darwin" \
+	   "${S}/build/app/${ctags_d}/ctags-win32.exe" || die
+
+	# Re-pack app.asar
+	# Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
+	cd "${S}/build" || die
+	x="--unpack={*.node,ctags-config,ctags-linux,**/node_modules/spellchecker/**,**/resources/atom.png}"
+	easar pack "${x}" "app" "app.asar"
+	cd "${S}" || die
+}
+
+_fix_binmods() {
+	local _dir="${2}" _prefix="${1}" path relpath modpath mod depth link f 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})
+
+		# must copy here as symlinks will cause the module loading to fail
+		cp -f "${S}/build/modules/${mod}/${f}" "${path}" || die
+		cruft=$(find "${d}" -name '*.a' -print)
+		if [[ -n "${cruft}" ]]; then
+			rm ${cruft} || die
+		fi
+	done
+}
+
+_fix_executables() {
+	local _dir="${1}" _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
+}
+
+src_install() {
+	local install_dir="$(get_install_dir)"
+	local suffix="$(get_install_suffix)"
+	local ctags_d="node_modules/symbols-view/vendor"
+
+	cd "${S}" || die
+
+	# Replace vendored ctags with a symlink to system ctags
+	rm "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+	ln -s "/usr/bin/ctags" \
+		"${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+
+	insinto "${install_dir}"
+
+	doins build/app.asar
+	doins -r build/app.asar.unpacked
+	doins -r usr/share/atom/resources/app
+
+	insinto /usr/share/applications/
+	newins usr/share/applications/atom.desktop "atom${suffix}.desktop"
+
+	insinto /usr/share/icons/
+	doins -r usr/share/icons/hicolor
+
+	exeinto "${install_dir}"
+	newexe usr/share/atom/resources/app/atom.sh atom
+	insinto /usr/share/licenses/"${PN}${suffix}"
+	doins usr/share/atom/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"
+}
--- a/app-editors/atom/files/atom-1.13-apm-path.patch
+++ b/app-editors/atom/files/atom-1.13-apm-path.patch
@ -0,0 +1,16 @@
+diff --git a/build/app/src/config-schema.js b/build/app/src/config-schema.js
+index 1307db6..d6a1ba4 100644
+--- a/build/app/src/config-schema.js
+++ b/build/app/src/config-schema.js
+@@ -21,6 +21,11 @@ var 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'],
--- a/app-editors/atom/files/atom-fix-app-restart.patch
+++ b/app-editors/atom/files/atom-fix-app-restart.patch
@ -0,0 +1,12 @@
+diff --git a/atom-application.js.orig b/atom-application.js
+index 92d985f..9a120e6 100644
+--- a/build/app/src/main-process/atom-application.js
+++ b/build/app/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-emacs/emacs-w3m/Manifest
+++ b/app-emacs/emacs-w3m/Manifest
@ -1,2 +1,2 @@
-DIST emacs-w3m-1.4.513_pre20130204.tar.xz 724892 SHA256 fc71922e8a5249584075a86bb274f08f193d82ed2e29786dcdfac4049b6b8873 SHA512 86d5aadd4a3e667a5f940ac47bd7c828546260dc6026bd3a906c5439ed07c702019e7dc7c4eac1bc2f4d3a9a6e03e28b59f3c48ce649c644d6608a120a67dfc0 WHIRLPOOL b4e7bd2809f6518f5b96fdc11c491ebe25169aef07613e443b6d293cedc3195f4789d31c2bea3e5648073087ecad66dd25175858f78e7307dcc37fb7fc5f526a
 DIST emacs-w3m-1.4.528_pre20140213.tar.xz 751532 SHA256 0be76617be14532493f95c1bb01b4c7337aa0407c5effe58d32feb9bd2b30f7f SHA512 f4ccb41f2011354c091c9b07b2ab596f030a6b2e8ef2ef674db75c93e5bfe7347b8b3602283e169e7fd591c44b222482d1a399880c60176fc55a5e77ed728483 WHIRLPOOL e3c838c1d65735899f74e09ed5362bc93e79564cb8c5076cf2dcd77880dd9d72afb7c3ddc2f9d60a49f1bda1766a6235ae702c368878e654d890127f6d0e445c
+DIST emacs-w3m-1.4.570_pre20170203.tar.xz 765108 SHA256 2923b18dcd9daea27ab2e3bbb8c3328723da97f34a0eeed57e8803ccad72f268 SHA512 d1940679055d7ad74b7c417dc9e56061524f5afdf758075139e279c2df325af10eae334a6b83d40d39857237396da04744f19c293ffb8adb2e579c32ed118b52 WHIRLPOOL a77c2e78d82f46482e890d28678fa05ff4c23f657093f22b0e03a8e8a8b70898ed9caf1a27c0d640f6d168b063b188ed41d285d14c39b0c41be7da6600256b82
--- a/app-emacs/emacs-w3m/emacs-w3m-1.4.570_pre20170203.ebuild
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.570_pre20170203.ebuild
@ -1,14 +1,14 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

-inherit elisp autotools
+inherit elisp autotools readme.gentoo-r1

 DESCRIPTION="emacs-w3m is an interface program of w3m on Emacs"
 HOMEPAGE="http://emacs-w3m.namazu.org/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"

 LICENSE="GPL-2+"
 SLOT="0"
@ -22,6 +22,9 @@ S="${WORKDIR}/${PN}"
 SITEFILE="70${PN}-gentoo.el"

 src_prepare() {
+	mv configure.{in,ac} || die
+	sed -i -e '/^configure:/,+2d' Makefile.in || die
+	eapply_user
 	eautoreconf
 }

@ -42,12 +45,8 @@ src_install() {
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
 	dodoc ChangeLog* NEWS README
 	use l10n_ja && dodoc BUGS.ja NEWS.ja README.ja
-}

-pkg_postinst() {
-	elisp-site-regen
-	einfo "Please see ${EPREFIX}/usr/share/doc/${PF}/README*"
-	einfo
-	elog "If you want to use the shimbun library, please emerge app-emacs/apel"
-	elog "and app-emacs/flim."
+	DOC_CONTENTS="If you want to use the shimbun library, please emerge
+		app-emacs/apel and app-emacs/flim."
+	readme.gentoo_create_doc
 }
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@ -1,9 +1,9 @@
 DIST kvmtool-1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2.tar.gz 244571 SHA256 c72c0e3463a8f0cfe2cdaa8b8e7951f4eb7293c486e44f84b9e421073dbf5ab9 SHA512 13db2bf2ff794f34c2a825c9b1862c85b0f470c81e3d91177979302f921e3970b8dfaeaf54602005fba8903bba52e43b6e8d67edaa0ee8de82002db7b396c3a0 WHIRLPOOL 0904a5783ac27befb207a5fa0030baede68ae589b69abf012ec733ff2e6d9f77b7198273c22fa7404b2c78bcc9ae40abc39d002519700666ba1e54c6550525b2
-DIST linux-4.8.6.tar.xz 91969848 SHA256 74744e00420856cfc8049fa3b3a55e57a116994226a498ef56801bc9492df36b SHA512 235acc394ce347d4131e86f6ff3f3fa9d552bf227c2483c25da7de99f3dc8fd20c4a04db0c8d59cdfa4fa9d98a5b102a5734f7b7704df6648c6efa5e8a7515ea WHIRLPOOL cb27d5654f7351ff32d057501c594f9b6e15fefe78c588b9e9cfedd88fbdb807ba7cfc1e238444d94f3d46168d6edc1bbb8e3966c2ca0f46c668dd4e9d60a01f
+DIST kvmtool-cfae4d64482ed745214e3c62dd84b79c2ae0f325.tar.gz 245010 SHA256 4aad2913d66c7a3c308e0ca34c214307850b2556ab35999e7f86c253cb8bbf82 SHA512 7cca005136f3628dfef359f83732d6f8cc062c5e4a8d77f57c6dd5e007ed06c85f0c275c8844228b404755dbf3f4d45f6a149fc64235f4f1abe0058214e24730 WHIRLPOOL 341f9be7ff9517c822da00166cbf5334cf329f51895bb459c3e0bdda2f0c8724957bb79b354eadf9249b4c1f4b8d677c7c6ca57eaa04553804779ec8c53b37f4
 DIST linux-4.9.2.tar.xz 93189108 SHA256 8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738 SHA512 85adf3715cba4a457efea8359ebed34413ac63ee58fe920c5713501dec1e727e167416e9d67a9e2d9430aa9f3a53ad0ac26a4f749984bc5a3f3c37ac504f75de WHIRLPOOL 74df775ab092a6be6684243d4c0d557c0ce27907c7e8ed97be54a45901e8f507deab1d5e72c35092884836f3fe446f838342ec0b53a3aa1c884489caadaf6a62
 DIST qemu-2.7.0.tar.bz2 26867760 SHA256 326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 SHA512 654acaa7b3724a288e5d7e2a26ab780d9c9ed9f647fba00a906cbaffbe9d58fd666f2d962514aa2c5b391b4c53811ac3170d2eb51727f090bd19dfe45ca9a9db WHIRLPOOL dcb3e5f7da89dd8e14d636d7ebd476e076e0043880bb9ea3fb1c03cb4bcd4e5c7d3c4719da26c3ce521e3a3db5ae671e86f198ac1bc3474e774d75504fef8b8d
-DIST rkt-1.21.0.tar.gz 3334473 SHA256 63eed8da954c24c1f9010e7513ee6ac21ffeaf63a648f9d5a0f9e9d3eb92fde5 SHA512 2723aab1aadbe7be0f7ce9c7f4e000c76d8c34d167b1157a08de7fb2248e4b73a7fc765ead557db495bab803f5d5c8d09e1d9441301396e18fa49b21a8c4c7ae WHIRLPOOL 11b28be68dd246ddafb5455becc64ea1b185d1128747dc51103ab692c34cd9157423164c4847be9e9a39338cb5ad6e2db3e588545378179b51a0ce58a1be1935
-DIST rkt-1.22.0.tar.gz 3338862 SHA256 49fda935e0ec628889b0c6ba22277354dbf9b89b4c09429c10800a562bbf1b7c SHA512 2aa6c15a0994e1ba427b05694f6fa12446e2f336ff51593fc6d4776f77d0b798203a0ab97f4c12ada1226c934b4e1866d9a5545f48ae1938e79d696d236ad8c7 WHIRLPOOL 98c8761e47379a02b536b760f327dc65dabd3594d30fdc792326044fc0e825401cc49abf0b5ab6ce6d4bc6072f0008466da4f3d2a12cdad16908e8549c0fa88e
+DIST qemu-2.8.0.tar.bz2 28368517 SHA256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2 WHIRLPOOL 0ce4e0539657eb832e4039819e7360c792b6aa41c718f0e0d762f4933217f0d370af94b1d6d9776853575b4a6811d8c85db069bf09d21bd15399ac8b50440ff5
 DIST rkt-1.23.0.tar.gz 3350060 SHA256 5cb10a0646e5cc8dccbd099c40bc6b11264591b30fa8e4113bc9e392feffcb2b SHA512 9673f70b385a4e5c61c037783071507e69097f0d0163b3d449ca129bcdc858bc177d38c6551dc9f8b2f074345b4698863bbe62bf4d6c83f5df515406011ddce3 WHIRLPOOL 7d2e7b20205e6e00992091bd3898094b27e75f9e4716c73a0a31df2747cb77c49b11678db478ed7414cf12eef8c3463afded0e2d2a0b93effb9cce0edbed799a
+DIST rkt-1.24.0.tar.gz 3359035 SHA256 ffeb9933d58a642a5dde4730eacde9a597345698120cf36283e02cf2ed085e2d SHA512 e5f30df83fc833f6a5f40c7e99207b38cbd01d078b26e9ea7d3587c3e57fe872e187850406fa5200c0245fb42b81223057eb561934004b57c3f2d57a31f3d269 WHIRLPOOL 842e58f90a676ee990c96e0dd4da42aad03dfb9201e7282565ce4f293a697ccb300a398ca66b14fe4ca73d5f4943582f58742a59098c091dcaf0a5bd1b094a6f
 DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
 DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
--- a/app-emulation/rkt/rkt-1.21.0.ebuild
+++ b/app-emulation/rkt/rkt-1.21.0.ebuild
@ -1,257 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1235.0.0"
-PXE_SYSTEMD_VERSION="v231"
-KVM_LINUX_VERSION="4.8.6"
-KVMTOOL_VERSION="1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2"
-QEMU_VERSION="v2.7.0"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
-	${PXE_URI} -> ${PXE_FILE}
-"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
-	https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
-	${SRC_URI_KVM}
-)
-rkt_stage1_kvm_qemu? (
-	http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
-	${SRC_URI_KVM}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src +actool systemd"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"
-
-# Some tests fail.
-# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
-RESTRICT="test rkt_stage1_src? ( userpriv )"
-
-DEPEND=">=dev-lang/go-1.5
-	app-arch/cpio
-	app-crypt/trousers
-	sys-fs/squashfs-tools
-	dev-perl/Capture-Tiny
-	rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
-	rkt_stage1_kvm_qemu? (
-		sys-apps/attr[static-libs(+)]
-		sys-libs/libcap[static-libs(+)]
-		sys-libs/zlib[static-libs(+)]
-		>=x11-libs/pixman-0.28.0[static-libs(+)]
-	)"
-
-RDEPEND="!app-emulation/rocket
-	rkt_stage1_host? ( systemd? (
-		>=sys-apps/systemd-222
-		app-shells/bash:0
-	) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
-	enewgroup rkt-admin
-	enewgroup rkt
-}
-
-src_unpack() {
-	local x
-	for x in ${A}; do
-		case ${x} in
-			*.img|linux-*) continue ;;
-			kvmtool-*)
-				mkdir kvmtool || die
-				pushd kvmtool >/dev/null || die
-				unpack ${x}
-				popd >/dev/null || die
-				;;
-			*)
-				unpack ${x}
-		esac
-	done
-}
-
-src_prepare() {
-	eapply_user
-
-	# This patch breaks linux kernel cc-option checks when the
-	# compiler doesn't recognize the -no-pie option.
-	rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
-
-	# avoid sdjournal include for bug 595874
-	if ! use systemd; then
-		sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
-			-i rkt/rkt.mk || die
-	fi
-
-	sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
-	# disable git fetch of systemd
-	sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
-	# disable git fetch of kvmtool
-	sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
-	# disable git fetch of qemu
-	sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CLONE_STAMP): get_qemu_sources\n\n'\
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' \
-	-e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
-	-i stage1/usr_from_kvm/qemu.mk || die
-
-	# disable fetch of kernel sources
-	sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
-		-i stage1/usr_from_kvm/kernel.mk || die
-
-	if use rkt_stage1_host; then
-		# Make systemdUnitsPath consistent with host
-		sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
-			-i stage1/init/init.go || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local flavors hypervisors myeconfargs=(
-		--with-stage1-default-images-directory="/usr/share/rkt"
-		--with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
-	)
-
-	use systemd || myeconfargs+=( --enable-sdjournal=no )
-
-	# enable flavors (first is default)
-	use rkt_stage1_host && flavors+=",host"
-	use rkt_stage1_src && flavors+=",src"
-	use rkt_stage1_coreos && flavors+=",coreos"
-	use rkt_stage1_fly && flavors+=",fly"
-	{ use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
-	myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
-	if use rkt_stage1_src; then
-		myeconfargs+=(
-			--with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
-			--with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
-		)
-	fi
-
-	if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
-		myeconfargs+=(
-			--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
-			--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
-		)
-	fi
-
-	if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
-		use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
-		use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
-		myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
-	fi
-
-	# Go's 6l linker does not support PIE, disable so cgo binaries
-	# which use 6l+gcc for linking can be built correctly.
-	if gcc-specs-pie; then
-		append-ldflags -nopie
-	fi
-
-	export CC=$(tc-getCC)
-	export CGO_ENABLED=1
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-	export CGO_LDFLAGS="${LDFLAGS}"
-	export BUILDDIR
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	local arch=${ARCH}
-	case ${arch} in
-		amd64) arch=x86_64;;
-	esac
-	ARCH=${arch} emake V=3
-	ARCH=${arch} emake V=3 bash-completion
-}
-
-src_install() {
-	dodoc README.md
-	use doc && dodoc -r Documentation
-	use examples && dodoc -r examples
-	use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
-	dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
-	insinto /usr/share/rkt
-	doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
-	# create symlink for default stage1 image path
-	if use rkt_stage1_host; then
-		dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_src; then
-		dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_coreos; then
-		dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_fly; then
-		dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_kvm_lkvm; then
-		dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_kvm_qemu; then
-		dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
-	fi
-
-	systemd_dounit "${S}"/dist/init/systemd/*.service \
-		"${S}"/dist/init/systemd/*.timer \
-		"${S}"/dist/init/systemd/*.socket
-
-	insinto /usr/lib/tmpfiles.d
-	doins "${S}"/dist/init/systemd/tmpfiles.d/*
-
-	newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
-
-	keepdir /etc/${PN}
-	fowners :rkt-admin /etc/${PN}
-	fperms 2775 /etc/${PN}
-}
--- a/app-emulation/rkt/rkt-1.24.0.ebuild
+++ b/app-emulation/rkt/rkt-1.24.0.ebuild
@ -10,9 +10,9 @@ KEYWORDS="~amd64"

 PXE_VERSION="1235.0.0"
 PXE_SYSTEMD_VERSION="v231"
-KVM_LINUX_VERSION="4.8.6"
-KVMTOOL_VERSION="1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2"
-QEMU_VERSION="v2.7.0"
+KVM_LINUX_VERSION="4.9.2"
+KVMTOOL_VERSION="cfae4d64482ed745214e3c62dd84b79c2ae0f325"
+QEMU_VERSION="v2.8.0"
 PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
 PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"

--- a/app-i18n/ibus-chewing/Manifest
+++ b/app-i18n/ibus-chewing/Manifest
@ -1,2 +1 @@
-DIST ibus-chewing-1.4.7-Source.tar.gz 108078 SHA256 73426b024be52eea0182f6b8c7936482ca2df7754e971e0b7980e504afdf8af2 SHA512 70e9c4950ac846c2f0087200d3b42f845ef8f911962d3f6bf37a3a0054606fa0fc061daa5dac390d022dbd29801fbcae596d2c5126270eb6e9843a9e0af4486e WHIRLPOOL 67b12375adfcc40c9e61e8f69e1bddc8b7c2354e9bdbe4a8fde97c6db3f212ca5b426428e1bf96ede1d5c55f5ffe230a57acd026ef1c0b960ee4cdc692aa35ca
 DIST ibus-chewing-1.5.1-Source.tar.gz 177044 SHA256 687ce9f09fef31b0e31ad0d2f1be17f1ca0b9212af9d71812cf53d84a90f0060 SHA512 2db6def1fe8ca3bd71419a001909d285ee48ef84c2f65e14bacff9cd114676bed594f0c90217e1fdab67c995a7b05d675812e90e281371d8464722c31649c633 WHIRLPOOL da566ec63b8733e2a80890c8f045829a101da0eaea11592b44541be2e92b57a1425fa65b5bb6868879ff588e798036056473f0e78bc228b90ce40650771c02eb
--- a/app-i18n/ibus-chewing/ibus-chewing-1.4.7.ebuild
+++ b/app-i18n/ibus-chewing/ibus-chewing-1.4.7.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit cmake-utils
-
-MY_P=${P}-Source
-
-DESCRIPTION="The Chewing IMEngine for IBus Framework"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://ibus.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="x11-libs/libXtst
-	>=app-i18n/ibus-1.3
-	>=dev-libs/libchewing-0.3.3
-	x11-libs/gtk+:2
-	dev-util/gob:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-CMAKE_IN_SOURCE_BUILD=1
-
-DOCS="AUTHORS ChangeLog README RELEASE-NOTES.txt USER-GUIDE"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPRJ_DOC_DIR=/usr/share/doc/${PF}
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_make all translations
-}
--- a/app-office/calcurse/Manifest
+++ b/app-office/calcurse/Manifest
@ -2,3 +2,4 @@ DIST calcurse-4.0.0.tar.gz 611593 SHA256 621b0019907618bd468f9c4dc1ce2186ee86254
 DIST calcurse-4.1.0.tar.gz 611105 SHA256 ca423f8c8dfbb92cd63281305fa23c2909a6aefcee9e86317584fff7619b42c4 SHA512 74312995e398edf0bc30bdf6c28e5894f21358d5b85bdff403425685905dd7f511a3244acd3983bc28d8d3bc90a79a2e83fc76554d7e5c9ef9dc16d18832e09a WHIRLPOOL 2a3c86f5f79903911f0aa38e3f32350770d5f839cbf460b288e64b20b315422a95bd64caec5fb9f5c9f366e9b3b5031f235ddaf89b40183360886b9f066c58d3
 DIST calcurse-4.2.0.tar.gz 612242 SHA256 a68e0e6984ec632180a9fdc496785b406fedc1d5af77dfe4fcd483b0cec84a77 SHA512 daba2db0b15dbaf400568ace700d06e6165dc9275e35cb3c31ee49963802234ee3fc4b91faa3c7a675452aac5bbcff2f26d7f0d76fc2a0e094e584ed10c8ad11 WHIRLPOOL 9652639ca19dc7990f616abd933f08c08ec1b607cf153f17fd0345736f29adb77dc8b4181ca6801684c918f523dd9e387000ec2c134e997aa9cffda3082896dd
 DIST calcurse-4.2.1.tar.gz 612593 SHA256 9d5db3fa920e82d76e43a08c4bd3554ffdde023385b0f9c37e6f0e99d8d00598 SHA512 77f7fd23fe28e34ace29239530948c7576196339e4c603952dd5d48a201fa2e52bfcfaf411edf3f299c9d8b30d659febade68679fc65a2b87afb305bbf5db8df WHIRLPOOL 1af299f7501bc5ec57eeadf020e10b7f6d76eddb2f538007dbd9e391b24686fd702952384529fe5f4ccc1d53408fb214fb64836212c40d8f265172107c4c61fd
+DIST calcurse-4.2.2.tar.gz 612456 SHA256 c6881ddbd1cc7fbd02898187ac0fb4c6d8ac4c2715909b1cf00fb7a90cf08046 SHA512 d54d5a1ca457499ff82fe0b6a945f5f54c0f93f84b34d5a69579dd42d4d44edda0b81a165d29b4f3d77ef7219b2e815b5858eaa744eb418e9549abf58eb2f958 WHIRLPOOL 8afee25e8ddd1d5d5ebf06c8618da4c03840b698ef9f9f5ea4c0f1e37956b89aa8a09ee9b5131c26bed02ed5bfe78db2e9ef488656e748e7b99c0b3a7dbe814c
--- a/app-office/calcurse/calcurse-4.2.1.ebuild
+++ b/app-office/calcurse/calcurse-4.2.1.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
 # $Id$

@ -12,7 +12,7 @@ SRC_URI="http://calcurse.org/files/${P}.tar.gz"

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+KEYWORDS="amd64 ~x86 ~ppc ~ppc64"

 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
--- a/app-office/calcurse/calcurse-4.2.2.ebuild
+++ b/app-office/calcurse/calcurse-4.2.2.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils autotools multilib-minimal
+
+DESCRIPTION="a text-based calendar and scheduling application"
+HOMEPAGE="http://calcurse.org/"
+SRC_URI="http://calcurse.org/files/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README )
+
+PATCHES=( "${FILESDIR}"/"${P}-tinfo.patch" )
+
+src_prepare() {
+	default
+
+	# Dubious tests.
+	rm -v "${S}/test"/ical-00{2,4,6}.sh || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+}
+
+src_install() {
+	multilib-minimal_src_install
+}
--- a/app-office/calcurse/files/calcurse-4.2.2-tinfo.patch
+++ b/app-office/calcurse/files/calcurse-4.2.2-tinfo.patch
@ -0,0 +1,21 @@
+--- a/configure.ac
+++ b/configure.ac
+@@ -3,7 +3,7 @@
+ #-------------------------------------------------------------------------------
+ AC_PREREQ(2.59)
+ AC_INIT([calcurse],
+-        m4_esyscmd([build-aux/git-version-gen .version]),
+        m4_esyscmd_s([cat .version]),
+         [bugs@calcurse.org])
+ AM_INIT_AUTOMAKE
+ #m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+@@ -51,6 +51,9 @@
+   LIBS="$LIBS -l$available_ncurses"
+ ])
+ 
+AC_SEARCH_LIBS([cbreak], [tinfow tinfo],,
+    AC_MSG_ERROR([Cannot find a library providing cbreak]))
+
+ AC_CHECK_HEADERS([pthread.h], [
+     AC_CHECK_LIB(pthread, pthread_create, [
+ 	LIBS="$LIBS -pthread"
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@ -1 +1,2 @@
 DIST hstr-1.21.tar.gz 45851 SHA256 f0e9762f2a9587f0995bbd51cb64526ae852c2425ceb8ceee0747efba80ac6b3 SHA512 dbcb8766ca7f5ca2265f30726c451b9fe9a51d9dc7a08293fae1e9eb5cb2f562a5a9fa96fa90bd703ae3db0446628c884349c636060fbebd97bd7413a5c6e4d0 WHIRLPOOL 33cc21efe738efe7dd2bccf7c7fc7b79e6b0fb9bca0d458232a44695a0c422aa6184962ea69964e5b8e22a73aa7c54dc859dbb9666ab8b0e48abfeb6d8c72afd
+DIST hstr-1.22.tar.gz 46487 SHA256 c4995e7041dc66e2118f83bd4c6c7f4cff5b4c493ca28bd7e4aef76edeff71ba SHA512 5f31434410963c236f4e0d1117f09849b0a391d4173924d9eb2b2ddb9977a8bcb5a0c9b2e01045b618d01dfbcebd9c5db41534cb6abbb024a3515d5994b442cd WHIRLPOOL 30c6e42c91eebbcf55d6e8d89921d0760e3bda8e84ece0e2ccc7ef6be51dae15806f3db434b79a3afa4e8a9ebe63462fa927cc305c7a8d89a5d0651aa342493e
--- a/app-shells/hstr/files/hstr-1.17-tinfo.patch
+++ b/app-shells/hstr/files/hstr-1.17-tinfo.patch
@ -1,47 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 9cf6a53..cbc649d 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -18,17 +18,21 @@ AC_PROG_CC
- 
- # Platform specific ncurses check.
- AC_CANONICAL_HOST
-AS_CASE([$host_os],
-  [darwin*],
-    [
-      AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
-      AC_CHECK_HEADER(curses.h)
-    ],
-  [
-    AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
-    AC_CHECK_HEADER(ncursesw/curses.h)
-  ]
-)
-+PKG_CHECK_MODULES([NCURSES], [ncursesw], [], [
-+  PKG_CHECK_MODULES([NCURSES], [ncurses], [], [
-+    AS_CASE([$host_os],
-+      [darwin*],
-+        [
-+          AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
-+          AC_CHECK_HEADER(curses.h)
-+        ],
-+      [
-+        AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
-+        AC_CHECK_HEADER(ncursesw/curses.h)
-+      ]
-+    )
-+  ])
-+])
- 
- # Checks for libraries.
- AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])])
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 5765613..ee411a9 100644
--- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -15,3 +15,5 @@ hh_SOURCES = 									\
- 	hstr_regexp.c include/hstr_regexp.h			\
- 	radixsort.c include/radixsort.h 			\
- 	hstr.c 
-+
-+hh_LDADD = $(NCURSES_LIBS)
--- a/app-shells/hstr/files/hstr-1.18-tinfo.patch
+++ b/app-shells/hstr/files/hstr-1.18-tinfo.patch
@ -1,47 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 9cf6a53..cbc649d 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -18,17 +18,21 @@ AC_PROG_CC
- 
- # Platform specific ncurses check.
- AC_CANONICAL_HOST
-AS_CASE([$host_os],
-  [darwin*],
-    [
-      AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
-      AC_CHECK_HEADER(curses.h)
-    ],
-  [
-    AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
-    AC_CHECK_HEADER(ncursesw/curses.h)
-  ]
-)
-+PKG_CHECK_MODULES([NCURSES], [ncursesw], [], [
-+  PKG_CHECK_MODULES([NCURSES], [ncurses], [], [
-+    AS_CASE([$host_os],
-+      [darwin*],
-+        [
-+          AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
-+          AC_CHECK_HEADER(curses.h)
-+        ],
-+      [
-+        AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
-+        AC_CHECK_HEADER(ncursesw/curses.h)
-+      ]
-+    )
-+  ])
-+])
- 
- # Checks for libraries.
- AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])])
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 5765613..ee411a9 100644
--- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -15,3 +15,5 @@ hh_SOURCES = 									\
- 	hstr_regexp.c include/hstr_regexp.h			\
- 	radixsort.c include/radixsort.h 			\
- 	hstr.c 
-+
-+hh_LDADD = $(NCURSES_LIBS)
--- a/app-shells/hstr/hstr-1.22.ebuild
+++ b/app-shells/hstr/hstr-1.22.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="shell history suggest box"
+HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com"
+SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	sys-libs/ncurses:0="
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( CONFIGURATION.md README.md )
+
+src_prepare() {
+	default
+	sed \
+		-e 's:-O2::g' \
+		-i src/Makefile.am || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+}
+
+src_install() {
+	multilib-minimal_src_install
+}
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@ -1,3 +1,4 @@
 DIST calibre-1.20.0.tar.xz 32430560 SHA256 475e09b1be4b9977240cbbe6743ab79da4b1f1afe3fe6015d212d868e8f2fac4 SHA512 84ac25080cf4948398b79f9a1af688cca9cf9a5a9200b2aad649f5fda1cd0556be4ade0c8b09ea6ffcc95654eac0aaaa5b8f8ed6ea9830174bc150e64de85e31 WHIRLPOOL 61b6ecde2e3f8679c1afea95dcd152a94ce03522c06dff34b406a5705f6255243f0565fbb5f9bef3ac96d7127190bd1b4363233fa24fafcd0412e061201f6fe8
 DIST calibre-2.70.0.tar.xz 40279720 SHA256 90391605c43db01acd7acf21707f5aa95c329b2055cca1b09b6fa46e050b3ba2 SHA512 1b98cdbd32dd02e64792b5e02ceb010a694c5669b8de3b0d03994b6f1e03e10dfcff6462317e1abfd27ca4b0085897218a12d79dd82604dad8a156d2f0fa5317 WHIRLPOOL d9c61f8d3514631fb8907e2fb5d63e32c6626c9d2fa35a985810b035f5a74c68e0d4fa8a63164c566030190ed362092d4d2145ee5e406fda8d97bbf778afbc1d
 DIST calibre-2.73.0.tar.xz 38674308 SHA256 ec05836d60ae6214c3dde22ec7f9340ab77b05eac25b0df5e245b43f553b1a9f SHA512 395ae04ca580b25ec5d72bf2134c073a9182eccf9c30b053a52e342ddf7bec27d2479acba8cde15da175dfd0b6f5f9add54c9a13d9da421c494b70de3217968d WHIRLPOOL b5de25d5c170578c21719e72ead9c2040d338a6e19d8d7af9f788392acf27989c00bf092a6e3f64e4422409bdf2639f1bbc61be088c5baee72b85fe16e9c4b0b
+DIST calibre-2.78.0.tar.xz 38739404 SHA256 d2b0b0c5451d3ac05ce9de0b801ddf8de7664fee45f273d7ee8445a1ec2f898b SHA512 0779ac385dde45ac4baee7cecb0916e245f3e1cf20662bad9d9a4278265390b1aa89c2b478601b57113e7de08a69343288488ee299e8b43332f0129e650aa0ca WHIRLPOOL 325fc344445078ef0df0a29b4cd8e32445a881ede89e3db87606166ff0c8b7db10b7cc34432e63c2bb49382537a5107686339b987f1be807d59a1786ddfd4a75
--- a/app-text/calibre/calibre-2.78.0.ebuild
+++ b/app-text/calibre/calibre-2.78.0.ebuild
@ -0,0 +1,251 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="http://calibre-ebook.com/"
+SRC_URI="http://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+	unRAR
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="+udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/podofo-0.8.2:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2
+	>=dev-libs/icu-4.4:=
+	>=dev-python/apsw-3.7.17[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/cssutils-0.9.9[${PYTHON_USEDEP}]
+	>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/mechanize-0.1.11[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.3.1[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-fonts/liberation-fonts
+	>=media-gfx/imagemagick-6.5.9[jpeg,png]
+	media-libs/fontconfig
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.5:=
+	>=media-libs/libwmf-0.2.8
+	sys-libs/zlib
+	virtual/libusb:1=
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	>=x11-misc/xdg-utils-1.0.2-r2
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-0.6_rc5[${PYTHON_USEDEP}]
+	>=virtual/podofo-build-0.8.2
+	virtual/pkgconfig"
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	eapply_user
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/build.py || die "sed failed to patch build.py"
+
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
+		|| die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+
+	# avoid failure of xdg tools to recognize vendor prefix
+	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
+		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
+		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
+		-i "${S}"/src/calibre/linux.py || die 'sed failed'
+
+	# don't create/install uninstaller
+	sed '/self\.create_uninstaller()/d' -i src/calibre/linux.py || die
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANGUAGE
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
+	local x
+	for x in /dev/dri/card[0-9] ; do
+		[[ -e ${x} ]] && addpredict ${x}
+	done
+
+	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
+	#dodir $(python_get_sitedir)
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}" || die
+
+	# The menu entries end up here due to '--mode user' being added to
+	# xdg-* options in src_prepare.
+	dodir /usr/share/mime/packages
+	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
+	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
+		die "failed to register mime types"
+	dodir /usr/share/icons
+	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
+		die "failed to install icon files"
+
+	domenu "${HOME}"/.local/share/applications/*.desktop ||
+		die "failed to install .desktop menu files"
+
+	find "${ED}"usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@ -3,17 +3,12 @@ DIST texlive-20130530-source.tar.xz 179963948 SHA256 a905832e4c04dd1cb16db4bb7ba
 DIST texlive-20140525-source.tar.xz 41657688 SHA256 08bb4eb02923ac65ce1183612c6b64da185904f26a1660f5ca4f902d055795be SHA512 09169af15d806abd721e55ffc20ed684c0a7ad60783272d49fabfe9c88857c4abd15b60f30e3f5511ceda1982fdc1d33db8265f97e374bfa5b250dbb5612f8ad WHIRLPOOL fd7fffeeaf319bca5333f6d5d8d9cc6517f76ffe5b2793a73604d844cb7474d83c23826f98d4d11ea5e1a35c0f273e12b2fe6f5945f9880a9577fedad6625014
 DIST texlive-20150521-source.tar.xz 45459552 SHA256 ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669 SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855 WHIRLPOOL e19e4cf9c6122e8a2e80d3ad62171591a2d53317792ce69d7b2afdd6978d397c873565d597b1457d23ba6f5b5de33750955690a92fb6c34d814c075397b67a0b
 DIST texlive-20160523-source.tar.xz 45941100 SHA256 a8b32ca47f0a403661a09e202f4567a995beb718c18d8f81ca6d76daa1da21ed SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e WHIRLPOOL 25d27fb7a7bdb47d40ddf951394e36546b184d71f2e09adb20698bd0f960e54841ddd0313a87510cb2ef43953eb4d9d05d30b88d25d15762dd774575c88fedbe
-DIST texlive-core-patches-36.tar.xz 2200 SHA256 409d48ef65032ec3c335be09ba8eaa5e746a02ed88cc13c0b0b0a5de4007652e SHA512 2e09516ec005a76d0c1fad8edf5930dcd57c77983ec2d8f4b0a020f5a95799797190d95e0e0bfdb1ce378df2337de64967d814cc807630666200ade71c2bf571 WHIRLPOOL d6dc2cf107b128ddb334a28b55da1440cfd249f69a7bbbc3860a1e57a3d22cd2e2c12f429c481f953590528955b491c8fa0b0eb14298ff7913d04b7e33570a84
 DIST texlive-core-patches-39.tar.xz 3056 SHA256 685705f1994b751df42738cb542a6ca0b4adbc013275318667c634665b8bd25b SHA512 95e7161820a648d667c2a69bd74c1d24a20670128889d1ebbec2e700b0459d84bb4d96b2d9f355e519d9efe0e126689b29225af1a184e5a06e0cb398fefc7cc3 WHIRLPOOL 24359dbca04f3e9f9c09a9afc195dd6858da2284947cbebaa770e73ef78276059f9d2e3c8a95c5005971fa64be76367a55887f1f94e423e7d0ca227d5573dc95
-DIST texlive-core-patches-41.tar.xz 2340 SHA256 64f914d6e32c1d91cd484b230e651a2646f94c90e94b8ca5b5accf634bf3905d SHA512 e829c9c68c6f9e7edbf582c6820d5b42483b9411754fcddc6a076ad4790497ef3ea30babbd4950451b543e3b0d960561d6cc099feb54282325040a8009b506b5 WHIRLPOOL d606d537f80aa30bdb05dd5a60afdcf23f9b863fdcc62aa22f1bb5a34ec89b79960efdc89fc19351e6d1f69236363a246cffe9059ee3df67d82308616dfb4bc4
-DIST texlive-core-patches-42.tar.xz 2508 SHA256 e3b4d4de520ff58420a7b695491ffd780d88621c5bef135e59f35e3112ed5fec SHA512 fb5753a25a07f8f9a42494ed96c29f01f11c3f1a070972eafceb8c5ab5fa598c4d7fd5d7533608e6595621394f71563c187e3aaa1e2ba7a6b4e09fe2ae273991 WHIRLPOOL f31aefa1fad71bc294b18655e2db222ce272b6e286693bb62a880a25493d5eed933a3ef549a7a6a814c12677833110f77dcb71f36792aad8755a900a4aba9193
-DIST texlive-core-patches-47.tar.xz 4556 SHA256 9a5f220e25a8d9980486d5599d38e14dc5fc19892354fac92ff890c9e788bcfe SHA512 737a959df416a013a7a1970f5d0c4a6ea3798825375bcd22e532fb0ded4e06c9c21890817d9abf16c6aa3d9e69f082930207c86c4bd7046456eadaa0907f7079 WHIRLPOOL caff55f3a250e38f21c4ef82689fc8273644c51d368ce05509e4e3b521ded826b2c8fcd03363c7c70fd3278101d1a3028eaeee383a65664c7c6d1d8d86cb3046
 DIST texlive-core-patches-48.tar.xz 3528 SHA256 521bffc6a9d3a79fe157855f6a58954b26308230ab2d4daa382f5c101e836177 SHA512 af7e3de4ab378e837a07bf5cd1e0db0bffd043273cc90b6d93484a1a4dfdee52df9846d656ab7821a2b3af82ccdc8ea6f86f35fea97a846166a9cd92e0f06021 WHIRLPOOL 5a5151960dea201cf87fada0a3e3cf297580d6a9b92ed5cc97ee49c0dd8d473798ddc858a4301b16c15dff71d1aafe663ab3017f0f391ea3aad1f0de8506ddc6
 DIST texlive-core-patches-49.tar.xz 2796 SHA256 2c17e0b8d24dd007e86ff7fbe7ef14d42f1b5287e08c133ab2c5c82cedc16709 SHA512 4faf0b9653b9a5335e4b210d15200b4118245687ff12e617f181bdece5d2b5cd827247fc72bdc304722f72d8f017804b8026300a9be18f7663749ddc82c7bb17 WHIRLPOOL 8145a9d5d4fa2713a1aaf0e51f546a20a844d1a12306d7f2b82e66ece961edafd34f9e6aebfc3f3110a23366dc1d43a13cc4fa7fc69c9f67fd300c55f7bb7b92
 DIST texlive-core-patches-50.tar.xz 4632 SHA256 417d50014d1701bb75aee0cfcae95716926fefdc7d0057c9784ba68bd1eab2e4 SHA512 f8fab7940b417b7065c9c467f7a9612e161a1a44db50a4523ee4a092ba381f7580adf1c3d75375165795dfc3f23d005028d67351815481dbdbd6edb13f376b64 WHIRLPOOL 9611be98c2fe494c1d354a23a1c1dfcaf30ca9e6f321056dbe34b99eef64dc8fbcc59428cf5ef8099584968b0b574d0e3e6acac87e37c5583e78eb87f87733b6
-DIST texlive-core-patches-51.tar.xz 3040 SHA256 7edcc57ba831f040a5fcd07080c6e197955c9b979c81c6722c3914fff9ed9a03 SHA512 a1b7132bf25ab0e374e232351cbe64f509a7aab4e795b2d1fb03cd59f7dd0ed87f34c4ee5058dcb544f4b6d7e50d1cf22db29fbb65bde8fe213963856cb486f2 WHIRLPOOL 2c5db621b11cc6c93d0f58aef0221f3a4ace13352fc2de86df89ceeb137edda53fa7f44cb1052570d7a1053417c60910c61b214a61713b9b10c9684fc1983f03
 DIST texlive-core-patches-52.tar.xz 3376 SHA256 294f44d6b24801206eec23a497d0b17f68ed88f8ef3d33492efd75e889db309f SHA512 fbc84217911d797373ad03e3da3bcb2277d74edf3a9fd77a5bf67bed7fb207d1cd3d9c9c7947c906ee10989fe6ceb6c263a4002a592217bce7e873db813dc367 WHIRLPOOL e249a1aa3c563beb14ebe88f93c2b144dfa6de3b7d47b502a9a7e18a8a0f39ab399925a47bd7e4406ecf2010589791fee09a71b6db48a04beadac18294cb0474
-DIST texlive-core-patches-63.tar.xz 3724 SHA256 d62817111996777a2111d6d5e4e92e5ef078cb3c993cd11e162c7a07953b59fd SHA512 b97f00f9476196304ced5b52762d682b1917fc46554e6dccfd89eee40a1a63139491651c8048c780d83b0c52a2307bc5235072e0a8ddd0c92d752bffe14820dd WHIRLPOOL 96e17c05dfa6f3bce2b96c5ae931e1954e4fd7385a9135d05993c5688d6e2196a10ea625a138386e4dfb1c93f7b7c11ee82c723c2128d9919bed98fc3432de70
+DIST texlive-core-patches-64.tar.xz 4084 SHA256 3c851c4ccf8bdc6b4b2446dd0e490da64a88907c06eee34af7d438aa3727cc34 SHA512 188b64a027eebaa47e803a847c183985daf83c86dcfee85f61f9e608c614391d03b070405355159813d11ec48c10709be12455696320ddcd0bcb3f98cd906c82 WHIRLPOOL 9c935339c10c73fba88a4d9cc8df1b8b6382d3788178fe6842497fb15542f47511fdccceede050ca883b976bdb3303a77ddb0b65f4a6e741d57cfd986d9f05d5
 DIST texlive-module-a2ping-2012.tar.xz 31124 SHA256 37b769091af7c7c9f95c52f92cbc26b22f72dc0de5ecb0e9e37cf1482438605a SHA512 b4f74f037d1113d204d3f0e34c8418e354ae002ab09e8c326458bf7c9c9a9bfa3211317e03bb7e69d7f2e83a2b22851410287477176dab5288dacf5a9ec4a8a6 WHIRLPOOL 5e76ab0e818c3e20d8211c35230a9ee1084f1de830c988b1ed9707036481582540aa97c6ee9e31b0dd1ee2a8346dc3b81197d8c0489563122bba2dd7dffe5fe1
 DIST texlive-module-a2ping-2013.tar.xz 31124 SHA256 a50f2714269e1725a05584d2e1b0b822f082c7291a989d37976b8666f69e8e09 SHA512 bc05c8610e58bacb6001fd41f848d12f8e77837b5e24d32f7af1c9939778d92aeac7ee07969f22e86c72a8850650ad1d06341681503d8d8699dbf6db1de4be62 WHIRLPOOL c4ebb0c3bb4db9d176fbadfd06753509965aa7d1d89be69ded9cc4488b1629fbd7584f2fed70b9633ead1341fb88de006b7f840446f142ec25eaeeb8cd7577d5
 DIST texlive-module-a2ping-2014.tar.xz 31124 SHA256 18c8686e9d443af0e3b6d4feaaa42996b1fa2f03a07dce0e19d10226b7bc8839 SHA512 d5b65f04a96b7206624fd80fae4a04779fd31995247ed4b04d3ddb7197aeb3373d6b3679f674e29fb39e7022f37115fab2a3f5fc7304b3c6c133456242fef8bb WHIRLPOOL a6a8c93836825b07930a61c35d37b657479025d217b4d006021724a1b85c9afa4b6dffa0ba1d96bc0bdcaa3fd72274c11ea401d8387d1bcedbd20df2fde31cbd
--- a/app-text/texlive-core/texlive-core-2012.ebuild
+++ b/app-text/texlive-core/texlive-core-2012.ebuild
@ -1,343 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-PATCHLEVEL="36"
-TL_SOURCE_VERSION=20120701
-
-inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
-
-# Fetch patches
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
-#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_CORE_BINEXTRA_MODULES="
-	a2ping asymptote bibtex8 bundledoc ctanify ctanupload ctie cweb de-macro dtl
-	dvi2tty dviasm dvicopy dvidvi dviljk dvipng dvipos findhyph fragmaster
-	hyphenex installfont lacheck latex2man latexfileversion latexpand
-	listings-ext match_parens mkjobtexmf patgen pdfcrop pdftools pkfix
-	pkfix-helper purifyeps seetexk sty2dtx synctex texcount texdef texdiff
-	texdirflatten texdoc texliveonfly texloganalyser texware tie tpic2pdftex
-	typeoutfileinfo web	collection-binextra
-	"
-TL_CORE_BINEXTRA_DOC_MODULES="
-	a2ping.doc asymptote.doc bibtex8.doc bundledoc.doc ctanify.doc
-	ctanupload.doc ctie.doc cweb.doc de-macro.doc dvi2tty.doc dvicopy.doc
-	dviljk.doc dvipng.doc dvipos.doc findhyph.doc fragmaster.doc installfont.doc
-	latex2man.doc latexfileversion.doc latexpand.doc listings-ext.doc
-	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
-	pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
-	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
-	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
-	typeoutfileinfo web.doc
-	"
-TL_CORE_BINEXTRA_SRC_MODULES="hyphenex.source listings-ext.source mkjobtexmf.source texdef.source"
-
-TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cjk X doc source tk xetex"
-
-MODULAR_X_DEPEND="X? (
-				x11-libs/libXmu
-				x11-libs/libXp
-				x11-libs/libXpm
-				x11-libs/libXaw
-	)"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
-	!app-text/ptex
-	!app-text/tetex
-	!<app-text/texlive-2007
-	!app-text/xetex
-	!<dev-texlive/texlive-basic-2009
-	!<dev-texlive/texlive-metapost-2011
-	!app-text/dvibook
-	sys-libs/zlib
-	>=media-libs/libpng-1.2.43-r2:0
-	>=app-text/poppler-0.12.3-r3
-	xetex? (
-		app-text/teckit
-		media-libs/fontconfig
-		media-libs/freetype:2
-		media-libs/silgraphite
-	)
-	>=dev-libs/kpathsea-6.1.0_p20120701
-	cjk? ( >=dev-libs/ptexenc-1.2.0_p20120701 )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-apps/ed
-	sys-devel/flex
-	app-arch/xz-utils"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ps2pkm-1.5_p20120701
-	>=app-text/dvipsk-5.992_p20120701
-	>=dev-tex/bibtexu-3.71_p20120701
-	virtual/perl-Getopt-Long
-	xetex? ( >=app-text/xdvipdfmx-0.7.8_p20120701 )
-	tk? ( dev-perl/Tk )"
-
-# texdoc needs luatex.
-PDEPEND=">=dev-tex/luatex-0.70"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_PV}"
-
-src_prepare() {
-	mkdir -p "${S}" || die "failed to create build dir"
-	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
-	cd "${B}"
-	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	elibtoolize
-}
-
-src_configure() {
-	# It fails on alpha without this
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Bug #265232 and bug #414271:
-	if use hppa; then
-		append-cppflags "-DU_IS_BIG_ENDIAN=1"
-	fi
-
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #242430
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-	tc-export CC CXX AR
-	ECONF_SOURCE="${B}" \
-		econf -C \
-		--bindir=/usr/bin \
-		--datadir="${S}" \
-		--with-system-freetype2 \
-		--with-freetype2-include=/usr/include \
-		--with-system-zlib \
-		--with-system-libpng \
-		--with-system-xpdf \
-		--with-system-poppler \
-		--with-system-teckit \
-		--with-teckit-includes=/usr/include/teckit \
-		--with-system-graphite \
-		--with-system-kpathsea \
-		--with-system-icu \
-		--with-system-ptexenc \
-		--without-texinfo \
-		--disable-dialog \
-		--disable-multiplatform \
-		--enable-epsfwin \
-		--enable-mftalkwin \
-		--enable-regiswin \
-		--enable-tektronixwin \
-		--enable-unitermwin \
-		--with-ps=gs \
-		--disable-psutils \
-		--disable-t1utils \
-		--enable-ipc \
-		--disable-biber \
-		--disable-bibtexu \
-		--disable-dvipng \
-		--disable-dvipsk \
-		--disable-dvipdfmx \
-		--disable-chktex \
-		--disable-lcdf-typetools \
-		--disable-pdfopen \
-		--disable-ps2eps \
-		--disable-ps2pkm \
-		--disable-detex \
-		--disable-ttf2pk \
-		--disable-tex4htk \
-		--disable-cjkutils \
-		--disable-xdvik \
-		--disable-xindy \
-		--disable-luatex \
-		--disable-dvi2tty \
-		--disable-dvisvgm \
-		--disable-vlna \
-		--disable-xdvipdfmx \
-		--enable-shared \
-		--disable-native-texlive-build \
-		--disable-largefile \
-		$(use_enable xetex) \
-		$(use_enable cjk ptex) \
-		$(use_enable cjk eptex) \
-		$(use_enable cjk uptex) \
-		$(use_enable cjk euptex) \
-		$(use_enable cjk mendexk) \
-		$(use_enable cjk makejvf) \
-		$(use_with X x)
-}
-
-src_compile() {
-	emake SHELL=/bin/sh texmf=${TEXMF_PATH:-/usr/share/texmf} || die "emake failed"
-
-	cd "${B}"
-	# Mimic updmap --syncwithtrees to enable only fonts installed
-	# Code copied from updmap script
-	for i in `egrep '^(Mixed)?Map' "texmf/web2c/updmap.cfg" | sed 's@.* @@'`; do
-		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
-	done > "${T}/updmap_update"
-	{
-		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-	} > "${T}/updmap_update2"
-	sed -f "${T}/updmap_update2" "texmf/web2c/updmap.cfg" >	"${T}/updmap_update3"\
-		&& cat "${T}/updmap_update3" > "texmf/web2c/updmap.cfg"
-}
-
-src_test() {
-	ewarn "Due to modular layout of texlive ebuilds,"
-	ewarn "It would not make much sense to use tests into the ebuild"
-	ewarn "And tests would fail anyway"
-	ewarn "Alternatively you can try to compile any tex file"
-	ewarn "Tex warnings should be considered as errors and reported"
-	ewarn "You can also run fmtutil-sys --all and check for errors/warnings there"
-}
-
-src_install() {
-	dodir ${TEXMF_PATH:-/usr/share/texmf}/web2c
-	emake DESTDIR="${D}" texmf="${D}${TEXMF_PATH:-/usr/share/texmf}" run_texlinks="true" run_mktexlsr="true" install || die "install failed"
-
-	cd "${B}"
-	dodir /usr/share # just in case
-	cp -pR texmf{,-dist} "${D}/usr/share/" || die "failed to install texmf trees"
-	cp -pR "${WORKDIR}"/tlpkg "${D}/usr/share/" || die "failed to install tlpkg files"
-
-	newsbin "${FILESDIR}/texmf-update2010" texmf-update
-
-	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
-	# exist. Instead, it is called mf, so we symlink it to please everything.
-	use X || dosym mf /usr/bin/mf-nowin
-
-	docinto texk
-	cd "${B}/texk"
-	dodoc ChangeLog README || die "failed to install texk docs"
-
-	docinto dviljk
-	cd "${B}/texk/dviljk"
-	dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
-
-	docinto makeindexk
-	cd "${B}/texk/makeindexk"
-	dodoc ChangeLog NOTES README || die "failed to install makeindexk docs"
-
-	docinto web2c
-	cd "${B}/texk/web2c"
-	dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
-
-	use doc || rm -rf "${D}/usr/share/texmf/doc"
-	use doc || rm -rf "${D}/usr/share/texmf-dist/doc"
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${D}/etc/env.d/98texlive"
-	# populate /etc/texmf
-	keepdir /etc/texmf/web2c
-
-	# take care of updmap.cfg and language.d files
-	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
-	mv "${D}${TEXMF_PATH}/web2c/updmap.cfg"	"${D}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${D}${TEXMF_PATH}/web2c/fmtutil.cnf"
-	# Remove bundled and invalid updmap.cfg
-	rm -f "${D}/usr/share/texmf-dist/web2c/updmap.cfg"
-
-	texlive-common_handle_config_files
-
-	keepdir /usr/share/texmf-site
-
-	# the virtex symlink is not installed
-	# The links has to be relative, since the targets
-	# is not present at this stage and MacOS doesn't
-	# like non-existing targets
-	dosym tex /usr/bin/virtex
-	dosym pdftex /usr/bin/pdfvirtex
-
-	# Remove texdoctk if we don't want it
-	if ! use tk ; then
-		rm -f "${D}/usr/bin/texdoctk" "${D}/usr/share/texmf/scripts/tetex/texdoctk.pl" "${D}/usr/share/man/man1/texdoctk.1" || die "failed to remove texdoc tk!"
-	fi
-
-	# Rename mpost to leave room for mplib
-	mv "${D}/usr/bin/mpost" "${D}/usr/bin/mpost-${P}"
-	dosym "mpost-${P}" /usr/bin/mpost
-
-	# Ditto for pdftex
-	mv "${D}/usr/bin/pdftex" "${D}/usr/bin/pdftex-${P}"
-	dosym "pdftex-${P}" /usr/bin/pdftex
-}
-
-pkg_preinst() {
-	# Remove stray files to keep the upgrade path sane
-	if has_version =app-text/texlive-core-2007* ; then
-		for i in pdftex/pdflatex aleph/aleph aleph/lamed omega/lambda omega/omega xetex/xetex xetex/xelatex tex/tex pdftex/etex pdftex/pdftex pdftex/pdfetex ; do
-			for j in log fmt ; do
-				local file="${ROOT}/var/lib/texmf/web2c/${i}.${j}"
-				if [ -f "${file}" ] ; then
-					elog "Removing stray ${file} from TeXLive 2007 install."
-					rm -f "${file}"
-				fi
-			done
-		done
-		for j in base log ; do
-			local file="${ROOT}/var/lib/texmf/web2c/metafont/mf.${j}"
-			if [ -f "${file}" ] ; then
-				elog "Removing stray ${file} from TeXLive 2007 install."
-				rm -f "${file}"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	etexmf-update
-
-	elog
-	elog "If you have configuration files in /etc/texmf to merge,"
-	elog "please update them and run /usr/sbin/texmf-update."
-	elog
-	ewarn "If you are migrating from an older TeX distribution"
-	ewarn "Please make sure you have read:"
-	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
-	ewarn "in order to avoid possible problems"
-	elog
-	elog "TeXLive has been split in various ebuilds. If you are missing a"
-	elog "package to process your TeX documents, you can install"
-	elog "dev-tex/texmfind to easily search for them."
-	elog
-}
--- a/app-text/texlive-core/texlive-core-2013-r1.ebuild
+++ b/app-text/texlive-core/texlive-core-2013-r1.ebuild
@ -1,354 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-PATCHLEVEL="41"
-TL_SOURCE_VERSION=20130530
-
-inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
-
-# Fetch patches
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
-#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_CORE_BINEXTRA_MODULES="
-	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
-	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
-	fragmaster hyphenex installfont lacheck latex2man latexfileversion
-	latexpand ltxfileinfo listings-ext match_parens mkjobtexmf patgen pdfcrop
-	pdftools pfarrei pkfix pkfix-helper purifyeps seetexk sty2dtx synctex
-	texcount texdef texdiff texdirflatten texdoc texliveonfly texloganalyser
-	texware tie tpic2pdftex typeoutfileinfo web	collection-binextra
-	"
-TL_CORE_BINEXTRA_DOC_MODULES="
-	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
-	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
-	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
-	installfont.doc	latex2man.doc latexfileversion.doc latexpand.doc
-	ltxfileinfo.doc listings-ext.doc match_parens.doc mkjobtexmf.doc patgen.doc
-	pdfcrop.doc pdftools.doc pfarrei.doc pkfix.doc pkfix-helper.doc
-	purifyeps.doc sty2dtx.doc synctex.doc texcount.doc texdef.doc texdiff.doc
-	texdirflatten.doc texdoc.doc texliveonfly.doc texloganalyser.doc texware.doc
-	tie.doc tpic2pdftex.doc	typeoutfileinfo web.doc
-	"
-TL_CORE_BINEXTRA_SRC_MODULES="
-	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
-	pfarrei.source texdef.source
-	"
-
-TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk X doc source tk xetex"
-
-TEXMF_PATH=/usr/share/texmf-dist
-
-MODULAR_X_DEPEND="X? (
-				x11-libs/libXmu
-				x11-libs/libXp
-				x11-libs/libXpm
-				x11-libs/libXaw
-	)"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
-	!app-text/ptex
-	!app-text/tetex
-	!<app-text/texlive-2007
-	!app-text/xetex
-	!<dev-texlive/texlive-basic-2013
-	!<dev-texlive/texlive-metapost-2011
-	!app-text/dvibook
-	sys-libs/zlib
-	>=media-libs/libpng-1.2.43-r2:0=
-	>=app-text/poppler-0.12.3-r3:=
-	>=x11-libs/cairo-1.12
-	>=x11-libs/pixman-0.18
-	xetex? (
-		>=media-libs/harfbuzz-0.9.20[icu,graphite]
-		>=dev-libs/icu-50:=
-		app-text/teckit
-		media-libs/fontconfig
-		media-gfx/graphite2
-		media-libs/freetype:2
-	)
-	>=dev-libs/kpathsea-6.1.1_p20130530
-	cjk? ( >=dev-libs/ptexenc-1.3.1_p20130530 )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-apps/ed
-	sys-devel/flex
-	app-arch/xz-utils"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ps2pkm-1.5_p20130530
-	>=app-text/dvipsk-5.993_p20130530
-	>=dev-tex/bibtexu-3.71_p20130530
-	virtual/perl-Getopt-Long
-	xetex? ( >=app-text/xdvipdfmx-0.7.9_p20130530 )
-	tk? ( dev-perl/Tk )"
-
-# texdoc needs luatex.
-PDEPEND=">=dev-tex/luatex-0.76"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die "failed to create build dir"
-}
-
-RELOC_TARGET=texmf-dist
-
-src_prepare() {
-	cd "${WORKDIR}"
-	# From texlive-module.eclass.
-	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
-	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
-	for i in $(<"${T}/dirlist"); do
-		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
-	done
-	for i in $(<"${T}/reloclist"); do
-		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
-	done
-
-	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
-	cd "${B}"
-	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	elibtoolize
-}
-
-src_configure() {
-	# It fails on alpha without this
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #242430
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-	tc-export CC CXX AR RANLIB
-	ECONF_SOURCE="${B}" \
-		econf -C \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${S}" \
-		--with-system-freetype2 \
-		--with-system-zlib \
-		--with-system-libpng \
-		--with-system-xpdf \
-		--with-system-poppler \
-		--with-system-teckit \
-		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
-		--with-system-kpathsea \
-		--with-kpathsea-includes="${EPREFIX}"/usr/include \
-		--with-system-icu \
-		--with-system-ptexenc \
-		--with-system-harfbuzz \
-		--with-system-icu \
-		--with-system-graphite2 \
-		--with-system-cairo \
-		--with-system-pixman \
-		--without-texinfo \
-		--disable-dialog \
-		--disable-multiplatform \
-		--enable-epsfwin \
-		--enable-mftalkwin \
-		--enable-regiswin \
-		--enable-tektronixwin \
-		--enable-unitermwin \
-		--with-ps=gs \
-		--disable-psutils \
-		--disable-t1utils \
-		--enable-ipc \
-		--disable-biber \
-		--disable-bibtex-x \
-		--disable-dvipng \
-		--disable-dvipsk \
-		--disable-dvipdfmx \
-		--disable-chktex \
-		--disable-lcdf-typetools \
-		--disable-pdfopen \
-		--disable-ps2eps \
-		--disable-ps2pkm \
-		--disable-detex \
-		--disable-ttf2pk \
-		--disable-tex4htk \
-		--disable-cjkutils \
-		--disable-xdvik \
-		--disable-xindy \
-		--disable-luatex \
-		--disable-dvi2tty \
-		--disable-dvisvgm \
-		--disable-vlna \
-		--disable-xdvipdfmx \
-		--enable-shared \
-		--disable-native-texlive-build \
-		--disable-largefile \
-		$(use_enable xetex) \
-		$(use_enable cjk ptex) \
-		$(use_enable cjk eptex) \
-		$(use_enable cjk uptex) \
-		$(use_enable cjk euptex) \
-		$(use_enable cjk mendexk) \
-		$(use_enable cjk makejvf) \
-		$(use_enable tk texdoctk) \
-		$(use_with X x)
-}
-
-src_compile() {
-	tc-export CC CXX AR RANLIB
-	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist} || die "emake failed"
-
-	cd "${B}"
-	# Mimic updmap --syncwithtrees to enable only fonts installed
-	# Code copied from updmap script
-	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
-		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
-	done > "${T}/updmap_update"
-	{
-		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-	} > "${T}/updmap_update2"
-	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
-		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
-}
-
-src_install() {
-	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
-	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install || die "install failed"
-
-	cd "${B}"
-	dodir /usr/share # just in case
-	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-
-	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
-	# exist. Instead, it is called mf, so we symlink it to please everything.
-	use X || dosym mf /usr/bin/mf-nowin
-
-	docinto texk
-	cd "${B}/texk"
-	dodoc ChangeLog README || die "failed to install texk docs"
-
-	docinto dviljk
-	cd "${B}/texk/dviljk"
-	dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
-
-	docinto makeindexk
-	cd "${B}/texk/makeindexk"
-	dodoc ChangeLog NOTES README || die "failed to install makeindexk docs"
-
-	docinto web2c
-	cd "${B}/texk/web2c"
-	dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
-
-	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
-	# populate /etc/texmf
-	keepdir /etc/texmf/web2c
-
-	# take care of updmap.cfg and language.d files
-	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
-	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
-	# Remove bundled and invalid updmap.cfg
-	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
-
-	texlive-common_handle_config_files
-
-	keepdir /usr/share/texmf-site
-
-	# the virtex symlink is not installed
-	# The links has to be relative, since the targets
-	# is not present at this stage and MacOS doesn't
-	# like non-existing targets
-	dosym tex /usr/bin/virtex
-	dosym pdftex /usr/bin/pdfvirtex
-
-	# Rename mpost to leave room for mplib
-	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
-	dosym "mpost-${P}" /usr/bin/mpost
-
-	# Ditto for pdftex
-	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
-	dosym "pdftex-${P}" /usr/bin/pdftex
-}
-
-pkg_preinst() {
-	# Remove stray files to keep the upgrade path sane
-	if has_version =app-text/texlive-core-2007* ; then
-		for i in pdftex/pdflatex aleph/aleph aleph/lamed omega/lambda omega/omega xetex/xetex xetex/xelatex tex/tex pdftex/etex pdftex/pdftex pdftex/pdfetex ; do
-			for j in log fmt ; do
-				local file="${EROOT}/var/lib/texmf/web2c/${i}.${j}"
-				if [ -f "${file}" ] ; then
-					elog "Removing stray ${file} from TeXLive 2007 install."
-					rm -f "${file}"
-				fi
-			done
-		done
-		for j in base log ; do
-			local file="${EROOT}/var/lib/texmf/web2c/metafont/mf.${j}"
-			if [ -f "${file}" ] ; then
-				elog "Removing stray ${file} from TeXLive 2007 install."
-				rm -f "${file}"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	etexmf-update
-
-	elog
-	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
-	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
-	elog
-	ewarn "If you are migrating from an older TeX distribution"
-	ewarn "Please make sure you have read:"
-	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
-	ewarn "in order to avoid possible problems"
-	elog
-	elog "TeXLive has been split in various ebuilds. If you are missing a"
-	elog "package to process your TeX documents, you can install"
-	elog "dev-tex/texmfind to easily search for them."
-	elog
-}
--- a/app-text/texlive-core/texlive-core-2014-r1.ebuild
+++ b/app-text/texlive-core/texlive-core-2014-r1.ebuild
@ -1,336 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-PATCHLEVEL="42"
-TL_SOURCE_VERSION=20140525
-
-inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
-
-# Fetch patches
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
-#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_CORE_BINEXTRA_MODULES="
-	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
-	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
-	fragmaster hyphenex installfont lacheck latex-git-log latex2man
-	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext
-	match_parens mkjobtexmf patgen pdfcrop pdftools pfarrei pkfix pkfix-helper
-	purifyeps seetexk sty2dtx synctex texcount texdef texdiff texdirflatten
-	texdoc texliveonfly texloganalyser texware tie tpic2pdftex typeoutfileinfo
-	web collection-binextra
-	"
-TL_CORE_BINEXTRA_DOC_MODULES="
-	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
-	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
-	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
-	installfont.doc	latex-git-log.doc latex2man.doc latexfileversion.doc
-	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
-	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
-	pfarrei.doc pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
-	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
-	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
-	typeoutfileinfo.doc web.doc
-	"
-TL_CORE_BINEXTRA_SRC_MODULES="
-	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
-	pfarrei.source texdef.source
-	"
-
-TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk X doc source tk xetex"
-
-TEXMF_PATH=/usr/share/texmf-dist
-
-MODULAR_X_DEPEND="X? (
-				x11-libs/libXmu
-				x11-libs/libXp
-				x11-libs/libXpm
-				x11-libs/libXaw
-	)"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
-	!app-text/ptex
-	!app-text/tetex
-	!<app-text/texlive-2007
-	!app-text/xetex
-	!<dev-texlive/texlive-basic-2014
-	!<dev-texlive/texlive-metapost-2011
-	!app-text/dvibook
-	!dev-tex/luatex
-	!app-text/dvipdfm
-	!app-text/dvipdfmx
-	!app-text/xdvipdfmx
-	sys-libs/zlib
-	>=media-libs/libpng-1.2.43-r2:0=
-	>=app-text/poppler-0.12.3-r3:=
-	>=x11-libs/cairo-1.12
-	>=x11-libs/pixman-0.18
-	dev-libs/zziplib
-	app-text/libpaper
-	xetex? (
-		>=media-libs/harfbuzz-0.9.20[icu,graphite]
-		>=dev-libs/icu-50:=
-		app-text/teckit
-		media-libs/fontconfig
-		media-gfx/graphite2
-	)
-	media-libs/freetype:2
-	>=dev-libs/kpathsea-6.2.0
-	cjk? ( >=dev-libs/ptexenc-1.3.2_p20140525-r1 )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-apps/ed
-	sys-devel/flex
-	app-arch/xz-utils"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ps2pkm-1.5_p20130530
-	>=app-text/dvipsk-5.993_p20130530
-	>=dev-tex/bibtexu-3.71_p20130530
-	virtual/perl-Getopt-Long
-	tk? ( dev-perl/Tk )"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die "failed to create build dir"
-}
-
-RELOC_TARGET=texmf-dist
-
-src_prepare() {
-	cd "${WORKDIR}"
-	# From texlive-module.eclass.
-	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
-	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
-	for i in $(<"${T}/dirlist"); do
-		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
-	done
-	for i in $(<"${T}/reloclist"); do
-		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
-	done
-
-	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
-	cd "${B}"
-	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	elibtoolize
-}
-
-src_configure() {
-	# It fails on alpha without this
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #242430
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-	tc-export CC CXX AR RANLIB
-	ECONF_SOURCE="${B}" \
-		econf -C \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${S}" \
-		--with-system-freetype2 \
-		--with-system-zlib \
-		--with-system-libpng \
-		--with-system-xpdf \
-		--with-system-poppler \
-		--with-system-teckit \
-		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
-		--with-system-kpathsea \
-		--with-kpathsea-includes="${EPREFIX}"/usr/include \
-		--with-system-icu \
-		--with-system-ptexenc \
-		--with-system-harfbuzz \
-		--with-system-icu \
-		--with-system-graphite2 \
-		--with-system-cairo \
-		--with-system-pixman \
-		--with-system-zziplib \
-		--with-system-libpaper \
-		--without-texinfo \
-		--disable-dialog \
-		--disable-multiplatform \
-		--enable-epsfwin \
-		--enable-mftalkwin \
-		--enable-regiswin \
-		--enable-tektronixwin \
-		--enable-unitermwin \
-		--with-ps=gs \
-		--disable-psutils \
-		--disable-t1utils \
-		--enable-ipc \
-		--disable-biber \
-		--disable-bibtex-x \
-		--disable-dvipng \
-		--disable-dvipsk \
-		--disable-chktex \
-		--disable-lcdf-typetools \
-		--disable-pdfopen \
-		--disable-ps2eps \
-		--disable-ps2pkm \
-		--disable-detex \
-		--disable-ttf2pk2 \
-		--disable-tex4htk \
-		--disable-cjkutils \
-		--disable-xdvik \
-		--disable-xindy \
-		--enable-luatex \
-		--disable-dvi2tty \
-		--disable-dvisvgm \
-		--disable-vlna \
-		--enable-shared \
-		--disable-native-texlive-build \
-		--disable-largefile \
-		$(use_enable xetex) \
-		$(use_enable cjk ptex) \
-		$(use_enable cjk eptex) \
-		$(use_enable cjk uptex) \
-		$(use_enable cjk euptex) \
-		$(use_enable cjk mendexk) \
-		$(use_enable cjk makejvf) \
-		$(use_enable tk texdoctk) \
-		$(use_with X x)
-}
-
-src_compile() {
-	tc-export CC CXX AR RANLIB
-	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist} || die "emake failed"
-
-	cd "${B}"
-	# Mimic updmap --syncwithtrees to enable only fonts installed
-	# Code copied from updmap script
-	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
-		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
-	done > "${T}/updmap_update"
-	{
-		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-	} > "${T}/updmap_update2"
-	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
-		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
-}
-
-src_install() {
-	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
-	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install || die "install failed"
-
-	cd "${B}"
-	dodir /usr/share # just in case
-	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-
-	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
-	# exist. Instead, it is called mf, so we symlink it to please everything.
-	use X || dosym mf /usr/bin/mf-nowin
-
-	docinto texk
-	cd "${B}/texk"
-	dodoc ChangeLog README || die "failed to install texk docs"
-
-	docinto dviljk
-	cd "${B}/texk/dviljk"
-	dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
-
-	docinto makeindexk
-	cd "${B}/texk/makeindexk"
-	dodoc ChangeLog NOTES README || die "failed to install makeindexk docs"
-
-	docinto web2c
-	cd "${B}/texk/web2c"
-	dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
-
-	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
-	# populate /etc/texmf
-	keepdir /etc/texmf/web2c
-
-	# take care of updmap.cfg and language.d files
-	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
-	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
-	# Remove bundled and invalid updmap.cfg
-	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
-
-	texlive-common_handle_config_files
-
-	keepdir /usr/share/texmf-site
-
-	# the virtex symlink is not installed
-	# The links has to be relative, since the targets
-	# is not present at this stage and MacOS doesn't
-	# like non-existing targets
-	dosym tex /usr/bin/virtex
-	dosym pdftex /usr/bin/pdfvirtex
-
-	# Rename mpost to leave room for mplib
-	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
-	dosym "mpost-${P}" /usr/bin/mpost
-
-	# Ditto for pdftex
-	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
-	dosym "pdftex-${P}" /usr/bin/pdftex
-}
-
-pkg_postinst() {
-	etexmf-update
-
-	elog
-	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
-	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
-	elog
-	ewarn "If you are migrating from an older TeX distribution"
-	ewarn "Please make sure you have read:"
-	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
-	ewarn "in order to avoid possible problems"
-	elog
-	elog "TeXLive has been split in various ebuilds. If you are missing a"
-	elog "package to process your TeX documents, you can install"
-	elog "dev-tex/texmfind to easily search for them."
-	elog
-}
--- a/app-text/texlive-core/texlive-core-2014-r3.ebuild
+++ b/app-text/texlive-core/texlive-core-2014-r3.ebuild
@ -1,336 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-PATCHLEVEL="47"
-TL_SOURCE_VERSION=20140525
-
-inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
-
-# Fetch patches
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
-#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_CORE_BINEXTRA_MODULES="
-	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
-	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
-	fragmaster hyphenex installfont lacheck latex-git-log latex2man
-	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext
-	match_parens mkjobtexmf patgen pdfcrop pdftools pfarrei pkfix pkfix-helper
-	purifyeps seetexk sty2dtx synctex texcount texdef texdiff texdirflatten
-	texdoc texliveonfly texloganalyser texware tie tpic2pdftex typeoutfileinfo
-	web collection-binextra
-	"
-TL_CORE_BINEXTRA_DOC_MODULES="
-	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
-	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
-	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
-	installfont.doc	latex-git-log.doc latex2man.doc latexfileversion.doc
-	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
-	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
-	pfarrei.doc pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
-	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
-	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
-	typeoutfileinfo.doc web.doc
-	"
-TL_CORE_BINEXTRA_SRC_MODULES="
-	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
-	pfarrei.source texdef.source
-	"
-
-TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk X doc source tk xetex"
-
-TEXMF_PATH=/usr/share/texmf-dist
-
-MODULAR_X_DEPEND="X? (
-				x11-libs/libXmu
-				x11-libs/libXp
-				x11-libs/libXpm
-				x11-libs/libXaw
-	)"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
-	!app-text/ptex
-	!app-text/tetex
-	!<app-text/texlive-2007
-	!app-text/xetex
-	!<dev-texlive/texlive-basic-2014
-	!<dev-texlive/texlive-metapost-2011
-	!app-text/dvibook
-	!dev-tex/luatex
-	!app-text/dvipdfm
-	!app-text/dvipdfmx
-	!app-text/xdvipdfmx
-	sys-libs/zlib
-	>=media-libs/libpng-1.2.43-r2:0=
-	>=app-text/poppler-0.12.3-r3:=
-	>=x11-libs/cairo-1.12
-	>=x11-libs/pixman-0.18
-	dev-libs/zziplib
-	app-text/libpaper
-	xetex? (
-		>=media-libs/harfbuzz-0.9.20[icu,graphite]
-		>=dev-libs/icu-50:=
-		app-text/teckit
-		media-libs/fontconfig
-		media-gfx/graphite2
-	)
-	media-libs/freetype:2
-	>=dev-libs/kpathsea-6.2.0
-	cjk? ( >=dev-libs/ptexenc-1.3.2_p20140525-r1 )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-apps/ed
-	sys-devel/flex
-	app-arch/xz-utils"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ps2pkm-1.5_p20130530
-	>=app-text/dvipsk-5.993_p20130530
-	>=dev-tex/bibtexu-3.71_p20130530
-	virtual/perl-Getopt-Long
-	tk? ( dev-perl/Tk )"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die "failed to create build dir"
-}
-
-RELOC_TARGET=texmf-dist
-
-src_prepare() {
-	cd "${WORKDIR}"
-	# From texlive-module.eclass.
-	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
-	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
-	for i in $(<"${T}/dirlist"); do
-		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
-	done
-	for i in $(<"${T}/reloclist"); do
-		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
-	done
-
-	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
-	cd "${B}"
-	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	elibtoolize
-}
-
-src_configure() {
-	# It fails on alpha without this
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #242430
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-	tc-export CC CXX AR RANLIB
-	ECONF_SOURCE="${B}" \
-		econf -C \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${S}" \
-		--with-system-freetype2 \
-		--with-system-zlib \
-		--with-system-libpng \
-		--with-system-xpdf \
-		--with-system-poppler \
-		--with-system-teckit \
-		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
-		--with-system-kpathsea \
-		--with-kpathsea-includes="${EPREFIX}"/usr/include \
-		--with-system-icu \
-		--with-system-ptexenc \
-		--with-system-harfbuzz \
-		--with-system-icu \
-		--with-system-graphite2 \
-		--with-system-cairo \
-		--with-system-pixman \
-		--with-system-zziplib \
-		--with-system-libpaper \
-		--without-texinfo \
-		--disable-dialog \
-		--disable-multiplatform \
-		--enable-epsfwin \
-		--enable-mftalkwin \
-		--enable-regiswin \
-		--enable-tektronixwin \
-		--enable-unitermwin \
-		--with-ps=gs \
-		--disable-psutils \
-		--disable-t1utils \
-		--enable-ipc \
-		--disable-biber \
-		--disable-bibtex-x \
-		--disable-dvipng \
-		--disable-dvipsk \
-		--disable-chktex \
-		--disable-lcdf-typetools \
-		--disable-pdfopen \
-		--disable-ps2eps \
-		--disable-ps2pkm \
-		--disable-detex \
-		--disable-ttf2pk2 \
-		--disable-tex4htk \
-		--disable-cjkutils \
-		--disable-xdvik \
-		--disable-xindy \
-		--enable-luatex \
-		--disable-dvi2tty \
-		--disable-dvisvgm \
-		--disable-vlna \
-		--enable-shared \
-		--disable-native-texlive-build \
-		--disable-largefile \
-		$(use_enable xetex) \
-		$(use_enable cjk ptex) \
-		$(use_enable cjk eptex) \
-		$(use_enable cjk uptex) \
-		$(use_enable cjk euptex) \
-		$(use_enable cjk mendexk) \
-		$(use_enable cjk makejvf) \
-		$(use_enable tk texdoctk) \
-		$(use_with X x)
-}
-
-src_compile() {
-	tc-export CC CXX AR RANLIB
-	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
-
-	cd "${B}" || die
-	# Mimic updmap --syncwithtrees to enable only fonts installed
-	# Code copied from updmap script
-	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
-		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
-	done > "${T}/updmap_update"
-	{
-		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-	} > "${T}/updmap_update2"
-	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
-		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
-}
-
-src_install() {
-	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
-	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
-
-	cd "${B}" || die
-	dodir /usr/share # just in case
-	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-
-	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
-	# exist. Instead, it is called mf, so we symlink it to please everything.
-	use X || dosym mf /usr/bin/mf-nowin
-
-	docinto texk
-	cd "${B}/texk"
-	dodoc ChangeLog README
-
-	docinto dviljk
-	cd "${B}/texk/dviljk"
-	dodoc ChangeLog README NEWS
-
-	docinto makeindexk
-	cd "${B}/texk/makeindexk"
-	dodoc ChangeLog NOTES README
-
-	docinto web2c
-	cd "${B}/texk/web2c"
-	dodoc ChangeLog NEWS PROJECTS README
-
-	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
-	# populate /etc/texmf
-	keepdir /etc/texmf/web2c
-
-	# take care of updmap.cfg and language.d files
-	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
-	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
-	# Remove bundled and invalid updmap.cfg
-	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
-
-	texlive-common_handle_config_files
-
-	keepdir /usr/share/texmf-site
-
-	# the virtex symlink is not installed
-	# The links has to be relative, since the targets
-	# is not present at this stage and MacOS doesn't
-	# like non-existing targets
-	dosym tex /usr/bin/virtex
-	dosym pdftex /usr/bin/pdfvirtex
-
-	# Rename mpost to leave room for mplib
-	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
-	dosym "mpost-${P}" /usr/bin/mpost
-
-	# Ditto for pdftex
-	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
-	dosym "pdftex-${P}" /usr/bin/pdftex
-}
-
-pkg_postinst() {
-	etexmf-update
-
-	elog
-	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
-	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
-	elog
-	ewarn "If you are migrating from an older TeX distribution"
-	ewarn "Please make sure you have read:"
-	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
-	ewarn "in order to avoid possible problems"
-	elog
-	elog "TeXLive has been split in various ebuilds. If you are missing a"
-	elog "package to process your TeX documents, you can install"
-	elog "dev-tex/texmfind to easily search for them."
-	elog
-}
--- a/app-text/texlive-core/texlive-core-2014.ebuild
+++ b/app-text/texlive-core/texlive-core-2014.ebuild
@ -1,334 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-PATCHLEVEL="42"
-TL_SOURCE_VERSION=20140525
-
-inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
-
-# Fetch patches
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
-#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_CORE_BINEXTRA_MODULES="
-	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
-	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
-	fragmaster hyphenex installfont lacheck latex-git-log latex2man
-	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext
-	match_parens mkjobtexmf patgen pdfcrop pdftools pfarrei pkfix pkfix-helper
-	purifyeps seetexk sty2dtx synctex texcount texdef texdiff texdirflatten
-	texdoc texliveonfly texloganalyser texware tie tpic2pdftex typeoutfileinfo
-	web collection-binextra
-	"
-TL_CORE_BINEXTRA_DOC_MODULES="
-	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
-	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
-	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
-	installfont.doc	latex-git-log.doc latex2man.doc latexfileversion.doc
-	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
-	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
-	pfarrei.doc pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
-	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
-	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
-	typeoutfileinfo.doc web.doc
-	"
-TL_CORE_BINEXTRA_SRC_MODULES="
-	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
-	pfarrei.source texdef.source
-	"
-
-TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk X doc source tk xetex"
-
-TEXMF_PATH=/usr/share/texmf-dist
-
-MODULAR_X_DEPEND="X? (
-				x11-libs/libXmu
-				x11-libs/libXp
-				x11-libs/libXpm
-				x11-libs/libXaw
-	)"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
-	!app-text/ptex
-	!app-text/tetex
-	!<app-text/texlive-2007
-	!app-text/xetex
-	!<dev-texlive/texlive-basic-2014
-	!<dev-texlive/texlive-metapost-2011
-	!app-text/dvibook
-	!dev-tex/luatex
-	!app-text/dvipdfm
-	!app-text/dvipdfmx
-	!app-text/xdvipdfmx
-	sys-libs/zlib
-	>=media-libs/libpng-1.2.43-r2:0=
-	>=app-text/poppler-0.12.3-r3:=
-	>=x11-libs/cairo-1.12
-	>=x11-libs/pixman-0.18
-	dev-libs/zziplib
-	xetex? (
-		>=media-libs/harfbuzz-0.9.20[icu,graphite]
-		>=dev-libs/icu-50:=
-		app-text/teckit
-		media-libs/fontconfig
-		media-gfx/graphite2
-	)
-	media-libs/freetype:2
-	>=dev-libs/kpathsea-6.2.0
-	cjk? ( >=dev-libs/ptexenc-1.3.2_p20140525-r1 )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-apps/ed
-	sys-devel/flex
-	app-arch/xz-utils"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ps2pkm-1.5_p20130530
-	>=app-text/dvipsk-5.993_p20130530
-	>=dev-tex/bibtexu-3.71_p20130530
-	virtual/perl-Getopt-Long
-	tk? ( dev-perl/Tk )"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die "failed to create build dir"
-}
-
-RELOC_TARGET=texmf-dist
-
-src_prepare() {
-	cd "${WORKDIR}"
-	# From texlive-module.eclass.
-	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
-	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
-	for i in $(<"${T}/dirlist"); do
-		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
-	done
-	for i in $(<"${T}/reloclist"); do
-		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
-	done
-
-	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
-	cd "${B}"
-	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	elibtoolize
-}
-
-src_configure() {
-	# It fails on alpha without this
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #242430
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-	tc-export CC CXX AR RANLIB
-	ECONF_SOURCE="${B}" \
-		econf -C \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${S}" \
-		--with-system-freetype2 \
-		--with-system-zlib \
-		--with-system-libpng \
-		--with-system-xpdf \
-		--with-system-poppler \
-		--with-system-teckit \
-		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
-		--with-system-kpathsea \
-		--with-kpathsea-includes="${EPREFIX}"/usr/include \
-		--with-system-icu \
-		--with-system-ptexenc \
-		--with-system-harfbuzz \
-		--with-system-icu \
-		--with-system-graphite2 \
-		--with-system-cairo \
-		--with-system-pixman \
-		--with-system-zziplib \
-		--without-texinfo \
-		--disable-dialog \
-		--disable-multiplatform \
-		--enable-epsfwin \
-		--enable-mftalkwin \
-		--enable-regiswin \
-		--enable-tektronixwin \
-		--enable-unitermwin \
-		--with-ps=gs \
-		--disable-psutils \
-		--disable-t1utils \
-		--enable-ipc \
-		--disable-biber \
-		--disable-bibtex-x \
-		--disable-dvipng \
-		--disable-dvipsk \
-		--disable-chktex \
-		--disable-lcdf-typetools \
-		--disable-pdfopen \
-		--disable-ps2eps \
-		--disable-ps2pkm \
-		--disable-detex \
-		--disable-ttf2pk2 \
-		--disable-tex4htk \
-		--disable-cjkutils \
-		--disable-xdvik \
-		--disable-xindy \
-		--enable-luatex \
-		--disable-dvi2tty \
-		--disable-dvisvgm \
-		--disable-vlna \
-		--enable-shared \
-		--disable-native-texlive-build \
-		--disable-largefile \
-		$(use_enable xetex) \
-		$(use_enable cjk ptex) \
-		$(use_enable cjk eptex) \
-		$(use_enable cjk uptex) \
-		$(use_enable cjk euptex) \
-		$(use_enable cjk mendexk) \
-		$(use_enable cjk makejvf) \
-		$(use_enable tk texdoctk) \
-		$(use_with X x)
-}
-
-src_compile() {
-	tc-export CC CXX AR RANLIB
-	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist} || die "emake failed"
-
-	cd "${B}"
-	# Mimic updmap --syncwithtrees to enable only fonts installed
-	# Code copied from updmap script
-	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
-		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
-	done > "${T}/updmap_update"
-	{
-		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-	} > "${T}/updmap_update2"
-	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
-		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
-}
-
-src_install() {
-	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
-	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install || die "install failed"
-
-	cd "${B}"
-	dodir /usr/share # just in case
-	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-
-	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
-	# exist. Instead, it is called mf, so we symlink it to please everything.
-	use X || dosym mf /usr/bin/mf-nowin
-
-	docinto texk
-	cd "${B}/texk"
-	dodoc ChangeLog README || die "failed to install texk docs"
-
-	docinto dviljk
-	cd "${B}/texk/dviljk"
-	dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
-
-	docinto makeindexk
-	cd "${B}/texk/makeindexk"
-	dodoc ChangeLog NOTES README || die "failed to install makeindexk docs"
-
-	docinto web2c
-	cd "${B}/texk/web2c"
-	dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
-
-	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
-	# populate /etc/texmf
-	keepdir /etc/texmf/web2c
-
-	# take care of updmap.cfg and language.d files
-	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
-	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
-	# Remove bundled and invalid updmap.cfg
-	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
-
-	texlive-common_handle_config_files
-
-	keepdir /usr/share/texmf-site
-
-	# the virtex symlink is not installed
-	# The links has to be relative, since the targets
-	# is not present at this stage and MacOS doesn't
-	# like non-existing targets
-	dosym tex /usr/bin/virtex
-	dosym pdftex /usr/bin/pdfvirtex
-
-	# Rename mpost to leave room for mplib
-	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
-	dosym "mpost-${P}" /usr/bin/mpost
-
-	# Ditto for pdftex
-	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
-	dosym "pdftex-${P}" /usr/bin/pdftex
-}
-
-pkg_postinst() {
-	etexmf-update
-
-	elog
-	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
-	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
-	elog
-	ewarn "If you are migrating from an older TeX distribution"
-	ewarn "Please make sure you have read:"
-	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
-	ewarn "in order to avoid possible problems"
-	elog
-	elog "TeXLive has been split in various ebuilds. If you are missing a"
-	elog "package to process your TeX documents, you can install"
-	elog "dev-tex/texmfind to easily search for them."
-	elog
-}
--- a/app-text/texlive-core/texlive-core-2015.ebuild
+++ b/app-text/texlive-core/texlive-core-2015.ebuild
@ -1,347 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-PATCHLEVEL="51"
-TL_SOURCE_VERSION=20150521
-
-inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
-
-# Fetch patches
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
-#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_CORE_BINEXTRA_MODULES="
-	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
-	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
-	fragmaster hyphenex installfont lacheck latex-git-log latex2man
-	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext
-	match_parens mkjobtexmf patgen pdfcrop pdftools pfarrei pkfix pkfix-helper
-	purifyeps seetexk sty2dtx synctex texcount texdef texdiff texdirflatten
-	texdoc texliveonfly texloganalyser texware tie tpic2pdftex typeoutfileinfo
-	web collection-binextra
-	"
-TL_CORE_BINEXTRA_DOC_MODULES="
-	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
-	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
-	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
-	installfont.doc	latex-git-log.doc latex2man.doc latexfileversion.doc
-	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
-	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
-	pfarrei.doc pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
-	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
-	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
-	typeoutfileinfo.doc web.doc
-	"
-TL_CORE_BINEXTRA_SRC_MODULES="
-	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
-	pfarrei.source texdef.source
-	"
-
-TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk X doc source tk +luajittex xetex"
-
-TEXMF_PATH=/usr/share/texmf-dist
-
-MODULAR_X_DEPEND="X? (
-				x11-libs/libXmu
-				x11-libs/libXp
-				x11-libs/libXpm
-				x11-libs/libXaw
-	)"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
-	!app-text/ptex
-	!app-text/tetex
-	!<app-text/texlive-2007
-	!app-text/xetex
-	!<dev-texlive/texlive-basic-2014
-	!<dev-texlive/texlive-metapost-2011
-	!app-text/dvibook
-	!dev-tex/luatex
-	!app-text/dvipdfm
-	!app-text/dvipdfmx
-	!app-text/xdvipdfmx
-	sys-libs/zlib
-	>=media-libs/libpng-1.2.43-r2:0=
-	>=app-text/poppler-0.12.3-r3:=
-	>=x11-libs/cairo-1.12
-	>=x11-libs/pixman-0.18
-	dev-libs/zziplib
-	app-text/libpaper
-	dev-libs/gmp:0
-	dev-libs/mpfr:0
-	xetex? (
-		>=media-libs/harfbuzz-0.9.20[icu,graphite]
-		>=dev-libs/icu-50:=
-		>=app-text/teckit-2.5.3
-		media-libs/fontconfig
-		media-gfx/graphite2
-	)
-	media-libs/freetype:2
-	>=dev-libs/kpathsea-6.2.1
-	cjk? ( >=dev-libs/ptexenc-1.3.3_p20150521 )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-apps/ed
-	sys-devel/flex
-	app-arch/xz-utils"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ps2pkm-1.7_p20150521
-	>=app-text/dvipsk-5.995_p20150521
-	>=dev-tex/bibtexu-3.71_p20150521
-	virtual/perl-Getopt-Long
-	tk? ( dev-perl/Tk )"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die "failed to create build dir"
-}
-
-RELOC_TARGET=texmf-dist
-
-src_prepare() {
-	cd "${WORKDIR}"
-	# From texlive-module.eclass.
-	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
-	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
-	for i in $(<"${T}/dirlist"); do
-		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
-	done
-	for i in $(<"${T}/reloclist"); do
-		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
-	done
-
-	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
-	cd "${B}"
-	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	sed -i \
-		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
-		texk/web2c/configure || die
-
-	elibtoolize
-}
-
-src_configure() {
-	# It fails on alpha without this
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #242430
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-	tc-export CC CXX AR RANLIB
-	ECONF_SOURCE="${B}" \
-		econf -C \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${S}" \
-		--with-system-freetype2 \
-		--with-system-zlib \
-		--with-system-libpng \
-		--with-system-xpdf \
-		--with-system-poppler \
-		--with-system-teckit \
-		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
-		--with-system-kpathsea \
-		--with-kpathsea-includes="${EPREFIX}"/usr/include \
-		--with-system-icu \
-		--with-system-ptexenc \
-		--with-system-harfbuzz \
-		--with-system-icu \
-		--with-system-graphite2 \
-		--with-system-cairo \
-		--with-system-pixman \
-		--with-system-zziplib \
-		--with-system-libpaper \
-		--with-system-gmp \
-		--with-system-mpfr \
-		--without-texinfo \
-		--disable-dialog \
-		--disable-multiplatform \
-		--enable-epsfwin \
-		--enable-mftalkwin \
-		--enable-regiswin \
-		--enable-tektronixwin \
-		--enable-unitermwin \
-		--with-ps=gs \
-		--disable-psutils \
-		--disable-t1utils \
-		--enable-ipc \
-		--disable-biber \
-		--disable-bibtex-x \
-		--disable-dvipng \
-		--disable-dvipsk \
-		--disable-chktex \
-		--disable-lcdf-typetools \
-		--disable-pdfopen \
-		--disable-ps2eps \
-		--disable-ps2pk \
-		--disable-detex \
-		--disable-ttf2pk2 \
-		--disable-tex4htk \
-		--disable-cjkutils \
-		--disable-xdvik \
-		--disable-xindy \
-		--enable-luatex \
-		--disable-dvi2tty \
-		--disable-dvisvgm \
-		--disable-vlna \
-		--enable-shared \
-		--disable-native-texlive-build \
-		--disable-largefile \
-		$(use_enable luajittex) \
-		$(use_enable xetex) \
-		$(use_enable cjk ptex) \
-		$(use_enable cjk eptex) \
-		$(use_enable cjk uptex) \
-		$(use_enable cjk euptex) \
-		$(use_enable cjk mendexk) \
-		$(use_enable cjk makejvf) \
-		$(use_enable cjk pmp) \
-		$(use_enable cjk upmp) \
-		$(use_enable tk texdoctk) \
-		$(use_with X x)
-}
-
-src_compile() {
-	tc-export CC CXX AR RANLIB
-	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
-
-	cd "${B}" || die
-	# Mimic updmap --syncwithtrees to enable only fonts installed
-	# Code copied from updmap script
-	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
-		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
-	done > "${T}/updmap_update"
-	{
-		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-	} > "${T}/updmap_update2"
-	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
-		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
-}
-
-src_install() {
-	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
-	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
-
-	cd "${B}" || die
-	dodir /usr/share # just in case
-	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-
-	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
-	# exist. Instead, it is called mf, so we symlink it to please everything.
-	use X || dosym mf /usr/bin/mf-nowin
-
-	docinto texk
-	cd "${B}/texk"
-	dodoc ChangeLog README
-
-	docinto dviljk
-	cd "${B}/texk/dviljk"
-	dodoc ChangeLog README NEWS
-
-	docinto makeindexk
-	cd "${B}/texk/makeindexk"
-	dodoc ChangeLog NOTES README
-
-	docinto web2c
-	cd "${B}/texk/web2c"
-	dodoc ChangeLog NEWS PROJECTS README
-
-	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
-	# populate /etc/texmf
-	keepdir /etc/texmf/web2c
-
-	# take care of updmap.cfg and language.d files
-	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
-	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
-	# Remove bundled and invalid updmap.cfg
-	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
-
-	texlive-common_handle_config_files
-
-	keepdir /usr/share/texmf-site
-
-	# the virtex symlink is not installed
-	# The links has to be relative, since the targets
-	# is not present at this stage and MacOS doesn't
-	# like non-existing targets
-	dosym tex /usr/bin/virtex
-	dosym pdftex /usr/bin/pdfvirtex
-
-	# Rename mpost to leave room for mplib
-	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
-	dosym "mpost-${P}" /usr/bin/mpost
-
-	# Ditto for pdftex
-	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
-	dosym "pdftex-${P}" /usr/bin/pdftex
-}
-
-pkg_postinst() {
-	etexmf-update
-
-	elog
-	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
-	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
-	elog
-	ewarn "If you are migrating from an older TeX distribution"
-	ewarn "Please make sure you have read:"
-	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
-	ewarn "in order to avoid possible problems"
-	elog
-	elog "TeXLive has been split in various ebuilds. If you are missing a"
-	elog "package to process your TeX documents, you can install"
-	elog "dev-tex/texmfind to easily search for them."
-	elog
-}
--- a/app-text/texlive-core/texlive-core-2016-r2.ebuild
+++ b/app-text/texlive-core/texlive-core-2016-r2.ebuild
@ -5,7 +5,7 @@
 EAPI=5

 #TL_UPSTREAM_PATCHLEVEL="1"
-PATCHLEVEL="63"
+PATCHLEVEL="64"
 TL_SOURCE_VERSION=20160523

 inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@ -4,3 +4,4 @@ DIST mongodb-src-r3.0.14.tar.gz 28093922 SHA256 ebbb758ca7ee53e8d25e2410bb7ef616
 DIST mongodb-src-r3.2.11.tar.gz 29113706 SHA256 625eb28fd47b2af63b30343a064de7f42e5265f4c642874ec766ba3643fd80d7 SHA512 8cb63f878d573e2fb2bace57a10d036aebe0cc06e46a3cd5480fb4a8bcd51ac5219c729b5ea85213e0c905906a93780080332fa01dbcd29e01358f5e9051824c WHIRLPOOL fca825400e9ab16e53dfbbd400a9bd87b9a866d56b2a5839ece25b8dbfe55074fa04d40f47c337f67cb3bd3e547b99b4349eeb15a87a9b9659ea0f1a0cc2c526
 DIST mongodb-src-r3.2.12.tar.gz 29178424 SHA256 406ced873a9abe8a3f0f92939bf5374663bac86c72181c80bec144aedf6cd306 SHA512 0c4ddaaddf15d97957faff46dc4a3f79c545cacc8a56dbe1d063778117ba9b645323b0cb7fd054fae805d092b8372c411a82e3370244b7939bda20a65fdb951c WHIRLPOOL 67673788859ea99752f2e0d1d8c7feb40b004efc344a2a589553675be7f9020ed384cb4a9000bb7eee0059105af364a722f17890ea3f0d38508b8d045db7da75
 DIST mongodb-src-r3.4.1.tar.gz 40161375 SHA256 54f475e553827733fb351ee4b03b470297f0d08e0434fbf7e6661705124da97b SHA512 48400f00ed84922b1e734ad915c376a567af2cd32e9cdcc40819fdfbc0a5c2444e4f325b1a541fc21cf87f4d95f9bdcc64bd59eab9d25e75b28732978feda031 WHIRLPOOL 1dce39c7b36b2c1d3760c7c560c1fefde9ea6d780ef1ef8b5db38f3ed8f0aff9a4ae51ab26381d9330c5b3ad3182ed998ae8e2a0ecc85e9347714ffa853d7734
+DIST mongodb-src-r3.4.2.tar.gz 39796167 SHA256 29b60f6c5331fd2ff5242171a65c03e3b47c1ff957fa317bfaa2ddccd8d51b59 SHA512 42f1b946e4be22670a3d79ec5ea359c2c43f0cff6f6329486b2cc797fd57981982544fbce53412ab91eafa3a1fbecb30bc95316cc9405d778b20a270f77df777 WHIRLPOOL 25e512f455661c0e49bde559fb1662e98643e2078c3c1dd7f675524de467741db3091d3868e34c4e470232e1be7e37cf6f032a76d39afee2b673cb8a4c188798
--- a/dev-db/mongodb/mongodb-3.4.2.ebuild
+++ b/dev-db/mongodb/mongodb-3.4.2.ebuild
@ -0,0 +1,190 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+SCONS_MIN_VERSION="2.3.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit eutils flag-o-matic multilib pax-utils scons-utils systemd toolchain-funcs user versionator check-reqs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug kerberos libressl mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3
+	>=dev-libs/boost-1.60[threads(+)]
+	>=dev-libs/libpcre-8.39[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.8
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/gcc-5.3.0:*
+	sys-libs/ncurses
+	sys-libs/readline
+	debug? ( dev-util/valgrind )
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	test? (
+		dev-python/pymongo
+		dev-python/pyyaml
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if [[ ${REPLACING_VERSIONS} < 3.0 ]]; then
+		ewarn "To upgrade from a version earlier than the 3.0-series, you must"
+		ewarn "successively upgrade major releases until you have upgraded"
+		ewarn "to 3.2-series. Then upgrade to 3.4 series."
+	fi
+}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	# Maintainer notes
+	#
+	# --use-system-tcmalloc is strongly NOT recommended:
+	# https://www.mongodb.org/about/contributors/tutorial/build-mongodb-from-source/
+
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	# wiredtiger not supported on 32bit platforms #572166
+	use x86 && scons_opts+=( --wiredtiger=off )
+
+	if use debug; then
+		scons_opts+=( --dbg=on )
+	fi
+
+	if use prefix; then
+		scons_opts+=(
+			--cpppath="${EPREFIX}/usr/include"
+			--libpath="${EPREFIX}/usr/$(get_libdir)"
+		)
+	fi
+
+	if use kerberos; then
+		scons_opts+=( --use-sasl-client )
+	fi
+
+	if use ssl; then
+		scons_opts+=( --ssl )
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-3.4.0-fix-scons.patch"
+	if has_version ">=dev-libs/boost-1.62"; then
+		epatch "${FILESDIR}/${PN}-3.2.10-boost-1.62.patch"
+	fi
+	epatch_user
+}
+
+src_compile() {
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+	escons "${scons_opts[@]}" core tools
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners mongodb:mongodb "${x}"
+	done
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
+	newinitd "${FILESDIR}/${PN/db/s}.initd-r2" ${PN/db/s}
+	newconfd "${FILESDIR}/${PN/db/s}.confd-r2" ${PN/db/s}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+}
+
+pkg_preinst() {
+	# wrt bug #461466
+	if [[ "$(get_libdir)" == "lib64" ]]; then
+		rmdir "${ED}"/usr/lib/ &>/dev/null
+	fi
+}
+
+src_test() {
+	# this one test fails
+	rm jstests/core/repl_write_threads_start_param.js
+
+	./buildscripts/resmoke.py --dbpathPrefix=test --suites core || die "Tests failed"
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 3.0 ${v}; then
+			ewarn "!! IMPORTANT !!"
+			ewarn " "
+			ewarn "${PN} configuration files have changed !"
+			ewarn " "
+			ewarn "Make sure you migrate from /etc/conf.d/${PN} to the new YAML standard in /etc/${PN}.conf"
+			ewarn "  http://docs.mongodb.org/manual/reference/configuration-options/"
+			ewarn " "
+			ewarn "Make sure you also follow the upgrading process :"
+			ewarn "  http://docs.mongodb.org/master/release-notes/3.0-upgrade/"
+			ewarn " "
+			ewarn "MongoDB 3.0 introduces the WiredTiger storage engine."
+			ewarn "WiredTiger is incompatible with MMAPv1 and you need to dump/reload your data if you want to use it."
+			ewarn "Once you have your data dumped, you need to set storage.engine: wiredTiger in /etc/${PN}.conf"
+			ewarn "  http://docs.mongodb.org/master/release-notes/3.0-upgrade/#change-storage-engine-to-wiredtiger"
+			break
+		fi
+	done
+
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.org/manual/release-notes/3.4/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/3.4/#upgrade-procedures"
+}
--- a/dev-db/phpmyadmin/phpmyadmin-4.6.6.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.6.6.ebuild
@ -15,7 +15,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"

 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"

 RDEPEND="
--- a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r3.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r3.ebuild
@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils dotnet flag-o-matic
+
+DESCRIPTION="Library for using System.Drawing with mono"
+HOMEPAGE="http://www.mono-project.com"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
+
+IUSE="cairo"
+
+RDEPEND=">=dev-libs/glib-2.16:2
+	>=media-libs/freetype-2.3.7
+	>=media-libs/fontconfig-2.6
+	>=media-libs/libpng-1.4:0
+	x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXt
+	>=x11-libs/cairo-1.8.4[X]
+	media-libs/libexif
+	>=media-libs/giflib-4.2.3
+	virtual/jpeg:0
+	media-libs/tiff:0
+	!cairo? ( >=x11-libs/pango-1.20 )"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+PATCHES=("${FILESDIR}/${P}-gold.patch"
+	"${FILESDIR}/${PN}-2.10.1-libpng15.patch"
+	"${FILESDIR}/${PN}-2.10.9-giflib-quantizebuffer.patch")
+
+src_prepare() {
+	base_src_prepare
+	sed -i -e 's:ungif:gif:g' configure || die
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	econf 	--disable-dependency-tracking		\
+		--disable-static			\
+		--with-cairo=system			\
+		$(use !cairo && printf %s --with-pango)
+}
+
+src_compile() {
+	emake "$@"
+}
+
+src_install () {
+	emake -j1 DESTDIR="${D}" "$@" install #nowarn
+	dotnet_multilib_comply
+	local commondoc=( AUTHORS ChangeLog README TODO )
+	for docfile in "${commondoc[@]}"
+	do
+		[[ -e "${docfile}" ]] && dodoc "${docfile}"
+	done
+	if [[ "${DOCS[@]}" ]]
+	then
+		dodoc "${DOCS[@]}"
+	fi
+	prune_libtool_files
+}
--- a/dev-dotnet/libgdiplus/libgdiplus-4.2-r3.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-4.2-r3.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Library for using System.Drawing with mono"
+HOMEPAGE="http://www.mono-project.com"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.gz"
+
+IUSE="cairo"
+
+RDEPEND=">=dev-libs/glib-2.2.3:2
+	>=media-libs/freetype-2.3.7
+	>=media-libs/fontconfig-2.6
+	>=media-libs/libpng-1.4:0
+	x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXt
+	>=x11-libs/cairo-1.8.4[X]
+	media-libs/libexif
+	>=media-libs/giflib-5.1.2
+	virtual/jpeg:0
+	media-libs/tiff:0
+	!cairo? ( >=x11-libs/pango-1.20 )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-static \
+		$(usex cairo "" "--with-pango")
+}
+
+src_install () {
+	default
+
+	dotnet_multilib_comply
+	local commondoc=( AUTHORS ChangeLog README TODO )
+	for docfile in "${commondoc[@]}"; do
+		[[ -e "${docfile}" ]] && dodoc "${docfile}"
+	done
+	[[ "${DOCS[@]}" ]] && dodoc "${DOCS[@]}"
+	prune_libtool_files
+}
--- a/dev-lang/php/php-5.6.30.ebuild
+++ b/dev-lang/php/php-5.6.30.ebuild
@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"

 SLOT="$(get_version_component_range 1-2)"
-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"

 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2"
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@ -10,4 +10,7 @@ DIST rustc-1.12.1-x86_64-unknown-linux-gnu.tar.gz 47642897 SHA256 a753e3b6cfa841
 DIST rustc-1.13.0-i686-unknown-linux-gnu.tar.gz 36766826 SHA256 e4b04e396533296b0b9fddecb25cf5cd0667dc764a2e6db9cb081cc62ca19602 SHA512 d9a85e114c174a8fb2ae3e55ed17fa882323875512bab380ac3d0f5b251702dd6d4aa90119fcc4b22cbfef1a221e2fcbedd4e33eb1ab31289a18562ab73da159 WHIRLPOOL ccd3e08a5770529d37a5842e011a0b88e2507b416e1e93ac3e4b7dcf54fb03630f46298a2e739686908660231f35330eeb2cc4f7aef1608c72cd6622ac9ad69c
 DIST rustc-1.13.0-src.tar.gz 27483805 SHA256 ecb84775ca977a5efec14d0cad19621a155bfcbbf46e8050d18721bb1e3e5084 SHA512 6d2983c28834165139b06b9f1bdc909c35814b32500072f5265a53360f7ca54f3a34a1e463a1c0ce58ffd0d3d7c3cb5b1b4ddcb24a374e2279fbbdc30b03d992 WHIRLPOOL 51f9563fcc2cb352cf0f814002da5d35bf83e22c448b965a4eb041de636671ddb982e766582c2577c6c17eec45014c05d89b1c11cd7b7180a18c44939cced435
 DIST rustc-1.13.0-x86_64-unknown-linux-gnu.tar.gz 34881955 SHA256 0b092ba6750be89aad32b231ad9c625a11b040fae3cad5aa3ef32aaf213332d4 SHA512 c7d3177ed25ba80cdaaafa7c3d238bd24e548e2f0f6e00d1ef1dbaf7afa4809def6bd893cc4a607c0e1973fc68e82dc9342fc6a84f77bd8e47d1c547bd0adcfb WHIRLPOOL f292b3bdb25b85533dc7adc41957344f747bdf99f2d9d90f70b8a00f3c052abe79ab97c313d803f98a709b85c76685ad90693c715d893efb9a272dbe6f628df9
+DIST rustc-1.14.0-i686-unknown-linux-gnu.tar.gz 51391277 SHA256 52b7df5025c302d82f0572fbdc74309334bad36e796c4a2fdf934abe2e5e23ac SHA512 4a951439d8c001b8ff2f6aa2f505e23130209494026fdacea019aef05bebb2f0d3404df047ccedbe9f4140cb5163404db22a5b0977752c495fc45f739d1252fb WHIRLPOOL 881f1a042568d55a3826f629ddd04642dbbfa3a7f423bb3c1d4e1d4e73fa31fe34c708b718b5d44cdd34cc71f99243de98f1478d880ff5804375bbc33ff4766e
 DIST rustc-1.14.0-src.tar.gz 27572650 SHA256 c790edd2e915bd01bea46122af2942108479a2fda9a6f76d1094add520ac3b6b SHA512 3d7ea4ed29ade247a40e586b1966752af508f2d93fb6695027189f4fe012af910dc2ad554acf3a661134a4371c9699fc0e04fae1dcf8f2f49691797b5c9ed356 WHIRLPOOL 9486f51ef29b22cc7f0af1ae4bf9b080497aa8506958f0098441274907e723f24f172c9d675118d23d5f7a5f80b54bcdf4a039c381fc797b45d111178f7540c1
+DIST rustc-1.14.0-x86_64-unknown-linux-gnu.tar.gz 49370951 SHA256 0eeec4211aa872f24c220200a0c2b095bbfc9c0f737c1c5df2555967c8f36787 SHA512 da33a8c509d3a554bed3173f8cdd6fc3639646e5b12eae80654d83290160227238c6f9ff9c0247d63a90f48eeafc8dc31a4a02575ba43fa6d5f75ae58a347c32 WHIRLPOOL a5aa3eb98b0b6b080057a4c5ffb00996904d3a6bb660297a984205f85e9fd6932f9e9c6c4d4fe60a8ca16a216304ab6e504a45b75b876408a8f3450f29872332
+DIST rustc-1.15.0-src.tar.gz 27560549 SHA256 f655e4fac9c2abb93eb579e29c408e46052c0e74b7655cd222c63c6743457673 SHA512 d77ad7838ec8788f64da61ffab6d6a5415c76e825a7563ce0e94fa2c7081277499e80004562b81fc07dda53d35a0c6f48d80dfd4442fa839b20c2ad863bffe8c WHIRLPOOL a3ee07dd7dd0c959a3f6ff27c4099125b7fc1a03f651463396730c092316ae88f61cd454f4020a5cb7e1727a2ac20e6b02056c9225d0f7f3a4ed1a4ef29832af
--- a/dev-lang/rust/rust-1.15.0.ebuild
+++ b/dev-lang/rust/rust-1.15.0.ebuild
@ -0,0 +1,154 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 versionator toolchain-funcs
+
+if [[ ${PV} = *beta* ]]; then
+	betaver=${PV//*beta}
+	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+	MY_P="rustc-beta"
+	SLOT="beta/${PV}"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.gz"
+	KEYWORDS=""
+else
+	ABI_VER="$(get_version_component_range 1-2)"
+	SLOT="stable/${ABI_VER}"
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+CARGO_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
+STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
+RUST_STAGE0_amd64="rustc-${STAGE0_VERSION}-x86_64-unknown-linux-gnu"
+RUST_STAGE0_x86="rustc-${STAGE0_VERSION}-i686-unknown-linux-gnu"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="http://www.rust-lang.org/"
+
+SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
+	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz )
+	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz )
+"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="clang debug doc libcxx +system-llvm"
+REQUIRED_USE="libcxx? ( clang )"
+
+RDEPEND="libcxx? ( sys-libs/libcxx )
+	system-llvm? ( >=sys-devel/llvm-3.8.1-r2
+		<sys-devel/llvm-3.10.0 )
+"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-lang/perl-5.0
+	clang? ( sys-devel/clang )
+"
+
+PDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+	>=dev-util/cargo-${CARGO_VERSION}"
+
+S="${WORKDIR}/${MY_P}-src"
+
+src_prepare() {
+	find mk -name '*.mk' -exec \
+		 sed -i -e "s/-Werror / /g" {} \; || die
+
+	default
+}
+
+src_configure() {
+	export CFG_DISABLE_LDCONFIG="notempty"
+
+	local stagename="RUST_STAGE0_${ARCH}"
+	local stage0="${!stagename}"
+
+	"${ECONF_SOURCE:-.}"/configure \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)/${P}" \
+		--mandir="${EPREFIX}/usr/share/${P}/man" \
+		--release-channel=${SLOT%%/*} \
+		--disable-manage-submodules \
+		--disable-rustbuild \
+		--default-linker=$(tc-getBUILD_CC) \
+		--default-ar=$(tc-getBUILD_AR) \
+		--python=${EPYTHON} \
+		--disable-rpath \
+		--enable-local-rust \
+		--local-rust-root="${WORKDIR}/${stage0}/rustc" \
+		$(use_enable clang) \
+		$(use_enable debug) \
+		$(use_enable debug llvm-assertions) \
+		$(use_enable !debug optimize) \
+		$(use_enable !debug optimize-cxx) \
+		$(use_enable !debug optimize-llvm) \
+		$(use_enable !debug optimize-tests) \
+		$(use_enable doc docs) \
+		$(use_enable libcxx libcpp) \
+		$(usex system-llvm "--llvm-root=${EPREFIX}/usr" " ") \
+		|| die
+}
+
+src_compile() {
+	emake VERBOSE=1
+}
+
+src_install() {
+	unset SUDO_USER
+
+	default
+
+	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
+	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
+	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
+
+	dodoc COPYRIGHT
+
+	dodir "/usr/share/doc/rust-${PV}/"
+	mv "${D}/usr/share/doc/rust"/* "${D}/usr/share/doc/rust-${PV}/" || die
+	rmdir "${D}/usr/share/doc/rust/" || die
+
+	cat <<-EOF > "${T}"/50${P}
+	LDPATH="/usr/$(get_libdir)/${P}"
+	MANPATH="/usr/share/${P}/man"
+	EOF
+	doenvd "${T}"/50${P}
+
+	cat <<-EOF > "${T}/provider-${P}"
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	EOF
+	dodir /etc/env.d/rust
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update --if-unset
+
+	elog "Rust installs a helper script for calling GDB now,"
+	elog "for your convenience it is installed under /usr/bin/rust-gdb-${PV}."
+
+	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+
+	if has_version 'app-shells/zsh'; then
+		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust unset --if-invalid
+}
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@ -1,5 +1,3 @@
-DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731 SHA512 e65c7f66254eae22deaa67bf621ebd1d7af897b93d93ba6cffaa4ce9894cf14c140e6888d877b6b36fcea8be1b8d1ef4fcc7ec1719bd23b1cc6fd662876c70ae WHIRLPOOL 20254678a86595353058ee8dc81a02e4ae7bb16ba9ba34e036fe2e99d3fffa25c825f8961bdeb5fa50c49582ce37e65684e414631c74653c4523c2baee34c341
-DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f SHA512 4452b741382194d4ca425f084fa60e1a9e30040ac2e839c9136047d0461cf4b1ebcc16aac4e65998d1b9329ead8f617966b3d09317a83634f14d556a7e14b7a8 WHIRLPOOL 478957ce8e49228d022bae50b042cdfc6d522d0d4880a0328b5695471295450c81c5e186e1760e56e317a4c4c95aabc5f2010d7a9b912fc451d04e14610e7dca
 DIST glib-2.44.1.tar.xz 7132940 SHA256 8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07 SHA512 c24d307408e061b2657f7e7d1b8245c55605ebda26ee2dcc3497ee9d90bfc137d8e5f42f0cd5acf4b49ea28c424fa901e81f75ecf81833f6d0fe51d5e36e5888 WHIRLPOOL 6a1eef94b3ffed4d5cb551f4def6859ddff8ea0aac50048e706863f2bd4957c40b7034946852fa4604a109eb121c55b94ec51b3708a325ace5692f61fd1babb7
 DIST glib-2.48.2.tar.xz 6408644 SHA256 f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4 SHA512 2eac104eb2207d0a6488992e48069a34b417f51e141364f281ab7b0953a6de88be177b1c694dd9464a856c9a5d8021e3cf0193a8d9c5aaf6ea11f1f9ff743c43 WHIRLPOOL cba211000d5597e93d01113e5f2b6736e47f4daa00935a53af182b3304fef9a1ac25f78995c7a53cc1234261433a1bbd1ec751c87b556845a15da720af5b971b
 DIST glib-2.50.2.tar.xz 7582312 SHA256 be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5 SHA512 63d7b5ece8d7d15b10e06ef10a8e0a4446f30a8d9c97daa3352ec00dfef622728bd42ed24cbf67e553166a0f9e29a3e3d024d1d085b9804fd67608db438b6771 WHIRLPOOL f7a005c0ad0edd0a9010aec60c4df907f79c45948b7bb583d70c378557c2a2f63383ebbaded9074b319a669bdf0532d78ce41a4f98d80d53a3a151a4a69be2a2
--- a/dev-libs/glib/files/glib-1.2.10-automake-1.13.patch
+++ b/dev-libs/glib/files/glib-1.2.10-automake-1.13.patch
@ -1,23 +0,0 @@
-Replace macros deprecated in automake-1.13; fixed upstream in glib-2.36
-
-diff --git a/configure.in b/configure.in
-index e94cc77..d88d834 100644
--- a/configure.in
-+++ b/configure.in
-@@ -60,7 +60,7 @@ PACKAGE=glib
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
- 
- # Specify a configuration file
-AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION)
- AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION)
-@@ -151,7 +151,6 @@ AC_DEFINE_UNQUOTED(G_COMPILED_WITH_DEBUGGING, "${enable_debug}")
- 
- # Checks for programs.
- AC_PROG_CC
-AM_PROG_CC_STDC
- AC_PROG_INSTALL
- 
- changequote(,)dnl
--- a/dev-libs/glib/files/glib-1.2.10-automake.patch
+++ b/dev-libs/glib/files/glib-1.2.10-automake.patch
@ -1,29 +0,0 @@
-fix errors with newer automake:
-
-gmodule/Makefile.am:44: testgmodule_LDFLAGS must be set with `=' before using `+='
-
-Makefile.am:73: BUILT_SOURCES multiply defined in condition TRUE ...
-Makefile.am:11: ... `BUILT_SOURCES' previously defined here
-
--- Makefile.am
-+++ Makefile.am
-@@ -70,7 +70,7 @@
- 
- CONFIGURE_DEPENDENCIES = acglib.m4		
- 
-BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
-+BUILT_SOURCES += stamp-gc-h #note: not glibconfig.h
- glibconfig.h: stamp-gc-h
- 	@:
- stamp-gc-h: config.status
--- gmodule/Makefile.am
-+++ gmodule/Makefile.am
-@@ -41,7 +41,7 @@
- libgplugin_b_la_LIBADD = @G_MODULE_LIBS@  $(libglib)
- 
- noinst_PROGRAMS = testgmodule
-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
-+testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
- testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
- 
- .PHONY: files release
--- a/dev-libs/glib/files/glib-1.2.10-configure-LANG.patch
+++ b/dev-libs/glib/files/glib-1.2.10-configure-LANG.patch
@ -1,44 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
-option parsing, it may break.
-
-http://bugs.gentoo.org/133679
-
--- configure
-+++ configure
-@@ -54,6 +54,19 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
-+do
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+    eval $as_var=C; export $as_var
-+  else
-+    unset $as_var
-+  fi
-+done
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -452,16 +463,6 @@
-   esac
- done
- 
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.
--- a/dev-libs/glib/files/glib-1.2.10-gcc34-fix.patch
+++ b/dev-libs/glib/files/glib-1.2.10-gcc34-fix.patch
@ -1,41 +0,0 @@
--- glib-1.2.10/gstrfuncs.c.orig	2001-02-27 07:00:22.000000000 +0100
-+++ glib-1.2.10/gstrfuncs.c	2004-03-01 13:19:49.531603760 +0100
-@@ -867,7 +867,7 @@
-                   /* beware of positional parameters
-                    */
-                 case '$':
-                  g_warning (G_GNUC_PRETTY_FUNCTION
-+                  g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
-                              "(): unable to handle positional parameters (%%n$)");
-                   len += 1024; /* try adding some safety padding */
-                   break;
-@@ -1034,7 +1034,7 @@
-                   /*          n   .   dddddddddddddddddddddddd   E   +-  eeee */
-                   conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4;
-                   if (spec.mod_extra_long)
-                    g_warning (G_GNUC_PRETTY_FUNCTION
-+                    g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
-                                "(): unable to handle long double, collecting double only");
- #ifdef HAVE_LONG_DOUBLE
- #error need to implement special handling for long double
-@@ -1077,7 +1077,7 @@
-                   conv_done = TRUE;
-                   if (spec.mod_long)
-                     {
-                      g_warning (G_GNUC_PRETTY_FUNCTION
-+                      g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
-                                  "(): unable to handle wide char strings");
-                       len += 1024; /* try adding some safety padding */
-                     }
-@@ -1108,9 +1108,8 @@
-                   conv_len += format - spec_start;
-                   break;
-                 default:
-                  g_warning (G_GNUC_PRETTY_FUNCTION
-                             "(): unable to handle `%c' while parsing format",
-                             c);
-+                  g_warning ("%s(): unable to handle `%c' while parsing format",
-+                             G_GNUC_PRETTY_FUNCTION, c);
-                   break;
-                 }
-               conv_done |= conv_len > 0;
--- a/dev-libs/glib/files/glib-1.2.10-m4.patch
+++ b/dev-libs/glib/files/glib-1.2.10-m4.patch
@ -1,9 +0,0 @@
-Fix aclocal warning:
-/usr/share/aclocal/glib.m4:8: warning: underquoted definition of AM_PATH_GLIB
--- glib-1.2.10/glib.m4
-+++ glib-1.2.10/glib.m4
-@@ -7,3 +7,3 @@
- dnl
-AC_DEFUN(AM_PATH_GLIB,
-+AC_DEFUN([AM_PATH_GLIB],
- [dnl 
--- a/dev-libs/glib/glib-1.2.10-r6.ebuild
+++ b/dev-libs/glib/glib-1.2.10-r6.ebuild
@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GNOME_TARBALL_SUFFIX="gz"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 libtool flag-o-matic portability multilib-minimal
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	 mirror://gentoo/glib-1.2.10-r1-as-needed.patch.bz2
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="hardened static-libs"
-
-DEPEND=""
-RDEPEND=""
-
-MULTILIB_CHOST_TOOLS=(/usr/bin/glib-config)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-automake.patch
-	epatch "${FILESDIR}"/${P}-m4.patch
-	epatch "${FILESDIR}"/${P}-configure-LANG.patch #133679
-
-	# Allow glib to build with gcc-3.4.x #47047
-	epatch "${FILESDIR}"/${P}-gcc34-fix.patch
-
-	# Fix for -Wl,--as-needed (bug #133818)
-	epatch "${DISTDIR}"/glib-1.2.10-r1-as-needed.patch.bz2
-
-	# build failure with automake-1.13
-	epatch "${FILESDIR}/${P}-automake-1.13.patch"
-
-	use ppc64 && use hardened && replace-flags -O[2-3] -O1
-	sed -i "/libglib_la_LDFLAGS/i libglib_la_LIBADD = $(dlopen_lib)" Makefile.am || die
-
-	rm -f acinclude.m4 #168198
-
-	mv configure.in configure.ac || die
-
-	eautoreconf
-	elibtoolize
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# Bug 48839: pam fails to build on ia64
-	# The problem is that it attempts to link a shared object against
-	# libglib.a; this library needs to be built with -fPIC.  Since
-	# this package doesn't contain any significant binaries, build the
-	# whole thing with -fPIC (23 Apr 2004 agriffis)
-	append-flags -fPIC
-	append-cflags -std=gnu89
-
-	ECONF_SOURCE="${S}" \
-	gnome2_src_configure \
-		--with-threads=posix \
-		--enable-debug=yes \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-
-	chmod 755 "${ED}"/usr/$(get_libdir)/libgmodule-1.2.so.* || die
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dohtml -r docs
-}
--- a/dev-libs/icu/icu-58.1-r1.ebuild
+++ b/dev-libs/icu/icu-58.1-r1.ebuild
@ -39,7 +39,7 @@ pkg_pretend() {
 	if tc-is-gcc ; then
 		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
 			|| $(gcc-major-version) -lt 4 ]] ; then
-				die "You need at least sys-devel/gcc-4.8.3"
+				die "You need at least sys-devel/gcc-4.9"
 		fi
 	fi
 }
@ -75,7 +75,7 @@ src_configure() {
 	if tc-is-gcc ; then
 		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
 			|| $(gcc-major-version) -lt 4 ]] ; then
-				die "You need at least sys-devel/gcc-4.8.3"
+				die "You need at least sys-devel/gcc-4.9"
 		fi
 	fi

--- a/dev-libs/icu/icu-58.2.ebuild
+++ b/dev-libs/icu/icu-58.2.ebuild
@ -39,7 +39,7 @@ pkg_pretend() {
 	if tc-is-gcc ; then
 		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
 			|| $(gcc-major-version) -lt 4 ]] ; then
-				die "You need at least sys-devel/gcc-4.8.3"
+				die "You need at least sys-devel/gcc-4.9"
 		fi
 	fi
 }
@ -75,7 +75,7 @@ src_configure() {
 	if tc-is-gcc ; then
 		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
 			|| $(gcc-major-version) -lt 4 ]] ; then
-				die "You need at least sys-devel/gcc-4.8.3"
+				die "You need at least sys-devel/gcc-4.9"
 		fi
 	fi

--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@ -13,8 +13,11 @@ DIST sbcl-1.3.0-source.tar.bz2 5722767 SHA256 d60caf6a0a495e41fc9e7f6a797e7c4188
 DIST sbcl-1.3.0-x86-64-linux-binary.tar.bz2 9830954 SHA256 e6e801f0cc31fd6a14cf20b983c6ef2be5750225fad221bf9621788c0a0a90c5 SHA512 916fdd1627903b7227a6d5962a2534fa2cd9003f832b975c96d0e11c301d73c7c3225cfd4121f10cbcdde87dcac9079b9a48e6737ba9a3d2c18c484bae3c371d WHIRLPOOL a4372dd59df03e0e0e8d2359799e0580b6829e001c219ef28504cc7db8b3a8ad7429ecdcd36bb72ed5196192d9f66b2854c5b6960cd5f97c31afd758a17c6a67
 DIST sbcl-1.3.11-source.tar.bz2 5790557 SHA256 077a2d98f94c62076bcb4dea715a11975b92d85d8de20f5a0d1c36d280397642 SHA512 07cce0b33f1d41bc208827d228ae356b56165bb55fab72c48973a15a63e2e680aafc16db67d36cc4952f71101faaacafd9660276cd67673314f1699d6a91af82 WHIRLPOOL 0e61c415775c4c11d111d6ae830f8be1611fd1674b23c2fc8fead59277af507adc9c4683b066fde9e3c0dfa52023b850f6714f2ec480901718d452e0f25818bf
 DIST sbcl-1.3.11-x86-64-linux-binary.tar.bz2 9248214 SHA256 9ab2c149b7ba43e7f6237c1a23e3037078db46a83913040958fa08dd6011dba5 SHA512 ffb443f9e3ede2f9dbdc1bf28554bd59ef1fd5ad855465ee10f9835221fde20211188e881be854b4760870b122dfc6c5ad5c8cad1bea613ffb3b6a6f67a36056 WHIRLPOOL 0a34701abd81cdea411ac37e276660e29f43279509bef28600e7084e9ffc525883e18c42338492b0ccb5fb21e85c91726f978aa20a87deeb92e813a15b36d9fa
+DIST sbcl-1.3.12-armhf-linux-binary.tar.bz2 917504 SHA256 d11c5a7cd844e9f275b8c86a76137620ae856f357be822fe6b5c9a9e13edbbb2 SHA512 aa34ab53f5b579ba210a4808649782211f3ee8be7d80e970300822a7d256f818474fcfbed00e17818e0f800fbb80898bed8ac4f4aa9255ac8fd8ed0d4799b78d WHIRLPOOL cb4a5876a0372b9b60d4a47d169a9a0c2886db75badfb94e6ae83b540aba444a5ff126c2f7267e4670fbc806ca14a93e45b5e2e4795a084a3333d4561cae0c67
 DIST sbcl-1.3.12-source.tar.bz2 5795516 SHA256 8039ec01d04baad3ee3ebee7a830757dc488be33ca128f4a0592f8af701759c2 SHA512 2a2969b826dcf9d568204a01546c47af777d5866baa8da809c49ace1655b54cd4c8db1872e322a1d08a4983b0962cc0e2e346816488212709b28867c53233275 WHIRLPOOL 019f5919d2203e1ffde465d460575ad8517e176723d00acc99c6c50bbdd7ee68b90df4c8f10ab63646b0a2f5266a0328182e3c55cbfa9562ef7bac2897011663
 DIST sbcl-1.3.12-x86-64-linux-binary.tar.bz2 9235579 SHA256 6508577bd6a2769a74d7b6fa7885e12932acf7a18736c4df599fc41f1b5db237 SHA512 536710d498f98edc2ca9bd794a09d57b37fab2595d1b8eb2f4c1dff186d262c059b674a7786cf78f8bc4a87dc27dc3f7cc61c21bb826abc8a4e99854742595b0 WHIRLPOOL 41daaff2dbcbe4e4b172ae45c29987eee7aeb4ae37eddfb808cd9cb7600289559f79e8395930e7364fe28b00efdcd947ba951771e6b2724d59759221ec6a63e9
 DIST sbcl-1.3.13-source.tar.bz2 5783599 SHA256 4c6935e4a9022637da95f2aab04d08326762f55a35942b40cb6a4276838c76cc SHA512 c0aac045f19f8f49642027eb37be21bb68b4cdb58895f4adbb92b67d0025ab50dd4eb1725d90c6a4ad592d59395d119623cdff3a2c838b2206efbf1e37d34f4e WHIRLPOOL d4451aa39c9a90c14a2986869915c343bd1397b58bc35910e63dc97284c8190cd071cf45fe704d2cb6185e9e304ae6166ca1fb90456289c3ebaf279e03cd31a3
 DIST sbcl-1.3.13-x86-64-linux-binary.tar.bz2 9103731 SHA256 f92dbcb379f3a35ba13fd75a10912b767e5d8b2b10698413e5a217cea2f49cca SHA512 0e6302e408ea0b05f89c982a1660187cf2054cc65b464e340166c8fea962c4e52960f143cd2393491c60c83f5d90ff828a0807ee7f45bc1213ba5f13a6950c2b WHIRLPOOL 1e25fc22c6cf8725380cbe018d7a4a6875e457ec76428894f00568e8b9d3872ab4fdfee932d151efae5c726aca4161753131029347d5397e5f1dc9a4ea486e76
+DIST sbcl-1.3.14-source.tar.bz2 5784135 SHA256 bf963d58533d839eb76a8028abd17071708d964d5dce07787839cfb6d0d6dcca SHA512 3bcfb27c75864290f47814cdac3c6d0ab7e88fce2fef11062f71993383470bd4f9bc2888314e016a80d3a629d748bf45358261fd320bf67ce55981b2fba42420 WHIRLPOOL 9f2c5460ea604d71eacb8f197782fc2bc9c8d2c974c8e0b06cca56078c2f83cf513c99a4a717d4856316aded939a05146a44a5bcf8d4c314ffdaa970cdc03c6d
+DIST sbcl-1.3.14-x86-64-linux-binary.tar.bz2 9077586 SHA256 84dae89aa4741cac41e163fe9c85b9ab42ff8c2cbdcb31111d60e9019e2d4235 SHA512 0bff8737f389bf59f1fed2d76de32ce977da9c8c685c7f73280eef93428edcc48ca451adc26a305ea31f23507d7c45ffa5893aa4add2418048a1087fab686534 WHIRLPOOL 194a775092a4a035b65126ec6de63c981796e3618ca324d431fa544dbdbaaf3b790574d2e3c6813125ed55ace4b58be0727f2b6f4abffb686e3b773fdc8d3149
 DIST sbcl-1.3.9-armhf-linux-binary.tar.bz2 9161130 SHA256 da2d296a8ab107a7b2e10831836648d882b01193f60269853932af4f63a06571 SHA512 309e2ac7ef9ac95bf751432cf243af0de022c5b21054df2bf4e99da4ff087218af72b0ab3be69214eba3df1b6bbe707cc28840508e960c5d2ed2af0e86de3fdd WHIRLPOOL d2dde314d2b49e4246823032d953bbfe0858f7c69d0445da356426f9c5fac73036b32c1c048cf7f43615fa02707e8e434d8b085942e79d1e2b20f6fcb7e08919
--- a/dev-lisp/sbcl/sbcl-1.3.14.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.3.14.ebuild
@ -0,0 +1,241 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.2.7
+BV_AMD64=1.3.14
+BV_PPC=1.2.7
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=1.3.12
+BV_ARM64=1.3.11
+BV_PPC_MACOS=1.0.47
+BV_X86_MACOS=1.1.6
+BV_X64_MACOS=1.2.11
+BV_SPARC_SOLARIS=1.0.23
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
+	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )
+	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
+	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.1:="
+DEPEND="${CDEPEND}
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		pax_kernel? ( sys-apps/elfix )"
+RDEPEND="${CDEPEND}
+		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zlib)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-* sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/gentoo-fix_install_man.patch
+	# bug #468482
+	eapply "${FILESDIR}"/concurrency-test-1.2.6.patch
+	# bugs #486552, #527666, #517004
+	eapply "${FILESDIR}"/bsd-sockets-test-1.3.12.patch
+	# bugs #560276, #561018
+	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
+
+	eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
+	eapply "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch
+
+	# To make the hardened compiler NOT compile with -fPIE -pie
+	if gcc-specs-pie ; then
+		einfo "Disabling PIE..."
+		eapply "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
+	fi
+
+	eapply_user
+
+	# bug #526194
+	sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \
+		-e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+	# change location of /etc/sbclrc ...
+	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	strip-unsupported-flags ; filter-flags -fomit-frame-pointer
+
+	if use pax_kernel ; then
+		# To disable PaX on hardened systems
+		pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+		# Hack to disable PaX on second GENESIS stage
+		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
+			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
+	fi
+
+	# clear the environment to get rid of non-ASCII strings, see bug 174702
+	# set HOME for paludis
+	env - HOME="${T}" PATH="${PATH}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# bug #517008
+	pax-mark -mr "${D}"/usr/bin/sbcl
+
+	# rm empty directories lest paludis complain about this
+	find "${ED}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dodoc -r doc/internals/sbcl-internals
+
+		doinfo doc/manual/*.info*
+		doinfo doc/internals/sbcl-internals.info
+
+		docinto internals-notes
+		dodoc doc/internals-notes/*
+	else
+		rm -Rv "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}
--- a/dev-ml/eliom/Manifest
+++ b/dev-ml/eliom/Manifest
@ -1 +1,2 @@
 DIST eliom-6.1.0.tar.gz 722881 SHA256 cc27c90dfae92db69f23c9d1301d67433d71c7b8d83cba7253dd7d9c41728dbc SHA512 ab389e8023de952f371209c5fe6863240214af559c4ae883dc9d3dc9f353afcc8e38292974c8c0a05c65213fe7dc0b350580c5c8647bba679a5ec0c44859621e WHIRLPOOL e4eeacc566db899ffbaab8dd58bf81dbb49ed18b27e4285669e809bc05232a4b212e0422e33580d40dbf1ec18f236e65ab09f790211693bfbf5882d269ea5137
+DIST eliom-6.2.0.tar.gz 724359 SHA256 bda9ab348fb7a6a45f69e908bdc0ae2752b11a2dc199059b0dcd342a50a28405 SHA512 02ea52c78470f222297dd9f82218e82427ea2d2d0c9f261d1a9c2decbe7644c0bf583b77b8cef2577d5662d363efd276755f400e7a4c29c89a2265e49ca850db WHIRLPOOL f90b6a2b5d2e13d13164ae2b20200566bd44b2d68db9eb7d79e76ca27448cfe2b23bc57618a83368d587b268315fff2dd154fbb501a6ce0beda49d28d8b3dbec
--- a/dev-ml/eliom/eliom-6.2.0.ebuild
+++ b/dev-ml/eliom/eliom-6.2.0.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib findlib
+
+DESCRIPTION="A web framework to program client/server applications"
+HOMEPAGE="http://ocsigen.org/eliom/"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/ocsigen/eliom"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ocsigen/eliom/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+IUSE="doc +ocamlopt +ppx"
+
+RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]
+	>=dev-ml/js_of_ocaml-2.8.2:=
+	>=www-servers/ocsigenserver-2.8:=
+	>=dev-ml/tyxml-4:=
+	>=dev-ml/deriving-0.6:=
+	>=dev-ml/reactiveData-0.2.1:=
+	dev-ml/ocaml-ipaddr:=
+	dev-ml/react:=
+	dev-ml/ocaml-ssl:=
+	>=dev-ml/lwt-2.5.0:=
+	dev-ml/camlp4:=
+	ppx? ( >=dev-ml/ppx_tools-0.99.3:= )"
+DEPEND="${RDEPEND}
+	dev-ml/ocamlbuild
+	dev-ml/opam"
+
+src_compile() {
+	if use ocamlopt ; then
+		emake PPX=$(usex ppx true false) all
+	else
+		emake PPX=$(usex ppx true false) byte
+	fi
+	use doc && emake doc
+	emake man
+}
+
+src_install() {
+	opam-installer \
+		--prefix="${ED}/usr" \
+		--libdir="${D}/$(ocamlc -where)" \
+		--docdir="${ED}/usr/share/doc/${PF}" \
+		--mandir="${ED}/usr/share/man" \
+		|| die
+	dodoc CHANGES README.md
+	if use doc ; then
+		docinto client/html
+		dodoc -r _build/src/lib/client/api.docdir/*
+		docinto server/html
+		dodoc -r _build/src/lib/server/api.docdir/*
+	fi
+}
--- a/dev-ml/findlib/findlib-1.7.1.ebuild
+++ b/dev-ml/findlib/findlib-1.7.1.ebuild
@ -20,11 +20,10 @@ DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
 RDEPEND="${DEPEND}"

-ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
-stublibs="${ocamlfind_destdir}/stublibs"
-
 src_prepare() {
 	epatch "${FILESDIR}/externalmeta4.patch"
+	export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+	export stublibs="${ocamlfind_destdir}/stublibs"
 }

 src_configure() {
--- a/dev-ml/ocsigen-start/Manifest
+++ b/dev-ml/ocsigen-start/Manifest
@ -1 +1,2 @@
 DIST ocsigen-start-0.99.tar.gz 889806 SHA256 18670c3c80a482f7c66342c09f370ffacda8621417ec53eaf9c88bedd8be39e7 SHA512 2ba79409b714053900d747d9cd5a0860760c1c695299b85d3e79666c4c7921b23abd8625f358b6de18477f2ec21dd38080b10ce5f05bdf40373d405e0bb6d3fc WHIRLPOOL a059e7a1b01f87361a5850f819986640c914cd58fd10484d9dd02a3182af4204f1c544b1fc0dc6867bc7210822ed774caeec40a6f258174c0f7f9e24b0663c38
+DIST ocsigen-start-1.0.0.tar.gz 1024594 SHA256 94623cb9927f35542169aaa9a01c2b11ff03369d5a3be0a989acc7347014ec5a SHA512 983253d7732f4b81919aed1f499a8c54d8a82b5595f33f324ad7218a332cdd8eb2de4c0e21f9d54919cc1b35b5dc2b6789a03c7cec11b909340f009e9facb3cf WHIRLPOOL d8ab45e701150404c93f2f8ba79e22b06ff5fa76b933087afd61b4292b7dfd33400ff33a464aaca535aabd4f28d160630fab0b66373a9cfd13cf009e7353c4a6
--- a/dev-ml/ocsigen-start/ocsigen-start-1.0.0.ebuild
+++ b/dev-ml/ocsigen-start/ocsigen-start-1.0.0.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Eliom Base Application with users, (pre)registration, notifications, etc."
+HOMEPAGE="https://github.com/ocsigen/ocsigen-start"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+IUSE=""
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/ocsigen/ocsigen-start"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ocsigen/ocsigen-start/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RDEPEND="dev-lang/ocaml:=
+	dev-ml/pgocaml:=
+	dev-ml/macaque:=
+	dev-ml/ocaml-safepass:=
+	>=dev-ml/eliom-6.2:=
+	dev-ml/ocsigen-toolkit:=
+	dev-ml/ppx_deriving:=
+	dev-ml/yojson:=
+	dev-ml/OCaml-ImageMagick:=
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	findlib_src_preinst
+	DESTDIR="${ED}" OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install
+	dodoc README.md
+}
--- a/dev-ml/ocsigen-start/ocsigen-start-9999.ebuild
+++ b/dev-ml/ocsigen-start/ocsigen-start-9999.ebuild
@ -19,7 +19,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ocsigen/ocsigen-start"
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/ocsigen/ocsigen-start/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/ocsigen/ocsigen-start/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi

@ -27,7 +27,7 @@ RDEPEND="dev-lang/ocaml:=
 	dev-ml/pgocaml:=
 	dev-ml/macaque:=
 	dev-ml/ocaml-safepass:=
-	dev-ml/eliom:=
+	>=dev-ml/eliom-6.2:=
 	dev-ml/ocsigen-toolkit:=
 	dev-ml/ppx_deriving:=
 	dev-ml/yojson:=
--- a/dev-ml/ocsigen-toolkit/Manifest
+++ b/dev-ml/ocsigen-toolkit/Manifest
@ -1 +1,2 @@
 DIST ocsigen-toolkit-0.99.tar.gz 68978 SHA256 fd42765a5f0d9297607160523bb99c4a6b2b6ef25b4c1464b6065bc98caea54b SHA512 a46577b4627a19a85c4f628dc47bfb81ba8da641dcf08e97df02f236e0a328086d8395aa165a9e82b42b3254c7d04f7d763c12cd7495f427a6d681544ad7963b WHIRLPOOL a496e41ec1974c0c841f4e154182a407326884067ffd389a83824b5957fe1f320643856acf422239e67d4a7a5dace1ab1f703c869b87feb6f8c16855cc78ce36
+DIST ocsigen-toolkit-1.0.0.tar.gz 69175 SHA256 427e5e4d11215862dcb012b769aea9e6c63b8799d9bde5076893eea3b575a472 SHA512 4776dcceef822ac63fd6d57ce05e870f726c1e1d137bab239b8558acb4ef55f97b847825f621414334b01d30c066ea986d2b8180b80a09719b5b76cb3bb69a20 WHIRLPOOL 4718049847f3a2e7e219a21ec9f8082d467808791010dac92426c8ec7e70c03783f8de5d2bfba600c27c89c46efac0c07502eb04a7de685fae09030d0000526a
--- a/dev-ml/ocsigen-toolkit/ocsigen-toolkit-1.0.0.ebuild
+++ b/dev-ml/ocsigen-toolkit/ocsigen-toolkit-1.0.0.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="User interface widgets for Ocsigen applications"
+HOMEPAGE="https://github.com/ocsigen/ocsigen-toolkit"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt debug"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/ocsigen/ocsigen-toolkit"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ocsigen/ocsigen-toolkit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RDEPEND="dev-lang/ocaml:=[ocamlopt?]
+	>dev-ml/js_of_ocaml-2.7:=
+	>=dev-ml/eliom-5.1:=[ppx]
+	dev-ml/ppx_deriving:=
+	dev-ml/calendar:=
+	dev-ml/lwt:="
+DEPEND="${RDEPEND}
+	dev-ml/opam"
+
+src_compile() {
+	emake \
+		DEBUG="$(usex debug yes no)" \
+		NATIVE="$(usex ocamlopt yes no)" \
+		all
+}
+
+src_install() {
+	findlib_src_preinst
+	OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install
+	opam-installer -i \
+		--prefix="${ED}/usr" \
+		--libdir="${D}/$(ocamlc -where)" \
+		--docdir="${ED}/usr/share/doc/${PF}" \
+		${PN}.install || die
+	dodoc README.md
+}
--- a/dev-ml/ocsigen-toolkit/ocsigen-toolkit-9999.ebuild
+++ b/dev-ml/ocsigen-toolkit/ocsigen-toolkit-9999.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
 # $Id$

@ -20,7 +20,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ocsigen/ocsigen-toolkit"
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/ocsigen/ocsigen-toolkit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/ocsigen/ocsigen-toolkit/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi

--- a/dev-php/Savant2/Manifest
+++ b/dev-php/Savant2/Manifest
@ -1 +0,0 @@
-DIST Savant2-2.4.3.tgz 42752 SHA256 3b2a5868bb1459827b2458b1b6e117185f1955979d848a5f06b90b0bf663b7b5 SHA512 2392cb830ab8f28cd2a354177ee3f196ffbe504c58d96ed3bc7998b4a9d6fc16f03ef02a36439cf8c35721724e1edfde95d3a7630d9375c8bf7df1b7f2f9856e WHIRLPOOL b1858d145c09263370f2bf0a128963348cb516b015507fc96214ed94b9871d0423768b4d3be0a51955e7fbc54f00e61879b8dd8ffccce520460e6631d27365e0
--- a/dev-php/Savant2/Savant2-2.4.3-r1.ebuild
+++ b/dev-php/Savant2/Savant2-2.4.3-r1.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit php-pear-lib-r1
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="The simple PHP template alternative to Smarty"
-HOMEPAGE="http://phpsavant.com/"
-SRC_URI="http://phpsavant.com/${P}.tgz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
--- a/dev-php/Savant2/metadata.xml
+++ b/dev-php/Savant2/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-php/Savant3-Plugin-Form/Manifest
+++ b/dev-php/Savant3-Plugin-Form/Manifest
@ -1 +0,0 @@
-DIST Savant3_Plugin_Form-0.2.1.tgz 17166 SHA256 10a1570b96a6278e052cb3967382e6268d5ca1e0439122acef3e1fe294021b5e SHA512 372ca80e4d3804b97bf07f96e383b45b6d5198fcb1fce1bfd5e363f534cc1b7745e8a3c6c9bfa77a4d5cc53a86eccfba895040b3825801596a87dadf65a645ee WHIRLPOOL 33b8fa9e29e502b1180dd3236a60da9690ce9c4cc016b2304d244d7ec723674132ff57878686be7f9e67deb164d6dde637d67b25b5a1204d0efbbb6b11f4ae5a
--- a/dev-php/Savant3-Plugin-Form/Savant3-Plugin-Form-0.2.1.ebuild
+++ b/dev-php/Savant3-Plugin-Form/Savant3-Plugin-Form-0.2.1.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit php-pear-lib-r1
-MY_P="${PN//-/_}-${PV}"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="The Form Plugin for Savant3"
-HOMEPAGE="http://phpsavant.com/"
-SRC_URI="http://phpsavant.com/${MY_P}.tgz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-php/Savant3-3.0.0"
-
-S="${WORKDIR}/${MY_P}"
--- a/dev-php/Savant3-Plugin-Form/metadata.xml
+++ b/dev-php/Savant3-Plugin-Form/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-php/Savant3/Manifest
+++ b/dev-php/Savant3/Manifest
@ -1 +0,0 @@
-DIST f3b4b70422bc743168d8e01443abc385d8acbef9.tar.gz 21921 SHA256 514359c8e831523b39b90c546cb09f8724ba2c925ab55b85a42666f403da5cd1 SHA512 77966146aed2a909005f0d103b27bc3b389e5edc63cc4090d8267dec4b42c96f65939752860f3833bb7f2255a9d1e9fc280d593916c9456b2590ccff0324ff89 WHIRLPOOL 260cc264407b0b9bbac7a70f129d13f5211b6181ccddff873a20559e8644624021ee24ef3301151e2cb46cf84f80459e19c93e1546de352b78fb341f9f6b7819
--- a/dev-php/Savant3/Savant3-3.0.1-r1.ebuild
+++ b/dev-php/Savant3/Savant3-3.0.1-r1.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="The simple PHP template alternative to Smarty"
-HOMEPAGE="https://github.com/saltybeagle/Savant3"
-
-# This is the last commit before the Composer integration broke
-# everything.
-COMMIT=f3b4b70422bc743168d8e01443abc385d8acbef9
-SRC_URI="https://github.com/saltybeagle/Savant3/archive/${COMMIT}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="minimal test"
-
-DEPEND="test? ( dev-php/phpunit )"
-RDEPEND="dev-lang/php:*
-	!minimal? ( >=dev-php/Savant3-Plugin-Form-0.2.1 )"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_install() {
-	dodoc README.md
-	insinto /usr/share/php/
-	doins "${PN}.php"
-	doins -r "${PN}"
-}
-
-src_test() {
-	cd tests && phpunit . || die "test suite failed"
-}
-
-pkg_postinst() {
-	elog "${PN} has been installed in /usr/share/php/."
-	elog
-	elog "To use it in your scripts, include the ${PN}.php file."
-	elog "For example,"
-	elog
-	elog "  require('${PN}.php');"
-	elog
-}
--- a/dev-php/Savant3/metadata.xml
+++ b/dev-php/Savant3/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@ -1 +1,2 @@
 DIST click-6.6.tar.gz 283420 SHA256 cc6a19da8ebff6e7074f731447ef7e112bd23adf3de5c597cf9989f2fd8defe9 SHA512 5650cfe6c8b55a7e823e22248964143278d61383dac63497508a864807f1950f9dd5d76ce6a501e589dd81fed6e2a1248d3f8973be25a91950896b7408dc88bc WHIRLPOOL db9f36bb86599599b95ae350659f75f387d15196261acaef1e069769ca8e2f29be8dc3ae5cdd94d8303907f94b90ed00209a3410da863afcce74d393a2f48d3c
+DIST click-6.7.tar.gz 279019 SHA256 f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b SHA512 d454369fe1acb01c2210a61e15f45ac9cc77102c93345257f4ef3090bd8f31f1ccc49d9fd6ea670cddca9f715ad5db29368b4eecd95abff50d1033c4f7a967d6 WHIRLPOOL c85fd3d8dff735eda63ca78cbd7bb09e8bd11e237d681f9d07cc3788e05191c4fc81a05ac813c176ef5966fa3cbd7d4eac0391633d5672b1ace8581663bef7d6
--- a/dev-python/click/click-6.7.ebuild
+++ b/dev-python/click/click-6.7.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package for creating beautiful command line interfaces"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc examples test"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
--- a/dev-python/rfc3987/rfc3987-1.3.7.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.7.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
 # $Id$

@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""

 RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
--- a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r1.ebuild
+++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -23,3 +23,4 @@ RDEPEND="
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/isnan.patch" )
--- a/dev-ros/depthimage_to_laserscan/files/isnan.patch
+++ b/dev-ros/depthimage_to_laserscan/files/isnan.patch
@ -0,0 +1,13 @@
+Index: depthimage_to_laserscan-1.0.7/src/DepthImageToLaserScan.cpp
+===================================================================
+--- depthimage_to_laserscan-1.0.7.orig/src/DepthImageToLaserScan.cpp
+++ depthimage_to_laserscan-1.0.7/src/DepthImageToLaserScan.cpp
+@@ -59,7 +59,7 @@ bool DepthImageToLaserScan::use_point(co
+   
+   // Infs are preferable over NaNs (more information)
+   if(!new_finite && !old_finite){ // Both are not NaN or Inf.
+-    if(!isnan(new_value)){ // new is not NaN, so use it's +-Inf value.
+    if(!std::isnan(new_value)){ // new is not NaN, so use it's +-Inf value.
+       return true;
+     }
+     return false; // Do not replace old_value
--- a/dev-ros/libmavconn/Manifest
+++ b/dev-ros/libmavconn/Manifest
@ -5,3 +5,4 @@ DIST mavros-0.18.2.tar.gz 208727 SHA256 347f88483be19ea8fc7da1ecd32e49874e2eb927
 DIST mavros-0.18.3.tar.gz 209081 SHA256 dfe679d49fe31f25d373c877a8d6656c7eb90274b325715df691ace0d1f98654 SHA512 f4608ca150b21099259559afa264d852e5a066986c3c0bd9b02b327a58b0f5c0bf769f02fadfde3d37292426f4deab263e1f10b850085b47cde76290b08e18df WHIRLPOOL 3d20f8acb3bd5943414543cfb6dc904ff41d20ff248b04664337ddcf7ea8fe026d7a93ad4ac54221a95d553e00d58203cebe9b44c9462d6f79d5e6bace613356
 DIST mavros-0.18.4.tar.gz 212211 SHA256 cd186f9cd014cee6fb53d0fa9bc476cf36e77fe34b0fc682cbc280db5594ca9b SHA512 8012c97118673f17f96257f25416752667254d73e7ad46ef1f857d4948dec6370247078a3b221b11e613a0b6eaf138c3f77f6fc1b5162b3c8b6a63a8b55e2add WHIRLPOOL 66d8e077ce6d5378b9bed7c3470eef774860ae398986b008421e1062b408fbd8f8786ad7ba4101dbb21031a6af2f281f968f4a98051a94536986b56acb2e7812
 DIST mavros-0.18.5.tar.gz 212723 SHA256 9a9ee89f3282f610e80b692839e315ed052ec4d1e92b3961516a8bf3bced547d SHA512 c0a46bac920eb351e8628e9116903e82b7b644d81bdf92064c4f684b6db5423b7db66941de3dae7c6730b08152baba92f457cf24409c877930e960872b553742 WHIRLPOOL 69b3ea6a16ce2276e7ef2980e80139c5d4b6a1ce303225490eb549a64cae94dcbe6823f1903c00f7f183316cae95ca10b83f507eeb54a3c2d83001d3dbb115b2
+DIST mavros-0.18.6.tar.gz 213212 SHA256 124c9f800353ae63b12a097d2a187d19b3d32470b7c787109170e75ad1a531a3 SHA512 bd1549ddc7d9485428b056b0601c2bcc013dcd821c32b843f80bc0321219a6a699383b3d2b08ccf6870c61abc8998790d0efe303f995730a0929b8168b35ed9b WHIRLPOOL d2a5a247064601811403c003e853b365e1ab8595b7b8aeb44f0ba955d71b928cefdce01352d4a817029725071cd7fe96ddbb7f0b3929eb0e732ebb6f2de93a75
--- a/dev-ros/libmavconn/libmavconn-0.18.6.ebuild
+++ b/dev-ros/libmavconn/libmavconn-0.18.6.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink communication library"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/mavlink-gbp-release-2016.7.7
+	dev-libs/boost:=
+	dev-libs/console_bridge
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/mavlink-gbp-release/Manifest
+++ b/dev-ros/mavlink-gbp-release/Manifest
@ -1,2 +1,3 @@
 DIST mavlink-gbp-release-2016.11.11.tar.gz 462247 SHA256 589497d73033965fd1f5cb9894eb5ba790b33893b65c26befc9002185e23bd0d SHA512 e9a7df28a8125c306d4d4755b12866a194470a0cc94608b9d798fbc2c3033ee21f287e285bf74c86b93b4eacbead5ab4e2bad46d81ddbd41714e40fcfd5f64f4 WHIRLPOOL bfec6a897e515eea1176d6e9697b4e9e2d2c99837b93e64bc2ef18e231971e1b217f4ba9dc62fa6d797d2e75bcd51b71692dbe76f5e15b6f61579c87c6ad35b4
 DIST mavlink-gbp-release-2016.7.7.tar.gz 524847 SHA256 927044566f4d5499bb89c0048683af65ee9f2615dbf9ce31f5bad33aac4bb595 SHA512 87a715a08e3467dc2865983ff6e93a34ac01abb11afd20daaedc863b6c22e5fbc3bef0905f301f3fa30d0c370640661e000ee852d1dc23ee37d2b9de461ae295 WHIRLPOOL be7edcbfb1641314237d6c5ae60ece805300ee4c7298e750b3d4dc1859cadf1a7c838d1044d3b9bce1c3c6daa9b18e206e5a93f93ea000b96243f6a30d1cee12
+DIST mavlink-gbp-release-2017.2.7.tar.gz 460082 SHA256 075032116e1eadcd3f9e70e62c61ee80e03b8268b09ee6a7bd69cafb32f44b0d SHA512 07c21a4d80f1d67657cc824bbd46279620008374af48dfa92547e6373cee5a48509fabf269b55911bdb1d63660c5581cb362b7ea469f0ca00317e5d32084b73c WHIRLPOOL 371cc9ce4a86c4c0d2dbc05134f196401fd3917c53768d4c6b2a8c9155c0096c7784712d6b646e020fd8682f4ceda4e82fd9faa0f00bee5e5942143fbd8860e4
--- a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.2.7.ebuild
+++ b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.2.7.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavlink-gbp-release"
+VER_PREFIX=release/kinetic/mavlink/
+VER_SUFFIX=-${PV#*_p}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+EGIT_BRANCH="release/kinetic/mavlink"
+DESCRIPTION="MAVLink message marshaling library"
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${PN}-${EGIT_BRANCH//\//-}"
+PATCHES=( "${FILESDIR}/gentoo.patch" )
--- a/dev-ros/mavros/Manifest
+++ b/dev-ros/mavros/Manifest
@ -1,2 +1,3 @@
 DIST mavros-0.18.4.tar.gz 212211 SHA256 cd186f9cd014cee6fb53d0fa9bc476cf36e77fe34b0fc682cbc280db5594ca9b SHA512 8012c97118673f17f96257f25416752667254d73e7ad46ef1f857d4948dec6370247078a3b221b11e613a0b6eaf138c3f77f6fc1b5162b3c8b6a63a8b55e2add WHIRLPOOL 66d8e077ce6d5378b9bed7c3470eef774860ae398986b008421e1062b408fbd8f8786ad7ba4101dbb21031a6af2f281f968f4a98051a94536986b56acb2e7812
 DIST mavros-0.18.5.tar.gz 212723 SHA256 9a9ee89f3282f610e80b692839e315ed052ec4d1e92b3961516a8bf3bced547d SHA512 c0a46bac920eb351e8628e9116903e82b7b644d81bdf92064c4f684b6db5423b7db66941de3dae7c6730b08152baba92f457cf24409c877930e960872b553742 WHIRLPOOL 69b3ea6a16ce2276e7ef2980e80139c5d4b6a1ce303225490eb549a64cae94dcbe6823f1903c00f7f183316cae95ca10b83f507eeb54a3c2d83001d3dbb115b2
+DIST mavros-0.18.6.tar.gz 213212 SHA256 124c9f800353ae63b12a097d2a187d19b3d32470b7c787109170e75ad1a531a3 SHA512 bd1549ddc7d9485428b056b0601c2bcc013dcd821c32b843f80bc0321219a6a699383b3d2b08ccf6870c61abc8998790d0efe303f995730a0929b8168b35ed9b WHIRLPOOL d2a5a247064601811403c003e853b365e1ab8595b7b8aeb44f0ba955d71b928cefdce01352d4a817029725071cd7fe96ddbb7f0b3929eb0e732ebb6f2de93a75
--- a/dev-ros/mavros/mavros-0.18.6.ebuild
+++ b/dev-ros/mavros/mavros-0.18.6.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink extendable communication node for ROS"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_updater
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/angles
+	dev-ros/libmavconn
+	dev-ros/rosconsole_bridge
+	dev-libs/boost:=
+	dev-ros/eigen_conversions
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/mavros_msgs-0.18.6[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/mavlink-gbp-release-2016.11.11
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/mavros/mavros-9999.ebuild
+++ b/dev-ros/mavros/mavros-9999.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
 # $Id$

@ -26,7 +26,7 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-ros/eigen_conversions
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	>=dev-ros/mavros_msgs-0.18.1[${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/mavros_msgs-0.18.6[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
--- a/dev-ros/mavros_extras/Manifest
+++ b/dev-ros/mavros_extras/Manifest
@ -1,3 +1,4 @@
 DIST mavros-0.18.3.tar.gz 209081 SHA256 dfe679d49fe31f25d373c877a8d6656c7eb90274b325715df691ace0d1f98654 SHA512 f4608ca150b21099259559afa264d852e5a066986c3c0bd9b02b327a58b0f5c0bf769f02fadfde3d37292426f4deab263e1f10b850085b47cde76290b08e18df WHIRLPOOL 3d20f8acb3bd5943414543cfb6dc904ff41d20ff248b04664337ddcf7ea8fe026d7a93ad4ac54221a95d553e00d58203cebe9b44c9462d6f79d5e6bace613356
 DIST mavros-0.18.4.tar.gz 212211 SHA256 cd186f9cd014cee6fb53d0fa9bc476cf36e77fe34b0fc682cbc280db5594ca9b SHA512 8012c97118673f17f96257f25416752667254d73e7ad46ef1f857d4948dec6370247078a3b221b11e613a0b6eaf138c3f77f6fc1b5162b3c8b6a63a8b55e2add WHIRLPOOL 66d8e077ce6d5378b9bed7c3470eef774860ae398986b008421e1062b408fbd8f8786ad7ba4101dbb21031a6af2f281f968f4a98051a94536986b56acb2e7812
 DIST mavros-0.18.5.tar.gz 212723 SHA256 9a9ee89f3282f610e80b692839e315ed052ec4d1e92b3961516a8bf3bced547d SHA512 c0a46bac920eb351e8628e9116903e82b7b644d81bdf92064c4f684b6db5423b7db66941de3dae7c6730b08152baba92f457cf24409c877930e960872b553742 WHIRLPOOL 69b3ea6a16ce2276e7ef2980e80139c5d4b6a1ce303225490eb549a64cae94dcbe6823f1903c00f7f183316cae95ca10b83f507eeb54a3c2d83001d3dbb115b2
+DIST mavros-0.18.6.tar.gz 213212 SHA256 124c9f800353ae63b12a097d2a187d19b3d32470b7c787109170e75ad1a531a3 SHA512 bd1549ddc7d9485428b056b0601c2bcc013dcd821c32b843f80bc0321219a6a699383b3d2b08ccf6870c61abc8998790d0efe303f995730a0929b8168b35ed9b WHIRLPOOL d2a5a247064601811403c003e853b365e1ab8595b7b8aeb44f0ba955d71b928cefdce01352d4a817029725071cd7fe96ddbb7f0b3929eb0e732ebb6f2de93a75
--- a/dev-ros/mavros_extras/mavros_extras-0.18.6.ebuild
+++ b/dev-ros/mavros_extras/mavros_extras-0.18.6.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Extra nodes and plugins for mavros"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_transport
+	dev-ros/cv_bridge
+	dev-ros/mavros
+	dev-ros/roscpp
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/urdf
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/mavros_msgs/Manifest
+++ b/dev-ros/mavros_msgs/Manifest
@ -5,3 +5,4 @@ DIST mavros-0.18.2.tar.gz 208727 SHA256 347f88483be19ea8fc7da1ecd32e49874e2eb927
 DIST mavros-0.18.3.tar.gz 209081 SHA256 dfe679d49fe31f25d373c877a8d6656c7eb90274b325715df691ace0d1f98654 SHA512 f4608ca150b21099259559afa264d852e5a066986c3c0bd9b02b327a58b0f5c0bf769f02fadfde3d37292426f4deab263e1f10b850085b47cde76290b08e18df WHIRLPOOL 3d20f8acb3bd5943414543cfb6dc904ff41d20ff248b04664337ddcf7ea8fe026d7a93ad4ac54221a95d553e00d58203cebe9b44c9462d6f79d5e6bace613356
 DIST mavros-0.18.4.tar.gz 212211 SHA256 cd186f9cd014cee6fb53d0fa9bc476cf36e77fe34b0fc682cbc280db5594ca9b SHA512 8012c97118673f17f96257f25416752667254d73e7ad46ef1f857d4948dec6370247078a3b221b11e613a0b6eaf138c3f77f6fc1b5162b3c8b6a63a8b55e2add WHIRLPOOL 66d8e077ce6d5378b9bed7c3470eef774860ae398986b008421e1062b408fbd8f8786ad7ba4101dbb21031a6af2f281f968f4a98051a94536986b56acb2e7812
 DIST mavros-0.18.5.tar.gz 212723 SHA256 9a9ee89f3282f610e80b692839e315ed052ec4d1e92b3961516a8bf3bced547d SHA512 c0a46bac920eb351e8628e9116903e82b7b644d81bdf92064c4f684b6db5423b7db66941de3dae7c6730b08152baba92f457cf24409c877930e960872b553742 WHIRLPOOL 69b3ea6a16ce2276e7ef2980e80139c5d4b6a1ce303225490eb549a64cae94dcbe6823f1903c00f7f183316cae95ca10b83f507eeb54a3c2d83001d3dbb115b2
+DIST mavros-0.18.6.tar.gz 213212 SHA256 124c9f800353ae63b12a097d2a187d19b3d32470b7c787109170e75ad1a531a3 SHA512 bd1549ddc7d9485428b056b0601c2bcc013dcd821c32b843f80bc0321219a6a699383b3d2b08ccf6870c61abc8998790d0efe303f995730a0929b8168b35ed9b WHIRLPOOL d2a5a247064601811403c003e853b365e1ab8595b7b8aeb44f0ba955d71b928cefdce01352d4a817029725071cd7fe96ddbb7f0b3929eb0e732ebb6f2de93a75
--- a/dev-ros/mavros_msgs/mavros_msgs-0.18.6.ebuild
+++ b/dev-ros/mavros_msgs/mavros_msgs-0.18.6.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for MAVROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
--- a/dev-ros/moveit_msgs/Manifest
+++ b/dev-ros/moveit_msgs/Manifest
@ -1,4 +1,2 @@
-DIST moveit_msgs-0.8.0.tar.gz 17350 SHA256 ab36aa14e1d49950654c25725376080ee8f4d2fef3acd1c4d4efc1c2c462a8a9 SHA512 d5da9e0da603c7437ce5541ae774866000572123c1d292161350a70b835664bf727d92d8cd3edfe29e4134da0c117023c396f34957f9d6b84d958f3804857b7a WHIRLPOOL 19458c30ebcad9a428b297b22af5ab2629b6223d266a02a9d858a69e5e74a25800edbd10ac55ce95000365c54cbf9a4d0b53719abf4a335b19feb50ee2529acf
-DIST moveit_msgs-0.8.1.tar.gz 17589 SHA256 9f1c9a095dfe2da3e95d4cd928187e14b9a40305e456f78ef072cb943683a3d0 SHA512 f1f663d4990ca480133d707701dc8504291b142a27730a41165dc148193f037a4fc7f418649c98d4f2b4e081d33d7c87b33f9f99d07fb9c7a54db27baaabf034 WHIRLPOOL c649d635ecb65d12ef35ecd1e355179bca54be05e36a407603188e19c96cbe07a143ece6478f5ff93986775d616afe2ce325287bcba40db2fb94255a46dc8244
-DIST moveit_msgs-0.8.3.tar.gz 17945 SHA256 ec3d2a6cb4a6cc20120cbe7a1168bb5063771d497b796f3d9a8a1fcea32c73cf SHA512 8f9f71fafcea296c2d6e0e34f623f89dbaa2bdfcde9c83a7b30a2f6d567626c9197a81818242a607e2e3ac926b882938ae7527ab4f37b0e42e144492dd826d58 WHIRLPOOL 732bfea8d1fedde2e4f35e2ec6311d4e2d6fc72ff19510cdc8da63b70abaae51561465a7f17da6fad43ba195bc6e063cf30f657468f994ca489afac041bd09eb
 DIST moveit_msgs-0.9.0.tar.gz 17842 SHA256 970c38221f50be81038c250f3c5a182152115d091ec52c8d202c09683c6a085e SHA512 eedb45fdbd7f0b38e20c0f6bcbcb4c8348b76a412be7c7134a54dc256ddb26f32b2e59294f533c14467be8c978255ea397233f81ceb79c1ee4faa638614f54f7 WHIRLPOOL 4d39c2b9a68a842a39143aaa3d783f7c9569d2170fcb1bae4693e40456413205a35c7276c07244ab6e4503686307d37072f66445666aec8a904291b793aacef0
+DIST moveit_msgs-0.9.1.tar.gz 17760 SHA256 49d5980e1ff4a4fb606eee079632de5360bbee71e8e8897076be5f619add7428 SHA512 af998019a5c1c82a2026c6d2071feb7494616b6eef942450dbb81178f0c393c173ca8b8c17018f6da15b5b0ac438515a762914122ad315572cc5ef25567be758 WHIRLPOOL 446aa78bc35b5a56a576180bd028c2cbc2018304fb20a628e8af64ab3ea2f65f625391d650ae78644f29f27696741e0f502b9644be7c1da0454db66abd89a582
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST restic-0.4.0.tar.gz 22926188 SHA256 746dbc7b73f5a542be57b71714b243266a011f1d750f56f5100c08a59df1aeac SHA512 ccd15f010f8da3bae3d33698e70ff1d9565f52fb56991b78d35f95493417a4ab050021153d81c424947233255d9553d050f7a66e1c709843fe3b2d323a81f85b WHIRLPOOL 94e6b9ed777a86cb6e46cf734b9280e68cc2ce1ea061c8a94409dca594add1ec24fb736a56e35571302ff5043a60bef7f60ff3b39b038ee128bc815f7d3d48cd`
				`@ -1 +0,0 @@`
				`DIST Savant2-2.4.3.tgz 42752 SHA256 3b2a5868bb1459827b2458b1b6e117185f1955979d848a5f06b90b0bf663b7b5 SHA512 2392cb830ab8f28cd2a354177ee3f196ffbe504c58d96ed3bc7998b4a9d6fc16f03ef02a36439cf8c35721724e1edfde95d3a7630d9375c8bf7df1b7f2f9856e WHIRLPOOL b1858d145c09263370f2bf0a128963348cb516b015507fc96214ed94b9871d0423768b4d3be0a51955e7fbc54f00e61879b8dd8ffccce520460e6631d27365e0`
				`@ -1 +0,0 @@`
				`DIST Savant3_Plugin_Form-0.2.1.tgz 17166 SHA256 10a1570b96a6278e052cb3967382e6268d5ca1e0439122acef3e1fe294021b5e SHA512 372ca80e4d3804b97bf07f96e383b45b6d5198fcb1fce1bfd5e363f534cc1b7745e8a3c6c9bfa77a4d5cc53a86eccfba895040b3825801596a87dadf65a645ee WHIRLPOOL 33b8fa9e29e502b1180dd3236a60da9690ce9c4cc016b2304d244d7ec723674132ff57878686be7f9e67deb164d6dde637d67b25b5a1204d0efbbb6b11f4ae5a`
				`@ -1 +0,0 @@`
				`DIST f3b4b70422bc743168d8e01443abc385d8acbef9.tar.gz 21921 SHA256 514359c8e831523b39b90c546cb09f8724ba2c925ab55b85a42666f403da5cd1 SHA512 77966146aed2a909005f0d103b27bc3b389e5edc63cc4090d8267dec4b42c96f65939752860f3833bb7f2255a9d1e9fc280d593916c9456b2590ccff0324ff89 WHIRLPOOL 260cc264407b0b9bbac7a70f129d13f5211b6181ccddff873a20559e8644624021ee24ef3301151e2cb46cf84f80459e19c93e1546de352b78fb341f9f6b7819`