diff --git a/dev-java/scala-bin/Manifest b/dev-java/scala-bin/Manifest
index 28241d06de22..6a9e08ecec50 100644
--- a/dev-java/scala-bin/Manifest
+++ b/dev-java/scala-bin/Manifest
@@ -1,3 +1,4 @@
 DIST scala-1.2.0.1.tar.bz2 4548508 SHA256 975d6e10febf5d52a3f2d826afa7f98ddbec0a6f05eaf6c30a3f27a472ca84b9 SHA512 8fd4958e1603b576cb73f7372a88a7b06c1432e4f8a0fa6a987aa4397343c6d859ddda9972af039e0b4b1ea722dbbbfd4df03fe2edf9cc54bbc72e5cebbf200b WHIRLPOOL dfa5d71b39ffa1012d66ac8bcc281562182af13ec642fceee2e1fb7f3228a303a198a401e0578e3aad7d7608a26ae6e11978042fd488b4503ffb144e5d2efa44
 DIST scala-2.11.4.tgz 26509669 SHA256 000f5a19de78049bc06e33ee98063c7ad3cfd51212df92a8a164af89aeef8084 SHA512 f963279cba5d2f4d41d195f80dad32bf529bc5f2c3d306ce6c1b9fbb6d4977a481796d98c3d1758f3987824880ab0925ac72e3a70e4165faf7c7985e64cece28 WHIRLPOOL a76a97854e0d4ac9f2f555ab3b5196d473e8723c88926163f88c891ac31cacb7d97acadf437aee101b2d9db0fc0295f4b3fc95c5db6bc16de8e6ff54b1a2ecda
 DIST scala-2.11.5.tgz 27135212 SHA256 6d593ce6df0e4f2e90ae423f2d40b915cd9be2bd41708b7fc1df56ebbdf0893c SHA512 c906cb1e42a62fc271674cb95b3eacd968dd579dfd43a1adaae8a102b4069096907af4798a6a002dfec796905e3cff05d58116013c8e45a7277879935c39d3d3 WHIRLPOOL d05fd600bf5c24a856f75ca245338d97da642dd7d68033bf21364aa9ba82aa79c00b37a1a8721cd761126e011556ef52ad06a370d680b04aa5391488e695f739
+DIST scala-2.11.6.tgz 27130723 SHA256 41ba45e4600404634217a66d6b2c960459d3a67e0344a7c3d9642d0eaa446583 SHA512 aeb6dd1b586d4e66e01f268aa8a647a303f2f960cbe255e9c79ced978dad92b6cef3cba143945affa3427548daed6e5e1d607b9ecb4d7567adc886d64546da61 WHIRLPOOL 20c1bd8b905ad4f7d155d366637a2aeaeb50569025ba585a0e6e3bb2268068e7b74bed26769a9b3a1d1d662833b6d5f57781c7165ec84d1c63142cdd6edae294
diff --git a/dev-java/scala-bin/metadata.xml b/dev-java/scala-bin/metadata.xml
index e80ed52a09bd..250f2d1940ea 100644
--- a/dev-java/scala-bin/metadata.xml
+++ b/dev-java/scala-bin/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-	<herd>java</herd>
+  <herd>java</herd>
 </pkgmetadata>
diff --git a/dev-java/scala-bin/scala-bin-2.11.5.ebuild b/dev-java/scala-bin/scala-bin-2.11.5.ebuild
index fb62c8e49535..1a70d138ade7 100644
--- a/dev-java/scala-bin/scala-bin-2.11.5.ebuild
+++ b/dev-java/scala-bin/scala-bin-2.11.5.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.5.ebuild,v 1.3 2015/03/21 15:11:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.5.ebuild,v 1.4 2015/03/24 09:33:33 jlec Exp $
+
 EAPI=5
 
 inherit java-pkg-2
diff --git a/dev-java/scala-bin/scala-bin-2.11.6.ebuild b/dev-java/scala-bin/scala-bin-2.11.6.ebuild
new file mode 100644
index 000000000000..8d3a3aca6dec
--- /dev/null
+++ b/dev-java/scala-bin/scala-bin-2.11.6.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.6.ebuild,v 1.2 2015/03/24 09:33:33 jlec Exp $
+
+EAPI=5
+
+inherit java-pkg-2
+
+DESCRIPTION="The Scala Programming Language"
+HOMEPAGE="http://scala.epfl.ch/"
+SRC_URI="http://downloads.typesafe.com/scala/${PV}/scala-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND="
+	>=virtual/jre-1.6
+	!dev-lang/scala"
+
+JAVA_PKG_IUSE='doc'
+
+S=${WORKDIR}/scala-${PV}
+
+java_prepare() {
+	ebegin 'Cleaning .bat files'
+	rm -f bin/*.bat || die
+	eend $?
+
+	ebegin 'Patching SCALA_HOME variable in bin/ scripts'
+	for f in bin/*; do
+		sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' $f || die
+	done
+	eend $?
+}
+
+src_install() {
+	ebegin 'Installing bin scripts'
+	dobin bin/*
+	eend $?
+
+	ebegin 'Installing jar files'
+	cd lib/ || die
+
+	# Unversion those libs
+	java-pkg_newjar scala-continuations-library_*.jar scala-continuations-library.jar
+	java-pkg_newjar akka-actor_*.jar akka-actor.jar
+	java-pkg_newjar config-*.jar config.jar
+	java-pkg_newjar scala-actors-2.11.0.jar scala-actors.jar
+	java-pkg_newjar scala-actors-migration_*.jar scala-actors-migration.jar
+	java-pkg_newjar scala-swing_*.jar scala-swing.jar
+	java-pkg_newjar scala-parser-combinators_*.jar scala-parser-combinators.jar
+	java-pkg_newjar scala-xml_*.jar scala-xml.jar
+	java-pkg_newjar jline-*.jar jline.jar
+	java-pkg_newjar scala-continuations-plugin_*.jar scala-continuations-plugin.jar
+	java-pkg_newjar scalap-*.jar scalap.jar
+
+	# Install these the usual way
+	java-pkg_dojar scala-compiler.jar
+	java-pkg_dojar scala-library.jar
+	java-pkg_dojar scala-reflect.jar
+
+	eend $?
+
+	cd ../ || die
+
+	ebegin 'Installing man pages'
+	doman man/man1/*.1
+	eend $?
+
+	if use doc; then
+		ebegin 'Installing documentation'
+		java-pkg_dohtml -r doc/tools
+		eend $?
+	fi
+}
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 973fcaa54137..693f244fe95f 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,6 +1,4 @@
-DIST Django-1.4.19.tar.gz 7877522 SHA256 d75d605e574305e1c2864c392e1454963ead4552477ce14e67e64b9ef9faa1a6 SHA512 811267ec1ad99a8eaf4daa098cd5140970718f5814ed1e7e9ab706ff049c508a788cf186aafe208947e6350e17baef4a205f549bba744ef53c7e365a101a9391 WHIRLPOOL 67b24ddd89a31294cb260923b58e31dadfd6b4fe654a625586bc9341ba95f9bb2960befdd58dfae91128149fba1b95c3dcef9f72510e3e904cb03de8b685d63c
 DIST Django-1.4.20.tar.gz 7877794 SHA256 58ac719464c4c8b13d664ded6770450602528bf4c36f9fd5daabdae8d410ebb1 SHA512 b4625547af0a7d53fa00f801239858619015ba990b50cb859168814a2cc385c867ce570192e762ef1399518407958c687e607536259e420b238a5dd587d2d4bd WHIRLPOOL 8b6bd9912fd27c03d7d06df29314eeb4ad1efbc1347780d2414f324b83f7869bdd7e322b11eecfc32a7fb0189eedf37f69774157292b92163f3fa0e78f24417c
 DIST Django-1.5.10.tar.gz 8074324 SHA256 7cb4217e740f7d5d6d74617dbb9d960f9c09e8269c6762fe68c6e762219f4018 SHA512 5357116870370f7fd06f77e5bfad98f89c6bb131eb2828ded524422d0690d8842c3106e4e92614c374ab2549d205e77c98e4071894f0625dfe69a382171b1834 WHIRLPOOL e603767d6912e9bffd65161750baa626c315362c8c438a2c6fb25a47ecdc867bace998752a9acb6b8db1833f30e8bd7b9aa8fc87f823b906b394d4ab455aa265
-DIST Django-1.6.10.tar.gz 6760152 SHA256 54eb59ce785401c7d1fdeed245efce597e90f811d6a20f6b5c6931c0049d63a6 SHA512 4ef44f2f4d0537443125765ab0e13b0d4798f828b09e7f881f2841d8e7078e4a8f0ac4750ebbd4586190feacd13490d4657575411737d2dc1e3c2cf046c2dadf WHIRLPOOL 8cbcfd690aa813b72da2f8480fcf66de87179a92a802450d354c1c383a7df415b3346d1a8a913a717b39db6edb67bcafd0fa0f45da55a2284e3e23c4fe45803f
 DIST Django-1.6.11.tar.gz 6764000 SHA256 7e50e573e484435873b3515d7982d80093b2695aba17fd0ff024307454dc3a56 SHA512 de6024b49e0344bf153f73ec344180fb701e415e4f9c330118821744d0e579436cc265724f7ef7213c9551847022ba9570312633f317b9003db533d06deb9829 WHIRLPOOL 5de086952bda9449f85798e8fe3bac82f11e1b856c1d39e340399e71ca6bf183318eebf1f536714567036485637166a929082a1ba9d6c1816f07c53dcc12c72a
 DIST Django-1.7.7.tar.gz 7603286 SHA256 4816f892063569ca9a77584fa23cb4995c1b3b954ef875102a8219229cbd2e33 SHA512 e08446e7b6a0c64594dca2411b8b3fe16a8fe9b951bd33ae4c1f5187c83a2ce36bd7e0a07e169c338236d6f258362861e868a62f59d9d86bea679d9d42722ceb WHIRLPOOL bf38ff3730d20107e7f25d8793c7ce487edf66407f3c4dda906eca98eb6d8d9ff080338e20d2e418d82b217ef7611511be838a398737717bbad97fca6c8acc5e
diff --git a/dev-python/django/django-1.4.19.ebuild b/dev-python/django/django-1.4.19.ebuild
deleted file mode 100644
index b85ac3358a69..000000000000
--- a/dev-python/django/django-1.4.19.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.19.ebuild,v 1.4 2015/03/01 11:22:47 ago Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite?'
-
-inherit bash-completion-r1 distutils-r1 eutils versionator webapp
-
-MY_P="Django-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
-SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="sqlite test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${PYTHON_DEPS//sqlite?/sqlite}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		<dev-python/numpy-1.9[$(python_gen_usedep 'python*')]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		virtual/python-imaging[${PYTHON_USEDEP}]
-		)"
-
-#		app-text/pytextile[${PYTHON_USEDEP}]
-#		dev-python/markdown[${PYTHON_USEDEP}]
-#		dev-python/selenium[${PYTHON_USEDEP}]
-#		dev-python/py-bcrypt[${PYTHON_USEDEP}]
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-bashcomp.patch
-	"${FILESDIR}"/${P}-test.patch
-)
-
-python_prepare_all() {
-	# Disable tests requiring network connection.
-	sed \
-		-e "s/test_correct_url_value_passes/_&/" \
-		-e "s/test_correct_url_with_redirect/_&/" \
-		-i tests/modeltests/validation/tests.py || die
-	sed \
-		-e "s/test_urlfield_3/_&/" \
-		-e "s/test_urlfield_4/_&/" \
-		-e "s/test_urlfield_10/_&/" \
-		-i tests/regressiontests/forms/tests/fields.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-	webapp_src_install
-
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
-	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysql-connector-python
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature "Memcached support" dev-python/python-memcached
-	optfeature "ImageField Support" virtual/python-imaging
-	echo ""
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r django/contrib/admin/static/admin/.
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "A copy of the admin media is available to"
-	elog "webapp-config for installation in a webroot,"
-	elog "as well as the traditional location in python's"
-	elog "site-packages dir for easy development"
-	elog
-	ewarn "If you build Django ${PV} without USE=\"vhosts\""
-
-	# XXX: call webapp_pkg_postinst? the old ebuild didn't do that...
-	ewarn "webapp-config will automatically install the"
-	ewarn "admin media into the localhost webroot."
-}
diff --git a/dev-python/django/django-1.4.20.ebuild b/dev-python/django/django-1.4.20.ebuild
index 96ed9152c882..be8ed3115d60 100644
--- a/dev-python/django/django-1.4.20.ebuild
+++ b/dev-python/django/django-1.4.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.20.ebuild,v 1.2 2015/03/19 19:15:33 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.20.ebuild,v 1.3 2015/03/24 09:12:33 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="sqlite test"
 
 RDEPEND=""
diff --git a/dev-python/django/django-1.6.10.ebuild b/dev-python/django/django-1.6.10.ebuild
deleted file mode 100644
index 4795be820e3e..000000000000
--- a/dev-python/django/django-1.6.10.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.6.10.ebuild,v 1.5 2015/03/01 17:19:31 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-
-PYTHON_REQ_USE='sqlite?'
-WEBAPP_NO_AUTO_INSTALL="yes"
-
-inherit bash-completion-r1 distutils-r1 eutils versionator webapp
-
-MY_P="Django-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
-SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
-	test? (
-		${PYTHON_DEPS//sqlite?/sqlite}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		<dev-python/numpy-1.9[$(python_gen_usedep 'python*')]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		)"
-
-#		dev-python/bcrypt[${PYTHON_USEDEP}]
-#		dev-python/selenium[${PYTHON_USEDEP}]
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5-py3tests.patch
-	"${FILESDIR}"/${PN}-1.6-objects.patch
-	"${FILESDIR}"/${P}-bashcomp.patch
-	"${FILESDIR}"/${P}-test.patch
-)
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-python_prepare_all() {
-	# Disable tests requiring network connection.
-	sed \
-		-e "s:test_sensitive_cookie_not_cached:_&:g" \
-		-i tests/cache/tests.py || die
-
-	distutils-r1_python_prepare_all
-}
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-	webapp_src_install
-
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
-	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysql-connector-python
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature "Memcached support" dev-python/python-memcached
-	optfeature "ImageField Support" virtual/python-imaging
-	echo ""
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources || die
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r django/contrib/admin/static/admin/.
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "A copy of the admin media is available to webapp-config for installation in a"
-	elog "webroot, as well as the traditional location in python's site-packages dir"
-	elog "for easy development."
-	webapp_pkg_postinst
-}
diff --git a/dev-python/django/django-1.6.11.ebuild b/dev-python/django/django-1.6.11.ebuild
index 1a684cf75da8..44a1734e5ea3 100644
--- a/dev-python/django/django-1.6.11.ebuild
+++ b/dev-python/django/django-1.6.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.6.11.ebuild,v 1.2 2015/03/19 19:15:33 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.6.11.ebuild,v 1.3 2015/03/24 09:12:33 ago Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 
 RDEPEND=""
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index a82fbcc70763..1489e850079a 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,3 +1,2 @@
 DIST dulwich-0.10.0.tar.gz 272600 SHA256 518bb4aa3e5ad81982bfe571594af81ab9f78feb4e33bfade6c1553afff69237 SHA512 a5aa321e1265ee6c96c763a357d204eda7b9d4d6e90e0b18898342f34b9babf4d43857b9974d6bf442f9ba4da54fed4342c5724772cc9028138e8ec75d2e4896 WHIRLPOOL a032b962f106f0b8c9b9dd3238b135a04b6c6787c0344b8c3235c14e0bd3392ee5298776ff318a8bbafacbb60451dd685febd4a01160d017be3ea49541349af9
-DIST dulwich-0.9.7.tar.gz 259335 SHA256 12e77b0434a3bb3075e9c96e608ee9c3f85e49bc9c8335139aba8795de4000f3 SHA512 163a3df862e72d8bda5119a381868e7e64edb37973c206aa3f8eb850c6207d3ab5399c97b25adf543f57bdef46e5d3ebd8d2d5e45f5b3ed9babf64ae94f77386 WHIRLPOOL ca4fad28e04931858db39422f64cd2225dac55569fedfd4f7ce911bfe29a55cc8144860c679bd8f4344eaef6f15fb52fca622798d927e6e30316067c7497844a
 DIST dulwich-0.9.9.tar.gz 270127 SHA256 084e762c8d4d0c0002823249db57b8e735c99c409dacc2849565dd3c0c288496 SHA512 5039e8e80c51b8ee0df2ba0805fa63d9b476a05c86b6bd9eaf9348ac03a83f0f1208e259ae6bcf40fb2c94ffb57c9b45bff852e367b8bee95c10e672d3dc19d5 WHIRLPOOL 2a79d25f1233d9a6a242d064af179486810555eb3c9803c336ae152095318a32eb8588779cb07f84b073a05bf7f083ba3b3d4c8d2b4f8929b2aa3d01c29a0a01
diff --git a/dev-python/dulwich/dulwich-0.9.7.ebuild b/dev-python/dulwich/dulwich-0.9.7.ebuild
deleted file mode 100644
index 743d9d718311..000000000000
--- a/dev-python/dulwich/dulwich-0.9.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dulwich/dulwich-0.9.7.ebuild,v 1.5 2014/12/28 10:18:18 ago Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Dulwich is a pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="https://github.com/jelmer/dulwich/  http://pypi.python.org/pypi/dulwich"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/gevent[$(python_gen_usedep python2_7)]
-	)"
-RDEPEND=""
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# https://github.com/jelmer/dulwich/issues/196
-	if [[ "${EPYTHON}" == pypy ]]; then
-		"${PYTHON}" -m unittest dulwich.tests.test_suite || die "Tests failed under pypy"
-	else
-		emake check
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/android-studio/android-studio-1.1.0.135.1740770-r1.ebuild b/dev-util/android-studio/android-studio-1.1.0.135.1740770-r1.ebuild
new file mode 100644
index 000000000000..8e5e82e40f98
--- /dev/null
+++ b/dev-util/android-studio/android-studio-1.1.0.135.1740770-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/android-studio-1.1.0.135.1740770-r1.ebuild,v 1.1 2015/03/24 09:49:28 perfinion Exp $
+
+EAPI=5
+inherit eutils versionator
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/bin/libbreakgen.so"
+STUDIO_V=$(get_version_component_range 1-3)
+BUILD_V=$(get_version_component_range 4-5)
+if [[ $(get_version_component_count) -gt 5 ]]; then
+	STUDIO_V="${STUDIO_V}-$(get_version_component_range 6-)"
+fi
+
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="http://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/zip"
+RDEPEND=">=virtual/jdk-1.7
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
+	>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
+	>=dev-libs/libffi-3.0.13-r1[abi_x86_32(-)]
+	>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+	>=media-libs/freetype-2.5.5[abi_x86_32(-)]
+	>=media-libs/libpng-1.2.51[abi_x86_32(-)]
+	>=media-libs/mesa-10.2.8[abi_x86_32(-)]
+	>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
+	>=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)]
+	>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	>=x11-libs/libXfixes-5.0.1[abi_x86_32(-)]
+	>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+	>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+	>=x11-libs/libdrm-2.4.46[abi_x86_32(-)]
+	>=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
+	>=x11-libs/libxshmfence-1.1[abi_x86_32(-)]"
+S=${WORKDIR}/${PN}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}/bin/studio.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64"
+
+	newicon "bin/idea.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE"
+}
diff --git a/media-libs/mesa/files/mesa-10.5.1-fstat-include.patch b/media-libs/mesa/files/mesa-10.5.1-fstat-include.patch
new file mode 100644
index 000000000000..212d00db87cc
--- /dev/null
+++ b/media-libs/mesa/files/mesa-10.5.1-fstat-include.patch
@@ -0,0 +1,37 @@
+From 771cd266b9d00bdcf2cf7acaa3c8363c358d7478 Mon Sep 17 00:00:00 2001
+From: Emil Velikov <emil.l.velikov@gmail.com>
+Date: Wed, 11 Mar 2015 19:12:35 +0000
+Subject: loader: include <sys/stat.h> for non-sysfs builds
+
+Required by fstat(), otherwise we'll error out due to implicit function
+declaration.
+
+Cc: "10.4 10.5" <mesa-stable@lists.freedesktop.org>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89530
+Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+Reported-by: Vadim Rutkovsky <vrutkovs@redhat.com>
+Tested-by: Vadim Rutkovsky <vrutkovs@redhat.com>
+
+diff --git a/src/loader/loader.c b/src/loader/loader.c
+index 9ff5115..17bf133 100644
+--- a/src/loader/loader.c
++++ b/src/loader/loader.c
+@@ -64,6 +64,7 @@
+  *    Rob Clark <robclark@freedesktop.org>
+  */
+ 
++#include <sys/stat.h>
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -80,7 +81,6 @@
+ #endif
+ #endif
+ #ifdef HAVE_SYSFS
+-#include <sys/stat.h>
+ #include <sys/types.h>
+ #endif
+ #include "loader.h"
+-- 
+cgit v0.10.2
+
diff --git a/media-libs/mesa/mesa-10.5.1.ebuild b/media-libs/mesa/mesa-10.5.1.ebuild
index c9de76fe0fa5..eba5c75340a4 100644
--- a/media-libs/mesa/mesa-10.5.1.ebuild
+++ b/media-libs/mesa/mesa-10.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.5.1.ebuild,v 1.2 2015/03/17 11:43:43 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.5.1.ebuild,v 1.3 2015/03/24 11:35:44 chithanh Exp $
 
 EAPI=5
 
@@ -185,6 +185,7 @@ src_prepare() {
 	# fix for hardened pax_kernel, bug 240956
 	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
 
+	epatch "${FILESDIR}"/${P}-fstat-include.patch
 	eautoreconf
 }
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index c62db09ef088..a7dce9ffb026 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 24 Mar 2015 09:07:16 +0000
+Tue, 24 Mar 2015 12:06:50 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index c62db09ef088..a7dce9ffb026 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 24 Mar 2015 09:07:16 +0000
+Tue, 24 Mar 2015 12:06:50 +0000
diff --git a/metadata/md5-cache/dev-java/scala-bin-2.11.5 b/metadata/md5-cache/dev-java/scala-bin-2.11.5
index 3a428db3021f..7b2ce7a7d4c6 100644
--- a/metadata/md5-cache/dev-java/scala-bin-2.11.5
+++ b/metadata/md5-cache/dev-java/scala-bin-2.11.5
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 !dev-lang/scala >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=http://downloads.typesafe.com/scala/2.11.5/scala-2.11.5.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d94ae456af479ac862cb1c3b3ab09237
+_md5_=c53f731dcb17ab266c72adfa24fb90c8
diff --git a/metadata/md5-cache/dev-java/scala-bin-2.11.6 b/metadata/md5-cache/dev-java/scala-bin-2.11.6
new file mode 100644
index 000000000000..cc2b5b4ab346
--- /dev/null
+++ b/metadata/md5-cache/dev-java/scala-bin-2.11.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=dev-java/java-config-2.1.9-r1
+DESCRIPTION=The Scala Programming Language
+EAPI=5
+HOMEPAGE=http://scala.epfl.ch/
+IUSE=doc elibc_FreeBSD
+KEYWORDS=~x86 ~amd64
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.6 !dev-lang/scala >=dev-java/java-config-2.1.9-r1
+SLOT=0
+SRC_URI=http://downloads.typesafe.com/scala/2.11.6/scala-2.11.6.tgz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=b5dfaf046e150097bdd3cc755bc4bee2
diff --git a/metadata/md5-cache/dev-python/django-1.4.19 b/metadata/md5-cache/dev-python/django-1.4.19
deleted file mode 100644
index 523f5024c001..000000000000
--- a/metadata/md5-cache/dev-python/django-1.4.19
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/numpy-1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-admin/webapp-config-1.50.15
-DESCRIPTION=High-level Python web framework
-EAPI=5
-HOMEPAGE=http://www.djangoproject.com/ http://pypi.python.org/pypi/Django
-IUSE=sqlite test python_targets_python2_7 vhosts
-KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.djangoproject.com/m/releases/1.4/Django-1.4.19.tar.gz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=280fb39e97ba150314c394683e95a062
diff --git a/metadata/md5-cache/dev-python/django-1.4.20 b/metadata/md5-cache/dev-python/django-1.4.20
index a7cbe736ca51..84dfb6e7ff2d 100644
--- a/metadata/md5-cache/dev-python/django-1.4.20
+++ b/metadata/md5-cache/dev-python/django-1.4.20
@@ -4,11 +4,11 @@ DESCRIPTION=High-level Python web framework
 EAPI=5
 HOMEPAGE=http://www.djangoproject.com/ http://pypi.python.org/pypi/Django
 IUSE=sqlite test python_targets_python2_7 vhosts
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/1.4/Django-1.4.20.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=769551d4d4527ed49e7ab7c6be45a699
+_md5_=7add46d10d06a9f576801d8b5db248c6
diff --git a/metadata/md5-cache/dev-python/django-1.6.10 b/metadata/md5-cache/dev-python/django-1.6.10
deleted file mode 100644
index 69884d5334d6..000000000000
--- a/metadata/md5-cache/dev-python/django-1.6.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] doc? ( >=dev-python/sphinx-1.0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_pypy? ( virtual/pypy:0=[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] <dev-python/numpy-1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?] ) python_targets_pypy? ( virtual/pypy:0=[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=app-admin/webapp-config-1.50.15
-DESCRIPTION=High-level Python web framework
-EAPI=5
-HOMEPAGE=http://www.djangoproject.com/ http://pypi.python.org/pypi/Django
-IUSE=doc sqlite test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?] ) python_targets_pypy? ( virtual/pypy:0=[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
-SLOT=0
-SRC_URI=https://www.djangoproject.com/m/releases/1.6/Django-1.6.10.tar.gz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=8d7085473b053b7443bb93daf361a9f3
diff --git a/metadata/md5-cache/dev-python/django-1.6.11 b/metadata/md5-cache/dev-python/django-1.6.11
index 040bec27fe8c..b85b7c1315ed 100644
--- a/metadata/md5-cache/dev-python/django-1.6.11
+++ b/metadata/md5-cache/dev-python/django-1.6.11
@@ -4,11 +4,11 @@ DESCRIPTION=High-level Python web framework
 EAPI=5
 HOMEPAGE=http://www.djangoproject.com/ http://pypi.python.org/pypi/Django
 IUSE=doc sqlite test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?] ) python_targets_pypy? ( virtual/pypy:0=[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/1.6/Django-1.6.11.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=8a20c84ad52502e2a647bf9a6edfe660
+_md5_=c1ce5a8b624a3c01fa192d5031b24bec
diff --git a/metadata/md5-cache/dev-python/dulwich-0.9.7 b/metadata/md5-cache/dev-python/dulwich-0.9.7
deleted file mode 100644
index 5568df840ccf..000000000000
--- a/metadata/md5-cache/dev-python/dulwich-0.9.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] test? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
-DESCRIPTION=Dulwich is a pure-Python implementation of the Git file formats and protocols
-EAPI=5
-HOMEPAGE=https://github.com/jelmer/dulwich/ http://pypi.python.org/pypi/dulwich
-IUSE=doc examples test python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
-SLOT=0
-SRC_URI=mirror://pypi/d/dulwich/dulwich-0.9.7.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=d8232350980496f29eb8a5d97361fe24
diff --git a/metadata/md5-cache/dev-util/android-studio-1.1.0.135.1740770-r1 b/metadata/md5-cache/dev-util/android-studio-1.1.0.135.1740770-r1
new file mode 100644
index 000000000000..f0f963820d99
--- /dev/null
+++ b/metadata/md5-cache/dev-util/android-studio-1.1.0.135.1740770-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/zip
+DESCRIPTION=A new Android development environment based on IntelliJ IDEA
+EAPI=5
+HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
+IUSE=selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=dev-libs/libffi-3.0.13-r1[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.5[abi_x86_32(-)] >=media-libs/libpng-1.2.51[abi_x86_32(-)] >=media-libs/mesa-10.2.8[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)]
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://dl.google.com/dl/android/studio/ide-zips/1.1.0/android-studio-ide-135.1740770-linux.zip
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=2f7bcd6eacb886cee2b7f481b917fd97
diff --git a/metadata/md5-cache/media-libs/mesa-10.5.1 b/metadata/md5-cache/media-libs/mesa-10.5.1
index f35a65b16808..13b86f216cd8 100644
--- a/metadata/md5-cache/media-libs/mesa-10.5.1
+++ b/metadata/md5-cache/media-libs/mesa-10.5.1
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/10.5.1/mesa-10.5.1.tar.xz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=de3fb41b3e466265b6d74b2f306fe313
+_md5_=5b1054e8518220e4f705a47b9b974ca6
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.8.6 b/metadata/md5-cache/sys-apps/pkgcore-0.8.6
new file mode 100644
index 000000000000..98669beac023
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.8.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=>=dev-lang/python-2.5 >=dev-python/snakeoil-0.5.2 || ( >=dev-lang/python-2.5 dev-python/pycrypto ) doc? ( dev-python/sphinx dev-python/pyparsing ) dev-lang/python
+DESCRIPTION=pkgcore package manager
+EAPI=3
+HOMEPAGE=http://pkgcore.googlecode.com/
+IUSE=-doc build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/python-2.5 >=dev-python/snakeoil-0.5.2 || ( >=dev-lang/python-2.5 dev-python/pycrypto ) dev-lang/python
+SLOT=0
+SRC_URI=http://pkgcore.googlecode.com/files/pkgcore-0.8.6.tar.bz2
+_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
+_md5_=2405e494f8cca758703cb6f8a74b5cdf
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 08a64184dafc..df8cb51d522f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 24 Mar 2015 09:07:19 +0000
+Tue, 24 Mar 2015 12:06:53 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index c28ef3523ced..11bdf2b88abd 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Mar 24 09:07:16 UTC 2015
+Tue Mar 24 12:06:50 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f154a4fda4fa..002645977534 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 24 Mar 2015 09:30:01 +0000
+Tue, 24 Mar 2015 12:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 095dd0beeee9..8788eedb2bef 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1427187901 Tue 24 Mar 2015 09:05:01 AM UTC
+1427198701 Tue 24 Mar 2015 12:05:01 PM UTC
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index d62ccc132729..b8b34fa4d08f 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.mask,v 1.139 2014/10/02 10:29:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.mask,v 1.140 2015/03/24 09:37:19 perfinion Exp $
 
 # AMD64 Team <amd64@gentoo.org>
 # Mask packages that rely on amd64 multilib
@@ -46,6 +46,7 @@ dev-lang/ifc
 dev-perl/Archive-Rar
 dev-python/skype4py
 dev-util/android-sdk-update-manager
+dev-util/android-studio
 dev-util/biew
 games-action/cs2d
 games-action/descent3
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
index 3a5199ec663b..916005f4518e 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/package.mask,v 1.40 2014/10/02 10:29:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/package.mask,v 1.41 2015/03/24 09:37:19 perfinion Exp $
 
 # These are broken as reported by Halcy0n, Aug, 23, 2011
 net-misc/teamviewer
@@ -65,6 +65,7 @@ dev-lang/ifc
 dev-perl/Archive-Rar
 dev-python/skype4py
 dev-util/android-sdk-update-manager
+dev-util/android-studio
 dev-util/biew
 games-action/awesomenauts
 games-action/cs2d
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index e69de29bb2d1..d7de1d227e45 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -0,0 +1 @@
+DIST pkgcore-0.8.6.tar.bz2 446652 SHA256 05104f683bcad4fb477152c950d8ba21d8a59fe783f05e901f684c66f2c9488c SHA512 320562755c21cb1d749ea011d22313f8c09855375ea72c94910f45202d8a92bb75a0fa709a360c702c16e404dbec9d14d5ed3aff6687084418dc742a4c901955 WHIRLPOOL 611ad52a8015379de50593580c35eb1f175fd0fe3c219548911e7008c58a52185128840950d17c3fd730659196db79550762f029c8c0c199eaba8aa07a8bf9d9
diff --git a/sys-apps/pkgcore/pkgcore-0.8.6.ebuild b/sys-apps/pkgcore/pkgcore-0.8.6.ebuild
new file mode 100644
index 000000000000..1b8ee9e2af34
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.8.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.8.6.ebuild,v 1.5 2015/03/24 09:33:54 patrick Exp $
+
+EAPI="3"
+DISTUTILS_SRC_TEST="setup.py"
+inherit distutils eutils
+
+DESCRIPTION="pkgcore package manager"
+HOMEPAGE="http://pkgcore.googlecode.com/"
+SRC_URI="http://pkgcore.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="-doc build"
+
+RDEPEND=">=dev-lang/python-2.5
+	>=dev-python/snakeoil-0.5.2
+	|| ( >=dev-lang/python-2.5 dev-python/pycrypto )"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx dev-python/pyparsing )"
+
+DOCS="AUTHORS NEWS"
+
+pkg_setup() {
+	# disable snakeoil 2to3 caching...
+	unset PY2TO3_CACHEDIR
+	python_pkg_setup
+}
+
+src_compile() {
+	distutils_src_compile $(use_enable doc html-docs)
+}
+
+src_install() {
+	distutils_src_install $(use_enable doc html-docs)
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	pplugincache
+}