Sync with portage [Fri Sep 9 08:49:51 MSK 2016].

2016-09-09 08:49:51 +03:00 · 2016-09-09 08:49:51 +03:00 · 764cdaed6a
commit 764cdaed6a
parent 2bf0241b81
846 changed files with 4886 additions and 3680 deletions
--- a/app-admin/cli53/Manifest
+++ b/app-admin/cli53/Manifest
@ -1,2 +1 @@
-DIST cli53-0.7.4.tar.gz 3270107 SHA256 3cb89e6aa91676ffd0577798a4b06b056667d18ad836de4fa31c0564ee48474e SHA512 fb0fb7891dacf07b4a34861c6c93d8ab8c177710345cfb6d39feb56892d6b9fa8d39b1d933323a6649e3fefdb941cdc7d4940bbdb7040d41a99ea988c3b976fa WHIRLPOOL a62f999666215540afbd4bfbdc07366a772900520c21fb9e65dbcc7d7da6ea5c0354017c1ff1c1825ba84c777e7c1a07367ac521ce0aedaefe21ca2ec0c52871
-DIST cli53-0.8.0.tar.gz 4365177 SHA256 0a87de05110d9bba851ba3522a1072494256e31fa653f59331313bff21d5c160 SHA512 25094642796dfc13de470b20288b6e801437e826598414af9bbe65d6d1d0a76a5ada2dc4f732043e12d5a4e4b860f824381df04aeb847b0917414f9a3238432c WHIRLPOOL 5e36e8c957f1e6876bbb1834452be1526b62da84dd4ee5ba6273f9ff259e3bcb71c746d5c990346abd8d5914e2ccb887b3e4840a07620abd4ce49dcca7dea79b
+DIST cli53-0.8.2.tar.gz 4368555 SHA256 0a9999f3e40f510d6d6faa01b64cefcd5a3ddeca1f785a25ede568f440d100bf SHA512 968abc5a814fe169d67457435e86761b5499ff2c0138ad7b42e7810e4f369ce464b8b33dc34ce1e75cc52b7190f36ac50baa3f587076b4bb114deac86aac3142 WHIRLPOOL c1e4bbe13cdc08eb67ecf9d73596e5363e19b8617b11667468b2b9b0e94d7570946a099859ab247ed47fe5a0f18e2239b4cb468b5f680a436cdefbd6edeb0429
--- a/app-admin/cli53/cli53-0.7.4.ebuild
+++ b/app-admin/cli53/cli53-0.7.4.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	inherit golang-vcs
-else
-	inherit golang-vcs-snapshot
-	SRC_URI="https://github.com/barnybug/cli53/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Command line tool for Amazon Route 53"
-HOMEPAGE="https://github.com/barnybug/cli53"
-
-LICENSE="MIT"
-SLOT="0"
-
-EGO_PN="github.com/barnybug/cli53"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_compile() {
-	if [[ ${PV} == 9999 ]]; then
-		GOPATH="${WORKDIR}/${P}" emake build
-	else
-		GOPATH="${WORKDIR}/${P}" emake build version=${PV}
-	fi
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}" go test -v || die
-}
-
-src_install() {
-	dobin cli53
-	dodoc CHANGELOG.md README.md
-}
--- a/app-admin/cli53/cli53-0.8.2.ebuild
+++ b/app-admin/cli53/cli53-0.8.2.ebuild
@ -26,12 +26,7 @@ PATCHES=(
 )

 src_compile() {
-	export GOPATH="${WORKDIR}/${P}"
-	if [[ ${PV} == 9999 ]]; then
-		emake build
-	else
-		emake build version=${PV}
-	fi
+	GOPATH="${WORKDIR}/${P}" emake build
 }

 src_test() {
--- a/app-admin/cli53/cli53-9999.ebuild
+++ b/app-admin/cli53/cli53-9999.ebuild
@ -26,12 +26,7 @@ PATCHES=(
 )

 src_compile() {
-	export GOPATH="${WORKDIR}/${P}"
-	if [[ ${PV} == 9999 ]]; then
-		emake build
-	else
-		emake build version=${PV}
-	fi
+	GOPATH="${WORKDIR}/${P}" emake build
 }

 src_test() {
--- a/app-admin/glance/glance-2015.2.9999.ebuild
+++ b/app-admin/glance/glance-2015.2.9999.ebuild
@ -1,229 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 git-r3 user
-
-DESCRIPTION="Services for discovering, registering, and retrieving VM images"
-HOMEPAGE="https://launchpad.net/glance"
-EGIT_REPO_URI="https://github.com/openstack/glance.git"
-EGIT_BRANCH="stable/liberty"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc mysql postgres +sqlite +swift test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${RDEPEND}
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		<=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		<=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		<=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		<=dev-python/mox3-0.12.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		<=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-		!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-		<=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		<=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
-		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-		<=dev-python/testresources-1.0.0-r9999[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		<=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		<=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
-		>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
-		<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		<=dev-python/oslotest-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
-		<=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
-		>=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
-		<=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
-		<=dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
-		<=dev-python/qpid-python-0.32[$(python_gen_usedep 'python2_7')]
-		>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-		<=dev-python/python-swiftclient-2.7.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
-	)"
-
-#note to self, wsgiref is a python builtin, no need to package it
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
-
-RDEPEND="
-	${CDEPEND}
-	sqlite? (
-		>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		dev-python/mysql-python
-		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-	)
-	~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-	~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	<=dev-python/routes-2.2[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	<=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	<=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	<=dev-python/httplib2-0.9.2[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	<=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	<=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-context-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-	<=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
-	<=dev-python/futurist-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}]
-	<=dev-python/taskflow-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
-	<=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/WSME-0.7[${PYTHON_USEDEP}]
-	<=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
-	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-	<=dev-python/python-keystoneclient-2.0.0-r9999[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	<=dev-python/pyopenssl-0.15.1-r9999[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	<=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
-	<=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-log-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-policy-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	<=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
-	<=dev-python/osprofiler-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/glance_store-0.7.1[${PYTHON_USEDEP}]
-	!~dev-python/glance_store-0.9.0[${PYTHON_USEDEP}]
-	<=dev-python/glance_store-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
-	<=dev-python/semantic_version-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.2.0[${PYTHON_USEDEP}]
-	<=dev-python/castellan-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	<=dev-python/cryptography-1.1.2-r9999[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewgroup glance
-	enewuser glance -1 -1 /var/lib/glance glance
-}
-
-python_prepare_all() {
-	sed -i '/xattr/d' test-requirements.txt || die
-	sed -i '/pysendfile/d' test-requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	# https://bugs.launchpad.net/glance/+bug/1251105
-	# https://bugs.launchpad.net/glance/+bug/1242501
-	testr init
-	testr run --parallel || die "failed testsuite under python2.7"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	for svc in api registry scrubber; do
-		newinitd "${FILESDIR}/glance.initd" glance-${svc}
-	done
-
-	diropts -m 0750 -o glance -g glance
-	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
-	keepdir /etc/glance
-	keepdir /var/log/glance
-	keepdir /var/lib/glance/images
-	keepdir /var/lib/glance/scrubber
-
-	insinto /etc/glance
-	insopts -m 0640 -o glance -g glance
-	doins etc/*.ini
-	doins etc/*.conf
-	doins etc/*.sample
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
--- a/app-admin/needrestart/Manifest
+++ b/app-admin/needrestart/Manifest
@ -1 +1,2 @@
+DIST needrestart-2.9.tar.gz 49774 SHA256 812c9594a5a262524f354f2290d8f9cd623004b30222aaeb37faa8cc911bd89f SHA512 f3ed8c0312ec6ee40b7f74fb6a69eaec939c6af5d3a09fd62e59e426ac3fabd416db145eb3946e51f7fe53470c24aa8ccd3ad6aa1e5988195085456204153c81 WHIRLPOOL 577735033ad12178e6d1eafaa71a2e9f7d09eece84aa7970e19619767a823da9a6e872bd7e57fd2b0db5c6421f2690105e805c0450a3386ea92bc8b8625dc3d5
 DIST v2.8.tar.gz 46420 SHA256 33b4f734335987557c68a8c57ea070ac4d23a249fa8675260f0bc28769056cc8 SHA512 2a6e5616a412039e9057a655208a7c55ed611d0deee5ba4c1d25563bb2610bcbf2b6d2534b906fd729db2eee5b3891fdb3fd3bc647f4d6aa06e2a87173b69be7 WHIRLPOOL 4f9daf45ca1a034d6476cf0b387174665d6bf15a4f36cb86e565d6b3715227bf8f7e27f6af422b1ef53c4b07a76d7b36eea0852e2db2a9032679ecc0b04bfc15
--- a/app-admin/needrestart/needrestart-2.9.ebuild
+++ b/app-admin/needrestart/needrestart-2.9.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/liske/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Restart daemons after library updates"
+HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
+
+SLOT="0"
+LICENSE="GPL-2+"
+
+RDEPEND="
+	>=sys-apps/sed-4.2.2
+	dev-perl/libintl-perl
+	dev-perl/Module-Find
+	dev-perl/Module-ScanDeps
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/TermReadKey
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_install() {
+	default
+	doman man/*.1
+	dodoc -r ex
+}
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@ -1,3 +1,6 @@
+DIST xen-4.6.3-upstream-patches-0.tar.xz 24736 SHA256 5ae2d11fe0d7a57c3c55c55b37f63ce2b9a1413ab39cc90a6ae16f61511749d5 SHA512 23540225457bc0f0f039d88a229a6915b0f1317f2f51f20b1fa51e919003316c8da8797a9560eb98c68045eae43a4f7665a450febd438d94952b956718cd66bd WHIRLPOOL 01fc1b74c05b1f9cc63666df8a960a5390325d19a9413aeb606e478b7e4c9d18a96ba8f98c06e31388b27650a73d79cce01c1c6eba388b6e13c4981cdffce887
 DIST xen-4.6.3.tar.gz 19707041 SHA256 02badfce9a037bd1bd4a94210c1f6b85467746216c71795805102b514bcf1fc4 SHA512 187a860b40c05139f22b8498a5fae1db173c3110d957147af29a56cb83b7111c9dc4946d65f9dffc847001fc01c5e9bf51886eaa1194bb9cfd0b6dbcd43a2c5c WHIRLPOOL f80fa73727218567b8d6c8d6bab9dfd577c4bb84ac737b084e4396128e8c4aa79776a277f73c283d5b12f17764b183b67fbf8596e240042dd0709f28cbab777e
+DIST xen-4.7.0-upstream-patches-0.tar.xz 24560 SHA256 3d24ff56a6a21cf91982ae7106bc5c55c8443d8398479778452e48d17903aa16 SHA512 934b81c21c4e13fee5fe4e02ef439f47df76d1ade3caf7adeec1e0144d2546fe3802cce0f715294789d393336740fc12b21fb2127b7edfb548497221b5b40f12 WHIRLPOOL c67bf8139b0f2baf84b8c0ecff3726eeaf10f3f1cada6e3ad9a8cd92cd356bd7adc38f60f5835b7525786899bcd0c94c89700a958ea63bf0aff9f7139642154d
 DIST xen-4.7.0.tar.gz 20702550 SHA256 be5876144d49729572ae06142e0bb93f1c1f2695578141eff2931995add24623 SHA512 2c52c8ef145dfab7d069e79318d5d631e1106a0ddc79d88b3bacf36c7f15cea67dccb704a245e785d2a1e42c6fb6c0ad74832f564aaeec025ad7b864031f0921 WHIRLPOOL 9725ac9fe94e78aab47b0534b5ee1a190106a773bf7d6204fed736abe7069b71937717b6680833736bd02a3a3a43f2eb2162fe7c0d992ddd47d12158b5d9835f
 DIST xen-security-patches-13.tar.xz 3192 SHA256 2721580673d4d4f6f8997961ca6f08d8f818279916d37e5e996af0b4ea008fc7 SHA512 4fd15ca8b611d67b4868f027f9833403b756b87e2f1142a7a0ca41b4fee6143fe57b62ba5360e99c9295fdd0a356048af545c19ea96e075da5aba97845d4a3af WHIRLPOOL 4fd99edcf9afc7937da48131c4d4a82eadf911fd62778dbdf937d7fb914e20d16b2765f538179d9d8ecca5d042ee39736fd1d8cbf01d7fc3e753032472e6bc65
+DIST xen-security-patches-15.tar.xz 5572 SHA256 60577d213ecde0734c2b49f75f56ce9895ad281e40329aff7a12a5d78035f105 SHA512 73c14edab07a61d2c98566dc12f10e710c0406f3dfd8d335a69413206638ff9e988a54cc822eaa64b0ef3128f66a135a85c2454d3fa67e29945f994783da8a52 WHIRLPOOL 3d6c9d22e67ba82de7d4a694c247a4e7063433e8f2d53821ec1b8c88e0a452645ecbb5959f81d1f4f7f0e7715419fa253f69c2df7a7435806dfbb0eea4012632
--- a/app-emulation/xen/xen-4.6.3-r2.ebuild
+++ b/app-emulation/xen/xen-4.6.3-r2.ebuild
@ -0,0 +1,193 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=0
+	SECURITY_VER=15
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	epatch "${FILESDIR}"/${PN}-4.6-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	# remove -Werror for gcc-4.6's sake
+	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
+		xargs sed -i 's/ *-Werror */ /'
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+	# Bug #575868 converted to a sed statement, typo of one char
+	sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die
+
+	epatch_user
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+}
--- a/app-emulation/xen/xen-4.7.0-r2.ebuild
+++ b/app-emulation/xen/xen-4.7.0-r2.ebuild
@ -0,0 +1,193 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=0
+	SECURITY_VER=15
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	epatch "${FILESDIR}"/${PN}-4.6-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	# remove -Werror for gcc-4.6's sake
+	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
+		xargs sed -i 's/ *-Werror */ /'
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+	# Bug #575868 converted to a sed statement, typo of one char
+	sed -e "s:granter’s:granter's:" -i xen/include/public/grant_table.h || die
+
+	epatch_user
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+}
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@ -1,5 +1,4 @@
 DIST gtkmm-2.24.4.tar.xz 10262212 SHA256 443a2ff3fcb42a915609f1779000390c640a6d7fd19ad8816e6161053696f5ee SHA512 75d8c7a7c32adb33a9867b36877422bce52d8486d66be5aaa2afe1eee439efc2ba09aab7d06b9986d74879103415062c5386d5354aff6d44a63b2ba2d75f7c89 WHIRLPOOL 06074ec3f2f7adfe1f24b4d629ef73e852a9b21d719f2705f254389802813b53625be0be4aa30e191df134609b8349ea0725afcf858d26c0bf18282dd8358ab0
-DIST gtkmm-3.16.0.tar.xz 11468644 SHA256 9b8d4af5e1bb64e52b53bc8ef471ef43e1b9d11a829f16ef54c3a92985b0dd0c SHA512 282e53a0f3f3c4d1594057e4367bb4f4abe8fbf7f2bae2a819b35d4e4137a3e739aa83039114eb52eba16a9dd048abd78f011fb14635e53cf61019c6f4c06397 WHIRLPOOL 87c4dbccb79472c264621b3b96f5e06c73d03f4bbc0121f25e9c29f75e5c3e3e57aede9398b6c8b00e47d4eccd5eb6dfc6068c242af744f77f1d59af14bd2f25
-DIST gtkmm-3.18.0.tar.xz 11862504 SHA256 829fa113daed74398c49c3f2b7672807f58ba85d0fa463f5bc726e1b0138b86b SHA512 486a0c4bf6f5e6756c7eb0143374ef14d82ad41bca62403ece6ce76b4e56815a34751e331896126098c96983e767afbee35c9342bbb3908e551d5f31cadd496b WHIRLPOOL 5a268f65dbd067fd749e19e5cb9c2bf8ca718282b730ae3221297549d8a0dae4c6aa1eb7d744b0f9c4dd28a6ac5491e5a5f888975abc967ff792e87dd094ab6b
+DIST gtkmm-2.24.5.tar.xz 12022024 SHA256 0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e WHIRLPOOL b1bd5d27f53fece724c3389eb938a9ba746fb168637cacd437f152e6753f0150e5227acaed8d9b93b8e2e497352d03d77bec3fe4a5029c144ef2270c28c31c46
 DIST gtkmm-3.18.1.tar.xz 11872424 SHA256 747dff6164e5367db6fae6c30f01f0cb6bc14652353b1bdb33de8a69aa7b2520 SHA512 7f77b2e10c5041499541f5ee3762c2d17b243b6014b2d946afcd7c9d1112358db4803c08a411a4efe81a1013ae660c15ba67a7ebd0e17f3515d7258239b45cd9 WHIRLPOOL 0ccfef91c3fb0867ead5111d6c095df479fde4ea108465e4df226943a88b3db4443551eff350ffb8b823aa4b53646314b659b1491df16863326cc370327d8d76
 DIST gtkmm-3.20.1.tar.xz 12178004 SHA256 051de1b8756ca6ec61f26264338cfc3060af936fd70bf4558bfe1e115418c612 SHA512 fad034db02ee3f4658bb3c065d78998f5da090ecba8903016fa1412eff845fdd46f44b2b6bd1be54d1d177bca0840815a1f492391045fbe43fa173e40b7b0fd5 WHIRLPOOL 5368bf79026c7888304b3329a28269ce17a3656b121805c4649241c622512ad2890a0c7fe0c74edd3f156388da77195fe62733c3609c245041ad2ea93090513f
--- a/dev-cpp/gtkmm/files/gtkmm-3.18.0-gcc47.patch
+++ b/dev-cpp/gtkmm/files/gtkmm-3.18.0-gcc47.patch
@ -1,44 +0,0 @@
--- a/gtk/src/menushell.ccg	2015-07-16 21:00:55.000000000 +0200
-+++ b/gtk/src/menushell.ccg	2015-12-09 01:03:45.127863899 +0100
-@@ -43,7 +43,7 @@ MenuShell::MenuShell(GtkMenuShell* casti
- {}
- 
- // TODO: Why do we need a custom dtor?
-MenuShell::~MenuShell()
-+MenuShell::~MenuShell() noexcept
- {}
- 
- void MenuShell::accelerate(Window& window)
--- a/gtk/gtkmm/menushell.cc	2015-09-22 11:41:47.000000000 +0200
-+++ b/gtk/gtkmm/menushell.cc	2015-12-09 01:06:27.641701385 +0100
-@@ -54,7 +54,7 @@ MenuShell::MenuShell(GtkMenuShell* casti
- {}
- 
- // TODO: Why do we need a custom dtor?
-MenuShell::~MenuShell()
-+MenuShell::~MenuShell() noexcept
- {}
- 
- void MenuShell::accelerate(Window& window)
--- a/gtk/src/widget.ccg	2015-07-16 21:00:55.000000000 +0200
-+++ b/gtk/src/widget.ccg	2015-12-09 07:36:47.328538621 +0100
-@@ -413,7 +413,7 @@ void Widget_Class::get_preferred_width_f
-     (*base->get_preferred_width_for_height)(self, height, minimum_width, natural_width);
- }
- 
-Widget::~Widget()
-+Widget::~Widget() noexcept
- {}
- 
- void Widget::reparent(Widget& new_parent)
--- a/gtk/gtkmm/widget.cc	2015-09-22 11:44:13.000000000 +0200
-+++ b/gtk/gtkmm/widget.cc	2015-12-09 07:39:29.318214641 +0100
-@@ -423,7 +423,7 @@ void Widget_Class::get_preferred_width_f
-     (*base->get_preferred_width_for_height)(self, height, minimum_width, natural_width);
- }
- 
-Widget::~Widget()
-+Widget::~Widget() noexcept
- {}
- 
- void Widget::reparent(Widget& new_parent)
--- a/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
@ -1,9 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=6

 inherit gnome2 multilib-minimal

@ -11,14 +10,13 @@ DESCRIPTION="C++ interface for GTK+"
 HOMEPAGE="http://www.gtkmm.org"

 LICENSE="LGPL-2.1+"
-SLOT="3.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="aqua doc examples test wayland +X"
-REQUIRED_USE="|| ( aqua wayland X )"
+SLOT="2.4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="doc examples test"

 COMMON_DEPEND="
-	>=dev-cpp/glibmm-2.44.0:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-3.16:3[aqua?,wayland?,X?,${MULTILIB_USEDEP}]
+	>=dev-cpp/glibmm-2.34.1:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-2.24.15:2[${MULTILIB_USEDEP}]
 	>=x11-libs/gdk-pixbuf-2.28:2[${MULTILIB_USEDEP}]
 	>=dev-cpp/atkmm-2.22.7[${MULTILIB_USEDEP}]
 	>=dev-cpp/cairomm-1.10.0-r1[${MULTILIB_USEDEP}]
@ -31,14 +29,12 @@ RDEPEND="${COMMON_DEPEND}
 		!app-emulation/emul-linux-x86-gtkmmlibs[-abi_x86_32(-)] )
 "
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	doc? (
 		media-gfx/graphviz
 		dev-libs/libxslt
 		app-doc/doxygen )
 "
-#	dev-cpp/mm-common"
-# eautoreconf needs mm-common

 src_prepare() {
 	if ! use test; then
@ -57,12 +53,10 @@ src_prepare() {
 }

 multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
+	ECONF_SOURCE="${S}" \
+	gnome2_src_configure \
 		--enable-api-atkmm \
-		$(multilib_native_use_enable doc documentation) \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend)
+		$(multilib_native_use_enable doc documentation)
 }

 multilib_src_install() {
--- a/dev-cpp/gtkmm/gtkmm-3.18.0-r1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.18.0-r1.ebuild
@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for GTK+"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="3.0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="aqua doc examples test wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.46.1:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-3.18.0:3[aqua?,wayland?,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.28:2[${MULTILIB_USEDEP}]
-	>=dev-cpp/atkmm-2.24.1[${MULTILIB_USEDEP}]
-	>=dev-cpp/cairomm-1.12.0[${MULTILIB_USEDEP}]
-	>=dev-cpp/pangomm-2.38.1:1.4[${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	examples? ( >=media-libs/libepoxy-1.2[${MULTILIB_USEDEP}] )
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxslt
-		app-doc/doxygen )
-"
-#	dev-cpp/mm-common"
-# eautoreconf needs mm-common
-
-src_prepare() {
-	# Fix building with gcc-4.7, fixed in next version, bug #567882
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 1 failed"
-	fi
-
-	if ! use examples; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 2 failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		--enable-api-atkmm \
-		$(multilib_native_use_enable doc documentation) \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog PORTING NEWS README"
-	einstalldocs
-}
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@ -10,4 +10,5 @@ DIST go-linux-ppc64le-bootstrap.tbz 50134685 SHA256 ca816a3e3cbd7721200522fa3984
 DIST go-linux-s390x-bootstrap.tbz 49809007 SHA256 80a87bc5ac2239c99f8d7425fbc6f4fefba63f549b0835505c25378c08114656 SHA512 1b7500e6c42508b6cb07214620070065262349d2cd3698deeac0638d0bf0bfeb89c59c2d72a284af34f3071b4cfb9ce543c5fdec7add4a46adc9580295909439 WHIRLPOOL d3782cb515ab67720105224e02d96ab1ca86518db661719b2d0f7c48aa1f4f896a7cc5fed5b6ddc032c8206e8a10c6262646be0e59def61723936044d6ceb143
 DIST go-solaris-amd64-bootstrap.tbz 48367195 SHA256 92ebdbf001f243a78a6c2d8ee30e929ba2cecbedf8e0fc07e129b04b107453ad SHA512 cf8725db0d001d61badee71624799a3c9e75f61f77ab090c1f6c490d694c4be367019b28d88306045d877ab5a324a1f9b0674293caf3acb19c193fc3746a48f2 WHIRLPOOL 672c6642e340b6d4f38b633f67fdc3202e3725022a8a61e2129276fccd6c42ddc24ed06c1d57eb31a25ea8056b79686619cbb36431b9c23b6d4be5bcb715bd89
 DIST go1.6.3.src.tar.gz 12617426 SHA256 6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 SHA512 43e9b01220788112a185500bd53f091e7a0023a790092f428e2f40fc1a334dd148558b99d2a1c871b8cc79ad7d2d87a092b93eee7b5a27c2ee675c494de35306 WHIRLPOOL 0a22dc08b89ddfaccf1e871037e7ad6cdbf36f914de527011813d57a2d857478278202314b185e26aa905cb135d13cbea490d03337b42148c6fc2ef93a8cd9fe
+DIST go1.7.1.src.tar.gz 14098889 SHA256 2b843f133b81b7995f26d0cb64bbdbb9d0704b90c44df45f844d28881ad442d3 SHA512 eab2b44f44d05c62645756e05078c2a8b7e3c4d2413617a20a6659df22e4612bb2059cf4906ab81134421eb371903034c1b197bb5595c9af9901819b2b3330a3 WHIRLPOOL 0733985cece30858431f600af12f60c3ff2894a78f09900a64aac7d493d790679a75a7c878b461fc6548663cc0cd34481c6e62051fd55ea68e8fa1d3b19fcdb0
 DIST go1.7.src.tar.gz 14091954 SHA256 72680c16ba0891fcf2ccf46d0f809e4ecf47bbf889f5d884ccb54c5e9a17e1c0 SHA512 a9cd1279927ca50e083dcf6d5a4bcb3bff6a156b3555608334a41be9613b5002dd71caafa472aae6210b01a6cdbd6aa6a55b8882a8e4bda68a5ffd10a3ae1d14 WHIRLPOOL 77121f84e04e7266f46934c9350f7fe216aa8376fb9ac06602a4b7bf16ed6b3595dbbffc7289b5223e47a9e52980f381183bdeddf34b858d21bb0918a94d7e4e
--- a/dev-lang/go/go-1.7.1.ebuild
+++ b/dev-lang/go/go-1.7.1.ebuild
@ -0,0 +1,222 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
+SRC_URI="!gccgo? (
+kernel_Darwin? (
+	x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-bootstrap.tbz )
+)
+kernel_FreeBSD? (
+amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-bootstrap.tbz )
+x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-bootstrap-1.tbz )
+)
+kernel_linux? (
+	amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-bootstrap.tbz )
+	arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-bootstrap.tbz )
+	arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-bootstrap.tbz )
+	ppc64? (
+		${BOOTSTRAP_DIST}/go-linux-ppc64-bootstrap.tbz
+		${BOOTSTRAP_DIST}/go-linux-ppc64le-bootstrap.tbz
+	)
+	s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-bootstrap.tbz )
+	x86? ( ${BOOTSTRAP_DIST}/go-linux-386-bootstrap-1.tbz )
+)
+kernel_SunOS? (
+	x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-bootstrap.tbz )
+)
+)
+"
+
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="git://github.com/golang/go.git"
+	inherit git-r3
+else
+	SRC_URI+="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz"
+	case ${PV} in
+		*9999*|*_rc*) ;;
+		*)
+			KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+			;;
+	esac
+fi
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="http://www.golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="gccgo"
+
+DEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# These test data objects have writable/executable stacks.
+QA_EXECSTACK="usr/lib/go/src/debug/elf/testdata/*.obj"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# The go language uses *.a files which are _NOT_ libraries and should not be
+# stripped. The test data objects should also be left alone and unstripped.
+STRIP_MASK="/usr/lib/go/pkg/*.a
+	/usr/lib/go/src/debug/elf/testdata/*
+	/usr/lib/go/src/debug/dwarf/testdata/*
+	/usr/lib/go/src/runtime/race/*.syso"
+
+if [[ ${PV} != 9999 ]]; then
+	S="${WORKDIR}"/go
+fi
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+pkg_pretend()
+{
+	# make.bash does not understand cross-compiling a cross-compiler
+	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
+		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
+	fi
+}
+
+src_unpack()
+{
+	if [[ ${PV} = 9999 ]]; then
+		git-r3_src_unpack
+	fi
+	default
+}
+
+src_compile()
+{
+	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap
+	if use gccgo; then
+		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
+		local go_binary=$(gcc-config --get-bin-path)/go-5
+		[[ -x ${go_binary} ]] || go_binary=$(
+			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-5 | sort -V | tail -n1)
+		[[ -x ${go_binary} ]] || die "go-5: command not found"
+		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
+	fi
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+	elog "GOROOT_BOOTSTRAP is ${GOROOT_BOOTSTRAP}"
+
+	cd src
+	./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+		./run.bash -no-rebuild || die "tests failed"
+}
+
+src_install()
+{
+	local bin_path f x
+
+	dodir /usr/lib/go
+	insinto /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] https://golang.org/issue/2775
+	doins -r bin doc lib pkg src
+	fperms -R +x /usr/lib/go/bin /usr/lib/go/pkg/tool
+
+	cp -a misc "${D}"/usr/lib/go/misc
+
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+	dodoc AUTHORS CONTRIBUTORS PATENTS README.md
+}
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@ -28,6 +28,7 @@ kernel_linux? (
 		${BOOTSTRAP_DIST}/go-linux-ppc64-bootstrap.tbz
 		${BOOTSTRAP_DIST}/go-linux-ppc64le-bootstrap.tbz
 	)
+	s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-bootstrap.tbz )
 	x86? ( ${BOOTSTRAP_DIST}/go-linux-386-bootstrap-1.tbz )
 )
 kernel_SunOS? (
@ -89,6 +90,7 @@ go_arch()
 		x86)	echo 386;;
 		x64-*)	echo amd64;;
 		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
 		*)		echo "${portage_arch}";;
 	esac
 }
@ -218,33 +220,3 @@ src_install()
 	done
 	dodoc AUTHORS CONTRIBUTORS PATENTS README.md
 }
-
-pkg_preinst()
-{
-	has_version '<dev-lang/go-1.4' &&
-		export had_support_files=true ||
-		export had_support_files=false
-}
-
-pkg_postinst()
-{
-	# If the go tool sees a package file timestamped older than a dependancy it
-	# will rebuild that file.  So, in order to stop go from rebuilding lots of
-	# packages for every build we need to fix the timestamps.  The compiler and
-	# linker are also checked - so we need to fix them too.
-	ebegin "fixing timestamps to avoid unnecessary rebuilds"
-	tref="usr/lib/go/pkg/*/runtime.a"
-	find "${EROOT}"usr/lib/go -type f \
-		-exec touch -r "${EROOT}"${tref} {} \;
-	eend $?
-
-	if $had_support_files; then
-		ewarn
-		ewarn "All editor support, IDE support, shell completion"
-		ewarn "support, etc has been removed from the go package"
-		ewarn "upstream."
-		ewarn "For more information on which support is available, see"
-		ewarn "the following URL:"
-		ewarn "https://github.com/golang/go/wiki/IDEsAndTextEditorPlugins"
-	fi
-}
--- a/dev-libs/g-wrap/files/1.9.8-fix-ffi-build-issue.patch
+++ b/dev-libs/g-wrap/files/1.9.8-fix-ffi-build-issue.patch
@ -1,15 +0,0 @@
-diff -urN g-wrap-1.9.8.orig/guile/examples/Makefile.am g-wrap-1.9.8/guile/examples/Makefile.am
--- g-wrap-1.9.8.orig/guile/examples/Makefile.am	2007-05-31 15:07:17.000000000 -0700
-+++ g-wrap-1.9.8/guile/examples/Makefile.am	2007-06-01 10:07:32.000000000 -0700
-@@ -5,7 +5,10 @@
- 
- lib_LTLIBRARIES += libgw-guile-miscutils.la
- libgw_guile_miscutils_la_SOURCES = miscutils-guile.c miscutils-guile.h gw-miscutils.c
-libgw_guile_miscutils_la_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/guile
-+libgw_guile_miscutils_la_CFLAGS = \
-+	-I$(top_srcdir) \
-+	-I$(top_srcdir)/guile \
-+	$(LIBFFI_CFLAGS)
- libgw_guile_miscutils_la_LDFLAGS = -module
- libgw_guile_miscutils_la_LIBADD = libmiscutils.la \
- 				  $(top_builddir)/guile/g-wrap/libgwrap-guile-runtime.la \
--- a/dev-libs/g-wrap/files/1.9.8-fix-gcc-4.2.0-libffi.patch
+++ b/dev-libs/g-wrap/files/1.9.8-fix-gcc-4.2.0-libffi.patch
@ -1,21 +0,0 @@
-diff -urN g-wrap-1.9.8.orig/libffi/configure.ac g-wrap-1.9.8/libffi/configure.ac
--- g-wrap-1.9.8.orig/libffi/configure.ac	2007-06-03 21:50:15.000000000 -0700
-+++ g-wrap-1.9.8/libffi/configure.ac	2007-06-03 21:50:31.000000000 -0700
-@@ -5,7 +5,7 @@
- AC_INIT([libffi], [2.1], [http://gcc.gnu.org/bugs.html])
- AC_CONFIG_HEADERS([fficonfig.h])
- 
-AM_ENABLE_MULTILIB(, ..)
-+#AM_ENABLE_MULTILIB(, ..)
- 
- AC_CANONICAL_SYSTEM
- target_alias=${target_alias-$host_alias}
-diff -urN g-wrap-1.9.8.orig/libffi/include/Makefile.am g-wrap-1.9.8/libffi/include/Makefile.am
--- g-wrap-1.9.8.orig/libffi/include/Makefile.am	2007-06-03 21:50:15.000000000 -0700
-+++ g-wrap-1.9.8/libffi/include/Makefile.am	2007-06-03 21:50:47.000000000 -0700
-@@ -9,4 +9,4 @@
- gcc_version   := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
- toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
- 
-toollibffi_HEADERS = ffi.h ffitarget.h
-+include_HEADERS = ffi.h ffitarget.h
--- a/dev-libs/g-wrap/files/g-wrap-1.3.4-direntry.patch
+++ b/dev-libs/g-wrap/files/g-wrap-1.3.4-direntry.patch
@ -1,57 +0,0 @@
-diff -u g-wrap-1.3.4-vanilla/doc/g-wrap.info g-wrap-1.3.4/doc/g-wrap.info
--- g-wrap-1.3.4-vanilla/doc/g-wrap.info	2004-04-19 13:16:18.584411000 -0700
-+++ g-wrap-1.3.4/doc/g-wrap.info	2004-04-19 13:17:49.384608248 -0700
-@@ -1,5 +1,10 @@
- This is g-wrap.info, produced by makeinfo version 4.2 from g-wrap.texi.
- 
-+INFO-DIR-SECTION The Algorithmic Language Scheme
-+START-INFO-DIR-ENTRY
-+* G-wrap: (g-wrap).		Export C libraries into Scheme.
-+END-INFO-DIR-ENTRY
-+
- 
- Indirect:
- g-wrap.info-1: 73
-diff -u g-wrap-1.3.4-vanilla/doc/g-wrap.info-1 g-wrap-1.3.4/doc/g-wrap.info-1
--- g-wrap-1.3.4-vanilla/doc/g-wrap.info-1	2004-04-19 13:16:28.147958000 -0700
-+++ g-wrap-1.3.4/doc/g-wrap.info-1	2004-04-19 13:17:52.254172008 -0700
-@@ -1,5 +1,10 @@
- This is g-wrap.info, produced by makeinfo version 4.2 from g-wrap.texi.
- 
-+INFO-DIR-SECTION The Algorithmic Language Scheme
-+START-INFO-DIR-ENTRY
-+* G-wrap: (g-wrap).		Export C libraries into Scheme.
-+END-INFO-DIR-ENTRY
-+
- 
- File: g-wrap.info,  Node: Top,  Next: Copying,  Prev: (dir),  Up: (dir)
- 
-diff -u g-wrap-1.3.4-vanilla/doc/g-wrap.info-2 g-wrap-1.3.4/doc/g-wrap.info-2
--- g-wrap-1.3.4-vanilla/doc/g-wrap.info-2	2004-04-19 13:16:33.402159000 -0700
-+++ g-wrap-1.3.4/doc/g-wrap.info-2	2004-04-19 13:17:55.048747168 -0700
-@@ -1,5 +1,10 @@
- This is g-wrap.info, produced by makeinfo version 4.2 from g-wrap.texi.
- 
-+INFO-DIR-SECTION The Algorithmic Language Scheme
-+START-INFO-DIR-ENTRY
-+* G-wrap: (g-wrap).		Export C libraries into Scheme.
-+END-INFO-DIR-ENTRY
-+
- 
- File: g-wrap.info,  Node: Accessing the wrapped API from the target language,  Next: Coping With Old Guile Versions,  Prev: Generating the glue code,  Up: Generating and using the glue code
- 
-diff -r -u g-wrap-1.3.4-vanilla/doc/g-wrap.texi g-wrap-1.3.4/doc/g-wrap.texi
--- g-wrap-1.3.4-vanilla/doc/g-wrap.texi	2002-11-07 09:23:43.000000000 -0800
-+++ g-wrap-1.3.4/doc/g-wrap.texi	2004-04-19 13:30:50.391877096 -0700
-@@ -7,6 +7,11 @@
- @paragraphindent 0
- @c %**end of header
- 
-+@dircategory The Algorithmic Language Scheme
-+@direntry
-+* G-wrap: (g-wrap).		Export C libraries into Scheme.
-+@end direntry
-+
- @iftex
- @finalout
- @c DL: lose the egregious vertical whitespace, esp. around examples
--- a/dev-libs/g-wrap/files/g-wrap-1.3.4-m4.patch
+++ b/dev-libs/g-wrap/files/g-wrap-1.3.4-m4.patch
@ -1,20 +0,0 @@
--- g-wrap.m4.orig	2004-07-10 13:26:07.000000000 -0500
-+++ g-wrap.m4	2005-05-10 13:45:31.000000000 -0500
-@@ -4,7 +4,7 @@
- 
- dnl check whether we use the old or new guile smobs
- 
-AC_DEFUN(AC_GWRAP_CHECK_GUILE,
-+AC_DEFUN([AC_GWRAP_CHECK_GUILE],
- [if test x$GUILE = x ; then
- 	AC_PATH_PROG(GUILE, guile, no)
-  fi
-@@ -20,7 +20,7 @@
- dnl tests for minimum version of g-wrap.
- dnl sets G_WRAP_CONFIG and GWRAP_OLD_GUILE_SMOB if needed.
- 
-AC_DEFUN(AM_PATH_GWRAP,
-+AC_DEFUN([AM_PATH_GWRAP],
- [dnl
- dnl
- dnl
--- a/dev-libs/g-wrap/files/g-wrap-1.9.6_glib_automagic.patch
+++ b/dev-libs/g-wrap/files/g-wrap-1.9.6_glib_automagic.patch
@ -1,13 +0,0 @@
--- configure.ac.old	2007-01-20 10:54:27.000000000 +0100
-+++ configure.ac	2007-01-20 10:55:49.000000000 +0100
-@@ -95,7 +95,9 @@
- AM_CONDITIONAL(HAVE_SRFI_35, test "$HAVE_SRFI_35" = yes)
- 
- dnl Check for optional libraries
-PKG_CHECK_MODULES(GLIB, glib, [have_glib=yes], [have_glib=no])
-+if test "x$with_glib" != "xno"; then
-+	PKG_CHECK_MODULES([GLIB], [glib-2.0], [have_glib=yes], [have_glib=no])
-+fi
- AM_CONDITIONAL(HAVE_GLIB, test "$have_glib" = yes)
- 
- dnl Check for compiler flags and warnings. This should be last, since
--- a/dev-libs/g-wrap/files/g-wrap-1.9.7_glib_automagic.patch
+++ b/dev-libs/g-wrap/files/g-wrap-1.9.7_glib_automagic.patch
@ -1,16 +0,0 @@
--- configure.ac.old	2007-01-18 17:54:08.000000000 +0100
-+++ configure.ac	2007-01-18 17:57:38.000000000 +0100
-@@ -119,11 +119,8 @@
- AC_SUBST(GW_LANGUAGES)
- 
- dnl Check for optional libraries
-AC_CHECK_PROG(have_glib, glib-config, yes, no)
-if test "$have_glib" = yes; then
-  PKG_CHECK_MODULES(GLIB, glib, [echo building GLib 1.2 support])
-else
-  echo Not building Glib 1.2 support
-+if test "x$with_glib" != "xno"; then
-+       PKG_CHECK_MODULES([GLIB], [glib-2.0], [have_glib=yes], [have_glib=no])
- fi
- AM_CONDITIONAL(HAVE_GLIB, test "$have_glib" = yes)
- 
--- a/dev-libs/g-wrap/files/glib_automagic.patch
+++ b/dev-libs/g-wrap/files/glib_automagic.patch
@ -1,16 +0,0 @@
--- configure.ac.old	2007-01-18 17:54:08.000000000 +0100
-+++ configure.ac	2007-01-18 17:57:38.000000000 +0100
-@@ -119,11 +119,8 @@
- AC_SUBST(GW_LANGUAGES)
- 
- dnl Check for optional libraries
-AC_CHECK_PROG(have_glib, glib-config, yes, no)
-if test "$have_glib" = yes; then
-  PKG_CHECK_MODULES(GLIB, glib, [echo building GLib 1.2 support])
-else
-  echo Not building Glib 1.2 support
-+if test "x$with_glib" != "xno"; then
-+       PKG_CHECK_MODULES([GLIB], [glib-2.0], [have_glib=yes], [have_glib=no])
- fi
- AM_CONDITIONAL(HAVE_GLIB, test "$have_glib" = yes)
- 
--- a/dev-libs/g-wrap/files/libffi_automagic.patch
+++ b/dev-libs/g-wrap/files/libffi_automagic.patch
@ -1,11 +0,0 @@
--- configure.ac.old	2007-03-02 15:20:54.000000000 +0100
-+++ configure.ac	2007-03-02 15:21:08.000000000 +0100
-@@ -55,7 +55,7 @@
- dnl
- 
- dnl libffi
-ar_WITH_LIB_LIBFFI([have_libffi=yes], [have_libffi=no])
-+ar_WITH_LIB_LIBFFI([have_libffi=no], [have_libffi=no])
- LIBFFI_CFLAGS_INSTALLED="$LIBFFI_CFLAGS"
- LIBFFI_LIBS_INSTALLED="$LIBFFI_LIBS"
- if test "$have_libffi" = no; then
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@ -1 +1,2 @@
 DIST gjs-1.44.0.tar.xz 486144 SHA256 88c960f6ad47a6931d123f5d6317d13704f58572f68a4391913a254ff27dce80 SHA512 3866e124f05221fd47275951f8c2c6954ba28a9b1443cc3c01789284709e2dd69f496efa094e6ddc9fcae563b9def68441aa398c1488076701fa1e873f9b9735 WHIRLPOOL ee165353e08c6a5f69785e04fb12e582778695fb8b20f93153d6f648bd8597988a5d12349f73e70c2d52aed4d80d53484086f212c427fe2c7675eb858d41cad0
+DIST gjs-1.45.4.tar.xz 480828 SHA256 db51bc2aae51700a2a8ca8ba597c488505d106bc70b9605e77c6ab5183212228 SHA512 ef3587b16e0b4cc1df390e2d241f7293279c43d3399143d67c226ba668fe2c4f310ee08392ac1c21322abd9578ebe2eed4d870bbe62134af76c15555cf6445b1 WHIRLPOOL 8950f28feacc7d8768375446efcfad23aa16ad9be134e2b968f995b2f5e7d26392915f0ef667221b7a090fb1318f111c746a764c8b1dce83ae31d14c32674baf
--- a/dev-libs/gjs/gjs-1.45.4.ebuild
+++ b/dev-libs/gjs/gjs-1.45.4.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils gnome2 pax-utils virtualx
+
+DESCRIPTION="Javascript bindings for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/gobject-introspection-1.41.4:=
+
+	sys-libs/readline:0
+	dev-lang/spidermonkey:24
+	virtual/libffi
+	cairo? ( x11-libs/cairo[X] )
+	gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+
+src_prepare() {
+	# Disable broken unittests
+	eapply "${FILESDIR}"/${PN}-1.43.3-disable-unittest-*.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+	# XXX: Do NOT enable coverage, completely useless for portage installs
+	gnome2_src_configure \
+		--disable-systemtap \
+		--disable-dtrace \
+		--disable-coverage \
+		$(use_with cairo cairo) \
+		$(use_with gtk) \
+		$(use_with test dbus-tests) \
+		$(use_with test xvfb-tests)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	# installation sometimes fails in parallel, bug #???
+	gnome2_src_install -j1
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins "${S}"/examples/*
+	fi
+
+	# Required for gjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/gjs-console"
+}
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@ -3,4 +3,5 @@ DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783
 DIST glib-2.44.1.tar.xz 7132940 SHA256 8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07 SHA512 c24d307408e061b2657f7e7d1b8245c55605ebda26ee2dcc3497ee9d90bfc137d8e5f42f0cd5acf4b49ea28c424fa901e81f75ecf81833f6d0fe51d5e36e5888 WHIRLPOOL 6a1eef94b3ffed4d5cb551f4def6859ddff8ea0aac50048e706863f2bd4957c40b7034946852fa4604a109eb121c55b94ec51b3708a325ace5692f61fd1babb7
 DIST glib-2.46.2.tar.xz 7344636 SHA256 5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db SHA512 8b5298712710d77b4a47367071f782d2bb3042b149ec8fde8c065f80bf3c5375c94318d19665c0092572e4895e590231a47324d25f371310f02b43feb3009588 WHIRLPOOL 700b69360110351544780ace4dcb14f29505f63d8840882532a4b7c017860b6da86e09cbabca691b7b24cb08b8722e772555de044b8b21e4b0952c8a8e4e6ecb
 DIST glib-2.48.1.tar.xz 7441032 SHA256 74411bff489cb2a3527bac743a51018841a56a4d896cc1e0d0d54f8166a14612 SHA512 5bbea7d07ba6d75c35c6be8f1ebc685aa2549bd20030741b2d6e2c30e9b2d476c2afa50a974bbdad98c305666c8b04357b51619c97fe50d3e9965700088aad9b WHIRLPOOL 2f08854815fee79b6246accedb62a714845b7f0bc67bcd6cde48aa0147a957e6c9cbbc424100d651ee5573f31a3db89ee1935e3ffdc97c5bf1d5711a85545eb2
+DIST glib-2.48.2.tar.xz 6408644 SHA256 f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4 SHA512 2eac104eb2207d0a6488992e48069a34b417f51e141364f281ab7b0953a6de88be177b1c694dd9464a856c9a5d8021e3cf0193a8d9c5aaf6ea11f1f9ff743c43 WHIRLPOOL cba211000d5597e93d01113e5f2b6736e47f4daa00935a53af182b3304fef9a1ac25f78995c7a53cc1234261433a1bbd1ec751c87b556845a15da720af5b971b
 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
--- a/dev-libs/glib/glib-2.48.2.ebuild
+++ b/dev-libs/glib/glib-2.48.2.ebuild
@ -0,0 +1,281 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
+# adding new dependencies end up making stage3 to grow. Every addition needs
+# then to be think very closely.
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+# Completely useless with or without USE static-libs, people need to use
+# pkg-config
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 eutils flag-o-matic gnome2 libtool linux-info \
+	multilib multilib-minimal pax-utils python-r1  toolchain-funcs versionator virtualx
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI}
+	https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
+REQUIRED_USE="
+	utils? ( ${PYTHON_REQUIRED_USE} )
+	test? ( ${PYTHON_REQUIRED_USE} )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+	utils? (
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+		virtual/libelf:0=
+	)
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-libs/libxslt-1.0
+	>=sys-devel/gettext-0.11
+	>=dev-util/gtk-doc-am-1.20
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	test? (
+		sys-devel/gdb
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+		>=sys-apps/dbus-1.2.14 )
+	!<dev-util/gtk-doc-1.15-r2
+"
+PDEPEND="!<gnome-base/gvfs-1.6.4-r990
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+# Earlier versions of gvfs do not work with glib
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
+	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
+
+	if use test; then
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+			ewarn "Some tests will be skipped due to missing terminal program"
+			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
+	fi
+
+	# gdbus-codegen is a separate package
+	eapply "${FILESDIR}"/${PN}-2.40.0-external-gdbus-codegen.patch
+
+	# Leave python shebang alone - handled by python_replicate_script
+	# We could call python_setup and give configure a valid --with-python
+	# arg, but that would mean a build dep on python when USE=utils.
+	sed -e '/${PYTHON}/d' \
+		-i glib/Makefile.{am,in} || die
+
+	# Also needed to prevent cross-compile failures, see bug #267603
+	eautoreconf
+
+	gnome2_src_prepare
+
+	epunt_cxx
+}
+
+multilib_src_configure() {
+	# Avoid circular depend with dev-util/pkgconfig and
+	# native builds (cross-compiles won't need pkg-config
+	# in the target ROOT to work here)
+	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
+		if has_version sys-apps/dbus; then
+			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
+			export DBUS1_LIBS="-ldbus-1"
+		fi
+		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
+		export LIBFFI_LIBS="-lffi"
+	fi
+
+	# These configure tests don't work when cross-compiling.
+	if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		case ${CHOST} in
+		hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		*)            export glib_cv_stack_grows=no ;;
+		esac
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756474
+		export glib_cv_uscore=no
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756475
+		export ac_cv_func_posix_get{pwuid,grgid}_r=yes
+	fi
+
+	local myconf
+
+	case "${CHOST}" in
+		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
+		*)        myconf="${myconf} --with-threads=posix" ;;
+	esac
+
+	# libelf used only by the gresource bin
+	ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable xattr) \
+		$(use_enable fam) \
+		$(use_enable selinux) \
+		$(use_enable static-libs static) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable systemtap systemtap) \
+		$(multilib_native_use_enable utils libelf) \
+		--disable-compile-warnings \
+		--enable-man \
+		--with-pcre=system \
+		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
+
+	if multilib_is_native_abi; then
+		local d
+		for d in glib gio gobject; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	python_setup
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	# Hardened: gdb needs this, bug #338891
+	if host-is-pax ; then
+		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
+			|| die "Hardened adjustment failed"
+	fi
+
+	# Need X for dbus-launch session X11 initialization
+	virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install completiondir="$(get_bashcompdir)"
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use utils ; then
+		python_replicate_script "${ED}"/usr/bin/gtester-report
+	else
+		rm "${ED}usr/bin/gtester-report"
+		rm "${ED}usr/share/man/man1/gtester-report.1"
+	fi
+
+	# Do not install charset.alias even if generated, leave it to libiconv
+	rm -f "${ED}/usr/lib/charset.alias"
+
+	# Don't install gdb python macros, bug 291328
+	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"/${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="usr/$(get_libdir)/gio/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	# force (re)generation of gschemas.compiled
+	GNOME2_ECLASS_GLIB_SCHEMAS="force"
+
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gio/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
+	fi
+}
--- a/dev-libs/oniguruma/oniguruma-5.9.5-r1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-5.9.5-r1.ebuild
@ -2,12 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

 # Needed for a sane .so versionning on fbsd, please dont drop
-AUTOTOOLS_AUTORECONF=1
-
-inherit eutils autotools-multilib
+inherit autotools multilib-minimal

 MY_P=onig-${PV}

@ -25,15 +23,21 @@ DOCS=( AUTHORS HISTORY README{,.ja} doc/{API,FAQ,RE}{,.ja} )

 S=${WORKDIR}/${MY_P}

-src_configure() {
-	local myeconfargs=(
-		$(use_enable combination-explosion-check)
-		$(use_enable crnl-as-line-terminator)
-	)
-	autotools-multilib_src_configure
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
 }

-src_install() {
-	autotools-multilib_src_install
-	use static-libs || prune_libtool_files
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable combination-explosion-check) \
+		$(use_enable crnl-as-line-terminator)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
 }
--- a/dev-lisp/sbcl/files/bsd-sockets-test-1.2.patch
+++ b/dev-lisp/sbcl/files/bsd-sockets-test-1.2.patch
@ -1,24 +0,0 @@
-diff -r -U1 sbcl-1.2.2.orig/contrib/sb-bsd-sockets/tests.lisp sbcl-1.2.2/contrib/sb-bsd-sockets/tests.lisp
--- sbcl-1.2.2.orig/contrib/sb-bsd-sockets/tests.lisp	2014-07-28 17:15:05.000000000 +0700
-+++ sbcl-1.2.2/contrib/sb-bsd-sockets/tests.lisp	2014-08-01 19:48:30.011931081 +0700
-@@ -31,11 +31,11 @@
- ;;; for unknown protocols...
-#-(and freebsd sb-thread)
-#-(and dragonfly sb-thread)
-(deftest get-protocol-by-name/error
-  (handler-case (get-protocol-by-name "nonexistent-protocol")
-    (unknown-protocol ()
-      t)
-    (:no-error ()
-      nil))
-  t)
-+;#-(and freebsd sb-thread)
-+;#-(and dragonfly sb-thread)
-+;(deftest get-protocol-by-name/error
-+;  (handler-case (get-protocol-by-name "nonexistent-protocol")
-+;    (unknown-protocol ()
-+;      t)
-+;    (:no-error ()
-+;      nil))
-+;  t)
- 
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@ -3,3 +3,4 @@ DIST ocaml-ctypes-0.6.2.tar.gz 179953 SHA256 f31671c6515b9f9df245ec08e8ac6842cf3
 DIST ocaml-ctypes-0.7.0.tar.gz 181164 SHA256 8a68597b8545b36d7ced83a3365767ad0ebae99382ca7c8fff2a97666a78f94c SHA512 78929d4d9dd47e08751231a649f74259973333ecae84e6152b0a3e16a78da6b8b95bd8f69842b3b052324ecf96457eaa2b894557888aa53271917f9135259353 WHIRLPOOL 4edab9bacbea2f01676f0adc8b7058acd6097808c9d53e6d47320341de127634a3c0db3cdfd54678fdc97cb1bae8400ae79f8c5f5d55a921a3555d4f7c4ddc3a
 DIST ocaml-ctypes-0.8.0.tar.gz 182704 SHA256 db465ec1bc5c0222b2fe167065d35d588cdfaf8910bcf51e0a444d528c24b32a SHA512 6478a63643fbf56391e0ab982f535afc55a79af6723a04420b156d0e5da891eff3233259083d37a35f4a15242b291bd11f5d08608fa5a9f95e6faaf434b04e68 WHIRLPOOL 0fffc7c4994c6435ac349dac176f24fcda7273db7a02f6ee2c329f98f293ac8b51aaba1a1c7d053e8527e89c6ae4d15102badc921e396139eb594f8bc8acd61d
 DIST ocaml-ctypes-0.9.0.tar.gz 185021 SHA256 6a8e29447c2b24c8f4c4e5ae6f9580f42aaaa7c59ef92ed1a2944b097d87b9f3 SHA512 f94ed96b4df8b8fb11eb6d3bede7dd9d59427d3bf48357d51b32e967c3d97f6dc9f6180fa0b6e69c886a586a13ecc7ed39eff532dc499daf8117bdc1ce577410 WHIRLPOOL afc6c37bde106138cc852318f1e5db7c32cae87aee9bbe1730ad0e7e7ad1983495a1c200af3d864454eebf07fc40e8e12c0264296b1772d6a91964e507168fc9
+DIST ocaml-ctypes-0.9.1.tar.gz 185591 SHA256 66b06c312c7f3ed0363f14e0fc579650a9449e579e394ed8d26c65499614a83c SHA512 e194f21d26707ee79fb7e36df3aa5fdb76709027905a3f684fac8aafa6cd7f9a1174401646a85788ff58e31abd756d3c9ae36ee2f75adbc1f77772421aef43e6 WHIRLPOOL 5460c1680f9013f1415ee81f6e8ba7397cbd3976a10a2f492782c8b9b741573b6d5b889fbe5f5273514b104e5f8e77d62b3d536833babadd4240de8ec9164ea4
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.9.1.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.9.1.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Library for binding to C libraries using pure OCaml"
+HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes"
+SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.02:=[ocamlopt]
+	virtual/libffi
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit )"
+
+src_compile() {
+	emake -j1
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	findlib_src_install
+	dodoc CHANGES.md README.md
+}
--- a/dev-ml/ppx_deriving_yojson/Manifest
+++ b/dev-ml/ppx_deriving_yojson/Manifest
@ -0,0 +1 @@
+DIST ppx_deriving_yojson-3.0.tar.gz 18111 SHA256 28264562fa87fe0ae3484fa434126c02a7770f0324fa6a64ba8132ab10ae5143 SHA512 70c690d880ff652f9f92e95af047e87726bab48100e9325406eef7a9ed80f439df7292324de56cd17a93c6ad6bc9c1e7ce6edcd7c3b336352f0df4bfa7c7b81c WHIRLPOOL 7fac84e8faa78a9c362453098a2e73d1902ec9272f45ee32c9710bea527faeae55274ecfa257ad1eadbe4aa24d623e33b5ca73c122548efc0fe951061b1dc268
--- a/dev-ml/ppx_deriving_yojson/metadata.xml
+++ b/dev-ml/ppx_deriving_yojson/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
--- a/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.0.ebuild
+++ b/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.0.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A Yojson codec generator for OCaml"
+HOMEPAGE="A Yojson codec generator for OCaml"
+SRC_URI="https://github.com/whitequark/ppx_deriving_yojson/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt test"
+
+DEPEND="
+	dev-lang/ocaml:=[ocamlopt?]
+	dev-ml/yojson:=
+	dev-ml/result:=
+	>=dev-ml/ppx_deriving-4:=
+	dev-ml/cppo:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	dev-ml/findlib
+	dev-ml/ocamlbuild
+	test? ( dev-ml/ounit dev-ml/ppx_import )"
+
+src_compile() {
+	cp pkg/META.in pkg/META
+	ocaml pkg/build.ml \
+		native=$(usex ocamlopt true false) \
+		native-dynlink=$(usex ocamlopt true false) \
+		|| die
+}
+
+src_test() {
+	ocamlbuild -j 0 -use-ocamlfind -classic-display src_test/test_ppx_yojson.byte -- || die
+}
+
+src_install() {
+	opam-installer -i \
+		--prefix="${ED}/usr" \
+		--libdir="${D}/$(ocamlc -where)" \
+		--docdir="${T}/dontinstallit" \
+		${PN}.install || die
+	dodoc CHANGELOG.md README.md
+}
--- a/dev-ml/ppx_import/Manifest
+++ b/dev-ml/ppx_import/Manifest
@ -0,0 +1 @@
+DIST ppx_import-1.1.tar.gz 12951 SHA256 083f06119fa836939bec273340828c6f2c103cd88bdf775584d2036b8f4d0f5f SHA512 24a1db1f216518fb1302f8de2984bab5ffd33cbabe311d449e3767a96a63b386d11cdfd8f783d48169523a0535754b044841821aa24533d1d1127eb4a8aa42d6 WHIRLPOOL 479223751d0e180e4df3e4e7e36b774ded8284bcf8f67054518dabc6e3c16aae538a964ea4a01528caf78b388f1cd48e3dd487bb141bd0a315c622cd531fb637
--- a/dev-ml/ppx_import/metadata.xml
+++ b/dev-ml/ppx_import/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
--- a/dev-ml/ppx_import/ppx_import-1.1.ebuild
+++ b/dev-ml/ppx_import/ppx_import-1.1.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A syntax extension for importing declarations from interface files"
+HOMEPAGE="https://github.com/whitequark/ppx_impor://github.com/whitequark/ppx_import"
+SRC_URI="https://github.com/whitequark/ppx_import/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt test"
+
+DEPEND="
+	dev-lang/ocaml:=[ocamlopt?]
+	dev-ml/ppx_tools:=
+	dev-ml/cppo:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	test? ( dev-ml/ounit dev-ml/ppx_deriving )
+	dev-ml/opam
+	dev-ml/ocamlbuild
+	dev-ml/findlib
+"
+
+src_compile() {
+	cp pkg/META.in pkg/META
+	ocaml pkg/build.ml \
+		native=$(usex ocamlopt true false) \
+		native-dynlink=$(usex ocamlopt true false) \
+		|| die
+}
+
+src_test() {
+	ocamlbuild -classic-display -use-ocamlfind src_test/test_ppx_import.byte --	|| die
+}
+
+src_install() {
+	opam-installer -i \
+		--prefix="${ED}/usr" \
+		--libdir="${D}/$(ocamlc -where)" \
+		--docdir="${T}/dontinstallit" \
+		${PN}.install || die
+	dodoc CHANGELOG.md README.md
+}
--- a/dev-ml/ppx_type_conv/Manifest
+++ b/dev-ml/ppx_type_conv/Manifest
@ -1,2 +1,3 @@
 DIST ppx_type_conv-113.24.00.tar.gz 59641 SHA256 0751505c5d400416d5abc2525d164264ea82b8569ce819aec04065bf47ce2c42 SHA512 7fd809c35e5f009886dcaa310822eb919efecba155c8cd1377c50a05894c2c9afcf88a979361bb2a277791b6cd5b7d17e2a30fda36bd3d416a046a0b34989b57 WHIRLPOOL c22d424260b0f0fb1337da41de4beff1f90fcaca5590c7b0620f633ab1a296690f76df428d96dabece3fc8267704f1f34cf721bb5f3ca562d75098b3133d4701
 DIST ppx_type_conv-113.33.00.tar.gz 59371 SHA256 983e704c9e3579ad2dc93b8017c7c3852160c6245eb85ef98d6eb1723724921f SHA512 4da9e3252522865f2a4976810b33ecaf0275e3a19f40193466a5ddce7163727ff0c0e02fbabf93a3133bde231597b1fd4fba4ff4d813d49ab1858e9243b228f8 WHIRLPOOL c02ce8f8d401d527803b02a72b301ac5992fba1444ee4d8dec50b71785078213d5dc1d2c8bb7d68ee9779997cf5ba5b39c78ae97d3f66f482ea50f5690502b6b
+DIST ppx_type_conv-113.33.02+4.03.tar.gz 60598 SHA256 a211cc73cc3f31b6765b022bb851d762d9f6fa4c6b64666242923d5102d4f078 SHA512 305a46b9bf6ed6b082f5b794d180b9b194ed5f183d75e31fe49a392fa06c8cdfce1825987f9da0080bf83c49bf10dfd54837b22d73e50bc4eea8707bb64b7303 WHIRLPOOL 760ef375523410a8a1333bb5274a55efa8b27cd412a185fd65d6128a5f9ce5cb97d9d3703165cddf71b9f6c0d7c6a57baed6539bc22b8d689d19a8b1f54231d6
--- a/dev-ml/ppx_type_conv/ppx_type_conv-113.33.02.ebuild
+++ b/dev-ml/ppx_type_conv/ppx_type_conv-113.33.02.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit oasis eutils
+
+DESCRIPTION="Support Library for type-driven code generators"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}+4.03.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-ml/ppx_tools:=
+	dev-ml/ppx_driver:=
+	dev-ml/ppx_deriving:=
+	dev-ml/ppx_core:=
+	dev-ml/ppx_optcomp:=
+	>=dev-lang/ocaml-4.03:=
+"
+
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/opam"
+
+S=${WORKDIR}/${P}+4.03
+
+src_configure() {
+	emake setup.exe
+	OASIS_SETUP_COMMAND="./setup.exe" oasis_src_configure
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	opam-installer -i \
+		--prefix="${ED}/usr" \
+		--libdir="${D}/$(ocamlc -where)" \
+		--docdir="${ED}/usr/share/doc/${PF}" \
+		${PN}.install || die
+	dodoc CHANGES.md
+}
--- a/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild
+++ b/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=KAZEBURO
+DIST_VERSION=0.05
+inherit perl-module
+
+DESCRIPTION="Temporary changing working directory (chdir)"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test minimal"
+# Cwd -> perl-File-Spec
+RDEPEND="
+	virtual/perl-File-Spec
+	virtual/perl-Exporter
+	virtual/perl-if
+	virtual/perl-parent
+"
+# CPAN::Meta::Prereqs -> perl-CPAN-Meta
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.380.0
+	test? (
+		dev-perl/Test-Requires
+		virtual/perl-Test-Simple
+		!minimal? (
+			dev-perl/File-Copy-Link
+		)
+	)
+"
--- a/dev-perl/Cwd-Guard/Manifest
+++ b/dev-perl/Cwd-Guard/Manifest
@ -1 +1,2 @@
 DIST Cwd-Guard-0.04.tar.gz 9883 SHA256 1532cc4c453e4b3e5c195bc75c9b01974fa14304e54929850888641f2c28331c SHA512 7402203a51b1be99e91e9dfd1cf0e3577e5ba16afe8d808ab594bcff1603665399dc48fe867d40d9849cccbacfda0572fab09e8ef81934a251bb44625eade6f9 WHIRLPOOL 992d49d08b4cd14da70f0094f86f0f91837b1348f9e98e9a93a8129fd67f8fe2f59a7da3b678234c29beda3c7661177da512d7d1b38642df21c9d369bb61fc9f
+DIST Cwd-Guard-0.05.tar.gz 10253 SHA256 7afc7ca2b9502e440241938ad97a3e7ebd550180ebd6142e1db394186b268e77 SHA512 14aa68e535cec8f7182d5648558c539cbf6eebe2fee9c59d0b06f5b45cca1c6c652104a58f71b5a56f796f03d139e3e74962e45fb127bf038803b05cb9f32b82 WHIRLPOOL 00ce08639ec12ff73a15acd669585c22c5848eb9b462083728e4ff003117c19a099f2c00d327b9cb86a775ddf7a83457d462c3f9d3809bf2f7bfc6608048b31d
--- a/dev-perl/Cwd-Guard/metadata.xml
+++ b/dev-perl/Cwd-Guard/metadata.xml
@ -5,4 +5,8 @@
    <email>perl@gentoo.org</email>
    <name>Gentoo Perl Project</name>
  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Cwd-Guard</remote-id>
+    <remote-id type="cpan-module">Cwd::Guard</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/dev-perl/File-Copy-Link/File-Copy-Link-0.113.0-r1.ebuild
+++ b/dev-perl/File-Copy-Link/File-Copy-Link-0.113.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -20,3 +20,8 @@ DEPEND="dev-perl/Module-Build
 	${RDEPEND}"

 SRC_TEST="do"
+
+src_test() {
+	perl_rm_files t/pod-coverage.t t/pod.t
+	perl-module_src_test
+}
--- a/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild
+++ b/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild
@ -24,3 +24,8 @@ DEPEND="${RDEPEND}
 		virtual/perl-Test-Simple
 	)
 "
+
+src_test() {
+	perl_rm_files t/pod-coverage.t t/pod.t
+	perl-module_src_test
+}
--- a/dev-perl/File-Copy-Link/metadata.xml
+++ b/dev-perl/File-Copy-Link/metadata.xml
@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>c.affolter@stepping-stone.ch</email>
-		<description>Maintainer</description>
-	</maintainer>
-	<maintainer type="person">
-		<email>dev-zero@gentoo.org</email>
-		<description>Proxy maintainer</description>
-	</maintainer>
-	<maintainer type="project">
+  <maintainer type="person">
+    <email>c.affolter@stepping-stone.ch</email>
+    <description>Maintainer</description>
+  </maintainer>
+  <maintainer type="person">
+    <email>dev-zero@gentoo.org</email>
+    <description>Proxy maintainer</description>
+  </maintainer>
+  <maintainer type="project">
    <email>proxy-maint@gentoo.org</email>
    <name>Proxy Maintainers</name>
  </maintainer>
-	<longdescription>The Quota module provides access to file system quotas. The quotactl system call or ioctl is used to query or set quotas on the local host, or queries are submitted via RPC to a remote host. Mount tables can be parsed with getmntent and paths can be translated to device files (or whatever the actual quotactl implementations needs as argument) of the according file system.</longdescription>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <longdescription>The Quota module provides access to file system quotas. The quotactl system call or ioctl is used to query or set quotas on the local host, or queries are submitted via RPC to a remote host. Mount tables can be parsed with getmntent and paths can be translated to device files (or whatever the actual quotactl implementations needs as argument) of the according file system.</longdescription>
  <upstream>
    <remote-id type="cpan">File-Copy-Link</remote-id>
    <remote-id type="cpan-module">File::Copy::Link</remote-id>
+    <remote-id type="cpan-module">File::Spec::Link</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-perl/Pod-Readme/metadata.xml
+++ b/dev-perl/Pod-Readme/metadata.xml
@ -2,17 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-    <email>kentfredric@gmail.com</email>
+    <email>kentnl@gentoo.org</email>
    <name>Kent Fredric</name>
  </maintainer>
  <maintainer type="project">
    <email>perl@gentoo.org</email>
    <name>Gentoo Perl Project</name>
  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
  <upstream>
    <remote-id type="cpan">Pod-Readme</remote-id>
    <remote-id type="cpan-module">Pod::Readme</remote-id>
--- a/dev-perl/Test-File-ShareDir/metadata.xml
+++ b/dev-perl/Test-File-ShareDir/metadata.xml
@ -5,7 +5,7 @@
 	  <email>monsieurp@gentoo.org</email>
  </maintainer>
  <maintainer type="person">
-	  <email>kentnl@cpan.org</email>
+    <email>kentnl@gentoo.org</email>
  </maintainer>
  <maintainer type="project">
    <email>perl@gentoo.org</email>
--- a/dev-perl/Test-UseAllModules/metadata.xml
+++ b/dev-perl/Test-UseAllModules/metadata.xml
@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
    <maintainer type="person">
-        <email>kentfredric@gmail.com</email>
+        <email>kentnl@gentoo.org</email>
        <name>Kent Fredric</name>
    </maintainer>
    <maintainer type="project">
--- a/dev-perl/Tie-Hash-Method/metadata.xml
+++ b/dev-perl/Tie-Hash-Method/metadata.xml
@ -2,18 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>kentfredric@gmail.com</email>
+		<email>kentnl@gentoo.org</email>
 		<name>Kent Fredric</name>
-		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>perl@gentoo.org</email>
 		<name>Gentoo Perl Project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="cpan">Tie-Hash-Method</remote-id>
 		<remote-id type="cpan-module">Tie::Hash::Method</remote-id>
--- a/dev-python/flask-bootstrap/Manifest
+++ b/dev-python/flask-bootstrap/Manifest
@ -1,2 +1,2 @@
-DIST flask-bootstrap-3.3.5.7.tar.gz 485387 SHA256 f0cb530ff85a6756dd42a73f49783484eb06db2153a8ebb2ee2f2bf3152f2fa7 SHA512 2d8ed707ccd0dc028f7d765e1f213890186583b28b3879dae0df0282c5e068c91a285691355acf6742999a8bd96920a614098bf9f79ab67f3f40c1a17ac452a6 WHIRLPOOL 81d31625f2b9e35147c34a265405da561a9f91b9ccaf439588c01df68ec33e00c358bcecd78353e21ac1bc8dc6fbbc0b9aed534976b080efead4b0647a46ced5
 DIST flask-bootstrap-3.3.6.0.tar.gz 489779 SHA256 b7e215fbd570940a5a29fa08d41ee5958b616947f39f93cbd9d0ae3e5ed6d56a SHA512 4cf08a6fd75185fdf5c89783cf8610d74835bf9dc07bd83b36819147bd40cf0e10d20f563a5fc5b8e799e2b87f1e80ad896c76930ca1bc72f74a94818ac708c8 WHIRLPOOL 2963b38b7f076e5289e75ff439eb9facf3b025a548b907cd4a8166c833f164aa6b631a4ffbcad95b0d90c384bb0ccb95523f7c244334232a6d8ce6f43fb94266
+DIST flask-bootstrap-3.3.7.0.tar.gz 490438 SHA256 c526afd60c8d56391d2a728706470aa5f789ea6bc739c01613973652b1932f78 SHA512 0c7950d633d88f2e71eab444760229efde324b5169bc774215db4a5cd816d4b8eee8b5d55a68921330b2018d4ae57aafefa6e66cefa0ee822260103cf42143e6 WHIRLPOOL 698d5aee5c188349d6f00a0a9acc1fc8bb62b0ef707e4de46d6be1c788d1a578f64319f1936d47d9e2f69825a70ba15743cede32aa08ac8dda37d44ecdbb21e6
--- a/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.0.ebuild
+++ b/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.0.ebuild
@ -29,6 +29,7 @@ DEPEND="
 	test? (
 		dev-python/flask-appconfig[${PYTHON_USEDEP}]
 		dev-python/flask-debug[${PYTHON_USEDEP}]
+		dev-python/flask-nav[${PYTHON_USEDEP}]
 		dev-python/flask-wtf[${PYTHON_USEDEP}]
 		dev-python/pytest-runner[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@ -1,2 +1,2 @@
 DIST jaraco.functools-1.12.tar.gz 8819 SHA256 3f3af1cdc15355e8038a3bab0e8393cd7344c63ea5cdb4a81a3422d91c0bfdd2 SHA512 aafb9025e4e99b2469287b2e05161c89622809cd85b2916a65f11654ee5889811bc0def244215e0bbbd5428fa65a2f148229247929ec34b75b548b8e746d8fd0 WHIRLPOOL 6a2d39596473c29172f56ac767d26fd75ae3396b3fb66f5f9bd5b05b9f363d6ac18af614e7b500f0fdf165c3f49426f33c86289ad9546e398f484e31939eaec4
-DIST jaraco.functools-1.9.tar.gz 7220 SHA256 79a813f061ee16f431ac3828caca58b173d95d1518af144fa6307a92e90da496 SHA512 93b2cb1690bb9cf68b9f19b8964c7b660d35c2bd467ad724fe9d6169ae6a257aa2eab78da5bb49af14209991dc67df4ee7c7c03953fc753655aac924d5af550b WHIRLPOOL f49782df05f26513cdb5117b7412719498824e4394aa7557ba245dac35ff306c47412a4798713e2333c4ec700cbb78665da850e40cb499e8d961d815a0912acb
+DIST jaraco.functools-1.13.tar.gz 9026 SHA256 af9033b6aa974cfc70e4abec2be71f2434453b80db1b6f031d2ab26ee5b0eef9 SHA512 fb73a69811026562e1f8195960956a90757700ce13dbc00feb0ef97cf5f3c35f0334bcd7d5529ddab7c7524899bbcc6e264266a4cfe23056b50cd7a3cd9e896b WHIRLPOOL 14a59d390ff8e940d276181559d96fae4e2d5be8a1247b7cb892b452498953c3ed7881fa42dba5bd56dfd95093e8b3db3d3fc819253973828ff812e820acd8f1
--- a/dev-python/jaraco-functools/jaraco-functools-1.13.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-1.13.ebuild
@ -16,13 +16,19 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="doc test"

-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+	)
 	test? (
 		${RDEPEND}
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
@ -33,13 +39,15 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]

 S="${WORKDIR}/${MY_PN}-${PV}"

-python_prepare_all() {
-	if use test && has_version "${CATEGORY}/${PN}"; then
-		die "Ensure $PN is not already installed or the test suite will fail"
-	fi
-	distutils-r1_python_prepare_all
+python_compile_all() {
+	use doc && esetup.py build_sphinx
 }

 python_test() {
 	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
 }
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/jaraco-functools/metadata.xml
+++ b/dev-python/jaraco-functools/metadata.xml
@ -14,5 +14,6 @@
 		<remote-id type="pypi">jaraco.functools</remote-id>
 		<remote-id type="github">jaraco/jaraco.functools</remote-id>
 		<bugs-to>https://github.com/jaraco/jaraco.functools/issues</bugs-to>
+		<changelog>https://github.com/jaraco/jaraco.functools/blob/master/CHANGES.rst</changelog>
 	</upstream>
 </pkgmetadata>
--- a/dev-python/pyicu/pyicu-1.9.3.ebuild
+++ b/dev-python/pyicu/pyicu-1.9.3.ebuild
@ -34,8 +34,8 @@ DOCS=(CHANGES CREDITS README.md)
 python_compile_all() {
 	if use doc; then
 		einfo "Making documentation from ${EPYTHON} build"
-		cd "${BEST_BUILD_DIR}" || die
-		epydoc --html --verbose \
+		mkdir -p doc/html || die
+		epydoc --html --verbose -o doc/html \
 			--url="${HOMEPAGE}" --name="${MY_P}" \
 			icu.py || die "Making the docs failed!"
 	fi
@ -46,8 +46,8 @@ python_test() {
 }

 python_install_all() {
-	distutils-r1_python_install_all
 	if use doc; then
-		dohtml -r ../*/html/*
+		local HTML_DOCS=( doc/html/. )
 	fi
+	distutils-r1_python_install_all
 }
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@ -1 +1,2 @@
 DIST uvloop-0.4.20.tar.gz 1781445 SHA256 b39afbc242eafff7471337468b28c4164f55d130f8194e0fb4a8b2eb71cb1298 SHA512 c7f540da9d29340fb0cc0e589143fabc12d4c185d4e7eff889e3434478f445e98c703fd9024af66b6b121bce3c860be2b4da497a6492a43df5891e86b6007d7e WHIRLPOOL 1d50e45cf92fca4b983222038e6524359e7160d0ac87b89265dd298d0fa9f33527c5a839752e6cc0a2d34c6eb27f0919474085616885c779b876a8638a0c5ba1
+DIST uvloop-0.5.3.tar.gz 1913999 SHA256 ee402d2df4bf092f6f036637db41bb2896f7c6832adf91dbb6dfec0e6dfa6aee SHA512 7902557e865f6b346edcf7c71ea06e6970b7844d47c0d46aee23bb6ec8cae292a0d77960fc5fcaf0c4b47220c1f5f76b92546ccf94694f07adfd04474355a638 WHIRLPOOL 05c509e832a6866016c7187ac2ec71b9f1c2493a2d57594be341144a2ccfa9c478c2525bb0d348cc2e960350eab2969a46dd6fb3c57cc88e0fa489459590869e
--- a/dev-python/uvloop/uvloop-0.5.3.ebuild
+++ b/dev-python/uvloop/uvloop-0.5.3.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 )
+inherit distutils-r1
+
+DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv."
+HOMEPAGE="https://github.com/magicstack/uvloop"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-libs/libuv-1.9.0:="
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/cython-0.24.1[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/cython-0.24.1[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	cat <<EOF >> setup.cfg
+[build_ext]
+use-system-libuv=1
+EOF
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake docs
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@ -3,5 +3,5 @@ DIST cmake-3.2.2.tar.gz 6438736 SHA256 ade94e6e36038774565f2aed8866415443444fb7a
 DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e6672bd9356a98a0eaf667e66d926f52c4e80e53e38cb8e5cd489993e5668f SHA512 306cf4498cbad9f9c49a63c1870e04f33b5a91032508654a691fe116ec4821da98e9a1e35b6cb186bf9367ebdd9c42ac919e6fc44d2ba6938ad3bc1131b80655 WHIRLPOOL 1d30dd99ea6dc085f64c1b02ab0708f0c033e8d98f69ca431016da17eecc29f01489e5e253446bd542a4a9b770bcaee7b7a7bfa71e7520e7900094a9350c7f8f
 DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faeeeef0672b4578180de21b33f1 WHIRLPOOL 631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b
 DIST cmake-3.5.2.tar.gz 6863498 SHA256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a SHA512 7b08eb9f1b37993553f89c03eceedc465dc52b787dec99b78c74ebff2817d0aac9764e82ad835e8fc39f61cd2d2c0a3544d3f5ae299234ed52e9a940edf30b81 WHIRLPOOL c255825aa024ba9feb51540ed2a36cfa73c6397356d18c5ff8f49258a4c30906c8ed5d7553e7d56f3c373ffff418697f056f218f30aa409debab2303b0f9fa84
-DIST cmake-3.6.0.tar.gz 6897636 SHA256 fd05ed40cc40ef9ef99fac7b0ece2e0b871858a82feade48546f5d2940147670 SHA512 4e519fa30a6fee2fb0ef8df667504dfaba1f965c263fd4f42d17348c45cff33777de9a8c552b13da0bb4b9f1300a142f204a844eac03bdf431e826e8d7ba3505 WHIRLPOOL 4d2842efa7ae6bdfe5d1e0b773f8649a6dec7d23364f89570d442db2f4da033acd0023dd5cf80004a024b5c1ec142db284357a21c993bc84d0a07d8e0fb76c77
 DIST cmake-3.6.1.tar.gz 6895262 SHA256 28ee98ec40427d41a45673847db7a905b59ce9243bb866eaf59dce0f58aaef11 SHA512 69f20df70c58f7a09da7511a92a1e4492d89fecf30b11744aaf29a129f62384ff57ed7ed2d9dbb8b102abdc72d5722e744583161cb0ae71a01423473f36c8b1d WHIRLPOOL 82853de51dff610a769700f1063aecb83b7cb02308e7c05e0726b8a068cb3adbe764f717b8649709d629b28dcd38f38b2b53bc4bc0ba13657aeb7969dd7d758b
+DIST cmake-3.6.2.tar.gz 6920069 SHA256 189ae32a6ac398bb2f523ae77f70d463a6549926cde1544cd9cc7c6609f8b346 SHA512 50b217d3205cc65c2b55ece4ba050b1aa80dfa8a7e22ee0ec16c741cd99a639847d197a2e8448d7710c2a6ea7ba7bbcd6e3f12810f65dcc74bd27bcdb02f844a WHIRLPOOL 86ad3ff5edd071fdf46e3fc1b2d9af7cd420c93e5cb744ef0f490e6ce07c3f156384bdfb6d5246ac2caa6a563138c18e0d9208561715458343d135878223aab6
--- a/dev-util/cmake/cmake-3.6.1.ebuild
+++ b/dev-util/cmake/cmake-3.6.1.ebuild
@ -1,198 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
-
-RDEPEND="
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/expat-2.0.1
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
-	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
-	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-	if [ $? -eq 0 ]; then
-		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
-	fi
-
-	tc-export CC CXX LD
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:#IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    Qt4Deploy, which tries to break sandbox and ignores prefix
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
-	cmake_src_bootstrap
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-	)
-
-	if use qt4 || use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/cmake-syntax.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/cmake-indent.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -rf "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
--- a/dev-util/cmake/cmake-3.6.2.ebuild
+++ b/dev-util/cmake/cmake-3.6.2.ebuild
@ -45,8 +45,6 @@ S="${WORKDIR}/${MY_P}"

 SITEFILE="50${PN}-gentoo.el"

-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
 PATCHES=(
 	# prefix
 	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
@ -65,6 +63,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch

 	# upstream fixes (can usually be removed with a version bump)
+	"${FILESDIR}"/${PN}-3.6.1-find_library-lib32.patch
 )

 cmake_src_bootstrap() {
@ -78,6 +77,11 @@ cmake_src_bootstrap() {
 		par_arg="--parallel=1"
 	fi

+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
 	# execinfo.h on Solaris isn't quite what it is on Darwin
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
@ -121,18 +125,15 @@ cmake_src_test() {
 src_prepare() {
 	cmake-utils_src_prepare

-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
 	# Add gcc libs to the default link paths
 	sed -i \
 		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
 		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
 		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
-	cmake_src_bootstrap
+	if ! has_version ${CATEGORY}/${PN}; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
 }

 src_configure() {
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@ -2,3 +2,4 @@ DIST glib-2.44.1.tar.xz 7132940 SHA256 8811deacaf8a503d0a9b701777ea079ca6a4277be
 DIST glib-2.46.2.tar.xz 7344636 SHA256 5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db SHA512 8b5298712710d77b4a47367071f782d2bb3042b149ec8fde8c065f80bf3c5375c94318d19665c0092572e4895e590231a47324d25f371310f02b43feb3009588 WHIRLPOOL 700b69360110351544780ace4dcb14f29505f63d8840882532a4b7c017860b6da86e09cbabca691b7b24cb08b8722e772555de044b8b21e4b0952c8a8e4e6ecb
 DIST glib-2.48.0.tar.xz 7487800 SHA256 744be6931ca914c68af98dc38ff6b0cf8381d65e335060faddfbf04c17147c34 SHA512 684544bc594d9f6c905495d895daed40b074bcf5fa835aefb9a1034afc9564b2bd464e68d4c378c210e96918ef5d5202350da53a7104794420e990049ddbebf5 WHIRLPOOL 39ddd7fd17ecc2100f2156165210d2cf68ae13724b252e42705bc89d0c4145cddca3a30f9e3bf9b6a2971cbffe0e108d2acae1200c8fe6d9db91b4b3953c4950
 DIST glib-2.48.1.tar.xz 7441032 SHA256 74411bff489cb2a3527bac743a51018841a56a4d896cc1e0d0d54f8166a14612 SHA512 5bbea7d07ba6d75c35c6be8f1ebc685aa2549bd20030741b2d6e2c30e9b2d476c2afa50a974bbdad98c305666c8b04357b51619c97fe50d3e9965700088aad9b WHIRLPOOL 2f08854815fee79b6246accedb62a714845b7f0bc67bcd6cde48aa0147a957e6c9cbbc424100d651ee5573f31a3db89ee1935e3ffdc97c5bf1d5711a85545eb2
+DIST glib-2.48.2.tar.xz 6408644 SHA256 f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4 SHA512 2eac104eb2207d0a6488992e48069a34b417f51e141364f281ab7b0953a6de88be177b1c694dd9464a856c9a5d8021e3cf0193a8d9c5aaf6ea11f1f9ff743c43 WHIRLPOOL cba211000d5597e93d01113e5f2b6736e47f4daa00935a53af182b3304fef9a1ac25f78995c7a53cc1234261433a1bbd1ec751c87b556845a15da720af5b971b
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.48.2.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.48.2.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+# To prevent circular dependencies with glib[test]
+PDEPEND=">=dev-libs/glib-${PV}:2"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.40.0-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' gdbus-codegen.in > gdbus-codegen || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
--- a/eclass/java-ant-2.eclass
+++ b/eclass/java-ant-2.eclass
@ -245,12 +245,12 @@ java-ant_bsfix_files() {
 		done

 		# for javadoc target and all in one pass, we need the new rewriter.
-		local rewriter3="/usr/share/javatoolkit/xml-rewrite-3.py"
+		local rewriter3="${EPREFIX}/usr/share/javatoolkit/xml-rewrite-3.py"
 		if [[ ! -f ${rewriter3} ]]; then
-			rewriter3="/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-3.py"
+			rewriter3="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-3.py"
 		fi

-		local rewriter4="/usr/$(get_libdir)/javatoolkit/bin/build-xml-rewrite"
+		local rewriter4="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/build-xml-rewrite"

 		if [[ -x ${rewriter4} && ${JAVA_ANT_ENCODING} ]]; then
 			[[ ${JAVA_ANT_REWRITE_CLASSPATH} ]] && local gcp="-g"
@ -458,8 +458,8 @@ java-ant_ignore-system-classes() {
 # @DESCRIPTION:
 # Run the right xml-rewrite binary with the given arguments
 java-ant_xml-rewrite() {
-	local gen2="/usr/bin/xml-rewrite-2.py"
-	local gen2_1="/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py"
+	local gen2="${EPREFIX}/usr/bin/xml-rewrite-2.py"
+	local gen2_1="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py"
 	# gen1 is deprecated
 	if [[ -x "${gen2}" ]]; then
 		${gen2} "${@}" || die "${gen2} failed"
--- a/eclass/mozconfig-v6.48.eclass
+++ b/eclass/mozconfig-v6.48.eclass
@ -329,11 +329,9 @@ mozconfig_config() {
 	# Instead of the standard --build= and --host=, mozilla uses --host instead
 	# of --build, and --target intstead of --host.
 	# Note, mozilla also has --build but it does not do what you think it does.
+	# Set both --target and --host as mozilla uses python to guess values otherwise
 	mozconfig_annotate '' --target="${CHOST}"
-	if [[ "${CBUILD:-${CHOST}}" != "${CHOST}" ]]; then
-		# set --host only when cross-compiling
-		mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-	fi
+	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"

 	mozconfig_use_enable pulseaudio

--- a/games-board/ace/ace-1.4-r1.ebuild
+++ b/games-board/ace/ace-1.4-r1.ebuild
@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="DJ Delorie's Ace of Penguins solitaire games"
+HOMEPAGE="http://www.delorie.com/store/ace/"
+SRC_URI="http://www.delorie.com/store/ace/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libpng:0
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-xpm.patch
+	"${FILESDIR}"/${P}-libpng15.patch
+	"${FILESDIR}"/${P}-gold.patch
+	"${FILESDIR}"/${P}-CC.patch
+	"${FILESDIR}"/${P}-clang.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--program-prefix=ace-
+}
+
+src_install() {
+	default
+
+	dodoc docs/*
+	newicon docs/as.gif ${PN}.gif
+	cd "${D}/usr/bin" || die
+	local p
+	for p in *
+	do
+		make_desktop_entry $p "Ace ${p/ace-/}" /usr/share/pixmaps/${PN}.gif
+	done
+}
--- a/games-board/ace/files/ace-1.4-gold.patch
+++ b/games-board/ace/files/ace-1.4-gold.patch
@ -5,8 +5,8 @@ Subject: build system
 fix gold linker compilation
 https://bugs.gentoo.org/show_bug.cgi?id=435826

--- configure.in
-+++ configure.in
+--- a/configure.in
+++ b/configure.in
@@ -44,6 +44,9 @@
 AC_PROG_INSTALL
 AC_PROG_LN_S
@ -96,8 +96,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=435826
 AC_SUBST(PDA)
 
 AC_OUTPUT(Makefile lib/Makefile games/Makefile tests/Makefile)
--- lib/Makefile.am
-+++ lib/Makefile.am
+--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,18 +5,19 @@
 
 CLEANFILES = images.c images.d
@ -121,8 +121,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=435826
 # table_ai.c table_ck.c table_dc.c table_dg.c \
 #table_dp.c table_in.c table_ky.c table_rd.c table_rs.c
 
--- games/Makefile.am
-+++ games/Makefile.am
+--- a/games/Makefile.am
+++ b/games/Makefile.am
@@ -30,8 +30,7 @@
 
 STRIP = @STRIP@
--- a/games-board/ace/files/ace-1.4-libpng15.patch
+++ b/games-board/ace/files/ace-1.4-libpng15.patch
@ -1,5 +1,5 @@
--- lib/make-imglib.c
-+++ lib/make-imglib.c
+--- a/lib/make-imglib.c
+++ b/lib/make-imglib.c
@@ -86,7 +86,7 @@
     png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0);
     info_ptr = png_create_info_struct (png_ptr);
@ -9,8 +9,8 @@
       fclose (f);
       continue;
     }
--- lib/xwin.c
-+++ lib/xwin.c
+--- a/lib/xwin.c
+++ b/lib/xwin.c
@@ -824,13 +824,13 @@
   png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0);
   info_ptr = png_create_info_struct (png_ptr);
--- a/games-board/ace/files/ace-1.4-no-xpm.patch
+++ b/games-board/ace/files/ace-1.4-no-xpm.patch
@ -1,5 +1,5 @@
--- lib/table.c.orig	2008-01-15 15:05:27.000000000 -0500
-+++ lib/table.c	2010-09-29 17:34:40.925310980 -0400
+--- a/lib/table.c	2008-01-15 15:05:27.000000000 -0500
+++ b/lib/table.c	2010-09-29 17:34:40.925310980 -0400
@@ -23,7 +23,6 @@
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
--- a/games-board/ascal/ascal-0.1.1-r1.ebuild
+++ b/games-board/ascal/ascal-0.1.1-r1.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="A game similar to Draughts but with some really cool enhancements"
+HOMEPAGE="http://ascal.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ascal/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-cpp/libglademm
+	dev-cpp/libgnomecanvasmm
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-install.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf
+}
--- a/games-board/ascal/files/ascal-0.1.1-gcc43.patch
+++ b/games-board/ascal/files/ascal-0.1.1-gcc43.patch
@ -1,5 +1,5 @@
--- src/gui.cpp.old	2009-01-18 21:11:58.000000000 +0100
-+++ src/gui.cpp	2009-01-18 21:12:33.000000000 +0100
+--- a/src/gui.cpp	2009-01-18 21:11:58.000000000 +0100
+++ b/src/gui.cpp	2009-01-18 21:12:33.000000000 +0100
@@ -21,6 +21,7 @@
 #include "shareddata.hpp"
 #include "config.h"
@ -8,8 +8,8 @@
 
 gui::gui(shareddata *newData): GuiBoard() {
 	//clean, cleaner - pointer ;)
--- src/gui_board.cpp.old	2009-01-18 21:13:30.000000000 +0100
-+++ src/gui_board.cpp	2009-01-18 21:13:50.000000000 +0100
+--- a/src/gui_board.cpp	2009-01-18 21:13:30.000000000 +0100
+++ b/src/gui_board.cpp	2009-01-18 21:13:50.000000000 +0100
@@ -20,6 +20,7 @@
 #include <math.h>
 #include "helper.h"
@ -18,8 +18,8 @@
 
 
 gui_board::gui_board()   {
--- src/board.cpp.old	2009-01-18 21:14:27.000000000 +0100
-+++ src/board.cpp	2009-01-18 21:14:58.000000000 +0100
+--- a/src/board.cpp	2009-01-18 21:14:27.000000000 +0100
+++ b/src/board.cpp	2009-01-18 21:14:58.000000000 +0100
@@ -15,6 +15,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
--- a/games-board/ascal/files/ascal-0.1.1-install.patch
+++ b/games-board/ascal/files/ascal-0.1.1-install.patch
@ -1,5 +1,5 @@
--- configure.ac
-+++ configure.ac
+--- a/configure.ac
+++ b/configure.ac
@@ -63,9 +63,6 @@
         AC_DEFINE(DEBUG, 1, [Enable debug msg.])
 		CPPFLAGS=[`echo "$CXXFLAGS" | $SED -e 's/-O[0-9]*//g'`]
@ -19,8 +19,8 @@
 fi
 
 AC_ARG_ENABLE(static,
--- m4/Makefile.am
-+++ m4/Makefile.am
+--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -15,6 +15,5 @@
 m4macros = 
 
@ -28,8 +28,8 @@
 -m4data_DATA = $(m4macros) 
 EXTRA_DIST =  
 
--- Makefile.am
-+++ Makefile.am
+--- a/Makefile.am
+++ b/Makefile.am
@@ -17,13 +17,12 @@
 
 ACLOCAL_AMFLAGS = -I m4
@ -48,8 +48,8 @@
 -#include aminclude.am
 \ No newline at end of file
 +#include aminclude.am
--- po/Makefile.in.in
-+++ po/Makefile.in.in
+--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -34,7 +34,7 @@
 datarootdir = @datarootdir@
 libdir = @libdir@
@ -59,8 +59,8 @@
 subdir = po
 install_sh = @install_sh@
 # Automake >= 1.8 provides @mkdir_p@.
--- src/Makefile.am
-+++ src/Makefile.am
+--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,5 +50,5 @@
 
 
--- a/games-board/atakks/atakks-1.0-r1.ebuild
+++ b/games-board/atakks/atakks-1.0-r1.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils
+
+MY_P=${P/-/_}
+DESCRIPTION="A clone of Ataxx"
+HOMEPAGE="http://team.gcu-squad.org/~fab"
+# no version upstream
+#SRC_URI="http://team.gcu-squad.org/~fab/down/${PN}.tgz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl:0"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-warnings.patch
+	"${FILESDIR}"/${P}-as-needed.patch
+)
+
+src_prepare() {
+	default
+
+	# Modify game data paths
+	sed -i \
+		-e "s:SDL_LoadBMP(\":SDL_LoadBMP(\"/usr/share/${PN}/:" \
+		main.c || die
+}
+
+src_compile() {
+	emake E_CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /usr/share/${PN}
+	doins *bmp
+	newicon icon.bmp ${PN}.bmp
+	make_desktop_entry ${PN} Atakks /usr/share/pixmaps/${PN}.bmp
+}
--- a/games-board/atakks/files/1.0-warnings.patch
+++ b/games-board/atakks/files/1.0-warnings.patch
@ -1,5 +1,5 @@
--- main.c.orig	2004-06-02 01:26:00.000000000 -0700
-+++ main.c	2004-06-02 01:27:30.000000000 -0700
+--- a/main.c	2004-06-02 01:26:00.000000000 -0700
+++ b/main.c	2004-06-02 01:27:30.000000000 -0700
@@ -13,6 +13,7 @@
 #include<SDL/SDL.h>
 #include<unistd.h>
--- a/games-board/atakks/files/atakks-1.0-as-needed.patch
+++ b/games-board/atakks/files/atakks-1.0-as-needed.patch
@ -1,5 +1,5 @@
--- Makefile.old        2009-02-03 10:02:08.000000000 +0100
-+++ Makefile    2009-02-03 10:04:12.000000000 +0100
+--- a/Makefile        2009-02-03 10:02:08.000000000 +0100
+++ b/Makefile    2009-02-03 10:04:12.000000000 +0100
@@ -1,10 +1,10 @@
 -LDFLAGS= -lSDL -lpthread -s
 -CFLAGS= -Wall -ansi # -DDEBUG
--- a/games-board/awale/awale-1.5-r1.ebuild
+++ b/games-board/awale/awale-1.5-r1.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# do not use autotools related stuff in stable ebuilds
+# unless you like random breakage: 469796, 469798, 424041
+
+EAPI=6
+
+inherit autotools eutils gnome2-utils
+
+DESCRIPTION="Free Awale - The game of all Africa"
+HOMEPAGE="http://www.nongnu.org/awale/"
+SRC_URI="mirror://nongnu/awale/${P}.tar.gz"
+SRC_URI="${SRC_URI} https://dev.gentoo.org/~hasufell/distfiles/${P}-no-autoreconf2.patch.xz" # STABLE ARCH
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tk"
+
+RDEPEND="tk? ( dev-lang/tcl:0= dev-lang/tk:0= )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+)
+
+src_prepare() {
+	default
+
+	mv src/xawale.tcl src/xawale.tcl.in || die
+	mv configure.{in,ac} || die
+	rm aclocal.m4 || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--mandir=/usr/share/man \
+		--with-iconsdir=/usr/share/icons/hicolor/48x48/apps \
+		--with-desktopdir=/usr/share/applications \
+		$(use_enable tk)
+}
+
+src_install() {
+	default
+	use tk && fperms +x /usr/share/${PN}/xawale.tcl
+}
+
+pkg_preinst() {
+	use tk && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use tk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use tk && gnome2_icon_cache_update
+}
--- a/games-board/biloba/biloba-0.9.3-r1.ebuild
+++ b/games-board/biloba/biloba-0.9.3-r1.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils gnome2-utils
+
+DESCRIPTION="a board game, up to 4 players, with AI and network"
+HOMEPAGE="http://biloba.sourceforge.net/"
+SRC_URI="mirror://sourceforge/biloba/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl:0[X,video,sound]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+	# X11 headers are checked but not used, everything is done through SDL
+	"${FILESDIR}"/${P}-not-windows.patch
+	"${FILESDIR}"/${P}-no-X11-dep.patch
+)
+
+src_prepare() {
+	default
+
+	# "missing" file is old, and warns about --run not being supported
+	rm -f missing
+	eautoreconf
+}
+
+src_install() {
+	default
+	newicon -s 64 biloba_icon.png ${PN}.png
+	make_desktop_entry biloba Biloba
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
--- a/games-board/biloba/files/biloba-0.9.3-no-X11-dep.patch
+++ b/games-board/biloba/files/biloba-0.9.3-no-X11-dep.patch
@ -1,5 +1,5 @@
--- configure.ac.orig	2006-07-29 11:38:43.000000000 +0200
-+++ configure.ac	2006-07-29 11:40:52.000000000 +0200
+--- a/configure.ac	2006-07-29 11:38:43.000000000 +0200
+++ b/configure.ac	2006-07-29 11:40:52.000000000 +0200
@@ -40,14 +40,6 @@
         ;;
     *)
--- a/games-board/biloba/files/biloba-0.9.3-not-windows.patch
+++ b/games-board/biloba/files/biloba-0.9.3-not-windows.patch
@ -1,5 +1,5 @@
--- configure.ac.old	2008-01-14 14:51:11.000000000 +0100
-+++ configure.ac	2008-12-28 12:57:13.000000000 +0100
+--- a/configure.ac	2008-01-14 14:51:11.000000000 +0100
+++ b/configure.ac	2008-12-28 12:57:13.000000000 +0100
@@ -73,12 +65,6 @@
              AC_MSG_ERROR([*** SDL-Mixer not found!]))
 AC_CHECK_HEADER(SDL/SDL_mixer.h, , AC_MSG_ERROR([*** SDL-mixer devel files not found!]))
--- a/games-board/blokish/blokish-0.9.4-r3.ebuild
+++ b/games-board/blokish/blokish-0.9.4-r3.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+inherit eutils autotools wxwidgets
+
+MY_P="${PN}_v${PV}"
+DESCRIPTION="Open source clone of the four-player board game Blokus"
+HOMEPAGE="https://sourceforge.net/projects/blokish/"
+SRC_URI="mirror://sourceforge/blokish/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	virtual/glu
+	virtual/opengl"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-underlink.patch
+	"${FILESDIR}"/${P}-wxgtk.patch
+)
+
+src_prepare() {
+	default
+
+	# Otherwise $WX_CONFIG is unset:
+	setup-wxwidgets
+
+	sed -i \
+		-e "s:wx-config:${WX_CONFIG}:" \
+		configure.in makefile.am || die
+	mv configure.in configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	doicon src/${PN}.xpm
+	make_desktop_entry ${PN} Blokish ${PN}
+
+	dodoc docs/*
+}
--- a/games-board/blokish/files/blokish-0.9.4-gcc43.patch
+++ b/games-board/blokish/files/blokish-0.9.4-gcc43.patch
@ -1,5 +1,5 @@
--- src/base.h
-+++ src/base.h
+--- a/src/base.h
+++ b/src/base.h
@@ -25,6 +25,9 @@
 #include <vector>
 #include <fstream>
--- a/games-board/blokish/files/blokish-0.9.4-underlink.patch
+++ b/games-board/blokish/files/blokish-0.9.4-underlink.patch
@ -1,5 +1,5 @@
--- makefile.am.old	2011-06-21 08:43:21.804880067 +0200
-+++ makefile.am	2011-06-21 08:43:49.875661081 +0200
+--- a/makefile.am	2011-06-21 08:43:21.804880067 +0200
+++ b/makefile.am	2011-06-21 08:43:49.875661081 +0200
@@ -1,5 +1,5 @@
 INCLUDES = `wx-config --cxxflags`
 -LIBS = `wx-config --libs --gl-libs`
--- a/games-board/blokish/files/blokish-0.9.4-wxgtk.patch
+++ b/games-board/blokish/files/blokish-0.9.4-wxgtk.patch
@ -1,5 +1,5 @@
-diff -ru blokish.orig/src/blokish.cpp blokish/src/blokish.cpp
--- blokish.orig/src/blokish.cpp	2007-04-01 17:01:26.000000000 -0400
+diff -ru blokish/src/blokish.cpp blokish/src/blokish.cpp
+--- blokish/src/blokish.cpp	2007-04-01 17:01:26.000000000 -0400
 +++ blokish/src/blokish.cpp	2015-11-15 21:48:32.426081482 -0500
@@ -903,7 +903,7 @@
   void OnSaveGame(wxCommandEvent &event)
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@ -1,3 +1,4 @@
 DIST kdelibs-4.14.20.tar.xz 11632384 SHA256 b77e9b3c5063563db00e2fd816794f438148609aee22c2f2ddb2588b9e8c3cb4 SHA512 bcc52c959497ac229d21665113236428ac71e34cf5ac853b2d0200fd067f71db432aa29e1709ffcc2762764d1e973638e805a377ca4a254c0b3ded7f03228fbb WHIRLPOOL 76058923f6dc50ebdbc0dd1bfebc12048ebfa2ed431dc78e34017707e90553c0eb5e25825c0f13cc892eb1cd601d702aee4f62235be0f449974af402c3eeb650
 DIST kdelibs-4.14.22.tar.xz 11632176 SHA256 f0caa5e99ec325d9392a68393aadf58898c269be7c41f878b2b1807cc931d567 SHA512 9ea28cd541eb6ec46bd27b364c35ca7818a90651507beaed28f3a632fc17ec608e18643d1cfdb4a21661148f93ace0067a63dfd1328b66f271a1aa8d5c201609 WHIRLPOOL 59b6fdd92244b26a19dfa7d459cd4e5659e0f31d915febbe6173a9e2a8e9be9edf40969c395ebfc55446607b11416c9a5f2861e0307d38e27ca515c109f69b37
 DIST kdelibs-4.14.23.tar.xz 11633836 SHA256 3afe6ecf2d735484d2c2e22efda45a2c5c6ff702e87f56c80e2bcb565db11fcd SHA512 496d18e0764df7909bd4eeeb8d603bbca31cb7c1628e919588dd7a2b6c04fdd7feeb45e2597be1945c9d8afe34a6e479393e86211805c09301345a3f2d30a4a6 WHIRLPOOL 069ce8882cac94f51f3b502a90cfb671bf1b95084db2987a86b87d1220a2b587c70dd4f57d63b4cf125e3f723475c127dd11c0d632eb7179807f6b02080b94e4
+DIST kdelibs-4.14.24.tar.xz 11635840 SHA256 45e663e8739f131115eda69e5af95e895cce8161228d075d74a9a8cd390346ef SHA512 187737e30d05f324977cfc14aa375b49e15c322abb2b8f482382f9e6061bf7d18b97b957a7fcc1fb9184fa68cd3e1753d9633e14f32d799e3e5a78f283ff0894 WHIRLPOOL 2a4a67f792a2d88f2a4cfd49cafe2c611e79ba974a55d6d77e9688acf89be56817adfa6489017162afc42d7c30949df277b8974a2aaf59b2357a3b279a83b0a2
--- a/kde-base/kdelibs/kdelibs-4.14.24.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.14.24.ebuild
@ -0,0 +1,301 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CMAKE_MIN_VERSION="3.3.1-r1"
+CPPUNIT_REQUIRED="optional"
+DECLARATIVE_REQUIRED="always"
+KDE_HANDBOOK="optional"
+OPENGL_REQUIRED="optional"
+WEBKIT_REQUIRED="optional"
+inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
+
+APPS_VERSION="16.08.1" # Don't forget to bump this
+
+DESCRIPTION="KDE libraries needed by all KDE programs"
+[[ ${KDE_BUILD_TYPE} != live ]] && \
+SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 +crypt debug doc fam jpeg2k
+kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell
+cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
+
+REQUIRED_USE="
+	udisks? ( udev )
+	upower? ( udev )
+"
+
+# needs the kate regression testsuite from svn
+RESTRICT="test"
+
+COMMONDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	>=dev-libs/libattica-0.4.2
+	dev-libs/libdbusmenu-qt[qt4]
+	dev-libs/libpcre[unicode]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/giflib:=
+	media-libs/libpng:0=
+	media-libs/phonon[qt4]
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-misc/shared-mime-info
+	acl? ( virtual/acl )
+	!aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXcursor
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXrender
+		x11-libs/libXScrnSaver
+		x11-libs/libXtst
+		!kernel_SunOS? (
+			|| (
+				sys-libs/libutempter
+				>=sys-freebsd/freebsd-lib-9.0
+			)
+		)
+	)
+	bzip2? ( app-arch/bzip2 )
+	crypt? ( app-crypt/qca:2[qt4] )
+	fam? ( virtual/fam )
+	jpeg2k? ( media-libs/jasper )
+	kerberos? ( virtual/krb5 )
+	openexr? (
+		media-libs/openexr:=
+		media-libs/ilmbase:=
+	)
+	policykit? ( sys-auth/polkit-qt[qt4] )
+	spell? ( app-text/enchant )
+	ssl? (
+		libressl? ( dev-libs/libressl )
+		!libressl? ( dev-libs/openssl:0 )
+	)
+	udev? ( virtual/udev )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${COMMONDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( virtual/libintl )
+"
+RDEPEND="${COMMONDEPEND}
+	!dev-qt/qtphonon
+	>=app-crypt/gnupg-2.0.11
+	app-misc/ca-certificates
+	$(add_kdebase_dep kde-env '' 4.14.3)
+	sys-apps/dbus[X]
+	!aqua? (
+		udisks? ( sys-fs/udisks:2 )
+		x11-apps/iceauth
+		x11-apps/rgb
+		x11-misc/xdg-utils
+		upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
+	)
+	udev? ( app-misc/media-player-info )
+"
+PDEPEND="
+	$(add_kdebase_dep katepart '' 4.14.3)
+	|| (
+		$(add_kdeapps_dep kfmclient '' 4.14.3)
+		x11-misc/xdg-utils
+	)
+	handbook? ( kde-apps/khelpcenter:* )
+	policykit? ( || (
+		>=sys-auth/polkit-kde-agent-0.99
+		kde-plasma/polkit-kde-agent
+	) )
+"
+
+PATCHES=(
+	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
+	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
+	"${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch"
+	"${FILESDIR}/${PN}-4.14.5-mimetypes.patch"
+	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
+	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
+	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
+	"${FILESDIR}/${PN}-4.9.3-werror.patch"
+	"${FILESDIR}/${PN}-4.10.0-udisks.patch"
+	"${FILESDIR}/${PN}-4.14.20-FindQt4.patch"
+	"${FILESDIR}/${PN}-4.14.20-strigi-optional.patch"
+	"${FILESDIR}/${PN}-4.14.22-webkit.patch"
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
+	fi
+}
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
+	sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
+		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
+
+	if use aqua; then
+		sed -i -e \
+			"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
+			cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
+
+		#if [[ ${CHOST} == *-darwin8 ]]; then
+		sed -i -e \
+			"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
+			cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
+		#fi
+
+		# solid/solid/backends/iokit doesn't properly link, so disable it.
+		sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
+			|| die "disabling solid/solid/backends/iokit failed"
+		sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
+			|| die "disabling solid/solid/backends/iokit failed"
+
+		# There's no fdatasync on OSX and the check fails to detect that.
+		sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
+			|| die "disabling fdatasync failed"
+
+		# Fix nameser include to nameser8_compat
+		sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
+			|| die "fixing nameser include failed"
+		append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
+
+		# Try to fix kkeyserver_mac
+		epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_HSPELL=OFF
+		-DWITH_ASPELL=OFF
+		-DKDE_DEFAULT_HOME=.kde4
+		-DKAUTH_BACKEND=POLKITQT-1
+		-DWITH_Soprano=OFF
+		-DWITH_SharedDesktopOntologies=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Strigi=ON
+		-DBUILD_doc=$(usex handbook)
+		-DHAVE_X86_3DNOW=$(usex cpu_flags_x86_3dnow)
+		-DHAVE_PPC_ALTIVEC=$(usex altivec)
+		-DHAVE_X86_MMX=$(usex cpu_flags_x86_mmx)
+		-DHAVE_X86_SSE=$(usex cpu_flags_x86_sse)
+		-DHAVE_X86_SSE2=$(usex cpu_flags_x86_sse2)
+		-DWITH_ACL=$(usex acl)
+		-DWITH_BZip2=$(usex bzip2)
+		-DWITH_QCA2=$(usex crypt)
+		-DWITH_FAM=$(usex fam)
+		-DWITH_Jasper=$(usex jpeg2k)
+		-DWITH_GSSAPI=$(usex kerberos)
+		-DWITH_LibLZMA=$(usex lzma)
+		-DWITH_Libintl=$(usex nls)
+		-DWITH_OpenEXR=$(usex openexr)
+		-DWITH_OpenGL=$(usex opengl)
+		-DWITH_PolkitQt-1=$(usex policykit)
+		-DWITH_ENCHANT=$(usex spell)
+		-DWITH_OpenSSL=$(usex ssl)
+		-DWITH_UDev=$(usex udev)
+		-DWITH_SOLID_UDISKS2=$(usex udisks)
+		-DWITH_Avahi=$(usex zeroconf)
+		-DWITH_KDEWEBKIT=$(usex webkit)
+	)
+
+	use zeroconf || mycmakeargs+=( -DWITH_DNSSD=OFF )
+
+	kde4-base_src_configure
+}
+
+src_compile() {
+	kde4-base_src_compile
+
+	# The building of apidox is not managed anymore by the build system
+	if use doc; then
+		einfo "Building API documentation"
+		cd "${S}"/doc/api/
+		./doxygen.sh "${S}" || die "APIDOX generation failed"
+	fi
+}
+
+src_install() {
+	kde4-base_src_install
+
+	# use system certificates
+	rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
+	dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
+
+	if use doc; then
+		einfo "Installing API documentation. This could take a bit of time."
+		cd "${S}"/doc/api/
+		docinto /HTML/en/kdelibs-apidox
+		dohtml -r ${P}-apidocs/*
+	fi
+
+	if use aqua; then
+		einfo "fixing ${PN} plugins"
+
+		local _PV=${PV:0:3}.0
+		local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
+
+		install_name_tool -id \
+			"${_dir}/libkrossqtsplugin.${_PV}.dylib" \
+			"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
+			|| die "failed fixing libkrossqtsplugin.${_PV}.dylib"
+
+		einfo "fixing ${PN} cmake detection files"
+		#sed -i -e \
+		#	"s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
+		echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
+			"${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
+			|| die "failed fixing FindXKB.cmake"
+	fi
+
+	einfo Installing environment file.
+	# Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
+	echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
+	echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
+	doenvd "${T}/77kde"
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+
+	if use zeroconf; then
+		echo
+		elog "To make zeroconf support available in KDE make sure that the avahi daemon"
+		elog "is running."
+		echo
+		einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
+		einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
+		einfo "to include 'mdns', e.g.:"
+		einfo "	hosts: files mdns dns"
+		echo
+	fi
+
+	kde4-base_pkg_postinst
+}
+
+pkg_prerm() {
+	# Remove ksycoca4 global database
+	rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+
+	kde4-base_pkg_postrm
+}
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@ -2,3 +2,4 @@ DIST clutter-gst-2.0.16.tar.xz 357380 SHA256 a944f84186937021aba6329c23954f6015d
 DIST clutter-gst-2.0.18.tar.xz 358936 SHA256 8d82bebf01b65d433bfb0f8da7bf7a8da42289f58b66bc4dfa775df0385bf8b5 SHA512 effc45929c201643d8a3e01ea199e426ab0927a9394dabf796b8edf1b7cf5e264f48a524966e31a86d4cf9fe99718464de0bad26ca7d64e05d64b7f0006676be WHIRLPOOL a94a7383b51255c50000f68ed1a0280b0fa117073442938e69e0f81d336e18728cc6edf38600adf89de006be92f22d4f9c99e62e1286551e53f1580e5965c9e2
 DIST clutter-gst-3.0.16.tar.xz 406328 SHA256 803e8b7265e63e0581e21fd0c6064792dfe951512e9f515e9e7a9b452caaf9f0 SHA512 ad543156e05828a28d89d49080618fb64a010247eceee87d5930c14cd4ddc4fd276f6b30be8790d9003c988be45ead8c258157d72e60db0ea089eb068229da21 WHIRLPOOL 5ddf357183baed580fddf3b1171f30139495cfb7eb36571724b8c7ad7e758d6850aed6ef5ac3eb7452a2491bcf11c7748b9ce639a069b00c6078960d2e8e91dc
 DIST clutter-gst-3.0.18.tar.xz 407256 SHA256 0aec0d0c6020cd19a5bb0dab1165a92748f81a9a3acdfabb0f966d5f53bc8093 SHA512 cc08b0fd757c92028d38314db42749b3f512c79b0e07b64bd3e32706804ce6d11c3069f46ba01891df635351d7874c3818d26921c531f1f9b7ef780f9859f409 WHIRLPOOL e4b6cc186efe87b6efa11151896c7fa35c0819ef94e2fd5bf4c07540f7d909ca441c84ad6b4ca1243bd4f0f581adaae52ee2cd08c0ce55ae8e7431d64f8b04fc
+DIST clutter-gst-3.0.20.tar.xz 404988 SHA256 a0011787ed2a2dafe914f973c1ede283d40b8eb75123f4a7b608ae6d1cc066c9 SHA512 813ba6df8e89cd2820990cbd4b2d85a5786de654045c411eaae97940663abea34d0c0c34281e0dc383b0939aa99cc6fb57331744ea120c843bcd74f3f5043a14 WHIRLPOOL 00783842b7c459249ab219025311021af0887c8340c4be76a9d43967f7dfc51ecbbc3b768956423213b50f2d58436a7ef75af8a13613f6fdbf30f26ab494edfe
--- a/media-libs/clutter-gst/clutter-gst-3.0.20.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-3.0.20.ebuild
@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1
+
+HOMEPAGE="https://blogs.gnome.org/clutter/"
+DESCRIPTION="GStreamer integration library for Clutter"
+
+LICENSE="LGPL-2.1+"
+SLOT="3.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X debug examples +introspection udev"
+
+# >=cogl-1.18 provides cogl-2.0-experimental
+COMMON_DEPEND="
+	>=dev-libs/glib-2.20:2
+	>=media-libs/clutter-1.20:1.0=[X=,introspection?]
+	>=media-libs/cogl-1.18:1.0=[introspection?]
+	>=media-libs/gstreamer-1.4:1.0[introspection?]
+	>=media-libs/gst-plugins-bad-1.4:1.0
+	>=media-libs/gst-plugins-base-1.4:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8:= )
+	udev? ( virtual/libgudev )
+"
+# uses goom from gst-plugins-good
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-good-1.4:1.0
+	!udev? ( media-plugins/gst-plugins-v4l2 )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/gtk-doc-am-1.11
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# --enable-gl-texture-upload is experimental
+	gnome2_src_configure \
+		--disable-maintainer-flags \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_enable introspection) \
+		$(use_enable udev)
+}
+
+src_compile() {
+	# Clutter tries to access dri without userpriv, upstream bug #661873
+	# Massive failure of a hack, see bug 360219, bug 360073, bug 363917
+	unset DISPLAY
+	gnome2_src_compile
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins examples/{*.c,*.png,README}
+	fi
+}
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@ -3,9 +3,12 @@ DIST freetype-2.5.5-infinality-patches.tar.xz 24380 SHA256 6b7bc373b068c71feca2e
 DIST freetype-2.5.5.tar.bz2 1714529 SHA256 387bcc4b780b12484aa2ec9f7db1a55d8286eb5639f45fbc0fbba7a4e5a1afb9 SHA512 1fc72d24da1744a6a5faf3338e49912c81ce83f30def1e80a2a15b50e7f83893a4fe24a70ef88b65ecc217bed1c15d85804c364eba221b35e25531c727fe8559 WHIRLPOOL 57cf0f020cda6a66cfe8e2a30e1e997c0fd7f97bdaed38da65cce0b360fcc60cfdf1ba0724c1745668ae3f80743052e135edb8356dff4c90365caa6262d59158
 DIST freetype-2.6.3.tar.bz2 1753083 SHA256 371e707aa522acf5b15ce93f11183c725b8ed1ee8546d7b3af549863045863a2 SHA512 e1f9018835fc88beeb4479537b59f866c52393ae18d24a1e0710a464cf948ab02b35c2c6043bc20c1db3a04871ee4eb0bb1d210550c0ea2780c8b1aea98fbf0d WHIRLPOOL e17e87fe7b821730da13b1a54073fd0314025e3e15a41b10b5ece2731c8152c4d8dbe1fb7f26593794d70f15f6dfd70582678d48a8f068cec865f821eb3847a0
 DIST freetype-2.6.5.tar.bz2 1779603 SHA256 e20a6e1400798fd5e3d831dd821b61c35b1f9a6465d6b18a53a9df4cf441acf0 SHA512 d60f057e12992b4dccd7d5e232bda5c344e6ed0d74362032fbbc52526bac42d600fe0aa04c6442a9502a27a88f5d5155fb42e723531127400ccfce0d1911487f WHIRLPOOL 3cfbbe407ee024ff939469aa2b82b764fe89b1ba4fc7edcdd537e9ad81b3ea6a8fe807e2d5fdb80ec47de2f66cf3f28b5e45320c84a84ea446acbf6c2966cccb
+DIST freetype-2.7.tar.bz2 1789896 SHA256 d6a451f5b754857d2aa3964fd4473f8bc5c64e879b24516d780fb26bec7f7d48 SHA512 cd5bcde276d6d59379d9c60a90095be59b0692ec8fd2817aa44ff80ebb84840e8a72be2cfbbbcf7e13258026fa691f28c2673f03c3a3961a859900e61a62d761 WHIRLPOOL 74972198e66cb30465bc1ce40c3e394bae07e194f1ddbc4024e7969c52def6ffd255d88279f77a610c16bbac618c90c3a296d37a981e3048d94ed0135a2cdd5c
 DIST freetype-doc-2.5.5.tar.bz2 108133 SHA256 68becbae3578a8101e9f3c55f10e435fb75535011d3f7a523719371e86e368e7 SHA512 0e2455433f72766ec88275d2e53e49630457579a83ca491697bb5ce12196ee964618d1af86956651557d34e8ea1d57f75f69e0d60ef90e943509bc571370fb64 WHIRLPOOL 28d13ae3ce9bc3fb278df9a963cef3622672fa288fc0fd654e874054bedccd8510a3dcf7636ea2ec107b5299984742607d2a9436d5e473202856e27bf262655f
 DIST freetype-doc-2.6.3.tar.bz2 5367900 SHA256 28b7cb0b1ff3962d386c54cdffd3891d2126292f57b4ea9ad0467f07cf68de7d SHA512 7731d96543f73ace8afc4b5ff2148c32a8dacbf01a976a6870705f73b45dfe1429ffa94406cdfc83b163b039c4d375c0c553a7d7aaad659a87079f357e6599cc WHIRLPOOL 71b01f8d5daf8e93efab5453f198d1790365fd010b5a137f4f34e93f6bc03a6a644900b92b8263973248954895c73e70cad64fe50b09bb4042627182299a5a1c
 DIST freetype-doc-2.6.5.tar.bz2 1932398 SHA256 cb9cd73c3a713138e690a634608ec7b64ff645f9a71ac6645804b18e38be49e9 SHA512 1d2affa07f34c6486f1738141b428256f1d44bc0d166c74e9884caeeecdf3204164542e9bbc1c0eba6ff605f41d6022068546da64aee7859b72636bcd72fff00 WHIRLPOOL 90499d7ffdfe079dc058974e9d89a18a35c011244ea6d6003e8f445af579430910331fad2c6c7f4cc5ff318cf8582d8b30a32f878a4b8e4e5723e1b02025a396
+DIST freetype-doc-2.7.tar.bz2 1935798 SHA256 8440b7e576ccbe840051c162419a39083627a4de0c7d15fd20220736c03aac66 SHA512 07d5aab0c81369c8ab9d463a279b73a8189f9ab120733b31da1ad89faf01e00c9bb751af0ecee73517a6aa734f7b66a970e51767bf4e9f64eca5f35ba03a4ad8 WHIRLPOOL 26d3d2bef648a02856644de707f0f3b9c59bd912840a1d8b3d8c16867f51fb6d5d333bda22a0a880f4a6dae28f29483efcd863a41d6764a4a7b6bf1c657f6dea
 DIST ft2demos-2.5.5.tar.bz2 182006 SHA256 b87c7deb5d9b1fddb8520c091a5491cc63ecac4de25139e1da38aebee82195ea SHA512 c6e1855f2315665e39a894ecfcb65f8546de435c1dada0ea0a6665a1e3ef22331d6949cd9261dfb6b68e653631d4c2e74f8ea31b53b40e46f44ab4dae38e368b WHIRLPOOL 55d6add5e3fac008a39231e3805e151a5a9b7cafb6ef970e546d96d3fa338a6a4a744aeb59ea04804312164aedd5e5a21e19773dbf5c42a1acfc42d283d90930
 DIST ft2demos-2.6.3.tar.bz2 193412 SHA256 b076ac52465e912d035f111ede78b88bf3dd186f91a56a54ff83ffdf862e84e4 SHA512 1f23f9ab0bd59a06b8fd223bcc335ffba064477abee74d33308ddc28eb41e4ccf3728a52c36d4cab3995be695b56e1e099c2889f04e0835ba242b2938c5d2e78 WHIRLPOOL 1246985eca92e2e4d1b618d633602fc4114a69c1a8d715c51a5e96c17b3119fb3a254a577c876ad8ba9e2871bf59f4bd67f6721a706b3706a0a532728723f6a4
 DIST ft2demos-2.6.5.tar.bz2 216722 SHA256 568a8f3a6301189a881d2f7ec95da280d20c862de94d81815341870e380b00e6 SHA512 1b950254588835c4f797a3cf45034af714676e6b2a8415ee8fa860bab7e284c3833675efc84167a90bed29dc0dc2079b22a513cfb6642ba9b5cbc84f1bc4d30d WHIRLPOOL 64780f2ca5c1fe64f1e25f18297c7761bca7b4e9defa0ef823376037f99f5c270f875efd8052f372af3b6cf0f104db91cacad957691df89818404a17ff3d8fb3
+DIST ft2demos-2.7.tar.bz2 218381 SHA256 0865b71dd379605bc19396b8f9a4ee8bab436f44ea55299784a20ef0ff95d9c8 SHA512 69243d2a0bc92d62f7535d41d2f8c6f2e801b8e916c7f6666178c8276e4515fa66bcfe55a3d8b02ea2b5391fc444ded564f6646fac9b2b75308054b34832cb01 WHIRLPOOL 3f150c8c8711fb67f08eed18100bc865b11f32d5aed43902e087868ca09bd836bc7ec40501939214f3e5d0580b7a43c79260828ae9f3bb8438ca3d734535f675
--- a/media-libs/freetype/files/freetype-2.7-enable-valid.patch
+++ b/media-libs/freetype/files/freetype-2.7-enable-valid.patch
@ -0,0 +1,20 @@
+--- freetype-2.7/modules.cfg
+++ freetype-2.7/modules.cfg
+@@ -120,7 +120,7 @@
+ # TrueType GX/AAT table validation.  Needs ftgxval.c below.
+ #
+ # No FT_CONFIG_OPTION_PIC support.
+-# AUX_MODULES += gxvalid
+AUX_MODULES += gxvalid
+ 
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+@@ -143,7 +143,7 @@
+ # OpenType table validation.  Needs ftotval.c below.
+ #
+ # No FT_CONFIG_OPTION_PIC support.
+-# AUX_MODULES += otvalid
+AUX_MODULES += otvalid
+ 
+ # Auxiliary PostScript driver component to share common code.
+ #
--- a/media-libs/freetype/freetype-2.7.ebuild
+++ b/media-libs/freetype/freetype-2.7.ebuild
@ -0,0 +1,177 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools flag-o-matic multilib multilib-build multilib-minimal toolchain-funcs
+
+INFINALITY_PATCH="03-infinality-2.6.3-2016.03.26.patch"
+
+DESCRIPTION="A high-quality and portable font engine"
+HOMEPAGE="http://www.freetype.org/"
+SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
+	mirror://nongnu/freetype/${P/_/}.tar.bz2
+	utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2
+		mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
+	doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
+		mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
+
+LICENSE="|| ( FTL GPL-2+ )"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
+	infinality png static-libs utils"
+RESTRICT="!bindist? ( bindist )" # bug 541408
+
+CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] )
+	utils? (
+		X? (
+			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+			>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
+		)
+	)"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
+PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
+
+REQUIRED_USE="?? ( cleartype_hinting infinality )"
+
+PATCHES=(
+	# This is the same as the 01 patch from infinality
+	"${FILESDIR}"/${PN}-2.7-enable-valid.patch
+
+	"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
+)
+
+src_prepare() {
+	enable_option() {
+		sed -i -e "/#define $1/a #define $1" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to enable option $1"
+	}
+
+	disable_option() {
+		sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to disable option $1"
+	}
+
+	default
+
+	if use infinality; then
+		# FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in freetype-2.4.11
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
+	fi
+
+	if use cleartype_hinting; then
+		# Will be the new default for >=freetype-2.7.0
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+	fi
+
+	if ! use bindist; then
+		# See http://freetype.org/patents.html
+		# ClearType is covered by several Microsoft patents in the US
+		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+	fi
+
+	if ! use adobe-cff; then
+		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
+	fi
+
+	if use debug; then
+		enable_option FT_DEBUG_LEVEL_TRACE
+		enable_option FT_DEBUG_MEMORY
+	fi
+
+	if use utils; then
+		cd "${WORKDIR}/ft2demos-${PV}" || die
+		# Disable tests needing X11 when USE="-X". (bug #177597)
+		if ! use X; then
+			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
+		fi
+		cd "${S}" || die
+	fi
+
+	# we need non-/bin/sh to run configure
+	if [[ -n ${CONFIG_SHELL} ]] ; then
+		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
+			"${S}"/builds/unix/configure || die
+	fi
+
+	elibtoolize --patch-only
+}
+
+multilib_src_configure() {
+	append-flags -fno-strict-aliasing
+	type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+	local myeconfargs=(
+		--enable-biarch-config
+		--enable-shared
+		$(use_with bzip2)
+		$(use_with harfbuzz)
+		$(use_with png)
+		$(use_enable static-libs static)
+
+		# avoid using libpng-config
+		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
+		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
+	)
+
+	ECONF_SOURCE="${S}" \
+		econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use utils; then
+		einfo "Building utils"
+		# fix for Prefix, bug #339334
+		emake \
+			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
+			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use utils; then
+		einfo "Installing utils"
+		rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
+		local ft2demo
+		for ft2demo in ../ft2demos-${PV}/bin/*; do
+			./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
+				"${ED}"/usr/bin || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	if use fontforge; then
+		# Probably fontforge needs less but this way makes things simplier...
+		einfo "Installing internal headers required for fontforge"
+		local header
+		find src/truetype include/freetype/internal -name '*.h' | \
+		while read header; do
+			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+		done
+	fi
+
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
+	if use doc ; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	prune_libtool_files --all
+}
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@ -2,3 +2,4 @@ DIST harfbuzz-0.9.41.tar.bz2 1188176 SHA256 d81aa53d0c02b437beeaac159d7fc16394d6
 DIST harfbuzz-1.1.3.tar.bz2 1294579 SHA256 d93d7cb7979c32672e902fdfa884599e63f07f2fa5b06c66147d20c516d4b8f7 SHA512 e418a1543ec2a1e58e5d8d0ba9a40e8675eda13c94c664ff83ed6303c724f078cf1744883b454c46ec40157db8dc05e7f2cf5e52200601bb1e13827d8dfbaccf WHIRLPOOL 9d18d985df77ff841b1a87d25f17eb472517e109a051f2ed213b44ec91de3a499853cf7d93e23f5ac4c199ec65f2dd02300e05097cb4983565ebb9227c8d3810
 DIST harfbuzz-1.2.7.tar.bz2 1345389 SHA256 bba0600ae08b84384e6d2d7175bea10b5fc246c4583dc841498d01894d479026 SHA512 e1edfa0bf4936f7d47e5622547429b7f573710ac0c4fc023a7b00e1dceca8aa7f02800166eea0c883ae44d2886c50416d61791a8a8240ddaab9f4e389dadfff2 WHIRLPOOL 2ffcdb29b2a0506afb99e337c426c2e71cbc9ebf75add0ad25367fef6162984109260d6434fd1bf4fa9a8faba520eab1d5b1059286cd0d6d8a602dbf13d9181e
 DIST harfbuzz-1.3.0.tar.bz2 1351234 SHA256 b04be31633efee2cae1d62d46434587302554fa837224845a62565ec68a0334d SHA512 6a5b917e47233eebd8ecb36f24b4eb189c3bacc920b7ca8f8f1bc1036fedaba0b415727a4cc2836956eea48e8dabc63b117789331a9b27201731ab99bf0c2399 WHIRLPOOL c8455dca1c53e303f9e0026f4a6d66735d54cf3cc4aabcb05001f0a02955e8ee3b64181e2baffa2f4b6ecfa91858bbf30939e54cbb32982a7082dd40014fd875
+DIST harfbuzz-1.3.1.tar.bz2 1358437 SHA256 a242206dd119d5e6cc1b2253c116abbae03f9d930cb60b515fb0d248decf89a1 SHA512 7c2dbd1cc3c77646fd7627c4db9ac1a5781fb4babe8a92b276b2f2170f82d7075632253c7498c27735c5aa7331ee22d41e24c3a8cfa07adc2461ece1e36334b9 WHIRLPOOL 764b3f83d99d34dd73b989f57a3afdf0ef94de5a4b287717f4148c4d28976c1311b9c6bfbcfed612e53580c11c2228f0e3011bd689e3fa86b3a12185acd5cba1
--- a/media-libs/harfbuzz/harfbuzz-1.3.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.3.1.ebuild
@ -0,0 +1,102 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
+[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+[[ ${PV} == 9999 ]] || SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+
+IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+	dev-util/ragel
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
+	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	econf \
+		--without-coretext \
+		--without-uniscribe \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_with cairo) \
+		$(use_with fontconfig) \
+		$(use_with glib) \
+		$(use_with introspection gobject) \
+		$(use_with graphite graphite2) \
+		$(use_with icu) \
+		$(multilib_native_use_enable introspection) \
+		$(use_with truetype freetype)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Thu, 08 Sep 2016 10:10:36 +0000
+Fri, 09 Sep 2016 05:10:35 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Thu, 08 Sep 2016 10:10:36 +0000
+Fri, 09 Sep 2016 05:10:36 +0000
--- a/metadata/md5-cache/app-accessibility/freetts-1.2.1-r2
+++ b/metadata/md5-cache/app-accessibility/freetts-1.2.1-r2
@ -9,5 +9,5 @@ LICENSE=jsapi? ( sun-bcla-jsapi ) freetts
 RDEPEND=>=virtual/jre-1.4 mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/freetts/freetts-1.2.1-src.zip
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e7c8a2472610ba330197bf07f1dad392
--- a/metadata/md5-cache/app-accessibility/freetts-1.2.2
+++ b/metadata/md5-cache/app-accessibility/freetts-1.2.2
@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) >=dev
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/freetts/freetts-1.2.2-src.zip
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aa2ddf286aaf4ac8882d1bd42fc1f5a0
--- a/metadata/md5-cache/app-admin/389-admin-console-1.1.8-r1
+++ b/metadata/md5-cache/app-admin/389-admin-console-1.1.8-r1
@ -10,5 +10,5 @@ PDEPEND=net-nds/389-admin
 RDEPEND=|| ( >=virtual/jre-1.5 >=virtual/jdk-1.5 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=http://directory.fedoraproject.org/sources/389-admin-console-1.1.8.tar.bz2
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=edad47bcf1a9ae35fbcc2d7b4b3d554c
--- a/metadata/md5-cache/app-admin/389-console-1.1.7-r1
+++ b/metadata/md5-cache/app-admin/389-console-1.1.7-r1
@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 >=dev-java/java-config-2.2.0-r3
 SLOT=1.1
 SRC_URI=http://directory.fedoraproject.org/sources/389-console-1.1.7.tar.bz2 https://dev.gentoo.org/~lxnay/389-console/fedora.png
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=892ae847c0551e11c500c8f03129ec60
--- a/metadata/md5-cache/app-admin/389-ds-console-1.2.6-r1
+++ b/metadata/md5-cache/app-admin/389-ds-console-1.2.6-r1
@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 net-nds/389-ds-base >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=http://directory.fedoraproject.org/sources/389-ds-console-1.2.6.tar.bz2
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-ant-2	d1abcccd8e9c606be17deacfe5c7368a	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=40a800d981de104b50b90bb65c1a2b92
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST ppx_deriving_yojson-3.0.tar.gz 18111 SHA256 28264562fa87fe0ae3484fa434126c02a7770f0324fa6a64ba8132ab10ae5143 SHA512 70c690d880ff652f9f92e95af047e87726bab48100e9325406eef7a9ed80f439df7292324de56cd17a93c6ad6bc9c1e7ce6edcd7c3b336352f0df4bfa7c7b81c WHIRLPOOL 7fac84e8faa78a9c362453098a2e73d1902ec9272f45ee32c9710bea527faeae55274ecfa257ad1eadbe4aa24d623e33b5ca73c122548efc0fe951061b1dc268`
				`@ -0,0 +1 @@`
				`DIST ppx_import-1.1.tar.gz 12951 SHA256 083f06119fa836939bec273340828c6f2c103cd88bdf775584d2036b8f4d0f5f SHA512 24a1db1f216518fb1302f8de2984bab5ffd33cbabe311d449e3767a96a63b386d11cdfd8f783d48169523a0535754b044841821aa24533d1d1127eb4a8aa42d6 WHIRLPOOL 479223751d0e180e4df3e4e7e36b774ded8284bcf8f67054518dabc6e3c16aae538a964ea4a01528caf78b388f1cd48e3dd487bb141bd0a315c622cd531fb637`