Sync with portage [Fri Jan 8 17:47:30 MSK 2016].

app-admin/glance/Manifest

@@ -1,4 +1,2 @@
 DIST glance-11.0.0.tar.gz 1565001 SHA256 35abd3af08b97a56556fdd1a68c61fcfa99ead6354f746f8f7cdc4517e90084e SHA512 33ceab2c7f52f5ce92b2bb33732697a85e4bdf552ca9d08bb7b21430ef942b545614de9b834bdd455b0544474217675731b77cded7218c56ef44274c29a97f47 WHIRLPOOL a256b0525f8a42e588a1d7cce4a6add919b9bd31752560dc7664814178fb4b3c952bfd7ec5d0d40932dc39c380c866561f9cb5ed1383482d4320f5417179c028
 DIST glance-11.0.1.tar.gz 1571617 SHA256 357d8cc17b23aefce8c53c9230a26db504d8039baf7e07d8ab9448ce2ceaccf3 SHA512 d43e79700179bbef39d82f8baa378c377f391e7bbd9022ec9e399379fb026be36b06b7ad7b89e39cb0b2a876111b451ad1acf3ad27cead5b58ce02106867bfa6 WHIRLPOOL bbd70deae3ac5b3d549fcca20e666d1ee3f240d59556712783ff4bb8fe780c0c06ff1344476a7a036aa5e99afcdc3a369a7bf322227717f17c42cc02e5f3b477
-DIST glance-2015.1.1.tar.gz 1102359 SHA256 5c5714264c4ad9c3d178b983899b54f69f138505ddd77e13141dc5f3d1598ebe SHA512 d9233b78174ec0f84b317abf7d26153a7e3ead25b4ebc31acbe5d0806b6877da5875de52ee0742dcbdd5fd3d23cb0240208f6fd57fa59cc403ad228ac85f2a0f WHIRLPOOL 69a4cd27b4ac57a47523ceb4b899bbbb3569e7af2bb8f3e64373d98b7c72450bd587c6da96d33903dcbf44e02f89ea563d116d9d2dc90d4a0f472eca89963a87
-DIST glance-2015.1.2.tar.gz 1108933 SHA256 e46bc6648a74a643cef3825dcd44c7e275ed3385b96cab83ef50c4c514932541 SHA512 0f8b8dbc3c507a47ad0873f35ec2212903d7e419b61c0298f77661f89a9718e3604786d52976860c78841fe0a94ad8fc1fe99514183d2b29ed414efe448e590a WHIRLPOOL df8ba6586b2f71c5d7ecb252b80e6c6de6f08df1029576fc8b2fb2a68633f5ce76de1334949af955e85c39e9f1df25b2f8763837ef8efa228b29559dc34be863

app-admin/glance/glance-2015.1.1-r3.ebuild

@@ -1,190 +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 user
-
-DESCRIPTION="Services for discovering, registering, and retrieving VM images"
-HOMEPAGE="https://launchpad.net/glance"
-SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc mysql postgres +sqlite +swift test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? (
-			${RDEPEND}
-			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-			>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-			<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			<dev-python/mock-1.1.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.2.0[${PYTHON_USEDEP}]
-			!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-			>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
-			<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-			<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-			dev-python/mysql-python[${PYTHON_USEDEP}]
-			dev-python/psycopg[${PYTHON_USEDEP}]
-			~dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
-			dev-python/qpid-python[${PYTHON_USEDEP}]
-			>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-			>=dev-python/elasticsearch-py-1.3.0[${PYTHON_USEDEP}]
-		)"
-
-#note to self, wsgiref is a python builtin, no need to package it
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
-
-RDEPEND="
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		dev-python/mysql-python
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	dev-python/ordereddict[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/taskflow-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/WSME-0.6[${PYTHON_USEDEP}]
-	<dev-python/WSME-0.7[${PYTHON_USEDEP}]
-	dev-python/posix_ipc[${PYTHON_USEDEP}]
-	swift? (
-		>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-		<dev-python/python-swiftclient-2.5.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
-	<dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-0.3.1[${PYTHON_USEDEP}]
-	<dev-python/oslo-policy-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/glance_store-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/glance_store-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/cve-2015-5163-stable-kilo.patch"
-	"${FILESDIR}/cve-2015-5251-stable-kilo.patch"
-	"${FILESDIR}/CVE-2015-5286_2015.1.1.patch"
-)
-
-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
-	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
-}

app-admin/glance/glance-2015.1.2.ebuild

@@ -1,191 +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 user
-
-DESCRIPTION="Services for discovering, registering, and retrieving VM images"
-HOMEPAGE="https://launchpad.net/glance"
-SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc mysql postgres +sqlite +swift test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? (
-			${RDEPEND}
-			>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-			<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
-			>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-			<dev-python/mox3-0.8.0[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			<dev-python/mock-1.1.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.2.0[${PYTHON_USEDEP}]
-			!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-			>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
-			<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-			<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-			dev-python/mysql-python[${PYTHON_USEDEP}]
-			dev-python/psycopg[${PYTHON_USEDEP}]
-			~dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
-			dev-python/qpid-python[${PYTHON_USEDEP}]
-			>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-			>=dev-python/elasticsearch-py-1.3.0[${PYTHON_USEDEP}]
-		)"
-
-#note to self, wsgiref is a python builtin, no need to package it
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
-
-RDEPEND="
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		dev-python/mysql-python
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}]
-	<dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	dev-python/ordereddict[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
-	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/taskflow-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/WSME-0.6[${PYTHON_USEDEP}]
-	<dev-python/WSME-0.7[${PYTHON_USEDEP}]
-	dev-python/posix_ipc[${PYTHON_USEDEP}]
-	swift? (
-		>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-		<dev-python/python-swiftclient-2.5.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
-	<dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-0.3.1[${PYTHON_USEDEP}]
-	<dev-python/oslo-policy-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/glance_store-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/glance_store-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.3.1[${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
-}

app-backup/backintime/Manifest

@@ -1,2 +1 @@
-DIST backintime-1.1.4.tar.gz 562964 SHA256 434fc1fb6d9ac20d7b04c791e39bf9e077773c696e18f2bf1aa8f3e7fb59a770 SHA512 a207833c9708166cfbc4e0aa36c6e1b0ee609d5e05a8f23c51c3242f8e32ae25df09255885a812ac32bdec7874266e8a167be076c8938d90ddfe76c5b2736aa7 WHIRLPOOL e3dee1d437657939ce3290d0717f9c6f31a656de8f4642bf7fbcca1dd5b7426ba7f068f8faa96e731c863e4a8e02d1e8d1526fbf466b7ea8ba1b1682fd43ab7f
 DIST backintime-1.1.8.tar.gz 617754 SHA256 a1f2d210e95633dfe383eb50b3b560d1e09c43de4ce89dd4cb193cab40cb8a1e SHA512 550e270dcf341ec5ad952f4decd836007d19ff9bf60cada834dfb488dbf29954b6fd3ed80a4f8fb4406a0166895a7f7c922e5622d06c43086dd54073e5aabd99 WHIRLPOOL ea9af3c432c61def4214e1d1e2c70e40cb7e50867bb0fa08930740c13133293ad135fd6c97295ab176deaedacb33e72583dc7c34dcfc3cb375a8b6e7fc7ab632

app-backup/backintime/backintime-1.1.4.ebuild

@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_3 python3_4 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
-HOMEPAGE="http://backintime.le-web.org/"
-SRC_URI="http://${PN}.le-web.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="qt4"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	net-misc/openssh
-	net-misc/rsync[xattr,acl]"
-
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-python-version-stderr.patch
-
-	#fix doc install location
-	sed -e "s:/doc/${PN}-common:/doc/${PF}:g" \
-		-i common/Makefile.template || die
-	sed -e "s:/doc/${PN}-qt4:/doc/${PF}:g" \
-		-i qt4/Makefile.template || die
-	sed -e "/\/VERSION/d" -e "/\/LICENSE/d" -e "/\/copyright/d" \
-		-i {qt4,common}/Makefile.template || die
-
-	if [ -n ${LINGUAS+x} ] ; then
-		cd common/po || die
-		for po in *.po ; do
-			if ! has ${po/.po} ${LINGUAS} ; then
-				rm ${po} || die
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	cd "${S}"/common || die
-	./configure --python3 --no-fuse-group || die
-	if use qt4 ; then
-		cd "${S}"/qt4 || die
-		./configure --python3 || die
-	fi
-}
-
-src_compile() {
-	cd "${S}"/common || die
-	emake
-	if use qt4 ; then
-		cd "${S}"/qt4 || die
-		emake
-	fi
-}
-
-src_install() {
-	cd "${S}"/common || die
-	emake DESTDIR="${D}" install
-	if use qt4 ; then
-		cd "${S}"/qt4 || die
-		emake DESTDIR="${D}" install
-	fi
-
-	python_optimize "${D}"
-}

app-backup/backintime/backintime-1.1.8.ebuild

@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_3 python3_4 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
-HOMEPAGE="http://backintime.le-web.org/"
-SRC_URI="http://${PN}.le-web.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt4"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	net-misc/openssh
-	net-misc/rsync[xattr,acl]"
-
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	#fix doc install location
-	sed -e "s:/doc/${PN}-common:/doc/${PF}:g" \
-		-i common/configure || die
-	sed -e "s:/doc/${PN}-qt4:/doc/${PF}:g" \
-		-i qt4/configure || die
-	sed -e "/addInstallFile \"..\/VERSION/d" \
-		-e "/addInstallFile \"..\/LICENSE/d" \
-		-e "/addInstallFile \"..\/debian\/copyright/d" \
-		-i {qt4,common}/configure || die
-
-	if [ -n ${LINGUAS+x} ] ; then
-		cd common/po || die
-		for po in *.po ; do
-			if ! has ${po/.po} ${LINGUAS} ; then
-				rm ${po} || die
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	cd "${S}"/common || die
-	./configure --python3 --no-fuse-group || die
-	if use qt4 ; then
-		cd "${S}"/qt4 || die
-		./configure --python3 || die
-	fi
-}
-
-src_compile() {
-	cd "${S}"/common || die
-	emake
-	if use qt4 ; then
-		cd "${S}"/qt4 || die
-		emake
-	fi
-}
-
-src_install() {
-	cd "${S}"/common || die
-	emake DESTDIR="${D}" install
-	if use qt4 ; then
-		cd "${S}"/qt4 || die
-		emake DESTDIR="${D}" install
-	fi
-
-	python_optimize "${D}"
-}

app-backup/backintime/files/backintime-1.0.24-dont-install-license.patch

@@ -1,49 +0,0 @@
---- backintime-1.0.4/common/Makefile.template
-+++ backintime-1.0.4/common/Makefile.template
-@@ -17,10 +17,6 @@
- 	install -d $(DEST)/share/backintime/plugins
- 	install --mode=644 plugins/*.py $(DEST)/share/backintime/plugins
- 	
--	#install copyright file
--	install -d $(DEST)/share/doc/backintime-common
--	install --mode=644 debian_specific/copyright $(DEST)/share/doc/backintime-common
--	
- 	#install doc file(s)
- 	install -d $(DEST)/share/doc/backintime
- 	install --mode=644 ../AUTHORS $(DEST)/share/doc/backintime
---- backintime-1.0.24/common/Makefile.template
-+++ backintime-1.0.24/common/Makefile.template
-@@ -20,7 +20,6 @@
- 	#install doc file(s)
- 	install -d $(DEST)/share/doc/backintime
- 	install --mode=644 ../AUTHORS $(DEST)/share/doc/backintime
--	install --mode=644 ../LICENSE $(DEST)/share/doc/backintime
- 	install --mode=644 ../README $(DEST)/share/doc/backintime
- 	install --mode=644 ../TRANSLATIONS $(DEST)/share/doc/backintime
- 	install --mode=644 ../VERSION $(DEST)/share/doc/backintime
---- backintime-1.0.4/gnome/Makefile.template
-+++ backintime-1.0.4/gnome/Makefile.template
-@@ -15,10 +15,6 @@
- 	install -d $(DEST)/share/backintime/plugins
- 	install --mode=644 plugins/*.py $(DEST)/share/backintime/plugins
- 	
--	#install copyright file
--	install -d $(DEST)/share/doc/backintime-gnome
--	install --mode=644 ../common/debian_specific/copyright $(DEST)/share/doc/backintime-gnome
--	
- 	#install man file(s)
- 	install -d $(DEST)/share/man/man1
- 	install --mode=644 man/C/*.gz $(DEST)/share/man/man1
---- backintime-1.0.4/kde4/Makefile.template
-+++ backintime-1.0.4/kde4/Makefile.template
-@@ -19,10 +19,6 @@
- 	install -d $(DEST)/bin
- 	install backintime-kde4 $(DEST)/bin
- 	
--	#install copyright file
--	install -d $(DEST)/share/doc/backintime-kde4
--	install --mode=644 ../common/debian_specific/copyright $(DEST)/share/doc/backintime-kde4
--	
- 	#install .desktop file(s)
- 	install -d $(DEST)/share/applications/kde4
- 	install --mode=644 *.desktop $(DEST)/share/applications/kde4

app-backup/backintime/files/backintime-1.0.24-wrapper.patch

@@ -1,64 +0,0 @@
---- backintime-1.0.24-r2/common/backintime
-+++ backintime-1.0.24-r2/common/backintime
-@@ -17,15 +17,14 @@
- #    with this program; if not, write to the Free Software Foundation, Inc.,
- #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
--if [ -f backintime.py ]; then
--	APP_PATH="."
--else
--	APP_PATH="/usr/share/backintime/common"
--fi
-+APP_PATH="/usr/share/backintime/common"
- 
- #starting a new ssh-agent all the time is just a workaround for
- #https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672
- #normally this should only be necessary if run as cronjob
- #and the user is not logged in
--ssh-agent python $APP_PATH/backintime.py "$@"
-+if [ "x$SSH_AUTH_SOCK" = "x" ]; then
-+	eval "$(ssh-agent)"
-+fi
- 
-+python2 $APP_PATH/backintime.py "$@"
---- backintime-1.0.24-r2/gnome/backintime-gnome
-+++ backintime-1.0.24-r2/gnome/backintime-gnome
-@@ -17,14 +17,13 @@
- #    with this program; if not, write to the Free Software Foundation, Inc.,
- #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
--if [ -f app.py ]; then
--	APP_PATH="."
--else
--	APP_PATH="/usr/share/backintime/gnome"
--fi
-+APP_PATH="/usr/share/backintime/gnome"
- 
- #starting a new ssh-agent all the time is just a workaround for
- #https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672
- #normally we don't need to start ssh-agent for backintime-gnome
--ssh-agent python ${APP_PATH}/app.py "$@"
-+if [ "x$SSH_AUTH_SOCK" = "x" ]; then
-+	eval "$(ssh-agent)"
-+fi
- 
-+python2 ${APP_PATH}/app.py "$@"
---- backintime-1.0.24-r2/kde4/backintime-kde4
-+++ backintime-1.0.24-r2/kde4/backintime-kde4
-@@ -17,11 +17,10 @@
- #    with this program; if not, write to the Free Software Foundation, Inc.,
- #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
--if [ -f app.py ]; then
--	APP_PATH="."
--else
--	APP_PATH="/usr/share/backintime/kde4"
-+APP_PATH="/usr/share/backintime/kde4"
-+#https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672
-+if [ "x$SSH_AUTH_SOCK" = "x" ]; then
-+	eval "$(ssh-agent)"
- fi
- 
--python ${APP_PATH}/app.py "$@"
--
-+python2 ${APP_PATH}/app.py "$@"

app-backup/backintime/files/backintime-1.0.36-wrapper.patch

@@ -1,65 +0,0 @@
---- backintime-1.0.24-r2/common/backintime
-+++ backintime-1.0.24-r2/common/backintime
-@@ -17,15 +17,14 @@
- #    with this program; if not, write to the Free Software Foundation, Inc.,
- #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
--if [ -f backintime.py ]; then
--	APP_PATH="."
--else
--	APP_PATH="/usr/share/backintime/common"
--fi
-+APP_PATH="/usr/share/backintime/common"
- 
- #starting a new ssh-agent all the time is just a workaround for
- #https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672
- #normally this should only be necessary if run as cronjob
- #and the user is not logged in
--ssh-agent python $APP_PATH/backintime.py "$@"
-+if [ "x$SSH_AUTH_SOCK" = "x" ]; then
-+	eval "$(ssh-agent)"
-+fi
- 
-+python2 $APP_PATH/backintime.py "$@"
---- backintime-1.0.24-r2/gnome/backintime-gnome
-+++ backintime-1.0.24-r2/gnome/backintime-gnome
-@@ -17,14 +17,13 @@
- #    with this program; if not, write to the Free Software Foundation, Inc.,
- #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
--if [ -f app.py ]; then
--	APP_PATH="."
--else
--	APP_PATH="/usr/share/backintime/gnome"
--fi
-+APP_PATH="/usr/share/backintime/gnome"
- 
- #starting a new ssh-agent all the time is just a workaround for
- #https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672
- #normally we don't need to start ssh-agent for backintime-gnome
--ssh-agent python ${APP_PATH}/app.py "$@"
-+if [ "x$SSH_AUTH_SOCK" = "x" ]; then
-+	eval "$(ssh-agent)"
-+fi
- 
-+python2 ${APP_PATH}/app.py "$@"
---- backintime-1.0.24-r2/kde4/backintime-kde4
-+++ backintime-1.0.24-r2/kde4/backintime-kde4
-@@ -17,15 +17,10 @@
- #    with this program; if not, write to the Free Software Foundation, Inc.,
- #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
--if [ -f app.py ]; then
--	APP_PATH="."
--else
--	APP_PATH="/usr/share/backintime/kde4"
--fi
-+APP_PATH="/usr/share/backintime/kde4"
- 
- if [ "x$SSH_AUTH_SOCK" = "x" ]; then
-         eval "$(ssh-agent)"
- fi
- 
--python ${APP_PATH}/app.py "$@"
--
-+python2 ${APP_PATH}/app.py "$@"

app-backup/backintime/files/backintime-1.0.4-fix-configure-warning.diff

@@ -1,17 +0,0 @@
-diff -Naur backintime-1.0.4.orig/kde4/configure backintime-1.0.4/kde4/configure
---- backintime-1.0.4.orig/kde4/configure	2010-11-08 14:36:52.000000000 +0100
-+++ backintime-1.0.4/kde4/configure	2010-11-08 14:42:18.000000000 +0100
-@@ -16,13 +16,6 @@
- 	fi
- fi
- 
--#check for kdesudo (if not use kdesu)
--if [ -z `which kdesudo` ]; then
--	mv backintime-kde4-root.desktop.kdesudo backintime-kde4-root.desktop
--else
--	mv backintime-kde4-root.desktop.kdesu backintime-kde4-root.desktop
--fi
--
- cp Makefile.template Makefile
- 
- echo "All OK. Now run:"

app-backup/backintime/files/backintime-1.0.4-kde4-root.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Back In Time (root)
-Exec=kdesu -c backintime-kde4
-Icon=document-save
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-StartupNotify=true
-Categories=Qt;KDE;System;
-Comment=Simple backup system
-Comment[sl]=Enostaven sistem ustvarjanja varnostnih kopij

app-backup/backintime/files/backintime-1.1.4-python-version-stderr.patch

@@ -1,11 +0,0 @@
---- backintime-1.1.4/common/configure
-+++ backintime-1.1.4/common/configure
-@@ -84,7 +84,7 @@
- done
- printf "\n" >> Makefile
- 
--if [ $(python${PYVERSION} --version | grep -c "^Python 3") -ne 1 ]; then
-+if [ $(python${PYVERSION} --version 2>&1 | grep -c "^Python 3") -ne 1 ]; then
-     printf "Warning: Wrong Python version.\n"
-     printf "Please make sure Python 3.x is used by adding '--python' or '--python3'.\n"
-     exit 1

app-benchmarks/i7z/metadata.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>jlec@gentoo.org</email>
+		<email>chewi@gentoo.org</email>
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">i7z</remote-id>

app-misc/abduco/Manifest

@@ -1,2 +1,2 @@
-DIST abduco-0.2.tar.gz 11499 SHA256 c8b75a903b0914dd7804d57566f571f3f5efa91e46482bfb4652400156a71912 SHA512 9e6bda1779c4eff43c0f8a44857dd3beb25948c0f0bf2ff6e12bc951655e5f5ed3304794d7966b2e1cbb2c9f3917c153a1393889791a5293bd13111e15c3db11 WHIRLPOOL b76a95c21e16946eff999a148c453a44f819423fb6ab8c3903c8266c6d805d779c7232f2aa49fc0e09a19e3b6a6448b8a6a3c178266934dd1a3dcaaa4370a07c
 DIST abduco-0.3.tar.gz 11978 SHA256 934bf0b9ae25fb3f71b775387b5f281bf7d175fea79c12ec28ffdbbbb95390d4 SHA512 0bbd3a52e256738d39edf8e73e43d72fd4bcf2d240f45b8287486910777310320e239e7d1abb523a37c573dc557a0e33bf5849aa34f50f261f50c27a80db7338 WHIRLPOOL 1741f3c8d47a4f745b0fa0bed79306ca2d7dba8a936c6e66c1773205809fa1cf12f33f4c9f488eaa3c31f57d21299f17ec092926539a4fd037ebf2619e0dfb85
+DIST abduco-0.4.tar.gz 14222 SHA256 bda3729df116ce41f9a087188d71d934da2693ffb1ebcf33b803055eb478bcbb SHA512 1f6df3604f5b4b59a650ccb8b6b7f9e62591154f72163350b8c8d2ffa9c392c9ebda0f958537a203e87319e275674fec6d161f18a10d49e44d0afc512c467f88 WHIRLPOOL e232bbae99cdd0c3c5b0e06f8cce73126586f9d997a03ba03720030355d603ee488df40b04343b6bfd508d2ac05dbdd2ca3bc6a62a661b140c5bd9bfc43fde12

app-misc/abduco/abduco-0.4.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -43,7 +43,7 @@ src_test() {
 
 src_install() {
 	dobin ${PN}
-	dodoc README
+	dodoc README.md
 	doman ${PN}.1
 
 	save_config config.def.h

app-misc/elasticsearch/Manifest

@@ -1,3 +1,4 @@
 DIST elasticsearch-1.7.3.tar.gz 28510917 SHA256 af517611493374cfb2daa8897ae17e63e2efea4d0377d316baa351c1776a2bca SHA512 0cb6b2ebd77c3d1467f6a22f845bfbf9f4a7c9c9ddedae17aeb6bd2d2bc576171fc80e3a4963e7b890af574e9fd0b0faa152e7f2671a74254826e14fe2554c9f WHIRLPOOL c86de3076389a9b95cf4d424673edb3c3b1dae0b4470b18b15a5f2e9bde6669a61b8ffd5cc3f7fc3b52f99441915a84b0396a5673ebbc12fec0d83eb41a03c74
+DIST elasticsearch-1.7.4.tar.gz 28510433 SHA256 395f3417c26a6b36125f6a062c1129b454a961efea09151c692adc63562e5a94 SHA512 7a31c274a833d0f27dbfd54ce6c8d8f6d01562289e1c4c9258a7c338f3e4ecc9d842d2a5c0c804f333f9cdf9dcfec437640fb4a4e5cfdda3fa958bdb7a402022 WHIRLPOOL 0acff3f5b8047c2647b716d57255e7f884f06ea57e468c784e1a84742b47973570d175a723a4341c54a027b9a442c89e9bed2f66bb29c292d6c59ca40ffb3855
 DIST elasticsearch-2.1.0.tar.gz 28994631 SHA256 8a4e85bcb506daa369651506af1cbc55c09fd7ff387d111142ae14d0a85d4d14 SHA512 207f35c94c65dcc57e75479e0dbb9127598ea3d9fcc04c1181bf82ebf1022a4431239a0f49803ab53b7bed5152b719e99f8e0395c9b80168567148ae13281ad3 WHIRLPOOL 006a763bbfd8d1600d152a4f80fb05aa92cdf3c223cc59a6368d69ab85bc6e60ffaa84a1d888eff76270834ff407f5d5f71bdf43fb286f8cbe056170e1573272
 DIST elasticsearch-2.1.1.tar.gz 29007342 SHA256 ebd69c0483f20ba7e51caa9606d4e3ce5fe2667e1216c799f0cdbb815c317ce6 SHA512 eff12cd7342dc0036dc88f03ced9c7cc90d284222efeca86adfd9e4cf254cb8f96105c58673b239cfc9eb9764a2a669d2cd171ca73eb43b1ec1470a13c5e1776 WHIRLPOOL 2b0e069d162ee07eddc90d879d4ce5dd2cef9e4a804a9aaeb3d99e5d532f583589e2c6a36b5e856bf19a610f220eea6aaa75d28e7b6687b60eab7bf83b2def51

app-misc/elasticsearch/elasticsearch-1.7.4.ebuild

@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd user
+
+MY_PN="${PN%-bin}"
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+QA_PREBUILT="usr/share/elasticsearch/lib/sigar/libsigar-*.so"
+
+RDEPEND="|| ( virtual/jre:1.7 virtual/jre:1.8 )"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
+}
+
+src_prepare() {
+	rm -rf lib/sigar/*{solaris,winnt,freebsd,macosx}*
+	rm -rf bin/*.{bat,exe}
+	rm lib/sigar/libsigar-ia64-linux.so
+	rm LICENSE.txt
+
+	use amd64 && {
+		rm lib/sigar/libsigar-x86-linux.so
+	}
+
+	use x86 && {
+		rm lib/sigar/libsigar-amd64-linux.so
+	}
+}
+
+src_install() {
+	dodir /etc/${MY_PN}
+
+	insinto /usr/share/doc/${P}/examples
+	doins config/*
+	rm -rf config
+
+	insinto /usr/share/${MY_PN}
+	doins -r ./*
+	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
+
+	keepdir /var/{lib,log}/${MY_PN}
+
+	newinitd "${FILESDIR}/elasticsearch.init4" "${MY_PN}"
+	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
+	systemd_newunit "${FILESDIR}"/${PN}.service4 "${PN}.service"
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${MY_PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
+	elog
+	elog "Each of the example files in /usr/share/doc/${P}/examples"
+	elog "should be extracted to the proper configuration directory:"
+	elog "/etc/${MY_PN} (for standard init)"
+	elog "/etc/${MY_PN}/instance (for symlinked init)"
+	elog
+}

app-misc/g15macro/files/g15macro-1.0.3-Makefile.am.patch

@@ -0,0 +1,13 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -10,9 +10,8 @@
+ imagedir = $(prefix)/share/g15macro/splash
+ image_DATA = ${top_builddir}/g15macro.wbmp
+ 
+-LIBS = -lg15daemon_client -lg15render -lX11 -lXtst 
++LIBS = -lg15daemon_client -lg15render -lX11 -lXtst -lpthread
+ IMCLUDES = -I
+-g15macro_LDFLAGS = -avoid-version
+ g15macro_SOURCES =  g15macro.c
+ 
+ 

app-misc/g15macro/files/g15macro-1.0.3-configure.in.patch

@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -8,7 +8,6 @@
+ AC_CONFIG_HEADER([config.h])
+  
+ AC_PROG_CC
+-AC_PROG_LIBTOOL
+ AC_PROG_RANLIB
+ 
+ AC_CHECK_LIB([g15daemon_client], [g15daemon_version],,AC_MSG_ERROR(["libg15daemon_client (or its devel package) not found. please install it"]))

app-misc/g15macro/g15macro-1.0.3-r1.ebuild

@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="Macro recording plugin to G15daemon"
 HOMEPAGE="http://g15daemon.sourceforge.net/"
@@ -19,10 +20,18 @@ DEPEND=">=app-misc/g15daemon-1.9.0
 	x11-libs/libX11
 	x11-proto/xextproto
 	x11-proto/xproto
-	x11-libs/libXtst"
-
+	x11-libs/libXtst
+"
 RDEPEND="${DEPEND}
-	sys-libs/zlib"
+	sys-libs/zlib
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.am.patch
+	epatch "${FILESDIR}"/${P}-configure.in.patch
+	mv configure.in configure.ac || die
+	eautoreconf
+}
 
 src_configure() {
 	econf --enable-xtest

app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.0.ebuild

@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-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 ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ruby"
 
 RDEPEND=">=app-text/build-docbook-catalog-1.1

app-text/liblangtag/Manifest

@@ -1,3 +1,4 @@
 DIST liblangtag-0.5.1.tar.bz2 651785 SHA256 c3dd456762cd0b5fd1687f066c4bdf253d70b14729851b9cd05936a1cb46923b SHA512 006ed5b8621bfc4330589eeba8581dd2214a29c985f782b0c123012105ac6ea447f1d7593daec86b0126daf7929e6845208c633c63df67beca2d6201a6961bbf WHIRLPOOL 80f48834b00ba7732f07a7e88ae092a3f0f0168c3de176ad0544e130b8e0c3991a169ed4d502cdc9aff0af1fe3df43ac961d4c8517b9240b9934ea901c0626e5
 DIST liblangtag-0.5.2.tar.bz2 658800 SHA256 2b8dc5fa86486a1277c64e9b429eaf8ce0fcbef473b9123bb0374b711848f1c3 SHA512 73a40fbdef7820c3e1556b242e06e24040d048f62be8f9aeced0f12d0e606dfd8d49eb740bda4f0b07566c3d963d249c2440dbc9e865e1a3a11eb4fffcaa33a7 WHIRLPOOL fd04e243e5069723666acb1ed58fff2f33455916f76bfd871ef59de0ebd6b0ae392527bff13be09aab120bf72ab3b3af25b031cbb6097f04c3922652e0777e6a
 DIST liblangtag-0.5.6.tar.bz2 668949 SHA256 5cdec61f4ef8d4b1a198682fcdd17e88cb293549af5878d6ee4bdd55d129bd84 SHA512 60297d79b20c72a0ebf5fd685efbcb3eb2d40461cfe532fd5e4f2193c81c9037b8c69f9cb0977f640a7d8f315cb14508de9455334115b152ed30d23f91d75e52 WHIRLPOOL 0805c9dcde9802818ec4e19309eb9b09e4dfe77627fefcb190203110b9ec133083d48c0474171368e1b061612f1e06bc936d1dc1ad1ad551dd276afe3db26fb5
+DIST liblangtag-0.5.8.tar.bz2 672452 SHA256 08e2f64bfe3f750be7391eb0af53967e164b628c59f02be4d83789eb4f036eaa SHA512 477f74d8b7eab66e5c503942117d8b448dd9d1b13866b3ec48388058bc0e5e4c6215ece88405fd947515cd092853f069d70b3fe2f307a9b41cb697b6b1dc3baf WHIRLPOOL 7036649534870e34dab5f68f1a97c5aee4649df6cc076026795f09775efca7a00b3eb047743aef3efeccd901add3942e6c9f5c097124193cdd57463a250ef133

app-text/liblangtag/liblangtag-0.5.8.ebuild

@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="An interface library to access tags for identifying languages"
+HOMEPAGE="https://tagoh.bitbucket.org/liblangtag/"
+SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="introspection static-libs test"
+
+RDEPEND="
+	dev-libs/glib
+	dev-libs/libxml2
+	introspection? ( >=dev-libs/gobject-introspection-0.10.8 )"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	sys-devel/gettext
+	test? ( dev-libs/check )"
+
+# Upstream expect liblangtag to be installed when one runs tests...
+RESTRICT="test"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable introspection)
+		$(use_enable test)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	prune_libtool_files --all
+}

app-text/libmwaw/Manifest

@@ -2,3 +2,4 @@ DIST libmwaw-0.1.10.tar.xz 737680 SHA256 9a4547923c6db24e51733f91ecd74a9c4794739
 DIST libmwaw-0.2.0.tar.xz 808604 SHA256 c30f228681ba2fc3715c9e41fcf2c3bb2b873911acb22602ab7b2eb1eeed85bd SHA512 31a4641d30eaae8a6e4a7c38a875996c657c901efbf4b631a0575f8fa33a1bfe5c7fadfb867ba1d4c4a9ed321d304a4d1727d1d61596cedd75b6bf3bf0094094 WHIRLPOOL 81d7ad03f38d59c24fa6dcc87a586c7774c934e749becd465e8d58a54873072837c39ab52cfaf87011ddc03a24bf57aa52f804d70398c7091b42165456c22155
 DIST libmwaw-0.3.5.tar.xz 1069012 SHA256 34fedad820078e0d51150518c51e537363d1d2d3301c203dd0cc31970281a9ef SHA512 37468ecec556eb1ace77beb36ca176675ad5c9c362409b7cf689fedfb284e5e2c9cf776337dfd3500169d3af2adb976658e6d8edac02579d59ff11f8cdb6234c WHIRLPOOL 0e6e84b9ed42be6b944fe328135d117eb61e524007a473ed259d206c8c2d2d162f075ba7f13c72f49f49fe7acd44ecfbfbaa3cc1c8eefcbd214ee2b507c8a5d0
 DIST libmwaw-0.3.6.tar.xz 1136836 SHA256 015f1c7ce4b023512e72897e36c7b2f74533d49fa65689e6480a8632ad09650c SHA512 fb653080b4d1a9c13f998d998dcdd0b790f69f70f91d6a426661bde49e32fb977d49c50893141e6901de0b9a832159dd989661d6889f267c0dbe0064e7f342d1 WHIRLPOOL ec8171be462ccb6d1b656fbf546eeccf38332ff27fed565c281454754470992ba9fc4dbed2772ad3c81a57f57c55c06dafdd9180547e698dd970389f49b1df8f
+DIST libmwaw-0.3.7.tar.xz 1167156 SHA256 057611e871c279a28fcbede78dda11e500b9d5b341ab7064d6dce470f6fee8f9 SHA512 17f15f029633a22f8e7db7855b32dd5f4061e1eb3df865426bb736d2a5f3b7c0f631c22506aaed77e5fc4bce0e881c1f28f58a600c1155eac91d5897027b5499 WHIRLPOOL 8a9a05879e5c657be144685730e444290e3746949d77d7d3f1fe0700a32e86b786d93ae60ad4175c179b081263773f0a8121434f789b7413fbce5c7221b02111

app-text/libmwaw/libmwaw-0.3.7.ebuild

@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://git.code.sf.net/p/libmwaw/libmwaw"
+inherit eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library parsing many pre-OSX MAC text formats"
+HOMEPAGE="http://sourceforge.net/p/libmwaw/wiki/Home/"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46:=
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	# zip is hard enabled as the zlib is dep on the rdeps anyway
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-sharedptr=boost \
+		--enable-zip \
+		--disable-werror \
+		$(use_enable static-libs static) \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}

app-text/libwpd/Manifest

@@ -1,2 +1,3 @@
 DIST libwpd-0.10.0.tar.xz 506220 SHA256 9d8ba780cb9c0aed7859c59a602138d8ab360b40f6aa655e42f5f769f2cfd32c SHA512 1d1962edd133b72ef835e1c7cf8d856cb959b231811009da14a272f20dc6ad3f9df02424791d26012bf130db05e22fa7862af355ecbaf3be30d9948aa719eba2 WHIRLPOOL 867049ca6128c9182a5df7d39189392618a1d2aae5631e518b6b5a33d6f2b08ddf2ad7b9d5fee8c8bef0edc6a6dae0cb0552475a73bf84db3a9ddeb19ae07449
+DIST libwpd-0.10.1.tar.xz 524004 SHA256 09d3410bc770f9d9eedc8544b5c211771ea3322de3fee19b58ad7d40fb2984f6 SHA512 976694b5e02fd9eb0b3769d5071e9ae88505f491d8fa34473e5b99cd350060a85ddfad9b3c38e9b37a280e695e4571d353fd69fe7b69a627097587912b58ad2c WHIRLPOOL c6c1124a7124edda4dad6788794c46067ad21c8fde0765ff1b1ca6305c08139e86ac0667d6fd6ca53e4bed41ad0b7aa6b4803fad5f7f72c529cf0c3b22bc7b43
 DIST libwpd-0.9.9.tar.xz 541608 SHA256 b91df4ca0ef0f456be9531c9ee07cf6a5e50a16b52002abb99e8ebef13fac2b2 SHA512 a71b4990670446270518e1318066e714c02c4a0752fba0be03037ea7bd434c5dd0219d61687448faabf7e31bc40e4e4a9d4b67d01fd362dae96322db513d79ac WHIRLPOOL c51155a0a88047abe856d0a83b05721b1629c4e5c24e68de65905ce8c735fd0144290c2739971d0118dfcf24eff47aea0f6b8b260c7eaa9af2a36cf8325d3c0a

app-text/libwpd/libwpd-0.10.1.ebuild

@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit alternatives eutils
+
+DESCRIPTION="WordPerfect Document import/export library"
+HOMEPAGE="http://libwpd.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0.10"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~x86 ~x86-fbsd"
+IUSE="doc +tools"
+
+COMMON_DEPEND="dev-libs/librevenge"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<app-text/libwpd-0.8.14-r1"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable tools) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--program-suffix=-${SLOT}
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use tools; then
+		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9][0-9]"
+		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9][0-9]"
+		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-9][0-9]"
+	fi
+}
+
+pkg_postrm() {
+	if use tools; then
+		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9][0-9]"
+		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9][0-9]"
+		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-9][0-9]"
+	fi
+}

dev-db/barman/Manifest

@@ -1,3 +1,4 @@
 DIST barman-1.4.0.tar.gz 120590 SHA256 d18c331bd6d8931bd60dab272bc9d512eb494bfddb11964d7ca430f51b7e45e9 SHA512 415fd5597df94fb43b8c48ec1250c22e6bbe21217fe9937d6c0cf6ef8ab68bea21b9341c18a2e97f7af92b516f0201b82fa1279af6994d6fa60d441d3f9326e2 WHIRLPOOL 6e1e1c112ad5ef1afc76369d0f4428128ce85d2abe4a298b2eed73efc6bd2e248dd81baa3f6839360ea162dc676103f4e59f13fefe102ea609455e1330444e93
 DIST barman-1.4.1.tar.gz 122048 SHA256 38a649ab1cea811e2db9410d87c08423beb3135f88b1160913bcb9f16a10b1df SHA512 3f6d55ceee55efc95d526848292f68c80bbee4081fc26714b0da52990e3a05030ae2f89561a4c4c71c273bb1c07f009dc0bbbbebbc5cde87831b514e918ad531 WHIRLPOOL 8f42844f5d9514b0d8c14ff2ad03f1e8e3994e0e394e7e7a761b0a95ed6a8c9a4eea791a82a14b346cbcf3354aaa8f56547290eddc75ea0f57e775a55db70499
 DIST barman-1.5.0.tar.gz 128132 SHA256 21188b11f64dd13e70236456ca7ad43fc21ccb1956e093ced7f8f810b13d972a SHA512 7b9501277868b141f3813a545fe5463a1f7cddb0d4aaeb6c13a21aa969ced4a0a53a38ecb6e091b84c0174dae0593235cb8b586bdd244b30776273030cdfc1e8 WHIRLPOOL 5d5630370c5c30f79228e4007ff0608d2c6c44eee4e6d2f7dca2518c432bae24ddb5f6f32680b4759277d4b5e572140906f658f4d2db2d2fd82e1fea965675fe
+DIST barman-1.5.1.tar.gz 132842 SHA256 69127c298f91f696241df0e15f9327d53b050cbbeea6ba5dec039aea76d432de SHA512 bc99c3b970c82f24b49e44eb4672e1201237e3a7e575d45dff5186fb472d98e59a7a18b74b7218ef05b05c606d2f53e1723f1482681624dd386caff79161926c WHIRLPOOL aa7eb221264d590b2afa344dfc7344de7ce913c638eb41d021bf96ae30b0a6c37b4b462e9ac059b02595722eda8f21e990c9e6f1152ac8f789ef06490890bcea

dev-db/barman/barman-1.5.1.ebuild

@@ -0,0 +1,26 @@
+# 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
+
+DESCRIPTION="Administration tool for disaster recovery of PostgreSQL servers"
+
+HOMEPAGE="http://www.pgbarman.org"
+SRC_URI="http://downloads.sourceforge.net/project/pgbarman/${PV}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND="dev-python/argh[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/argcomplete[${PYTHON_USEDEP}]
+	net-misc/rsync
+	dev-db/postgresql[server]"
+DEPEND=""

dev-java/c3p0/Manifest

@@ -1,3 +1 @@
-DIST c3p0-0.9.1.2-codegen.tar.bz2 15434 SHA256 c8c920d7cc240e07276525d861f88128f6403e1a123e2526796caa440b9c9025 SHA512 4b20c5307f98dfaf82676d21ec9ade0251c043322b544acea912dbc6a866773180c548aa32764fb73894daa9115ae9eec702846a2112f620e90d1e462c879075 WHIRLPOOL 6df9184ef6c1385217e74dd0a5dd21dffce37be80e7f3bc418a3b83d9062e793f20ef436d641e8f03b7b5a2bcf3ce71d19f1b09dae1660c2f103942a6aa2f1c4
-DIST c3p0-0.9.1.2.src.tgz 380118 SHA256 b837a5668a7fb0cb2338dbe26867ecc91c6e9ea030440107becb999a9a8724d3 SHA512 a33c413b5471d56d72224e3ad74996828854a2a0227bc674d5956612db517348de1f36695d16ab4cbb38827bddbe03952a5518205296fc35ecbd11b536b5aa32 WHIRLPOOL 864fd5eb470024c1f6072a886ba62732d0c1e06ae3f0cc3235b071112f0d4a20b820d4e3b68194e8af0be07567b38f219d2dc8e597f3e5d6b01afa21fb5882b9
 DIST c3p0-0.9.5.1.src.tgz 839657 SHA256 35383e69cad101168575453c5ae5297a7e0fb2ab2cc885373f8d5b7c46254afd SHA512 1843696d48e68f6120a68c42f0eb60c342ed8d1ddcc1d78c500d85c3d7e5e48358d100ecb1e0efa192aba34c5d9221437d53c2a968a42b797ff84bc12db4a724 WHIRLPOOL 04621c0583c918099da5e59a8e2bbbc31ec4e07e73cb9b4377d1ae128606ca3f281cf38e89efa753d2c4367bb8b48d2669b2f405df9680df9616657edcc2219f

dev-java/c3p0/c3p0-0.9.1.2.ebuild

@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-JAVA_PKG_IUSE="doc source"
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
-
-inherit java-pkg-2 java-ant-2
-
-SRC_P="${P}.src"
-
-JAVA_PKG_WANT_SOURCE="1.4"
-JAVA_PKG_WANT_TARGET="1.4"
-
-DESCRIPTION="Library for augmenting traditional (DriverManager-based) JDBC drivers with JNDI-bindable DataSources"
-HOMEPAGE="http://c3p0.sourceforge.net/"
-# how to package the generated sources:
-# 1) comment out the sed build.xml calls below and compile with forced sun-jdk-1.5
-# 2) go to the ${WORKDIR}
-# 3) tar -cjf c3p0-0.9.1.2-codegen.tar.bz2 c3p0-0.9.1.2.src/build/codegen/
-SRC_URI="mirror://sourceforge/${PN}/${SRC_P}.tgz
-	mirror://gentoo/c3p0-0.9.1.2-codegen.tar.bz2"
-# Does not like Java 1.6's JDBC API
-COMMON_DEPEND="dev-java/log4j"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEPEND}"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-S="${WORKDIR}/${SRC_P}"
-
-src_prepare() {
-	echo "j2ee.jar.base.dir=${JAVA_HOME}" > build.properties
-	echo "log4j.jar.file=$(java-pkg_getjar log4j log4j.jar)" >> build.properties
-
-	java-ant_rewrite-bootclasspath 1.5
-	# don't generate sources, use the pregenerated from gentoo mirrors
-	# since generator uses reflection, it's not as simple as javac bootclasspath rewrite
-	sed -i 's/depends="codegen"//' build.xml
-	sed -i 's/depends="codegen,/depends="init,/' build.xml
-}
-
-EANT_DOC_TARGET="javadocs"
-
-src_install() {
-	java-pkg_newjar build/${P}.jar
-	dodoc README-SRC
-	use doc && java-pkg_dojavadoc build/apidocs
-	use source && java-pkg_dosrc src/classes/com
-}

dev-java/c3p0/c3p0-0.9.5.1.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$
 
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source examples test"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="Library for augmenting traditional (DriverManager-based) JDBC drivers with JNDI-bindable DataSources"
+DESCRIPTION="JDBC drivers with JNDI-bindable DataSources"
 HOMEPAGE="http://c3p0.sourceforge.net/"
 
 MY_P="${P}.src"
@@ -15,25 +15,30 @@ MY_P="${P}.src"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
-CDEPEND="dev-java/log4j:0
+CDEPEND="
+	dev-java/log4j:0
 	dev-java/mchange-commons:0"
-DEPEND=">=virtual/jdk-1.6
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/junit:4
+	)
+	>=virtual/jdk-1.6"
+
+RDEPEND="
 	${CDEPEND}
-	test? ( dev-java/junit:4 )
-	"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
+	>=virtual/jre-1.6"
 
 S="${WORKDIR}/${MY_P}"
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 
 java_prepare() {
-	find . -type f -name \*.jar -exec rm -v {} \; || die
-	find . -type f -name \*.class -exec rm -v {} \; || die
+	java-pkg_clean
 	java-pkg_jar-from --into lib/ mchange-commons
 	java-pkg_jar-from --into lib/ log4j
 
@@ -47,7 +52,7 @@ src_test() {
 }
 
 src_install() {
-	java-pkg_newjar build/${P}.jar
+	java-pkg_newjar "build/${P}.jar"
 	dodoc README-SRC
 	use doc && java-pkg_dojavadoc build/apidocs
 	use source && java-pkg_dosrc src/java/com/mchange/v2

dev-java/mchange-commons/mchange-commons-0.2.10.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$
 
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/swaldman/${MY_PN}/archive/${MY_P}.zip"
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+KEYWORDS="amd64 x86 ppc ppc64"
 
 IUSE="doc source"
 

dev-java/ognl/Manifest

@@ -1,3 +1,2 @@
 DIST OGNL_3_0_8.tar.gz 3564389 SHA256 e32d78c88985fc8f2c9ab5fb208d7dc22593dea32ed959b46b1d9101b99127d3 SHA512 79ca457077f344da16677e56f8e0ae809d2af85015e1c4bc17a3eef4dd25c01738fdbcac8a9397b83251b48164404df161d60e20d43868e1ff32e9bb388ef4b6 WHIRLPOOL a5e21dcccc4bfc424412abf94c48a3f45ba541a9e25bd0c7c4dc11869cac7051f586e5883011d03c75187fcd432195b526cfb53e3a300fbe2f84f5b4cd67e12a
-DIST ognl-2.6.9-dist.zip 2338429 SHA256 2fcb108c332b388c0ca282e8dfea9a079ab6af3caa08cfe3ccb307dffd57e290 SHA512 7883f4e2c3c4b1fab5966481c661cdb3fdd7489717333e985dc7a517fbf14f82e3c218f81e8ad94008f7fcd6e66d166bd03227ff5f1df6a203e1cbc2985bd44c WHIRLPOOL 821d93653b6217b69d575abcfaad9639d8f4e46699124b2ffc0d1ae8ba1fc763ec89b0bf6991b2a929b9e5d31e1b1fcbaf1fd1f6931952ed5f1c4df4d82c372c
 DIST osbuild.xml 5939 SHA256 b56534bfdceabe54f4c446d7ee3718dc373523aa368d83206723300fa6931726 SHA512 6b66b7b27073fd6b707b71fb2da7017602edd85de52e767ecb8d8931fdd96811b04d9ec0ac9ec1cb32daf03d43610f760471959cf7211b1921a92d5f5a070416 WHIRLPOOL d8b355472c773a4e180d8efa2c0ecbf55a1233432f8af6c21f9fc8e02012db9780f923af6c3383a343126f4753ce7a62316fdda6a393b5aceb822fe52b64f233

dev-java/ognl/ognl-2.6.9-r2.ebuild

@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Object-Graph Navigation Language; an expression language for getting/setting properties of objects"
-HOMEPAGE="http://www.ognl.org/"
-SRC_URI="http://www.ognl.org/${PV}/${P}-dist.zip
-	https://ognl.dev.java.net/source/browse/*checkout*/ognl/osbuild.xml"
-
-LICENSE="Apache-1.1"
-SLOT="2.6"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	default
-	cp "${DISTDIR}/osbuild.xml" "${S}/" || die
-}
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-}
-
-EANT_DOC_TARGET="javadocs"
-
-src_install() {
-	java-pkg_newjar build/${P}.jar ${PN}.jar
-	use doc && java-pkg_dohtml -r dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}

dev-java/ognl/ognl-3.0.8.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,40 +8,45 @@ JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="Object-Graph Navigation Language; an expression language for getting/setting properties of objects"
+DESCRIPTION="Object-Graph Navigation Language: get/set properties of objects"
 HOMEPAGE="http://www.ognl.org/"
 SRC_URI="https://github.com/jkuhnert/ognl/archive/OGNL_${PV//./_}.tar.gz
 	https://ognl.dev.java.net/source/browse/*checkout*/ognl/osbuild.xml"
 
 LICENSE="Apache-1.1"
 SLOT="3.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="dev-java/javassist:3"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
 	app-arch/unzip
-	${CDEPEND}"
+	>=virtual/jdk-1.6"
 
 S="${WORKDIR}/${PN}-OGNL_${PV//./_}"
 
 java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
+	java-pkg_clean
 
 	cp "${DISTDIR}/osbuild.xml" "${S}/" || die
 
 	sed "s/\(name=\"compile.version\" value=\"\)1.3\"/\1$(java-pkg_get-source)\"/" \
 		-i osbuild.xml || die
 
-	cd lib/build
+	cd lib/build || die
+
 	java-pkg_jar-from javassist-3
 }
 
 EANT_DOC_TARGET="javadocs"
 
 src_install() {
-	java-pkg_newjar build/ognl-2.7.2.jar ${PN}.jar
+	java-pkg_newjar build/ognl-2.7.2.jar "${PN}.jar"
 
 	use doc && java-pkg_dohtml -r dist/docs/api
 	use source && java-pkg_dosrc src/java/*

dev-java/snakeyaml/Manifest

@@ -1,2 +1 @@
-DIST SnakeYAML-all-1.11.zip 11972014 SHA256 dcca58023e8c40cd9b29513f2970791181e71e304c127e99d378fba70ebd7d40 SHA512 f454a8d99b8e08858b64d3ca13443f7934f92e31fb5e1fd57147dc957827ed4278275b201ad7a739eeebf8ee6b70669dc13d3994a876c22f09c7f1d8f312b941 WHIRLPOOL 0796ca3f5314efa6b2c48080acdcbf5c9989bee6d6d68e4a2df8dba4551a767de2f1b9a451ff49abf6daa61b33bcb7cb08f2985846dc97118d845968159e068c
 DIST SnakeYAML-all-1.9.zip 9122570 SHA256 7c1090eb1b2e06f784dc424678f18d513dfe020fd2f0042c63217e09ae9a8853 SHA512 8b2fd5de8374b592b74f52cea66cbb7aed04892fecf7f994fc797fc9fdb185fed4fa02a1fe69e69f137acb01037f77ed18988b83d038bc425fa04186947dab19 WHIRLPOOL f7a9dcd644638b28a35a8a33d81455984455d1b55dddc057db17cb6e60589240331ab2beb56df4f6a81bbe6ff1fe2b63731eff6454b601b1a76ba5c2061baa7c

dev-java/snakeyaml/snakeyaml-1.11.ebuild

@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A YAML 1.1 parser and emitter for Java 5"
-HOMEPAGE="https://bitbucket.org/asomov/snakeyaml"
-SRC_URI="https://snakeyaml.googlecode.com/files/SnakeYAML-all-${PV}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${PN}"
-
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	find "${WORKDIR}" -name '*.class' -exec rm {} +
-
-	# Easier to use java-pkg-simple.
-	rm -v pom.xml || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	dodoc AUTHORS src/etc/announcement.msg
-}

dev-java/snakeyaml/snakeyaml-1.9-r1.ebuild

@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A YAML 1.1 parser and emitter for Java 5"
-HOMEPAGE="https://bitbucket.org/asomov/snakeyaml"
-SRC_URI="https://snakeyaml.googlecode.com/files/SnakeYAML-all-${PV}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="1.9"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${PN}"
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	find "${WORKDIR}" -name '*.class' -exec rm {} +
-
-	# Easier to use java-pkg-simple.
-	rm -v pom.xml || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc AUTHORS src/etc/announcement.msg
-}

dev-java/snakeyaml/snakeyaml-1.9-r2.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="5"
 
 JAVA_PKG_IUSE="doc source"
 
@@ -17,14 +17,14 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
 
 S="${WORKDIR}/${PN}"
 JAVA_SRC_DIR="src/main/java"
 
 java_prepare() {
-	find "${WORKDIR}" -name '*.class' -exec rm {} +
+	java-pkg_clean
 
 	# Easier to use java-pkg-simple.
 	rm -v pom.xml || die

dev-java/tapestry/tapestry-3.0.4-r2.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="An open-source framework for creating dynamic, robust, highly scalable web applications in Java"
+DESCRIPTION="Dynamic, robust, highly scalable web framework in Java"
 HOMEPAGE="http://tapestry.apache.org/"
 SRC_URI="mirror://apache/${PN}/Tapestry-${PV}-src.zip"
 
@@ -16,7 +16,7 @@ LICENSE="Apache-2.0"
 SLOT="3.0"
 KEYWORDS="~amd64 ~x86"
 
-COMMON_DEP="
+CDEPEND="
 	dev-java/bsf:2.3
 	dev-java/commons-beanutils:1.7
 	dev-java/commons-codec:0
@@ -26,15 +26,17 @@ COMMON_DEP="
 	dev-java/commons-logging:0
 	dev-java/jakarta-oro:2.0
 	dev-java/javassist:2
-	dev-java/ognl:2.6
+	dev-java/ognl:3.0
 	dev-java/servletapi:2.4"
 
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.4"
 
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip:0
-	${COMMON_DEP}"
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.4"
 
 IUSE="${JAVA_PKG_IUSE}"
 
@@ -42,7 +44,7 @@ S="${WORKDIR}/Tapestry-${PV}"
 
 EANT_GENTOO_CLASSPATH="commons-logging,commons-fileupload,commons-lang-2.1"
 EANT_GENTOO_CLASSPATH+=",commons-codec,commons-beanutils-1.7,commons-digester"
-EANT_GENTOO_CLASSPATH+=",servletapi-2.4,ognl-2.6,bsf-2.3,jakarta-oro-2.0"
+EANT_GENTOO_CLASSPATH+=",servletapi-2.4,ognl-3.0,bsf-2.3,jakarta-oro-2.0"
 EANT_GENTOO_CLASSPATH+=",javassist-2"
 JAVA_ANT_REWRITE_CLASSPATH="true"
 

dev-java/testng/testng-6.8-r4.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$
 
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc examples source test"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="Testing framework introducing some new functionalities that make it more powerful and easier to use"
+DESCRIPTION="New generation testing framework in Java"
 HOMEPAGE="http://testng.org/"
 SRC_URI="http://${PN}.org/${P}.zip"
 
@@ -21,15 +21,17 @@ CDEPEND="
 	dev-java/guice:2
 	dev-java/junit:4
 	dev-java/ant-core:0
-	dev-java/jcommander:0
-	dev-java/snakeyaml:1.9"
+	dev-java/snakeyaml:0
+	dev-java/jcommander:0"
 
-DEPEND=">=virtual/jdk-1.6
+DEPEND="
+	${CDEPEND}
 	app-arch/zip
-	${CDEPEND}"
+	>=virtual/jdk-1.6"
 
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
 
 JAVA_ANT_CLASSPATH_TAGS+=" testng javadocs-current"
 JAVA_PKG_BSFIX_NAME="build.xml build-tests.xml"

dev-java/typesafe-config/typesafe-config-1.3.0-r1.ebuild

@@ -1,26 +1,29 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-inherit java-pkg-2 java-pkg-simple
-
 JAVA_PKG_IUSE="doc source"
 
+inherit java-pkg-2 java-pkg-simple
+
 DESCRIPTION="a library of arguably useful Java utilities"
 HOMEPAGE="https://github.com/typesafehub/config"
 SRC_URI="https://github.com/typesafehub/config/archive/v${PV}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86 ppc ppc64"
 IUSE="doc source"
 
 CDEPEND=""
 
-RDEPEND=">=virtual/jre-1.8
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.8
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
 	app-arch/zip
-	${CDEPEND}"
+	>=virtual/jdk-1.6"

dev-java/typesafe-config/typesafe-config-1.3.0.ebuild

@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit java-pkg-2 java-pkg-simple
-
-JAVA_PKG_IUSE="doc source"
-
-DESCRIPTION="a library of arguably useful Java utilities"
-HOMEPAGE="https://github.com/typesafehub/config"
-SRC_URI="https://github.com/typesafehub/config/archive/v${PV}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
-IUSE="doc source"
-
-CDEPEND=""
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/zip
-	${CDEPEND}"

dev-java/validation-api/Manifest

@@ -1,2 +1 @@
-DIST validation-api-1.0.0.GA-sources.jar 65220 SHA256 a394d52a9b7fe2bb14f0718d2b3c8308ffe8f37e911956012398d55c9f9f9b54 SHA512 88bcde2fc9446b09cb24e73137cd16ed54953a6d93f33e8500ca196e4cec07ac03ebc446f4629291e6437d2f3757802236e56974cd3023bb25886e69e2330fc0 WHIRLPOOL 9eef9230c08a712ddcdb81c85961fb3be7661bce3276adc77b91f274ba2df2edd7c919fad38e2499ccd58287477ca75cff55d4f86bc8d86c6c6020900e08cf6c
 DIST validation-api-1.1.0.jar 94671 SHA256 30c421ac184ae6204961304b60cd06db5fde3db5159e81430bcdcb386cf19470 SHA512 aa15184ff004357f1cdee693008587a3aa180a8f24392847258672c4a2e5a537cf189049ef95febb1a87968a42223f7736e22e00fe9307678c117f7ab6b944a8 WHIRLPOOL 69b5a70aa4e358d85b43d60857413744a62bf0215473c1d97ca0307f98f3a0626a21b4643ab1cb73ba8746ed237e6db3787e86334bc5bef346f99ede3ef658a8

dev-java/validation-api/validation-api-1.0.0.ebuild

@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Bean Validation (JSR-303) API"
-HOMEPAGE="http://fisheye.jboss.org/browse/Hibernate/beanvalidation/api/tags/v1_0_0_GA"
-SRC_URI="https://repository.jboss.org/nexus/service/local/repo_groups/public/content/javax/validation/${PN}/${PV}.GA/${P}.GA-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="1.0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-
-EANT_BUILD_TARGET="jar"
-EANT_DOC_TARGET="doc"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	mkdir -p "${S}/src"
-	cd "${S}/src"
-	unpack ${A}
-	cp "${FILESDIR}/build.xml" "${S}/"
-}
-
-src_install() {
-	java-pkg_dojar "${PN}.jar"
-	use doc && java-pkg_dojavadoc "${S}/api"
-	use source && java-pkg_dosrc "${S}/src/javax"
-}

dev-java/validation-api/validation-api-1.1.0.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$
 
@@ -14,11 +14,10 @@ SRC_URI="https://repo1.maven.org/maven2/javax/validation/${PN}/${PV}.Final/${P}.
 
 LICENSE="Apache-2.0"
 SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
-
 DEPEND=">=virtual/jdk-1.5
 	app-arch/unzip"

dev-lang/rubinius/rubinius-2.5.5.ebuild

@@ -15,7 +15,8 @@ SLOT="0"
 IUSE="+llvm"
 
 RDEPEND="
-	llvm? ( >=sys-devel/llvm-3.2 )
+	llvm? ( <sys-devel/llvm-3.6
+		>=sys-devel/llvm-3.2 )
 	dev-libs/openssl:0
 	sys-libs/ncurses
 	sys-libs/readline:0

dev-libs/libevdev/Manifest

@@ -1,3 +1,4 @@
 DIST libevdev-1.3.tar.xz 392744 SHA256 265411ce79a592b3074e9d07fb97d462745d0c7ef178254a6f720245ed253446 SHA512 d208a9be788e5531e2fd83da8bdef58245a0265a0551f28645a7de157d165cee161c8c5cde50156bbf6414b719d6a0125b4263ecf0f60c71ec864a21afcd303c WHIRLPOOL 01335f51ba67c01f9cff15592468bb5ab675fefd75dee859663c8df02c04d52a14f62a442dd841d9473fcefd4ea6fb1abe3e7cc54282a605f8ba0d61ed4d0a7a
 DIST libevdev-1.4.4.tar.xz 409856 SHA256 ed9979369b6a6e28f5897d099538549ecffb2b7c00c1b717eb77c31d85bc45a9 SHA512 5170ce3e99588b3ce2f9d3580b2d2087b527eaf258ab69a9e8620e2c336d9fa54c36f75ba4b68a61b5ecd7c8123bb9adf538ba882ed353df08a54cd68906e210 WHIRLPOOL 6812c199e03e0eab750c83603d8f9dcc8d5b917d7b0cc2942317fff75083d91b0601401c5e5fddc4d64066c44a4d7de210f994fc01f79f7ce884fdf039b9e1c5
 DIST libevdev-1.4.5.tar.xz 409756 SHA256 e91c58ca86e0631186798449e0a78c65474ff562081d968ba0521f76c8c2ca1d SHA512 086762a8bca049e9a5b88a8829b0175c0c908d893a286a2a75cc99921c5536ab2a0330ac26823e5154ef18336c48ad47f44784c3c2f91caa7f64bf46330e2808 WHIRLPOOL 1ff48b955e28f75efd90c5f68e9b1df16969582a86a71cd10903eeaa7aa0aeb2000b1af4725f669db18c16cd2951919f59c4fd820a417479a68bf05be618c0c8
+DIST libevdev-1.4.6.tar.xz 410224 SHA256 7b2ae1a0c7f9f7a96198ddc8fd167f090f233d6cbd8168b847e4f968445132d3 SHA512 7c2250ed87a352e5ce8503ff4ea7cac29e45bdfbde6e3443dd091ebfe139cb7a2b4be5e16d1aa1bf7e0e0550c16eb1d0038992645bf0bef5528f2dca4a8f0290 WHIRLPOOL a3df849cf24730ec401f6794e25c1a9e00c27d80f7cb468c55a3c8d09c0a7d504a8f1331837998df1c89fd84d4cd1e0d59581106e8ace2b4d0de486a0c2182d6

dev-libs/libevdev/libevdev-1.4.6.ebuild

@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+XORG_MULTILIB=yes
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit python-any-r1 xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}.git"
+
+DESCRIPTION="Handler library for evdev events"
+
+if [[ ${PV} == 9999* ]] ; then
+	SRC_URI=""
+else
+	SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+fi
+
+RESTRICT="test" # Tests need to run as root.
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"

dev-libs/libmaxminddb/Manifest

@@ -1 +1,2 @@
 DIST libmaxminddb-1.1.2.tar.gz 646557 SHA256 e2c0ea40ad932e5f0a0314a13fbd1354889b4ae85472a5499edb6279dd4964fa SHA512 46feef69cccdbc91500bdc1eebc6f89beb9fdf8d38749bccf965d8f5ea590b5cb09cf04c5fab388926c4878f7ed4edc60ca18bbcb9b79e0759a32f3255b548ca WHIRLPOOL fffee216829118b0b73487c2d99bf0929d29c27ffa78589eb4834df27f44625d552e2bda34e48a98386e53c3065fcb634b1855ec73289e381e174dd2226f4f1a
+DIST libmaxminddb-1.1.4.tar.gz 657648 SHA256 fb618d22f9dd3494faf860e82e75e4e1f4cc14410a01118feb7bb7c31ea089a4 SHA512 d6f94d4bd606fb821f108995e2388c3d1bbb093d8bde7cede52aec4660bd3f720ec10e6d79b758d52d53cdd65ac1e8e7b343029afca4d5d56a75fc961b3152c1 WHIRLPOOL bfbb7d61b0c99ebed746f015433eea71006f076d1a82595a9ee53e098072684c4f64e6201446c3227285994c589bd5be1eb7406329f1b3ac3865fcd9a6d593c8

dev-libs/libmaxminddb/libmaxminddb-1.1.4.ebuild

@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="C library for the MaxMind DB file format"
+HOMEPAGE="https://github.com/maxmind/libmaxminddb"
+SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/0.0.7"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DOCS=( Changes.md )
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}

dev-libs/librevenge/Manifest

@@ -1,2 +1,3 @@
 DIST librevenge-0.0.1.tar.xz 390796 SHA256 0cb22773dd1b268f71b291fba0e27127853e8e55ac6ec0fcf5370487d7eeee7d SHA512 65cc0e089a24e291700cca4a3f4d390d4646a1d6d847c060c068d53b525b7c69f0d870d2cafaf4d2f52cc102608e5a26c8883a455d031841e03cfbd32051e422 WHIRLPOOL d0645652b4f7834e5f14ccc24ba567d1fcf036183185c5b00e64615fce303ac5f9137b729ebf62615390ad8a482205b545158b4cdb9ffdedc8b429d57ded5a78
 DIST librevenge-0.0.2.tar.xz 396628 SHA256 f6f280c4345546aad16aeafd5cf2e4a4ac31a81606171755465bba0d96efcf0f SHA512 28e53aefdfe8585ef148781e53379a986b5becb459a27dffe8546341e7ada6a3323bc27ab3170227a532e796869b634ad0443324af72b16835a4287a64994637 WHIRLPOOL 648006d5024370e31e8b1bc2db4a7182572aa1ff5c4473754c02cbd33f30c51361fd4b6e6cd450aa40d08372eddd136c140cc7cac53e29188593b146fb55f121
+DIST librevenge-0.0.3.tar.xz 420288 SHA256 7ce7784ac732cb702cb42704779f4a36dfcd2f7187ba6ea12b500c9e0f2e16e4 SHA512 568ad98c861c13cda3461aad50df164a37f53e8e169231da7043dbfcab963b7870169badbe67c73532278ea229fea36c7dba4f0f03ea95730c17f49d01c0a2be WHIRLPOOL 025f5c2ef740c6ce59d378366b3cd78abab211e077a08029af8d58e6de05a28992c5457cbd8e77a84fb756ad5dc638b0cef9146c9d3b13519590b2e7872fc7ed

dev-libs/librevenge/librevenge-0.0.3.ebuild

@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="A helper library for REVerse ENGineered formats filters"
+HOMEPAGE="http://sf.net/p/libwpd/librevenge"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/librevenge"
+	inherit git-r3 autotools
+	KEYWORDS=""
+else
+	SRC_URI="http://sf.net/projects/libwpd/files/${PN}/${P}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="
+	dev-libs/boost:=
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit[${MULTILIB_USEDEP}] )
+"
+
+src_prepare() {
+	[[ ${PV} = 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable test tests) \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+}

dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.1.0.ebuild

@@ -6,7 +6,7 @@ EAPI="5"
 
 inherit php-pear-r1
 
-KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ppc ~ppc64 sparc x86"
 
 DESCRIPTION="OO interface for searching and manipulating LDAP-entries"
 LICENSE="LGPL-2.1"

dev-ruby/builder/builder-3.2.2-r1.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_TEST="test_all"
 

dev-ruby/ruby-net-ldap/Manifest

@@ -1,3 +1,2 @@
-DIST net-ldap-0.11.gem 87040 SHA256 fc5487b0c81cbf2beaede0e6c07af036559deb4ab6df185f61ac16562949d8f5 SHA512 8894fac34df186f03b879e707504ce8952030d38d88e902c8a98f195503765f7780771f26775606ff84a7940cd3b1a8193e028f85d05130940d583c222b4cc1f WHIRLPOOL 67d40f4ca3cb640aeb4a315ab2df44256357a6528c9fa3c69be20e1c2a26f1672c7a2c15afb5111f731dd8f0613000b1f6a9c2624230b62ebd67f64dab6f8ce0
-DIST net-ldap-0.12.0.gem 89600 SHA256 cfac33a3b76dd03938f272fefcdbfdc20e0ad419c4b79b6e9d8edb6c003b8a04 SHA512 7ccda246c983a290b2b26ee5117526332c93750f44dae7ba9eb1f193f8953557b20cf3268912aa4f33f93199e3dfc27bdde4f465a63f145fd74d91e42bfa18c1 WHIRLPOOL 0456ef77866338faf1f5369ed04ed195e5487eb5c522b73ff9406c9df9de36ac82238c036a1108885fc7687a7673cdea6e28e8ff963b93934070c0ca7dfee036
 DIST net-ldap-0.12.1.gem 90112 SHA256 864ce59bc51ab5a83a344a477a07def3b9691dd8a2b11f52dca3af45e707327c SHA512 013a66a0fa7e6027c5f31776d136294161936ae7dc2ec86a5342a2a2d575e5764ab06e11a7532c56e5c4ce95ab91a2ab4cc8628e6f1fcc879b9282c08142c31a WHIRLPOOL 4684076a97c3cc2285de6f23ccfb3fc60d3ae4eaef871d45ae3a772e47f5254f38a9ed7e78ace0aa6da28306c0043fe8d755bc48b4bca142b763fd65eb0e1e20
+DIST net-ldap-0.13.0.gem 91136 SHA256 e48f8d5a9e6fb119187a6cf63282d6d59afb0af6cf705a0463a396a4d029faf5 SHA512 1033bfd6b072d7448e35f85ba295c6c1eabd38c53f12a23b870c7f99cbed4580499d3b77913b7a9571645b501b73ff728c1e8df2ee7cc341cdbf3e143a1a8059 WHIRLPOOL 6785c0156822753beeab51fa222fa8c78fd12531c79e0bdf60e9d211d1924691fa087ba7a11d91b38a523ab1ae04581226e5e0757bf0ebb29362d66ed7fb2f58

dev-ruby/ruby-net-ldap/ruby-net-ldap-0.11.ebuild

@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="test spec"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc"
-
-RUBY_FAKEGEM_NAME="net-ldap"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure ruby LDAP client implementation"
-HOMEPAGE="https://github.com/ruby-ldap/ruby-net-ldap"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/flexmock-1.3.0 )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}

dev-ruby/ruby-net-ldap/ruby-net-ldap-0.13.0.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$
 

dev-ruby/tilt/Manifest

@@ -1,2 +1,3 @@
 DIST tilt-1.4.1.gem 42496 SHA256 39820562c4f5db45fe18de87ccc30a0e77a998bf5334b1d8c10a2f7dbc1f5903 SHA512 10fec263596d0e18a7a1440a7edfa08a161526cc46cc70427bc251951c447c40b4a4e8675e9162a9ed288879682b4aceeeb35b48cf3f4925921025194543363f WHIRLPOOL 5d70949358b97e867cdec160bd3c3726dabfec94bfeadc3a12f17463d378779d8502dda6458c7deb92bd3d9def91e306077ef806a7f75bd6c892554739ce46e9
 DIST tilt-2.0.1.gem 44544 SHA256 73dc6e2cd2fe4251cb7d15c92d0e66c884f17d0be580500d00cb426eb29881e1 SHA512 9451b2387c7c2535c9c78ae07dc0893f675e921d845f8eb5bc24c13a1e726888baba0d813195a81014370b640b290fab2e1b47871b6b2ab1e3eddb10c71217df WHIRLPOOL 92773f66291c193e912f810b8ad3da827782e744b19e2ef0ece7db262ff8a66324e9e08362f3b37ce14d125a196e743f1e264ef739bfeeaecd37c1a29c15c7e6
+DIST tilt-2.0.2.gem 48640 SHA256 04c91dcf7533576196e3ea2ba22514f37811ab7419bab6c71877e2e63a206d52 SHA512 93540d673f1c0e841be43e54e85451482f6ea8f967d14bce46c997be69a9ff16684aa5966c91cfd8d590cc32ef590974151183839ec315d46df5d398fd016832 WHIRLPOOL 051c29727ce157bf73d1c276c500471a48bde23a8a0ce516ad75e88a99b738e7c1a0283070db2c127922582e4f674e8591c69d36821744d5d09a3d0f9d0bd03f

dev-ruby/tilt/tilt-2.0.2.ebuild

@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/TEMPLATES.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A thin interface over a Ruby template engines to make their usage as generic as possible"
+HOMEPAGE="https://github.com/rtomayko/tilt"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Block on some of the potential test dependencies. These dependencies
+# are optional for the test suite, and we don't want to depend on all of
+# them to faciliate keywording and stabling.
+ruby_add_bdepend "test? (
+	dev-ruby/bluecloth
+	dev-ruby/coffee-script
+	dev-ruby/erubis
+	dev-ruby/nokogiri
+	!!<dev-ruby/maruku-0.7.2 )"
+
+# Most dependencies are optional: skip haml and radius for ruby20 and ruby21
+# because haml depends on rails.
+USE_RUBY="ruby20" ruby_add_bdepend "test? ( dev-ruby/haml )"
+USE_RUBY="ruby20 ruby21" ruby_add_bdepend "test? ( dev-ruby/radius )"
+
+ruby_add_rdepend ">=dev-ruby/builder-2.0.0:*
+	!!<dev-ruby/tilt-1.4.1-r2:0"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -e '/bundler/I s:^:#:' -i Rakefile test/test_helper.rb || die
+
+	# Avoid tests with minor syntax differences since this happens all
+	# the time when details in the dependencies change.
+	sed -e '/test_smarty_pants_true/,/^    end/ s:^:#:' -i test/tilt_markdown_test.rb || die
+	sed -e '/smartypants when :smart is set/,/^    end/ s:^:#:' -i test/tilt_rdiscounttemplate_test.rb || die
+	sed -i -e '/docbook templates/,/^    end/ s:^:#:' test/tilt_asciidoctor_test.rb || die
+}

dev-util/buildbot/buildbot-0.8.12-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$
 
@@ -31,8 +31,8 @@ RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}]
 DEPEND="${DEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
 	test? (
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/twisted-mail[${PYTHON_USEDEP}]
 		dev-python/twisted-web[${PYTHON_USEDEP}]

dev-util/patchelf/metadata.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
-    <email>jlec@gentoo.org</email>
+    <email>chewi@gentoo.org</email>
   </maintainer>
 </pkgmetadata>

eclass/scons-utils.eclass

@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,27 +9,42 @@
 # @DESCRIPTION:
 # This eclass provides a set of function to help developers sanely call
 # dev-util/scons and pass parameters to it.
-# @EXAMPLE:
 #
+# Please note that SCons is more like a 'build system creation kit',
+# and requires a lot of upstream customization to be used sanely.
+# You will often need to request fixes upstream and/or patch the build
+# system. In particular:
+#
+# 1. There are no 'standard' variables. To respect CC, CXX, CFLAGS,
+# CXXFLAGS, CPPFLAGS, LDFLAGS, upstream needs to define appropriate
+# variables explicitly. In some cases, upstreams respect envvars,
+# in others you need to pass them as options.
+#
+# 2. SCons scrubs out environment by default and replaces it with some
+# pre-defined values. To respect environment variables such as PATH,
+# Upstreams need to explicitly get them from os.environ and copy them
+# to the build environment.
+#
+# @EXAMPLE:
 # @CODE
 # inherit scons-utils toolchain-funcs
 #
-# EAPI=4
+# EAPI=5
 #
 # src_configure() {
-# 	myesconsargs=(
+# 	MYSCONS=(
 # 		CC="$(tc-getCC)"
-# 		$(use_scons nls ENABLE_NLS)
+#		ENABLE_NLS=$(usex nls)
 # 	)
 # }
 #
 # src_compile() {
-# 	escons
+# 	escons "${MYSCONS[@]}"
 # }
 #
 # src_install() {
 # 	# note: this can be DESTDIR, INSTALL_ROOT, ... depending on package
-# 	escons DESTDIR="${D}" install
+# 	escons "${MYSCONS[@]}" DESTDIR="${D}" install
 # }
 # @CODE
 
@@ -43,6 +58,8 @@
 # @VARIABLE: myesconsargs
 # @DEFAULT_UNSET
 # @DESCRIPTION:
+# DEPRECATED, EAPI 0..5 ONLY: pass options to escons instead
+#
 # List of package-specific options to pass to all SCons calls. Supposed to be
 # set in src_configure().
 
@@ -62,18 +79,22 @@
 
 # @ECLASS-VARIABLE: USE_SCONS_TRUE
 # @DESCRIPTION:
+# DEPRECATED: use usex instead
+#
 # The default value for truth in scons-use() (1 by default).
 : ${USE_SCONS_TRUE:=1}
 
 # @ECLASS-VARIABLE: USE_SCONS_FALSE
 # @DESCRIPTION:
+# DEPRECATED: use usex instead
+#
 # The default value for false in scons-use() (0 by default).
 : ${USE_SCONS_FALSE:=0}
 
 # -- EAPI support check --
 
 case ${EAPI:-0} in
-	0|1|2|3|4|5) ;;
+	0|1|2|3|4|5|6) ;;
 	*) die "EAPI ${EAPI} unsupported."
 esac
 
@@ -88,36 +109,82 @@ fi
 # -- public functions --
 
 # @FUNCTION: escons
-# @USAGE: [scons-arg] ...
+# @USAGE: [<args>...]
 # @DESCRIPTION:
-# Call scons, passing the supplied arguments, ${myesconsargs[@]},
-# filtered ${MAKEOPTS}, ${EXTRA_ESCONS}. Similar to emake. Like emake,
-# this function does die on failure in EAPI 4 (unless called nonfatal).
+# Call scons, passing the supplied arguments. Like emake, this function
+# does die on failure in EAPI 4. Respects nonfatal in EAPI 6 and newer.
 escons() {
 	local ret
 
 	debug-print-function ${FUNCNAME} "${@}"
 
+	# Use myesconsargs in EAPI 5 and older
+	if [[ ${EAPI} == [012345] ]]; then
+		set -- "${myesconsargs[@]}" "${@}"
+	fi
+
 	# if SCONSOPTS are _unset_, use cleaned MAKEOPTS
-	set -- scons ${SCONSOPTS-$(scons_clean_makeopts)} ${EXTRA_ESCONS} \
-		"${myesconsargs[@]}" "${@}"
+	if [[ ! ${SCONSOPTS+set} ]]; then
+		local SCONSOPTS
+		_scons_clean_makeopts
+	fi
+
+	set -- scons ${SCONSOPTS} ${EXTRA_ESCONS} "${@}"
 	echo "${@}" >&2
 	"${@}"
 	ret=${?}
 
-	[[ ${ret} -ne 0 ]] && has "${EAPI:-0}" 4 5 && die "escons failed."
+	if [[ ${ret} -ne 0 ]]; then
+		case "${EAPI:-0}" in
+			0|1|2|3) # nonfatal in EAPIs 0 through 3
+				;;
+			4|5) # 100% fatal in 4 & 5
+				die "escons failed."
+				;;
+			*) # respect nonfatal in 6 onwards
+				die -n "escons failed."
+				;;
+		esac
+	fi
 	return ${ret}
 }
 
-# @FUNCTION: scons_clean_makeopts
+# @FUNCTION: _scons_get_default_jobs
+# @INTERNAL
+# @DESCRIPTION:
+# Output the default number of jobs, used if -j is used without
+# argument. Tries to figure out the number of logical CPUs, falling
+# back to hardcoded constant.
+_scons_get_default_jobs() {
+	local nproc
+
+	if type -P nproc &>/dev/null; then
+		# GNU
+		nproc=$(nproc)
+	elif type -P python &>/dev/null; then
+		# fallback to python2.6+
+		# note: this may fail (raise NotImplementedError)
+		nproc=$(python -c 'import multiprocessing; print(multiprocessing.cpu_count());' 2>/dev/null)
+	fi
+
+	if [[ ${nproc} ]]; then
+		echo $(( nproc + 1 ))
+	else
+		# random default
+		echo 5
+	fi
+}
+
+# @FUNCTION: _scons_clean_makeopts
+# @INTERNAL
 # @USAGE: [makeflags] [...]
 # @DESCRIPTION:
 # Strip the supplied makeflags (or ${MAKEOPTS} if called without
 # an argument) of options not supported by SCons and make sure --jobs
 # gets an argument. Output the resulting flag list (suitable
 # for an assignment to SCONSOPTS).
-scons_clean_makeopts() {
-	local new_makeopts
+_scons_clean_makeopts() {
+	local new_makeopts=()
 
 	debug-print-function ${FUNCNAME} "${@}"
 
@@ -132,27 +199,26 @@ scons_clean_makeopts() {
 	# empty MAKEOPTS give out empty SCONSOPTS
 	# thus, we do need to worry about the initial setup
 	if [[ ${*} = ${_SCONS_CACHE_MAKEOPTS} ]]; then
-		set -- ${_SCONS_CACHE_SCONSOPTS}
-		debug-print "Cache hit: [${*}]"
-		echo ${*}
+		SCONSOPTS=${_SCONS_CACHE_SCONSOPTS}
+		debug-print "Cache hit: [${SCONSOPTS}]"
 		return
 	fi
-	export _SCONS_CACHE_MAKEOPTS=${*}
+	_SCONS_CACHE_MAKEOPTS=${*}
 
 	while [[ ${#} -gt 0 ]]; do
 		case ${1} in
 			# clean, simple to check -- we like that
 			--jobs=*|--keep-going)
-				new_makeopts=${new_makeopts+${new_makeopts} }${1}
+				new_makeopts+=( ${1} )
 				;;
 			# need to take a look at the next arg and guess
 			--jobs)
 				if [[ ${#} -gt 1 && ${2} =~ ^[0-9]+$ ]]; then
-					new_makeopts="${new_makeopts+${new_makeopts} }${1} ${2}"
+					new_makeopts+=( ${1} ${2} )
 					shift
 				else
 					# no value means no limit, let's pass a random int
-					new_makeopts=${new_makeopts+${new_makeopts} }${1}=5
+					new_makeopts+=( ${1}=$(_scons_get_default_jobs) )
 				fi
 				;;
 			# strip other long options
@@ -167,20 +233,20 @@ scons_clean_makeopts() {
 				while [[ -n ${str} ]]; do
 					case ${str} in
 						k*)
-							new_optstr=${new_optstr}k
+							new_optstr+=k
 							;;
 						# -j needs to come last
 						j)
 							if [[ ${#} -gt 1 && ${2} =~ ^[0-9]+$ ]]; then
-								new_optstr="${new_optstr}j ${2}"
+								new_optstr+="j ${2}"
 								shift
 							else
-								new_optstr="${new_optstr}j 5"
+								new_optstr+="j $(_scons_get_default_jobs)"
 							fi
 							;;
 						# otherwise, everything after -j is treated as an arg
 						j*)
-							new_optstr=${new_optstr}${str}
+							new_optstr+=${str}
 							break
 							;;
 					esac
@@ -188,22 +254,23 @@ scons_clean_makeopts() {
 				done
 
 				if [[ -n ${new_optstr} ]]; then
-					new_makeopts=${new_makeopts+${new_makeopts} }-${new_optstr}
+					new_makeopts+=( -${new_optstr} )
 				fi
 				;;
 		esac
 		shift
 	done
 
-	set -- ${new_makeopts}
-	export _SCONS_CACHE_SCONSOPTS=${*}
-	debug-print "New SCONSOPTS: [${*}]"
-	echo ${*}
+	SCONSOPTS=${new_makeopts[*]}
+	_SCONS_CACHE_SCONSOPTS=${SCONSOPTS}
+	debug-print "New SCONSOPTS: [${SCONSOPTS}]"
 }
 
 # @FUNCTION: use_scons
 # @USAGE: <use-flag> [var-name] [var-opt-true] [var-opt-false]
 # @DESCRIPTION:
+# DEPRECATED, EAPI 0..5 ONLY: use usex instead
+#
 # Output a SCons parameter with value depending on the USE flag state.
 # If the USE flag is set, output <var-name>=<var-opt-true>; otherwise
 # <var-name>=<var-opt-false>.
@@ -215,6 +282,9 @@ scons_clean_makeopts() {
 # If <var-opt-true> and/or <var-opt-false> are omitted,
 # ${USE_SCONS_TRUE} and/or ${USE_SCONS_FALSE} will be used instead.
 use_scons() {
+	[[ ${EAPI} == [012345] ]] \
+		|| die "${FUNCNAME} is banned in EAPI ${EAPI}, use usex instead"
+
 	local flag=${1}
 	local varname=${2:-${flag/\!/no}}
 	local vartrue=${3:-${USE_SCONS_TRUE}}

eclass/tests/scons-utils.sh

@@ -8,29 +8,30 @@ source tests-common.sh
 inherit scons-utils
 
 test-scons_clean_makeopts() {
-	local sconsopts=$(scons_clean_makeopts ${1})
+	tbegin "scons_clean_makeopts() for ${1}"
 
-	if [[ ${sconsopts} != ${2-${1}} ]]; then
+	local SCONSOPTS ret=0
+	_scons_clean_makeopts ${1}
+
+	if [[ ${SCONSOPTS} != ${2-${1}} ]]; then
 		eerror "Self-test failed:"
 		eindent
 		eerror "MAKEOPTS: ${1}"
 		eerror "Expected: ${2-${1}}"
-		eerror "Actual: ${sconsopts}"
+		eerror "Actual: ${SCONSOPTS}"
 		eoutdent
-		(( ++failed ))
-		return 1
+		ret=1
 	fi
 
-	return 0
+	tend ${ret}
+	return ${ret}
 }
 
 # jobcount expected for non-specified state
-jc=5
+jc=$(_scons_get_default_jobs)
 # failed test counter
 failed=0
 
-tbegin "scons_clean_makeopts()"
-
 # sane MAKEOPTS
 test-scons_clean_makeopts '--jobs=14 -k'
 test-scons_clean_makeopts '--jobs=14 -k'
@@ -59,6 +60,4 @@ test-scons_clean_makeopts '--jobs funnystuff -k' "--jobs=${jc} -k"
 test-scons_clean_makeopts '--jobs -l3' "--jobs=${jc}"
 test-scons_clean_makeopts '-j -l3' "-j ${jc}"
 
-tend ${failed}
-
 texit

games-action/atanks/Manifest

@@ -1 +1,2 @@
 DIST atanks-6.1.tar.gz 2786775 SHA256 116f5160b61116729d655a9c9110a6e358e8c45b696ed0e9c347bf89ab4afaab SHA512 1463455afcd67d042fda964f9c8b0caa9627611e758cb3badb5f8080b84644ec3452b78f2160d967ed9ebf427f426594fd0c6ee661fe48a731fcee85f14a3adb WHIRLPOOL d803d6885f185e4f5645a57b1be67a918b2682f74d725b891a057b2b4be23c90507202c314c22db553f2b0593df1dace498aff5ad44a678c1f4adcfc89be22f9
+DIST atanks-6.4.tar.gz 6059315 SHA256 ea5b560fb15872f7329a1f70d749c93cf553eeaa02480108e95c1664b85f049f SHA512 e9410e5bf0e8ec0281718ad8ddca74b67000db96b09b6af8aa906bbf2cd815f07ff550087ecdee2e4c5bfabc42941f184173f35e50538e57bb008372a599e1e6 WHIRLPOOL 25b59cf4592f526cdfbac4cc26b386571e658c8d0493a49790ffbfffe15d16b2796bf7a6684cdb9fad6de9c46d9ed544991469c3cf88a4ec24e4ba2d27c7db3e

games-action/atanks/atanks-6.4.ebuild

@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+DESCRIPTION="Worms and Scorched Earth-like game"
+HOMEPAGE="http://atanks.sourceforge.net/"
+SRC_URI="mirror://sourceforge/atanks/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="media-libs/allegro:0[X]"
+RDEPEND=${DEPEND}
+
+src_compile() {
+	emake \
+		BINDIR="${GAMES_BINDIR}" \
+		INSTALLDIR="${GAMES_DATADIR}/${PN}"
+}
+
+src_install() {
+	dogamesbin ${PN}
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r button misc missile sound stock tank tankgun text title unicode.dat *.txt
+	doicon -s 48 ${PN}.png
+	make_desktop_entry atanks "Atomic Tanks"
+	dodoc Changelog README TODO
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}

games-board/gtkatlantic/Manifest

@@ -1 +1,2 @@
 DIST gtkatlantic-0.5.0.tar.bz2 782124 SHA256 065f649e37144a545936546c8655c5d66558415c259c4838c101ab1c733e0d86 SHA512 5aa332af2f17612caae0e396614ddfecbb1df4ad1f2c15a402efea5e96fde72cb0aefa87e690234382b82d03904e7235536434e455827b838a988c13eaa78bfe WHIRLPOOL 48e0e44ecedb02686414b1fdbfbf355b7e214c31edc1db70f90657489b19fb65d5a984c5814f31aab045e3c0837e3978e105a330510a42704c05995a1b3a1556
+DIST gtkatlantic-0.6.1.tar.bz2 505701 SHA256 ab57fca9c45854752b4da77b749328884ddc975e9636ae6c73cc191f1d7eb331 SHA512 8388cbdd4c73d56eacb18a645bdd2d1f6e1fa8d21be972eaba1c4d6af6d0681a2a54909a82d6846ddd785b46b0ad99193e5afea528c5662956ff89a1e6e366df WHIRLPOOL 909331b930c540131bebcc7f1fd25ec36fa75f934ac23e21581c099aea61a78282ac5a9533b6a8622b4a76e482c023c54261bb98a5b563fa9563a3a4c5314d29

games-board/gtkatlantic/files/gtkatlantic-0.6.1-warnings.patch

@@ -0,0 +1,10 @@
+--- src/readpng.c.orig
++++ src/readpng.c
+@@ -23,6 +23,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <glib.h>
+ 
+ #include <png.h>

games-board/gtkatlantic/gtkatlantic-0.6.1.ebuild

@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils gnome2-utils games
+
+DESCRIPTION="Monopoly-like game that works with the monopd server"
+HOMEPAGE="http://gtkatlantic.gradator.net/"
+SRC_URI="http://download.tuxfamily.org/gtkatlantic/downloads/v0.6/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:3
+	dev-libs/libxml2
+	media-libs/libpng:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i -e 's:$(datadir):/usr/share:' {,data/}Makefile.am || die
+	sed -i -e 's/configure.in/configure.ac/' configure.in || die
+	mv configure.{in,ac} || die
+	epatch "${FILESDIR}"/${P}-warnings.patch
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--with-icons-path=/usr/share/icons/hicolor
+}
+
+src_install() {
+	default
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}

games-emulation/nestopia/Manifest

@@ -1,3 +1 @@
-DIST Nestopia140src.zip 2346187 SHA256 ec503320679062af260135bf38e1fa2376803c75efb74039224fb2ef3b888762 SHA512 54a7c569239c15aa9bd7a5bbe13f67b5a62baccf95f81fb55ad9578872edc11a3e456af7ea67107e96c0c88726e976203058cf971fbb527cd30b644d8d51795a WHIRLPOOL c62959e52e1366ec2966087269a6ac07998d6ae0c24cae00ec2621ea506128eb887eb10ce25ac8c8e82a6c89aea8aa7fad9351f55146ce4b16ae6f81b5c992b3
 DIST nestopia-1.46.2.tgz 1223407 SHA256 4a5065726ad9e7a120a2c6aa39b9c0904090119998a4d690d4deb5e374118fc0 SHA512 3aa87e98aa24b71e5feac5ffe8229e97d407fc0b14567b0ddbe7cc1eaca08a08f435a6fe294fbbd7066054befdfd27602db7c3c0577246b0e8addfe296404a23 WHIRLPOOL 25c43194797e5edca3abc5cb75dba126d9d246e9ab12270521e7fe6c13427b371ba9f92a71ed557271f159711411286b5ac5ab3fe06144760320531c33bf0c02
-DIST nst140_lnx_release_h.zip 250216 SHA256 0b6b11d98fabbb0319c1d0800428f8cba6631ac2808fb4618ced3d7c8d782859 SHA512 eea9b212a26f0d8c294371eeb15a22c1aba595334dd46629767af19671692bd29eda078caa96d4a91f505b4e2764861090578c63dd3715cfa0fce4af7fc39339 WHIRLPOOL 715f33a33a2dd630d35e3a7ca1acdbcdb8843139aa976686324d121fab6cd89a5e666cc952e6097563cda145e17717a823931bdb40067e9d295e747a4902d83d

games-emulation/nestopia/files/nestopia

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# create dir and copy files, if needed
-[ ! -d ~/.nestopia ] && mkdir ~/.nestopia
-[ ! -f ~/.nestopia/nstcontrols ]  && cp "%GAMES_DATADIR%/nestopia/nstcontrols" ~/.nestopia/
-[ ! -f ~/.nestopia/NstDatabase.xml ]  && cp "%GAMES_DATADIR%/nestopia/NstDatabase".xml ~/.nestopia/
-
-# wrap around the emu
-exec nestopia.bin "$@"
-

games-emulation/nestopia/files/nestopia-1.40-makefile.patch

@@ -1,69 +0,0 @@
---- Makefile.orig	2010-01-24 02:21:57.196476493 -0500
-+++ Makefile	2010-01-24 02:27:52.134475800 -0500
-@@ -3,19 +3,20 @@
- # By R. Belmont
- #
- 
--CC   = gcc
--CPP  = g++
--CFLAGS = -c -O3 -g3
--CFLAGS += -DNST_PRAGMA_ONCE_SUPPORT -D_SZ_ONE_DIRECTORY
--CFLAGS += -Isource -Isource/core -Isource/zlib -Isource/core/api -Isource/core/board -Isource/core/input -Isource/linux/unzip 
--CFLAGS += -Isource/core/vssystem -Isource/linux -Isource/nes_ntsc -I.. -I../nes_ntsc -Isource/linux/7zip 
--CFLAGS += `sdl-config --cflags` `pkg-config --cflags gtk+-2.0`
--CFLAGS += -finline-limit=2000 --param inline-unit-growth=1000 --param large-function-growth=1000 -finline-functions-called-once
-+FLAGS = -c \
-+	-DNST_PRAGMA_ONCE_SUPPORT -D_SZ_ONE_DIRECTORY \
-+	-Isource -Isource/core -Isource/zlib -Isource/core/api -Isource/core/board -Isource/core/input -Isource/linux/unzip  \
-+	-Isource/core/vssystem -Isource/linux -Isource/nes_ntsc -I.. -I../nes_ntsc -Isource/linux/7zip  \
-+	`sdl-config --cflags` `pkg-config --cflags gtk+-2.0` \
-+	-finline-limit=2000 --param inline-unit-growth=1000 --param large-function-growth=1000 -finline-functions-called-once
-+
-+CFLAGS += $(FLAGS)
-+CXXFLAGS += $(FLAGS)
- 
- # enable this for input debugging
- #CFLAGS += -DDEBUG_INPUT
- 
--CPPFLAGS = -Wno-deprecated -fno-rtti
-+CXXFLAGS += -Wno-deprecated -fno-rtti
- 
- EXE  = nst
- LIBS = -lm -lz -lasound  `sdl-config --libs` `pkg-config --libs gtk+-2.0`
-@@ -144,6 +145,8 @@
- OBJDIRS = objs objs/core objs/core/api objs/core/board objs/core/input objs/core/vssystem objs/nes_ntsc 
- OBJDIRS += objs/linux objs/linux/7zip objs/linux/unzip
- 
-+$(shell mkdir $(sort $(OBJDIRS)))
-+
- # build rules
- objs/%.o: source/%.c
- 	@echo Compiling $<...
-@@ -151,24 +154,19 @@
- 
- objs/%.o: source/%.cpp
- 	@echo Compiling $<...
--	@$(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@
-+	$(CC) $(CXXFLAGS) $< -o $@
- 
- objs/%.o: source/%.o
- 	@echo Compiling $<...
- 	@$.o) $(CFLAGS) $.oFLAGS) $< -o $@
- 
--all: maketree $(EXE) $(GENNSTCONTROLS)
--
--maketree: $(sort $(OBJDIRS))
-+all: $(EXE) $(GENNSTCONTROLS)
- 
--$(sort $(OBJDIRS)):
--	@echo Creating output directory $@
--	@mkdir $@
- 
- # link the commandline exe
- $(EXE): $(OBJS)
- 	@echo Linking $@...
--	@$(CPP) -g -o $(EXE) $^ $(LIBS)
-+	$(CXX) $(LDFLAGS) -g -o $(EXE) $^ $(LIBS)
- 
- clean:
- 	-@rm -f $(OBJS) $(EXE) $(GENNSTCONTROLS)

games-emulation/nestopia/nestopia-1.40.ebuild

@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic games
-
-MY_PV="${PV//./}"
-LNX_P="nst${MY_PV}_lnx_release_h"
-DESCRIPTION="NEStopia is a portable Nintendo Entertainment System emulator written in C++"
-HOMEPAGE="http://rbelmont.mameworld.info/?page_id=200"
-SRC_URI="mirror://sourceforge/${PN}/Nestopia${MY_PV}src.zip
-	http://rbelmont.mameworld.info/${LNX_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.4:2
-	media-libs/alsa-lib
-	>=media-libs/libsdl-1.2.12[sound,joystick,video]
-	sys-libs/zlib
-	virtual/opengl
-	virtual/glu"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	sed \
-	    -e "s:%GAMES_DATADIR%:${GAMES_DATADIR}:g" \
-	    "${FILESDIR}"/${PN} \
-	    > ${PN} \
-	    || die "sed failed"
-	strip-flags
-}
-
-src_install() {
-	newgamesbin nst ${PN}.bin
-	dogamesbin ${PN}
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins NstDatabase.xml nstcontrols
-
-	make_desktop_entry "${PN}" "Nestopia"
-
-	dodoc README.Linux changelog.txt
-	dohtml -r readme.html doc/*.html doc/details
-
-	prepgamesdirs
-}

games-fps/alephone/Manifest

@@ -1,2 +1,3 @@
 DIST AlephOne-20100424.tar.bz2 3180896 SHA256 d97089890ce99952027eaf6185baa6cb01b26c2882dfca9e68816dfe7076a5e6 SHA512 b246b662f4bf820238c09fbb6bc55289d0db0a9b5ba15ab2b91a53f93666e81583834fd8a64497074a2e270a2055de24b3be93bb56d58715f9d213b1f4c92494 WHIRLPOOL 3074f6c4ba4925b8a0f7718bdfb0d1084155421397a7604febfeae473635b970b3842152b9a3e200f2bc642790a0dc51e689aa3b18de2235d5697105060c7f93
 DIST AlephOne-20120514.tar.bz2 4716348 SHA256 6a7797af74cf3fae7f5505e64ffe57c56f7331521cb569bcc8b7d7041cb3718b SHA512 71e54341221485765b63c7c723f95e04d41c8e2cecf6bc3f885efc178f4c75fd88cdffe703c4bf41a5e7101fd8cef33797d00cd249e211b7de1b22fc639b4278 WHIRLPOOL 03ff5bd735a28a3113706f4de5837351404ddede2fabc09d45233b3bb646a9550f00cc1d30710a6f32952c452668e5f764fb427ef5495553f6c49ddcfcaef350
+DIST AlephOne-20150620.tar.bz2 5031898 SHA256 c0f360dfb74a6264f95d375103a74000930cf0439ffb0464f915f5379443e133 SHA512 fb47969137b791f83b111171d7b92b3708597db294ce19fb682ce28c49edcd4cb84a6ce4dcceb6630812a8c676dfe7f39f3fb4642f40ef7086a0d6c6fdeba8df WHIRLPOOL a00150e8c28763d7d01a5d805e449247dc9ff612eb0e9f0aa2d10e7fcf17654342fa31eb5a2eeb3bc756c80cce84dd9664179977900d635e67401036c71a7c10

games-fps/alephone/alephone-20150620.ebuild

@@ -0,0 +1,88 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils games
+
+MY_P=AlephOne-${PV}
+DESCRIPTION="An enhanced version of the game engine from the classic Mac game, Marathon"
+HOMEPAGE="http://source.bungie.org/"
+SRC_URI="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${PV}/AlephOne-${PV}.tar.bz2"
+
+LICENSE="GPL-3+ BitstreamVera OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="alsa curl ffmpeg mad mpeg sndfile speex vorbis"
+
+RDEPEND="media-libs/sdl-net
+	media-libs/sdl-ttf
+	media-libs/sdl-image[png]
+	media-libs/libsdl[joystick,opengl,video]
+	dev-libs/expat
+	dev-libs/zziplib
+	dev-libs/boost
+	media-libs/libpng:0
+	virtual/opengl
+	virtual/glu
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	ffmpeg? ( virtual/ffmpeg )
+	mad? ( media-libs/libmad )
+	mpeg? ( media-libs/smpeg )
+	sndfile? ( media-libs/libsndfile )
+	speex? ( media-libs/speex )
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed "s:GAMES_DATADIR:${GAMES_DATADIR}:g" \
+		"${FILESDIR}"/${PN}.sh > "${T}"/${PN}.sh \
+		|| die
+
+	# try using the system expat - bug #251108
+	sed -i \
+		-e '/SUBDIRS/ s/Expat//' \
+		-e 's/Expat\/libexpat.a/-lexpat/' \
+		Source_Files/Makefile.am || die
+	sed -i -e '/Expat/d' configure.ac || die
+	rm -r Source_Files/Expat || die
+
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--enable-lua \
+		--enable-opengl \
+		$(use_with alsa) \
+		$(use_with ffmpeg) \
+		$(use_with mad) \
+		$(use_with mpeg smpeg) \
+		$(use_with sndfile) \
+		$(use_with speex) \
+		$(use_with vorbis)
+}
+
+src_install() {
+	default
+	dogamesbin "${T}"/${PN}.sh
+	doman docs/${PN}.6
+	dohtml docs/*.html
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	echo
+	elog "Read the docs and install the data files accordingly to play."
+	echo
+	elog "If you only want to install one scenario, read"
+	elog "http://traxus.bungie.org/index.php/Aleph_One_install_guide#Single_scenario_3"
+	elog "If you want to install multiple scenarios, read"
+	elog "http://traxus.bungie.org/index.php/Aleph_One_install_guide#Multiple_scenarios_3"
+	echo
+}

games-server/monopd/Manifest

@@ -1,2 +1,3 @@
+DIST monopd-0.10.2.tar.gz 180317 SHA256 252da82002ea27015cb53f9ded04c63838b237c9d254d1b504af56249ed75fdb SHA512 f47d9623e110a98d9d32b522484944998fb6e7e8644e1f2b439428a1e12b3b514b902e52e7135150135a3e3251aa38604434347d06533f3cf3ffb28a2a81ede3 WHIRLPOOL 5f42874cbc51bf2209bf0328b4df348832a808faa101a50b323b8ce8b12c9eacf70684738819da16115c30244b1dfe1a94f0b98b177cfe9ad615f734a4db5641
 DIST monopd-0.9.7.tar.gz 180318 SHA256 34aa975c8ee410f661622f91a63c4199e68a333123218b3e48300be1bc7afc30 SHA512 55b2e3b6f16f20fc1928d79eaecbdceaf9b9a8c9fe44b2cf8a8489347c728a006df78043235504e3931bb71b90e7493375fb2b71285447ad4a11dd434aa3133f WHIRLPOOL 14c47c95b64fafe07dc37ea61579ad42cf09c535f35b8f22d7dbdfa1dd04c529173e22c99287d2c748266ab00cdd82e28340d945924681849a1209911d6fcd16
 DIST monopd-0.9.8.tar.gz 180509 SHA256 408321ea73f2e7cdee570973ff50a3ee1a2f7078f8f19e8861614f238574ec9a SHA512 c39806c51f27eb29f154db520bf1c49d10e5a8587b3d23411de43bd07cd3553c398ea31802473d9cdcf350f5432abeb7bde62478e1844abc93d73395951c87b1 WHIRLPOOL 9e18cfac665610f5372af16128b87095eeb19251cd511b489124c4e7d8845bcc123c6a1fc51d8d457cdabf6cacc6dcf704766b8ff1a96c0f5940bd4f66595272

games-server/monopd/monopd-0.10.2.ebuild

@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils systemd games
+
+DESCRIPTION="server for atlantik games"
+HOMEPAGE="http://gtkatlantic.gradator.net/"
+SRC_URI="http://download.tuxfamily.org/gtkatlantic/monopd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+RDEPEND="systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+	>=dev-cpp/muParser-2
+	dev-libs/utfcpp"
+
+src_prepare() {
+	sed "s:GENTOO_DIR:\"${GAMES_BINDIR}\":" \
+		"${FILESDIR}"/monopd.in > "${T}"/monopd || die
+	sed -i \
+		-e "s:/usr/sbin:${GAMES_BINDIR}:" \
+		doc/systemd/monopd.service || die
+	sed -i \
+		-e '/C_SUBST(CXXFLAGS/s/CFLAGS/CXXFLAGS/' \
+		configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf $(use_with systemd systemd-daemon)
+}
+
+src_install() {
+	default
+	doinitd "${T}"/monopd
+	systemd_dounit doc/systemd/monopd.s*
+	prepgamesdirs
+}

mail-client/roundcube/roundcube-1.1.3.ebuild

@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
 # roundcube is GPL-licensed, the rest of the licenses here are
 # for bundled PEAR components, googiespell and utf8.class.php
 LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86"
 
 IUSE="enigma ldap managesieve mysql postgres sqlite ssl spell"
 REQUIRED_USE="|| ( mysql postgres sqlite )"

media-fonts/cantarell/Manifest

@@ -1,3 +1,4 @@
 DIST cantarell-fonts-0.0.18.1.tar.xz 289248 SHA256 9c5b1a2edee1d3acf30eaae3d559b2b2e1d835249cf2770f6f8bfc6af861e8f0 SHA512 eeabffc1f51f1c5423c7eba29b9dd47b4e7595146a1f380bd2742ee692a95fafb159e5f0d67c2b8864da23d277a782eeb65939a3fb82f70b09d0c89d38663f7d WHIRLPOOL 5a610d9be666fa7b4aac9edebdbe6bd71c1d948fbdb4556dff8f4635db8298d7bf11b6d0d02f4a5a112e1653c3d32d14ab5756a2614879c815dc8694f77ed3bd
 DIST cantarell-fonts-0.0.19.tar.xz 386692 SHA256 c7f975ef3d5cf0ed409636c59d069260783683c47ba1289ac3e66a98446e46ae SHA512 52042a48a7fe36b3281006a56c4f8ccc98032e85776867fde803b593baabfdf80ff04173d983227964c185caa0949b2947e2dbbd4d4cf36116b52ba95ef8b7c7 WHIRLPOOL bd1de994ffe83544513d580cf4300fcd66a4fca6e2e8489e5383beac68920c48d01df682ad3adc691ba0b515fc25d556dfa9e8ba786226f4b3db5288a188dbd9
+DIST cantarell-fonts-0.0.20.1.tar.xz 353144 SHA256 0f933516f3270fb7307d9c2e26e4703b403608c5cc9da3127cba4395bcd4ec91 SHA512 b77b0eb34c68e0de916a55517835c807ea2ca2ca9ea94956f08a1381e4d957f2ab4ddf0f2930de35a4635cc1da1ed9108f0183691c278692226a1a6961971772 WHIRLPOOL b8f0293d106856c2ba6bfaff3f53b991c12d9dc4299424c54c50bf0d8839b3603985db7486932735177c7713569b13210d77843fa7133987ab8ccc001a798a15
 DIST cantarell-fonts-0.0.20.tar.xz 351660 SHA256 fb78a5cb6bdcfc464b763a030186c818080860107283bff8adcbb2d084f8f8de SHA512 fa6c993523e1079da2f53f215fe26777193180bddf3bdfcdbfb79ec83954ac54dd7c460df9d6d6eed043f37b5bbf18f12d56b03b3d7f56a102768072dc92b1b5 WHIRLPOOL 132c5641ff2b87d6e2a277af624d76d2141d210b0b92ccd55cbef85664bd83aad8e8d96bff17a630c6d66482e9aa3fa1022879cf89e7bba1963febf176c264a1

media-fonts/cantarell/cantarell-0.0.20.1.ebuild

@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME_ORG_MODULE="${PN}-fonts"
+
+inherit font gnome.org
+
+DESCRIPTION="Default fontset for GNOME Shell"
+HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="media-libs/fontconfig"
+DEPEND="virtual/pkgconfig"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+# Font eclass settings
+FONT_CONF=("${S}/fontconfig/31-cantarell.conf")
+FONT_S="${S}/otf"
+FONT_SUFFIX="otf"

media-gfx/darktable/Manifest

@@ -1,3 +1,3 @@
 DIST darktable-1.6.9.tar.xz 3124940 SHA256 0f721e9d298a9407f6c0325d9c95b9dc37fa60f3b6a2f2e3b5675ff97c423173 SHA512 c0e8e83cf1cb10b663e5486f2bdde3cba2db5dbaabacd260999be1173c67618023e785e9087a517959835459f8d54c245d190f63a9422a17f3472f5aa316d492 WHIRLPOOL 0a2446ff7f98cf0297c5948009414dbf828f1cc60a9fb117f1e110f454dd68df611310bd9ff287f1f2345a8ee9818c1918b4ac7791aeb094c01e71a1ecdfce9d
-DIST darktable-2.0.rc3.tar.xz 2953088 SHA256 4d81527350e6f722da484bdcd3f620918321b0e15b1fdad219821abbf23c2c89 SHA512 46bc286b3743001f09d2f1646c95dc76c7a3a5bf54e576eefaa8c151d46650040a12bcbf7520e917934f81edbb5c68250e36d6d97d46a3be4b8100ee8711c7d3 WHIRLPOOL 9635c94a9f9b7dba7c1d930a0e5a457f6b4be543c0958672341d5da465188ad7c51193dd5338c801543cb47bd911e369dc59d8b92ce87c4ba8eba68d90f86718
+DIST darktable-2.0.0.tar.xz 2888596 SHA256 d4f2f525bbbb1355bc3470e74cc158d79d7e236f3925928f67a88461f1df7cb1 SHA512 d4c829212bd30e218a3870d2fb5907c707dd41ed672cbebf38b02d6b771f252fa09648bd4b2496ad6381f2a3238cb0d5090afa05a4be3e3c284900cf6e010f16 WHIRLPOOL 7bbece902492f1865efa3b1e6c61424331301f0a6cf52ce8128506da6b9fa91493110711bb26d181b6208fe788994b5ffd3e332bb4829742f8f0ab24ffe19254
 DIST darktable-usermanual-1.6.0.pdf 12827069 SHA256 f5c46dbf0a2dd2d391f92555abdefe735c6362e51a755b296d71779492b7e945 SHA512 39ee8c1b4f23883025750416d9d1f73d1dfbec0e6ac3eeef0f15778ced66a373c00b0a46cb3a54b1cfd6e04313313f63e8e3cd3d0cbea011acaa07a725d0ab02 WHIRLPOOL 49a234e57c14d23ccb85eadf2ad03c52eae7f90b0371dce025c04019a7a5cca41858084f735fe0965f93958ab83601571ab3e33acd27c2bcbd381bb0c9da4794

media-gfx/darktable/darktable-2.0.0.ebuild

@@ -1,27 +1,24 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime pax-utils eutils versionator
+inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime pax-utils eutils
 
 DOC_PV="1.6.0"
-MY_PV="$(replace_version_separator 2 "")"
-MY_P="${PN}-$(replace_version_separator 2 ".")"
-MY_P_S="${PN}-$(replace_version_separator 2 "~")"
 
 DESCRIPTION="A virtual lighttable and darkroom for photographers"
 HOMEPAGE="http://www.darktable.org/"
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${PV}/${P}.tar.xz
 	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LANGS=" af ca cs da de el es fi fr gl it ja nl pl pt_BR pt_PT ro ru sk sq sv th uk zh_CN"
+LANGS=" ca cs da de el es fr it ja nl pl pt_BR pt_PT ru sk sq sv uk"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr gphoto2 graphicsmagick jpeg2k kde libsecret
 nls opencl openmp openexr pax_kernel +slideshow webp
 ${LANGS// / linguas_}"
 
@@ -47,7 +44,6 @@ CDEPEND="
 	colord? ( x11-misc/colord:0= )
 	cups? ( net-print/cups )
 	flickr? ( media-libs/flickcurl )
-	geo? ( net-libs/libsoup:2.4 )
 	gphoto2? ( media-libs/libgphoto2:= )
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	jpeg2k? ( media-libs/openjpeg:0 )
@@ -70,8 +66,6 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-S="${WORKDIR}/${MY_P_S}"
-
 pkg_pretend() {
 	if use openmp ; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"
@@ -94,7 +88,6 @@ src_configure() {
 		$(cmake-utils_use_use colord COLORD)
 		$(cmake-utils_use_build cups PRINT)
 		$(cmake-utils_use_use flickr FLICKR)
-		$(cmake-utils_use_use geo GEO)
 		$(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
 		$(cmake-utils_use_use graphicsmagick GRAPHICSMAGICK)
 		$(cmake-utils_use_use jpeg2k OPENJPEG)
@@ -106,6 +99,7 @@ src_configure() {
 		$(cmake-utils_use_use openmp OPENMP)
 		$(cmake-utils_use_build slideshow SLIDESHOW)
 		$(cmake-utils_use_use webp WEBP)
+		-DUSE_GEO=OFF
 		-DUSE_LUA=OFF
 		-DCUSTOM_CFLAGS=ON
 		-DINSTALL_IOP_EXPERIMENTAL=ON

media-video/smtube/Manifest

@@ -1 +1,2 @@
 DIST smtube-15.11.0.tar.bz2 670236 SHA256 dedef3dc634624e8252c5806e2cb09b1c2b8a363c29bea2b6dfa79610868f38e SHA512 b66026b69c36f2ade0797ab50c7df458b9508509574563079ca22af63bc842b317f9b8853220860527f100aa97f1c35a39b00ee588957e1939cffd54b244e9b2 WHIRLPOOL 17409b7ac1058ad9ba5919db5fd7e161e8e677eda7bf794ad101791c7131e611515da9340ccf367d2b55cade58918fbdacd6b807eb32240145ab851bc7157e6d
+DIST smtube-16.1.0.tar.bz2 670383 SHA256 9948596342b94b152cc5ab62e9600bd06d066b12f32bf7ca4088bb5be43b56fa SHA512 dd844d181864b62a872f65fb1aad96e9cc1edb2d91a5ce5c1b2cc67ba99fa052f5e0e9439d61bfb9f4a8438fe745ad408763b2bd5020f10e3efc559119cf13f1 WHIRLPOOL 7b5fa5663ff0117a4dcebae813fd7ac16d2abd5cdaf95bd2551c75f4a94c770a132e47961dc7e19d0cd5ce0b6b4e2a4aa0ef430fe8f0224d14cbe764daeabba0

media-video/smtube/metadata.xml

@@ -10,6 +10,10 @@
 		that allows you to play videos directly in a variety of media players.
 	</longdescription>
 	<upstream>
+		<maintainer status="active">
+			<email>ricardo@smplayer.info</email>
+			<name>Ricardo Villalba</name>
+		</maintainer>
 		<remote-id type="sourceforge">smtube</remote-id>
 	</upstream>
 	<use>

media-video/smtube/smtube-16.1.0.ebuild

@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PLOCALES="bg cs da de en_GB en es eu fr gl he_IL hr hu it ja ko ms nn_NO pl pt_BR pt ru sq sr tr uk zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit l10n qmake-utils
+
+DESCRIPTION="YouTube Browser for SMPlayer"
+HOMEPAGE="http://smplayer.sourceforge.net/smtube"
+SRC_URI="mirror://sourceforge/smplayer/${P}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="qt5"
+
+# Deps in makefile seemed to be -core, -network, -script, -gui, -webkit, but the
+# given packages seem to be deprecated...
+DEPEND="qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebkit:5 dev-qt/qtscript:5 )
+		!qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 dev-qt/qtscript:4 )"
+RDEPEND="${DEPEND}
+	|| ( media-video/smplayer[streaming] media-video/mpv media-video/mplayer media-video/vlc media-video/totem media-video/gnome-mplayer )"
+
+gen_translation() {
+	lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	if use qt5; then
+		eqmake5 src/${PN}.pro
+	else
+		eqmake4 src/${PN}.pro
+	fi
+	emake
+
+	cd "${S}"/src/translations
+	l10n_for_each_locale_do gen_translation
+}
+
+install_locale() {
+	insinto /usr/share/${PN}/translations
+	doins "${S}"/src/translations/${PN}_${1}.qm
+	eend $? || die "failed to install $1 translation"
+}
+
+src_install() {
+	dobin ${PN}
+	domenu ${PN}.desktop
+	newicon icons/${PN}_64.png ${PN}.png
+	dodoc Changelog
+
+	l10n_for_each_locale_do install_locale
+}

metadata/dtd/timestamp.chk

@@ -1 +1 @@
-Thu, 07 Jan 2016 20:43:55 +0000
+Fri, 08 Jan 2016 14:13:48 +0000

metadata/glsa/timestamp.chk

@@ -1 +1 @@
-Thu, 07 Jan 2016 20:43:55 +0000
+Fri, 08 Jan 2016 14:13:48 +0000

metadata/md5-cache/app-backup/backintime-1.1.4

@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] dev-python/dbus-python[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] dev-python/keyring[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] net-misc/openssh net-misc/rsync[xattr,acl]
-DESCRIPTION=Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4
-EAPI=5
-HOMEPAGE=http://backintime.le-web.org/
-IUSE=qt4 python_targets_python3_3 python_targets_python3_4 python_single_target_python3_3 python_single_target_python3_4
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] dev-python/dbus-python[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] dev-python/keyring[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] net-misc/openssh net-misc/rsync[xattr,acl]
-REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 )
-SLOT=0
-SRC_URI=http://backintime.le-web.org/download/backintime/backintime-1.1.4.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=2331c4ead876d0e95882211f7f37c6ed

metadata/md5-cache/app-backup/backintime-1.1.8

@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] dev-python/dbus-python[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] dev-python/keyring[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] net-misc/openssh net-misc/rsync[xattr,acl]
-DESCRIPTION=Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4
-EAPI=5
-HOMEPAGE=http://backintime.le-web.org/
-IUSE=qt4 python_targets_python3_3 python_targets_python3_4 python_single_target_python3_3 python_single_target_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] dev-python/dbus-python[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] dev-python/keyring[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_jython2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] net-misc/openssh net-misc/rsync[xattr,acl]
-REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 )
-SLOT=0
-SRC_URI=http://backintime.le-web.org/download/backintime/backintime-1.1.8.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=1acf41db5d28210ab726098de9dc2589

metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.3-r2

@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 CDDL
 RDEPEND=app-i18n/ibus ~app-i18n/sunpinyin-2.0.3 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=https://sunpinyin.googlecode.com/files/ibus-sunpinyin-2.0.3.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	scons-utils	b7d634f772db55c8af429f50aeec6ee0	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	scons-utils	6a35944612b7ecb18a3803359554badc	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
 _md5_=fb11c5a1442d37cae9de2561d8951375

metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20130108-r1

@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 CDDL
 RDEPEND=app-i18n/ibus ~app-i18n/sunpinyin-2.0.4_pre20130108:= nls? ( virtual/libintl ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-2.0.4_pre20130108.tar.xz
-_eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	scons-utils	b7d634f772db55c8af429f50aeec6ee0	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	scons-utils	6a35944612b7ecb18a3803359554badc	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
 _md5_=d658a028f3f15cbc2641dd8288e1592d

metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20130108-r2

@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-2.0.4_pre20130108.tar.xz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	scons-utils	b7d634f772db55c8af429f50aeec6ee0	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	scons-utils	6a35944612b7ecb18a3803359554badc	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
 _md5_=ae69b9628d34a1bf37e0b504b178e379

metadata/md5-cache/app-i18n/scim-sunpinyin-2.0.3-r2

@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 CDDL
 RDEPEND=app-i18n/scim ~app-i18n/sunpinyin-2.0.3 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://sunpinyin.googlecode.com/files/scim-sunpinyin-2.0.3.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	scons-utils	b7d634f772db55c8af429f50aeec6ee0	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	scons-utils	6a35944612b7ecb18a3803359554badc	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
 _md5_=c4f6a55c4df0aa4f6984f3ffa9a26475

metadata/md5-cache/app-i18n/sunpinyin-2.0.3-r1

@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 CDDL
 RDEPEND=dev-db/sqlite:3
 SLOT=0
 SRC_URI=https://sunpinyin.googlecode.com/files/sunpinyin-2.0.3.tar.gz https://open-gram.googlecode.com/files/dict.utf8.tar.bz2 https://open-gram.googlecode.com/files/lm_sc.t3g.arpa.tar.bz2
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	scons-utils	b7d634f772db55c8af429f50aeec6ee0	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	scons-utils	6a35944612b7ecb18a3803359554badc	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
 _md5_=099c7fc4f25ca8a2363950d3c4cd0efb

metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108

@@ -9,5 +9,5 @@ PDEPEND=app-i18n/sunpinyin-data
 RDEPEND=dev-db/sqlite:3
 SLOT=0/1
 SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-2.0.4_pre20130108.tar.xz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	scons-utils	b7d634f772db55c8af429f50aeec6ee0	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	30887c5e8630bbf27b5cf0fd74564323	scons-utils	6a35944612b7ecb18a3803359554badc	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
 _md5_=6475e8cf019ac90271a5def476210dc8

metadata/md5-cache/app-i18n/xsunpinyin-2.0.3-r3

@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 CDDL
 RDEPEND=~app-i18n/sunpinyin-2.0.3 x11-libs/gtk+:2 x11-libs/libX11
 SLOT=0
 SRC_URI=https://sunpinyin.googlecode.com/files/xsunpinyin-2.0.3.tar.gz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	scons-utils	b7d634f772db55c8af429f50aeec6ee0	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	scons-utils	6a35944612b7ecb18a3803359554badc	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
 _md5_=822276f39af3b150a17ea2f02f7d129a

metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20130108

@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 CDDL
 RDEPEND=~app-i18n/sunpinyin-2.0.4_pre20130108:= x11-libs/gtk+:2 x11-libs/libX11
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-2.0.4_pre20130108.tar.xz
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	cbc4807273837f5fccb5372e385e99eb	scons-utils	b7d634f772db55c8af429f50aeec6ee0	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	cbc4807273837f5fccb5372e385e99eb	scons-utils	6a35944612b7ecb18a3803359554badc	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
 _md5_=14549cd65159066c7a1e8057903482b1